changed include protection from #if !defined to ifndef, and added #pragma once, if possible

1179 files changed, 16449 insertions, 14664 deletions

diff --git a/ASNMP/agent/agent_impl.h b/ASNMP/agent/agent_impl.h
index ee107a88a99..60ee90034a2 100644
--- a/ASNMP/agent/agent_impl.h
+++ b/ASNMP/agent/agent_impl.h
@@ -5,16 +5,16 @@
 //
 // = LIBRARY
 //    ASNMP
-// 
+//
 // = FILENAME
-//    agent_impl.h 
+//    agent_impl.h
 //
 // = AUTHOR
-//    Michael R. MacFaden 
-// 
+//    Michael R. MacFaden
+//
 // ============================================================================
 
-#if !defined (AGENT_IMPL_H)
+#ifndef AGENT_IMPL_H
 #define AGENT_IMPL_H
 
 #include <ace/Event_Handler.h>
@@ -24,7 +24,7 @@
 #include <asnmp/sagent.h>
 #include <asnmp/vb.h>
 
-class agent_impl : public sagent 
+class agent_impl : public sagent
 {
 public:
   agent_impl(unsigned short port, const char *rd, const char *wr);
@@ -35,7 +35,7 @@ public:
 
   virtual int handle_get_next( Pdu &pdu, UdpTarget &target);
   // retrieve data lexically adjacent to the oids specified in the pdu
-  // from the peer agent 
+  // from the peer agent
 
   virtual int handle_set( Pdu &pdu, UdpTarget &target);
   // set data in the agent from the list of oids in the pdu
@@ -45,7 +45,7 @@ public:
 
 private:
   UdpTarget tgt_;  // this agent's read, write community strings
-  int get_response(Vb& vb);	// set values for a "get" cmd
+  int get_response(Vb& vb);     // set values for a "get" cmd
   ACE_High_Res_Timer agent_clock_; // agent "uptime" ticks reported in 1/100 second
 };
 
diff --git a/ASNMP/agent/snmp_agent.h b/ASNMP/agent/snmp_agent.h
index 72184ddb14a..a7fc4c42de8 100644
--- a/ASNMP/agent/snmp_agent.h
+++ b/ASNMP/agent/snmp_agent.h
@@ -13,7 +13,7 @@
 //    snmp_agent.h
 //
 // = AUTHOR
-//    Michael R. MacFaden (mrm@cisco.com) 
+//    Michael R. MacFaden (mrm@cisco.com)
 //
 // ============================================================================
 
@@ -24,7 +24,7 @@ class snmp_agent {
   //   An SNMP v1 agent class
   //
   // = DESCRIPTION
-  //   Contructs agents that are capable of processing SNMPv1 requests 
+  //   Contructs agents that are capable of processing SNMPv1 requests
   //   over the MIB II System group
 
   public:
diff --git a/ASNMP/asnmp/address.h b/ASNMP/asnmp/address.h
index 5640a607f98..a9250b8244d 100644
--- a/ASNMP/asnmp/address.h
+++ b/ASNMP/asnmp/address.h
@@ -15,7 +15,7 @@
 //  addresses into easy to use, safe and portable classes.
 //
 // = AUTHOR
-//    Peter E Mellquist 
+//    Peter E Mellquist
 //
 // ============================================================================
 
@@ -24,37 +24,42 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 //----[ includes ]-----------------------------------------------------
 // ACE OS Adaption layer
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "asnmp/smival.h"
 #include "asnmp/octet.h"
 
-//----[ enumerated types ] --------------------------------  
+//----[ enumerated types ] --------------------------------
 enum address_lengths {
    IPV4LEN=4,
    UDPIPV4LEN=6,
    IPV6LEN=16,
    UDPIPV6LEN=18,
    IPXLEN=10,
-   IPXSOCKLEN=12, 
+   IPXSOCKLEN=12,
    NETBIOSLEN=16,
    APPLETKLEN=3,
    DECNETLEN=2,
    MACLEN=6,
    HASH0=19,
-   HASH1=13, 
+   HASH1=13,
    HASH2=7,
    MAX_ADDR_SZ=20,
    MAX_DISPLAY_SZ=MAXHOSTNAMELEN+1
@@ -74,28 +79,28 @@ enum addr_type {
   type_invalid
 };
 
-// TODO: get rest of nb service types added here 
+// TODO: get rest of nb service types added here
 enum nb_service {
   nb_workstation = 0x0, nb_server = 0x20
 };
 
 //---[ forward declarations ]-----------------------------------------
-class GenAddress; 
+class GenAddress;
 class UdpAddress;
 class IpxSockAddress;
 class NetbiosAddress;
 class SIPAddress; // aka ipv6
 
-// TODO: 
+// TODO:
 // class AtmE164Address;
 
 
 //--------------------------------------------------------------------
 //----[ Address class ]-----------------------------------------------
 //--------------------------------------------------------------------
-class  ACE_Export Address: public  SnmpSyntax 
+class  ACE_Export Address: public  SnmpSyntax
   // = TITLE
-  //     Defines the member functions for the abstract base class 
+  //     Defines the member functions for the abstract base class
   //     Address. An Address is a unique network endpoint.
 {
 
@@ -140,13 +145,13 @@ public:
    // overloaded <=, is an address less than or equal to a string?
 
    virtual operator const char *() const = 0;
-   // overloaded const char * cast 
+   // overloaded const char * cast
 
-  virtual int valid() const;            
+  virtual int valid() const;
   // verify the is the address object constructed ok
 
-  virtual void to_octet(OctetStr& octet) const = 0; 
-  // return a suitable buffer to contain the address 
+  virtual void to_octet(OctetStr& octet) const = 0;
+  // return a suitable buffer to contain the address
 
   virtual SmiUINT32 get_syntax() = 0;
   // (pure virtual) syntax type
@@ -160,7 +165,7 @@ public:
   virtual SnmpSyntax *clone() const = 0;
   // create a new instance of this Value
 
-  virtual addr_type get_type() const = 0; 
+  virtual addr_type get_type() const = 0;
   // return the type of address
 
   virtual SnmpSyntax& operator=( SnmpSyntax &val) = 0;
@@ -173,7 +178,7 @@ public:
 protected:
   int valid_flag;
   // state of constructed object (TRUE/FALSE)
-  unsigned char address_buffer[MAX_ADDR_SZ]; 
+  unsigned char address_buffer[MAX_ADDR_SZ];
   // addr internal representation
 
   virtual int parse_address( const char * inaddr) =0;
@@ -192,11 +197,11 @@ protected:
 //-----------------------------------------------------------------------
 //---------[ IPv4 Address Class ]----------------------------------------
 //-----------------------------------------------------------------------
-class ACE_Export IpAddress : public Address 
+class ACE_Export IpAddress : public Address
   // = TITLE
   //     Defines the member functions for the concrete class IpAddress
   //     An IP Version 4 Address is 4 bytes long and consists of a
-  //     Network, Sub Network, and host component. 
+  //     Network, Sub Network, and host component.
 {
 public:
   IpAddress( const char *inaddr = "");
@@ -246,13 +251,13 @@ public:
   // is this the loopback address? 127.0.0.1/loopback/1.0.0.127.in-addr.arpa
 
   int is_multicast() const;
-  // determine if this is a multicast address 
+  // determine if this is a multicast address
 
   int is_broadcast() const;
-  // determine if this a broadcast address 
+  // determine if this a broadcast address
 
   int is_private() const;
-  // per RFC 1597,  private addresses are:: 10, 172.16, and 192.168.0 
+  // per RFC 1597,  private addresses are:: 10, 172.16, and 192.168.0
 
   virtual void to_octet(OctetStr& octet) const;
   // convert address into octet string format in network byte order
@@ -264,12 +269,12 @@ protected:
   // friendly name storage
 
   int  iv_friendly_name_status_;
-  // did resolver call work? some addrs won't resolve 
+  // did resolver call work? some addrs won't resolve
 
   virtual int parse_address( const char *inaddr);
   // redefined parse address
   // specific to IP addresses
-   
+
   virtual void format_output();
   // redefined format output
   // specific to IP addresses
@@ -295,7 +300,7 @@ protected:
 //--------------[ DNS Iterator Class ]------------------------------------
 //------------------------------------------------------------------------
 
-class ACE_Export Address_Iter 
+class ACE_Export Address_Iter
   // = TITLE
   //     Defines routines to obtain information on a hostname/FQDN
   //     such as multiple addresses
@@ -314,9 +319,9 @@ public:
 
 private:
   Address_Iter(const Address_Iter&);
-  int valid_;		       // ctor status
-  int count_;			// number of addresses
-  char **entry_;		// ptr to current address
+  int valid_;                  // ctor status
+  int count_;                   // number of addresses
+  char **entry_;                // ptr to current address
   struct hostent lookupResult_;
   ACE_HOSTENT_DATA buffer_;
   int query_dns(const char *hostname);
@@ -325,7 +330,7 @@ private:
 //------------------------------------------------------------------------
 //---------[ UDP/IPv4 Address Class ]-------------------------------------
 //------------------------------------------------------------------------
-class  ACE_Export UdpAddress : public IpAddress 
+class  ACE_Export UdpAddress : public IpAddress
   // = TITLE
   //     Defines the member functions for the concrete class UdpAddress
   //     A Udp Address consists of an IP Version 4 Address (IpAddress)
@@ -370,14 +375,14 @@ public:
   void set_port( const unsigned short p);
   // set the port number
 
-  unsigned short get_port() const; 
+  unsigned short get_port() const;
   // get the port number
 
   virtual addr_type get_type() const;
   // return the type
 
 protected:
-  char output_buffer[MAX_DISPLAY_SZ];           
+  char output_buffer[MAX_DISPLAY_SZ];
   // output buffer
 
   virtual int parse_address( const char *inaddr);
@@ -393,10 +398,10 @@ protected:
 //-------------------------------------------------------------------------
 //---------[ 802.3 MAC Address Class ]-------------------------------------
 //-------------------------------------------------------------------------
-class  ACE_Export MacAddress : public Address 
+class  ACE_Export MacAddress : public Address
   // = TITLE
   //     Defines the member functions for the concrete class MacAddress.
-  //     A Media Access Control Address consists of 48 bits as defined 
+  //     A Media Access Control Address consists of 48 bits as defined
   //     in IEEE 802.3 specifications.
 {
 public:
@@ -410,7 +415,7 @@ public:
   // construct a MacAddress with a GenAddress
 
   ~MacAddress();
-  // destructor 
+  // destructor
 
   SmiUINT32 get_syntax();
   // syntax type
@@ -421,7 +426,7 @@ public:
   MacAddress& operator=( const MacAddress &macaddress);
   // assignment to another IpAddress object overloaded
 
-  SnmpSyntax *clone() const; 
+  SnmpSyntax *clone() const;
   // create a new instance of this Value
 
   virtual char *to_string();
@@ -437,10 +442,10 @@ public:
   // return a hash key
 
   virtual void to_octet(OctetStr& octet) const;
-  // return byte array of the mac address 
+  // return byte array of the mac address
 
 protected:
-  char output_buffer[MAX_DISPLAY_SZ];           
+  char output_buffer[MAX_DISPLAY_SZ];
   // output buffer containing string representation of object
 
   virtual int parse_address( const char *inaddr);
@@ -453,10 +458,10 @@ protected:
 //------------------------------------------------------------------------
 //---------[ Netbios Address Class ]--------------------------------------
 //------------------------------------------------------------------------
-class  ACE_Export NetbiosAddress : public Address 
+class  ACE_Export NetbiosAddress : public Address
   // = TITLE
   //     Defines the member functions for the concrete class NetbiosAddress.
-  //     The IBM/Microsoft address for NETBIOS, NETBEUI protocol transport. 
+  //     The IBM/Microsoft address for NETBIOS, NETBEUI protocol transport.
 {
 public:
 
@@ -464,15 +469,15 @@ public:
    // default constructor with string arg
 
    NetbiosAddress( const char *inaddr, nb_service svc);
-   // set name and service type 
+   // set name and service type
 
-   NetbiosAddress( const NetbiosAddress& nbaddr); 
+   NetbiosAddress( const NetbiosAddress& nbaddr);
    // copy constructor
 
-   NetbiosAddress( const GenAddress& genaddr); 
+   NetbiosAddress( const GenAddress& genaddr);
    // construct with a GenAddress
-   
-   ~NetbiosAddress(); 
+
+   ~NetbiosAddress();
 
    virtual char *to_string();
 
@@ -490,20 +495,20 @@ public:
    virtual SmiUINT32 get_syntax();
    // syntax type
 
-   SnmpSyntax& operator=( SnmpSyntax &val); 
+   SnmpSyntax& operator=( SnmpSyntax &val);
    // copy an instance of this Value
 
-   SnmpSyntax *clone() const; 
+   SnmpSyntax *clone() const;
    // create a new instance of this Value
 
    virtual void to_octet(OctetStr& octet) const;
-   // output byte buffer containing netbios name 
+   // output byte buffer containing netbios name
 
 protected:
   void InitNBAddr(const char *inaddr);
-  char output_buffer[MAX_DISPLAY_SZ];           
+  char output_buffer[MAX_DISPLAY_SZ];
 
-  virtual void format_output(); 
+  virtual void format_output();
   // output buffer to hold string representation
   virtual int parse_address( const char  *inaddr);
   virtual addr_type get_type() const;
@@ -512,7 +517,7 @@ protected:
 //------------------------------------------------------------------------
 //---------[ DecNet Address Class ]---------------------------------------
 //------------------------------------------------------------------------
-class  ACE_Export DecNetAddress : public Address 
+class  ACE_Export DecNetAddress : public Address
   // = TITLE
   //     Defines the member functions for the concrete class DecNetAddress.
   //     DecNet Phase ? address consists of two octets (CISCO-TC.my)
@@ -520,45 +525,45 @@ class  ACE_Export DecNetAddress : public Address
   public:
    DecNetAddress( const char *inaddr = "");
    // default constructor with string arg
- 
+
    DecNetAddress( const DecNetAddress& decaddr);
    // copy constructor
- 
+
    DecNetAddress( const GenAddress& genaddr);
    // construct with a GenAddress
- 
+
    ~DecNetAddress();
- 
+
    virtual char *to_string();
- 
+
    DecNetAddress& operator=( const DecNetAddress &decaddr);
 
    virtual void to_octet(OctetStr& octet) const;
-   // convert address into octet string format 2 bytes of decnet address 
- 
+   // convert address into octet string format 2 bytes of decnet address
+
    virtual operator const char *() const;
    // const char * operator overloaded for streaming output
- 
+
    virtual SmiUINT32 get_syntax();
    // syntax type
- 
+
    SnmpSyntax& operator=( SnmpSyntax &val);
    // copy an instance of this Value
- 
+
    SnmpSyntax *clone() const;
    // create a new instance of this Value
 
-   protected:  
+   protected:
    virtual int parse_address( const char *inaddr);
    virtual addr_type get_type() const;
    virtual void format_output();
-   char output_buffer[MAX_DISPLAY_SZ];           
+   char output_buffer[MAX_DISPLAY_SZ];
 };
 
 //------------------------------------------------------------------------
 //---------[ AppleTalk Address Class ]------------------------------------
 //------------------------------------------------------------------------
-class  ACE_Export AppleTalkAddress :  public Address 
+class  ACE_Export AppleTalkAddress :  public Address
   // = TITLE
   //     Defines the member functions for the concrete class DecNetAddress.
   //     DecNet Phase ? address consists of two octets (CISCO-TC.my)
@@ -566,21 +571,21 @@ class  ACE_Export AppleTalkAddress :  public Address
   public:
   AppleTalkAddress( const char *inaddr = "");
    // default constructor with string arg
- 
+
    AppleTalkAddress( const AppleTalkAddress& atkaddr);
    // copy constructor
- 
+
    AppleTalkAddress( const GenAddress& genaddr);
    // construct with a GenAddress
- 
+
    ~AppleTalkAddress();
- 
+
    virtual char *to_string();
- 
+
    AppleTalkAddress& operator=( const AppleTalkAddress &atkaddr);
- 
+
    virtual void to_octet(OctetStr& octet) const;
-   // convert address into octet string format 3 bytes of atk address 
+   // convert address into octet string format 3 bytes of atk address
 
    char get_host_address() const;
    // get the host part of the address
@@ -593,30 +598,30 @@ class  ACE_Export AppleTalkAddress :  public Address
 
    void set_net_address(const short atknet);
    // set the host 2 byte atk  network address
-   
+
    virtual operator const char *() const;
    // const char * operator overloaded for streaming output
- 
+
    virtual SmiUINT32 get_syntax();
    // syntax type
- 
+
    SnmpSyntax& operator=( SnmpSyntax &val);
    // copy an instance of this Value
- 
+
    SnmpSyntax *clone() const;
    // create a new instance of this Value
- 
+
    private:
    virtual int parse_address( const char *inaddr);
    virtual addr_type get_type() const;
    virtual void format_output();
-   char output_buffer[MAX_DISPLAY_SZ];           
+   char output_buffer[MAX_DISPLAY_SZ];
 };
 
 //------------------------------------------------------------------------
 //---------[ IPX Address Class ]------------------------------------------
 //------------------------------------------------------------------------
-class ACE_Export IpxAddress : public Address 
+class ACE_Export IpxAddress : public Address
   // = TITLE
   //     Defines the member functions for the concrete class IpxAddress.
   //     Novell's IPX (version ?) network protocol endpoint
@@ -632,12 +637,12 @@ public:
   // construct with a GenAddress
 
   ~IpxAddress();
-  // destructor 
+  // destructor
 
   virtual SmiUINT32 get_syntax();
   // syntax type
 
-  SnmpSyntax& operator=( SnmpSyntax &val); 
+  SnmpSyntax& operator=( SnmpSyntax &val);
   // copy an instance of this Value
 
   IpxAddress& operator=( const IpxAddress &ipxaddress);
@@ -646,7 +651,7 @@ public:
   int get_hostid( MacAddress& mac);
   // get the host id portion of an ipx address
 
-  SnmpSyntax *clone() const; 
+  SnmpSyntax *clone() const;
   // create a new instance of this Value
 
   virtual char *to_string();
@@ -659,13 +664,13 @@ public:
   // return the type
 
   virtual void to_octet(OctetStr& octet) const;
-  // return byte sequence containing ipx address 
+  // return byte sequence containing ipx address
 
 protected:
   char separator;
   // ipx format separator {:,/}
 
-  char output_buffer[MAX_DISPLAY_SZ];           
+  char output_buffer[MAX_DISPLAY_SZ];
   // output buffer to hold string representation
 
   virtual int parse_address( const char  *inaddr);
@@ -681,10 +686,10 @@ protected:
 //------------------------------------------------------------------------
 //---------[ IpxSock Address Class ]--------------------------------------
 //------------------------------------------------------------------------
-class ACE_Export IpxSockAddress : public IpxAddress 
+class ACE_Export IpxSockAddress : public IpxAddress
   // = TITLE
   //     Defines the member functions for the concrete class IpxAddress.
-  //     Novell's IPX (version ?) network protocol endpoint 
+  //     Novell's IPX (version ?) network protocol endpoint
 {
 public:
   IpxSockAddress( const char *inaddr = "");
@@ -706,7 +711,7 @@ public:
   virtual SmiUINT32 get_syntax();
   // syntax type
 
-  SnmpSyntax& operator=( SnmpSyntax &val); 
+  SnmpSyntax& operator=( SnmpSyntax &val);
   // copy an instance of this Value
 
   IpxSockAddress& operator=( const IpxSockAddress &ipxaddr);
@@ -731,7 +736,7 @@ public:
   // return the type
 
 protected:
-  char output_buffer[MAX_DISPLAY_SZ];           
+  char output_buffer[MAX_DISPLAY_SZ];
   // output buffer to hold string representation of object
 
   virtual int parse_address( const char  *inaddr);
@@ -745,7 +750,7 @@ protected:
 //-------------------------------------------------------------------------
 //--------[ Generic Address ]----------------------------------------------
 //-------------------------------------------------------------------------
-class ACE_Export GenAddress : public Address 
+class ACE_Export GenAddress : public Address
   // = TITLE
   //     Defines the member functions for the concrete class GenAddress.
   //     This class attempts to determine an address type given a char string.
@@ -786,12 +791,12 @@ public:
 
   virtual void to_octet(OctetStr& octet) const;
   // return the address as a octet sequence
- 
+
 protected:
   Address *address;
   // pointer to a a concrete address
 
-  char output_buffer[MAX_DISPLAY_SZ];           
+  char output_buffer[MAX_DISPLAY_SZ];
   // output buffer of objects value
 
   virtual int parse_address( const char *addr);
diff --git a/ASNMP/asnmp/asn1.h b/ASNMP/asnmp/asn1.h
index ce0256c43df..dd84e8f5b00 100644
--- a/ASNMP/asnmp/asn1.h
+++ b/ASNMP/asnmp/asn1.h
@@ -15,24 +15,24 @@
 // As defined in ISO/IS 8824 and ISO/IS 8825
 // This implements a subset of the above International Standards that
 // is sufficient to implement SNMP.
-// 
+//
 // = AUTHOR
 //   Steve Waldbusser/CMU ?
 //
 // ============================================================================
 
 /**********************************************************************
-	Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University
+        Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University
 
                       All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of CMU not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -44,68 +44,73 @@ SOFTWARE.
 ******************************************************************/
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "asnmp/snmp.h"
 
 // CMU code to define "oid" typedef (old C style)
 #ifndef EIGHTBIT_SUBIDS
-typedef unsigned long	oid;
+typedef unsigned long   oid;
 #define MAX_SUBID   0xFFFFFFFF
 #else
-typedef unsigned char	oid;
+typedef unsigned char   oid;
 #define MAX_SUBID   0xFF
 #endif
 
-#define MAX_OID_LEN	    64	/* max subid's in an oid */
+#define MAX_OID_LEN         64  /* max subid's in an oid */
 
 
 // asn.1 values
-#define ASN_BOOLEAN	     (0x01)
-#define ASN_INTEGER	     (0x02)
-#define ASN_BIT_STR	     (0x03)
-#define ASN_OCTET_STR	 (0x04)
-#define ASN_NULL	     (0x05)
-#define ASN_OBJECT_ID	 (0x06)
-#define ASN_SEQUENCE	 (0x10)
-#define ASN_SET		     (0x11)
-#define ASN_UNIVERSAL	 (0x00)
+#define ASN_BOOLEAN          (0x01)
+#define ASN_INTEGER          (0x02)
+#define ASN_BIT_STR          (0x03)
+#define ASN_OCTET_STR    (0x04)
+#define ASN_NULL             (0x05)
+#define ASN_OBJECT_ID    (0x06)
+#define ASN_SEQUENCE     (0x10)
+#define ASN_SET              (0x11)
+#define ASN_UNIVERSAL    (0x00)
 #define ASN_APPLICATION  (0x40)
-#define ASN_CONTEXT	     (0x80)
-#define ASN_PRIVATE	     (0xC0)
-#define ASN_PRIMITIVE	 (0x00)
-#define ASN_CONSTRUCTOR	 (0x20)
-#define ASN_LONG_LEN	 (0x80)
+#define ASN_CONTEXT          (0x80)
+#define ASN_PRIVATE          (0xC0)
+#define ASN_PRIMITIVE    (0x00)
+#define ASN_CONSTRUCTOR  (0x20)
+#define ASN_LONG_LEN     (0x80)
 #define ASN_EXTENSION_ID (0x1F)
-#define ASN_BIT8	     (0x80)
+#define ASN_BIT8             (0x80)
 
-#define IS_CONSTRUCTOR(byte)	((byte) & ASN_CONSTRUCTOR)
-#define IS_EXTENSION_ID(byte)	(((byte) & ASN_EXTENSION_ID) == ASN_EXTENSION_ID)
+#define IS_CONSTRUCTOR(byte)    ((byte) & ASN_CONSTRUCTOR)
+#define IS_EXTENSION_ID(byte)   (((byte) & ASN_EXTENSION_ID) == ASN_EXTENSION_ID)
 
 #define ASNERROR( string)
-#define MAX_NAME_LEN   64 
+#define MAX_NAME_LEN   64
 #define SNMP_VERSION_1 0
 #define SNMP_VERSION_2C 1
 
 
-// defined types (from the SMI, RFC 1065) 
+// defined types (from the SMI, RFC 1065)
 #define SMI_IPADDRESS   (ASN_APPLICATION | 0)
-#define SMI_COUNTER	    (ASN_APPLICATION | 1)
-#define SMI_GAUGE	    (ASN_APPLICATION | 2)
+#define SMI_COUNTER         (ASN_APPLICATION | 1)
+#define SMI_GAUGE           (ASN_APPLICATION | 2)
 #define SMI_TIMETICKS   (ASN_APPLICATION | 3)
-#define SMI_OPAQUE	    (ASN_APPLICATION | 4)
+#define SMI_OPAQUE          (ASN_APPLICATION | 4)
 #define SMI_NSAP        (ASN_APPLICATION | 5)
 #define SMI_COUNTER64   (ASN_APPLICATION | 6)
 #define SMI_UINTEGER    (ASN_APPLICATION | 7)
 
-#define GET_REQ_MSG	    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x0)
-#define GETNEXT_REQ_MSG	(ASN_CONTEXT | ASN_CONSTRUCTOR | 0x1)
-#define GET_RSP_MSG	    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x2)
-#define SET_REQ_MSG	    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x3)
-#define TRP_REQ_MSG	    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x4)
+#define GET_REQ_MSG         (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x0)
+#define GETNEXT_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x1)
+#define GET_RSP_MSG         (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x2)
+#define SET_REQ_MSG         (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x3)
+#define TRP_REQ_MSG         (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x4)
 
-#define GETBULK_REQ_MSG	(ASN_CONTEXT | ASN_CONSTRUCTOR | 0x5)
-#define INFORM_REQ_MSG	(ASN_CONTEXT | ASN_CONSTRUCTOR | 0x6)
-#define TRP2_REQ_MSG	(ASN_CONTEXT | ASN_CONSTRUCTOR | 0x7)
-#define REPORT_MSG	    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x8)
+#define GETBULK_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x5)
+#define INFORM_REQ_MSG  (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x6)
+#define TRP2_REQ_MSG    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x7)
+#define REPORT_MSG          (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x8)
 
 #define SNMP_NOSUCHOBJECT    (ASN_CONTEXT | ASN_PRIMITIVE | 0x0)
 #define SNMP_NOSUCHINSTANCE  (ASN_CONTEXT | ASN_PRIMITIVE | 0x1)
@@ -117,37 +122,37 @@ typedef struct sockaddr_in  ipaddr;
 
 // pdu
 struct snmp_pdu {
-    int	    command;	     // pdu type
-    unsigned long  reqid;    // Request id 
-    unsigned long  errstat;	 // Error status 
-    unsigned long  errindex; // Error index 
-
-    // Trap information 
-    oid	    *enterprise;     // System OID 
-    int	    enterprise_length;
-    ipaddr  agent_addr;	    // address of object generating trap 
-    int	    trap_type;	    // trap type 
-    int	    specific_type;  // specific type 
-    unsigned long  time;	// Uptime 
-
-	// vb list
+    int     command;         // pdu type
+    unsigned long  reqid;    // Request id
+    unsigned long  errstat;      // Error status
+    unsigned long  errindex; // Error index
+
+    // Trap information
+    oid     *enterprise;     // System OID
+    int     enterprise_length;
+    ipaddr  agent_addr;     // address of object generating trap
+    int     trap_type;      // trap type
+    int     specific_type;  // specific type
+    unsigned long  time;        // Uptime
+
+        // vb list
     struct variable_list *variables;
 };
 
 // vb list
 struct variable_list {
-    struct variable_list *next_variable;    // NULL for last variable 
-    oid	    *name;                          // Object identifier of variable 
-    int	    name_length;                    // number of subid's in name 
-    unsigned char   type;                   // ASN type of variable 
-    union {                                 // value of variable 
-	long	*integer;
-	unsigned char 	*string;
-	oid	*objid;
-	unsigned char   *bitstring;
-	struct counter64 *counter64;
+    struct variable_list *next_variable;    // NULL for last variable
+    oid     *name;                          // Object identifier of variable
+    int     name_length;                    // number of subid's in name
+    unsigned char   type;                   // ASN type of variable
+    union {                                 // value of variable
+        long    *integer;
+        unsigned char   *string;
+        oid     *objid;
+        unsigned char   *bitstring;
+        struct counter64 *counter64;
     } val;
-    int	    val_len;
+    int     val_len;
 };
 
 struct counter64 {
@@ -156,180 +161,180 @@ struct counter64 {
 };
 
 // CMU Interface class for ASN.1 routines
-class ACE_Export asn1 
+class ACE_Export asn1
   // = TITLE
-  //     Defines the member functions for the asn1 concrete interface class 
+  //     Defines the member functions for the asn1 concrete interface class
   //     CMU routines for performing ASN.1 data marshalling / representation
 
 {
 public:
-static unsigned char *parse_int( unsigned char *data, 
-			      int *datalength, 
-			      unsigned char *type, 
-			      long int *intp, 
-			      int intsize);
-static unsigned char *parse_unsigned_int( unsigned char *data,	
-				       int *datalength,
-				       unsigned char *type,
-				       unsigned long *intp,
-				       int	intsize);
+static unsigned char *parse_int( unsigned char *data,
+                              int *datalength,
+                              unsigned char *type,
+                              long int *intp,
+                              int intsize);
+static unsigned char *parse_unsigned_int( unsigned char *data,
+                                       int *datalength,
+                                       unsigned char *type,
+                                       unsigned long *intp,
+                                       int      intsize);
 static unsigned char *build_int( unsigned char *data,
-			      int *datalength,
-			      unsigned char type,
-			      long *intp,
-			      int intsize);
+                              int *datalength,
+                              unsigned char type,
+                              long *intp,
+                              int intsize);
 
 static unsigned char *build_unsigned_int( unsigned char *data,
-				       int *datalength,
-				       unsigned char type,
-				       unsigned long *intp,
-				       int intsize);
+                                       int *datalength,
+                                       unsigned char type,
+                                       unsigned long *intp,
+                                       int intsize);
 
-static unsigned char *parse_string( unsigned char	*data,
-				 int *datalength,
-				 unsigned char *type,
-				 unsigned char *string,
-				 int *strlength);
+static unsigned char *parse_string( unsigned char       *data,
+                                 int *datalength,
+                                 unsigned char *type,
+                                 unsigned char *string,
+                                 int *strlength);
 
 static unsigned char *build_string( unsigned char *data,
-				 int *datalength,
-				 unsigned char type,
-				 unsigned char *string,
-				 int strlength);
+                                 int *datalength,
+                                 unsigned char type,
+                                 unsigned char *string,
+                                 int strlength);
 
 static unsigned char *parse_header( unsigned char *data,
-				int *datalength,
-				unsigned char *type);
+                                int *datalength,
+                                unsigned char *type);
 
 static unsigned char * build_header( unsigned char *data,
-				 int *datalength,
-				 unsigned char type,
-				 int length);
+                                 int *datalength,
+                                 unsigned char type,
+                                 int length);
 
 static unsigned char * build_sequence( unsigned char *data,
-				   int *datalength,
-				   unsigned char type,
-				   int length);
+                                   int *datalength,
+                                   unsigned char type,
+                                   int length);
 
 static unsigned char * parse_length( unsigned char *data,
-				 unsigned long  *length);
+                                 unsigned long  *length);
 
 static unsigned char *build_length( unsigned char *data,
-				int *datalength,
-				int length);
+                                int *datalength,
+                                int length);
 
 static unsigned char *build_objid( unsigned char *data,
-			       int *datalength,
-			       unsigned char type,
-			       oid *objid,
-			       int objidlength);
+                               int *datalength,
+                               unsigned char type,
+                               oid *objid,
+                               int objidlength);
 
 static unsigned char *parse_objid( unsigned char *data,
-			       int *datalength,
-			       unsigned char *type,
-			       oid *objid,
-			       int *objidlength);
+                               int *datalength,
+                               unsigned char *type,
+                               oid *objid,
+                               int *objidlength);
 
-static unsigned char *parse_null(unsigned char *data, 
-				int *datalength, unsigned 
-				char *type);
+static unsigned char *parse_null(unsigned char *data,
+                                int *datalength, unsigned
+                                char *type);
 
 static unsigned char *build_null( unsigned char *data,
-			      int *datalength,
-			      unsigned char type);
+                              int *datalength,
+                              unsigned char type);
 
 static unsigned char *parse_bitstring( unsigned char *data,
-				   int *datalength,
-				   unsigned char *type,
-				   unsigned char *string,
-				   int *strlength);
+                                   int *datalength,
+                                   unsigned char *type,
+                                   unsigned char *string,
+                                   int *strlength);
 
 static unsigned char *build_bitstring( unsigned char *data,
-				   int *datalength,
-				   unsigned char type,	
-				   unsigned char *string,
-				   int strlength);
+                                   int *datalength,
+                                   unsigned char type,
+                                   unsigned char *string,
+                                   int strlength);
 
 static unsigned char * parse_unsigned_int64(unsigned char *data,
-					 int *datalength,
-					 unsigned char *type,
-					 struct counter64 *cp,
-					 int countersize);
+                                         int *datalength,
+                                         unsigned char *type,
+                                         struct counter64 *cp,
+                                         int countersize);
 
 static unsigned char * build_unsigned_int64( unsigned char *data,
-					 int *datalength,
-					 unsigned char	type,
-					 struct counter64 *cp,
-					 int countersize);
+                                         int *datalength,
+                                         unsigned char  type,
+                                         struct counter64 *cp,
+                                         int countersize);
 
 };
 
 
 // CMU Interface class for SNMPv1, SNMPv2c routines
-class ACE_Export cmu_snmp 
+class ACE_Export cmu_snmp
   // = TITLE
-  //    Defines the static functions for the cmu_snmp concrete class. 
-  //    These routine create cmu pdu's that can be sent/received on/from agents 
+  //    Defines the static functions for the cmu_snmp concrete class.
+  //    These routine create cmu pdu's that can be sent/received on/from agents
 {
  public:
   static struct snmp_pdu *pdu_create( int command);
   static void free_pdu( struct snmp_pdu *pdu);
-  static int build( struct snmp_pdu	*pdu, 
-		   unsigned char *packet, 
-		   int *out_length, 
-		   long version,
-		   unsigned char* community,
-		   int community_len);
-
-  static void add_var(struct snmp_pdu *pdu, 
-		      oid *name, 
-		      int name_length,
-		      SmiVALUE *smival);
+  static int build( struct snmp_pdu     *pdu,
+                   unsigned char *packet,
+                   int *out_length,
+                   long version,
+                   unsigned char* community,
+                   int community_len);
+
+  static void add_var(struct snmp_pdu *pdu,
+                      oid *name,
+                      int name_length,
+                      SmiVALUE *smival);
 
   static int parse( struct snmp_pdu *pdu,
-		   unsigned char  *data,
-		   unsigned char *community_name,
-		   unsigned long &community_len,
-		   snmp_version &version,
-		   int length);
+                   unsigned char  *data,
+                   unsigned char *community_name,
+                   unsigned long &community_len,
+                   snmp_version &version,
+                   int length);
   static unsigned char *auth_build( unsigned char *data,
-			       int *length,
-			       long int version,
-			       unsigned char *community,
-			       int community_len,
-			       int messagelen);
+                               int *length,
+                               long int version,
+                               unsigned char *community,
+                               int community_len,
+                               int messagelen);
 
-   static unsigned char *build_var_op(unsigned char *data, 
-				  oid * var_name, 
-				  int *var_name_len, 
-				  unsigned char var_val_type, 
-				  int var_val_len,
-				  unsigned char *var_val, 
-				  int *listlength);
+   static unsigned char *build_var_op(unsigned char *data,
+                                  oid * var_name,
+                                  int *var_name_len,
+                                  unsigned char var_val_type,
+                                  int var_val_len,
+                                  unsigned char *var_val,
+                                  int *listlength);
 
 
 static unsigned char *auth_parse(unsigned char *data,
                                int *length,
                                unsigned char *sid,
-			       int *slen,
-                               long	*version);
+                               int *slen,
+                               long     *version);
 
 /*
- @params  data, IN - pointer to the start of object 
-	var_name OUT - object id of variable 
-     var_name_len IN/OUT - length of variable name 
-     var_val_type OUT - type of variable (int or octet string) (one byte) 
+ @params  data, IN - pointer to the start of object
+        var_name OUT - object id of variable
+     var_name_len IN/OUT - length of variable name
+     var_val_type OUT - type of variable (int or octet string) (one byte)
      var_val_len  OUT - length of variable
-     var_val,	 OUT - pointer to ASN1 encoded value of variable
+     var_val,    OUT - pointer to ASN1 encoded value of variable
      listlength IN/OUT - number of valid bytes left in var_op_list
 */
-static unsigned char *parse_var_op( unsigned char *data, 
-			    oid	    *var_name,	  
-			    int	    *var_name_len, 
-			    unsigned char  *var_val_type,
-			    int	    *var_val_len,	 
-			    unsigned char  **var_val,	 
-			    int	    *listlength);
+static unsigned char *parse_var_op( unsigned char *data,
+                            oid     *var_name,
+                            int     *var_name_len,
+                            unsigned char  *var_val_type,
+                            int     *var_val_len,
+                            unsigned char  **var_val,
+                            int     *listlength);
 
 };
 
diff --git a/ASNMP/asnmp/counter.h b/ASNMP/asnmp/counter.h
index a4cac10eec7..2b0f79807f3 100644
--- a/ASNMP/asnmp/counter.h
+++ b/ASNMP/asnmp/counter.h
@@ -14,23 +14,23 @@
 //  Class definition for SMI Counter32 class.
 //
 // = AUTHOR
-//    Peter E Mellquist 
+//    Peter E Mellquist
 //
 // ============================================================================
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
- 
+
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 #include "asnmp/smival.h"
@@ -46,9 +46,9 @@
 
 class ACE_Export Counter32: public SnmpUInt32
   // = TITLE
-  //     Defines the member functions for the Counter32 concrete class 
+  //     Defines the member functions for the Counter32 concrete class
   //     This class implements RFC 1155 Counter Object and is named
-  //     Counter32 after the RFC1902 redefinition of V1 SMI datatypes 
+  //     Counter32 after the RFC1902 redefinition of V1 SMI datatypes
 {
   public:
      Counter32( const unsigned long i = 0);
diff --git a/ASNMP/asnmp/ctr64.h b/ASNMP/asnmp/ctr64.h
index fc2d00149c6..f9dc641a94a 100644
--- a/ASNMP/asnmp/ctr64.h
+++ b/ASNMP/asnmp/ctr64.h
@@ -14,7 +14,7 @@
 //  SNMP Counter64 class definition.
 //
 // = AUTHOR
-//    Peter E Mellquist 
+//    Peter E Mellquist
 //
 // ============================================================================
 /*===================================================================
@@ -22,22 +22,22 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
-=====================================================================*/  
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
+=====================================================================*/
 
 #include "asnmp/smival.h"
 
 #define CTR64OUTBUF 30  // maximum ascii string for a 64-bit ctr
 
-                
+
 //---------[ 64 bit Counter Class ]--------------------------------
 // Counter64 Class encapsulates two unsigned integers into a
 // a single entity. This type has is available in SNMPv2 but
@@ -46,18 +46,18 @@
 class ACE_Export Counter64: public  SnmpSyntax
   // = TITLE
   //     Defines the member functions for the Counter64 concrete class
-  //     This class implements RFC 1902 64 bit Counter Object. 
-{ 
+  //     This class implements RFC 1902 64 bit Counter Object.
+{
 public:
   Counter64( unsigned long long llw = 0);
-  // default constructor 
+  // default constructor
 
   Counter64( unsigned long hiparm, unsigned long loparm);
-  // constructor with values   
-     
+  // constructor with values
+
   Counter64( const Counter64 &ctr64);
   // copy constructor
-     
+
   ~Counter64();
   // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
 
@@ -70,41 +70,41 @@ public:
   Counter64& assign( long double ld);
   // assign a long double to a counter64
 
-  unsigned long high() const;  
-  // return the high part   
-        
+  unsigned long high() const;
+  // return the high part
+
   unsigned long low() const;
-  // return the low part   
-        
+  // return the low part
+
   void set_high( const unsigned long h);
-  // set the high part   
-        
+  // set the high part
+
   void set_low( const unsigned long l);
-  // set the low part   
+  // set the low part
 
   Counter64& operator=( const unsigned long long rhs);
   // overloaded assignment
-     
+
   Counter64& operator=( const Counter64 &rhs);
   // overloaded assignment
-   
+
   char *to_string();
   // get a printable ASCII representation
 
-  SnmpSyntax *clone() const; 
+  SnmpSyntax *clone() const;
   // create a new instance of this Value
 
   SnmpSyntax& operator=( SnmpSyntax &val);
   // copy an instance of this Value
 
   int valid() const;
-  // general validity test, always true 
+  // general validity test, always true
 
   operator unsigned long long();
   // otherwise, behave like an unsigned long long
 
 protected:
   char output_buffer[CTR64OUTBUF];
-}; 
+};
 
-#endif  // CTR64_ 
+#endif  // CTR64_
diff --git a/ASNMP/asnmp/enttraps.h b/ASNMP/asnmp/enttraps.h
index 130f7bdfffe..d90a593a4e4 100644
--- a/ASNMP/asnmp/enttraps.h
+++ b/ASNMP/asnmp/enttraps.h
@@ -11,7 +11,7 @@
 //     enttraps.cpp
 //
 // = DESCRIPTION
-//   constants for Enterprise Traps 
+//   constants for Enterprise Traps
 //
 // = AUTHOR
 //   Peter E Mellquist
@@ -22,84 +22,84 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
-=====================================================================*/ 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
+=====================================================================*/
 
 #include "asnmp/asn1.h"                       // ASN.1 header file
 
 //--------------[ well known trap ids ]-----------------------------------
-class ACE_Export snmpTrapsOid: public Oid 
+class ACE_Export snmpTrapsOid: public Oid
   // = TITLE
-  //     Defines the member functions for the snmpTrapsOid base class 
-  //     to implement the traps defined in RFC 1215 
+  //     Defines the member functions for the snmpTrapsOid base class
+  //     to implement the traps defined in RFC 1215
 {
-   public: 
+   public:
    snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){}
 };
 
-class ACE_Export snmpTrapEnterpriseOid: public Oid 
+class ACE_Export snmpTrapEnterpriseOid: public Oid
   // = TITLE
   //     Defines the default Enterprise Oid for this software package
 {
-   public: 
+   public:
    snmpTrapEnterpriseOid(void): Oid("1.3.6.1.6.3.1.1.4.3.0") { }
 };
 
-class ACE_Export coldStartOid: public snmpTrapsOid 
+class ACE_Export coldStartOid: public snmpTrapsOid
   // = TITLE
   //     Defines the RFC 1215 agent cold start generic trap  (system reboot)
 {
-   public: 
+   public:
    coldStartOid( void){*this+=".1";}
 };
 
-class ACE_Export warmStartOid: public snmpTrapsOid 
+class ACE_Export warmStartOid: public snmpTrapsOid
   // = TITLE
   //     Defines the RFC 1215 agent warm start generic trap  (agent reboot)
 {
-   public: 
+   public:
    warmStartOid( void){*this+=".2";}
 };
 
-class ACE_Export linkDownOid: public snmpTrapsOid 
+class ACE_Export linkDownOid: public snmpTrapsOid
   // = TITLE
-  //     Defines the RFC 1215 interface (link) down trap 
+  //     Defines the RFC 1215 interface (link) down trap
 {
-   public: 
+   public:
    linkDownOid( void){*this+=".3";}
 };
 
 
 // SMI LinkUp Oid
-class ACE_Export linkUpOid: public snmpTrapsOid 
+class ACE_Export linkUpOid: public snmpTrapsOid
   // = TITLE
-  //     Defines the RFC 1215 interface (link) up trap 
+  //     Defines the RFC 1215 interface (link) up trap
 {
-   public: 
+   public:
    linkUpOid( void){*this+=".4";}
 };
 
-class ACE_Export authenticationFailureOid: public snmpTrapsOid 
+class ACE_Export authenticationFailureOid: public snmpTrapsOid
   // = TITLE
   //     Defines the RFC 1215 device/agent invalid access trap
 {
-   public: 
+   public:
    authenticationFailureOid( void){*this+=".5";}
 };
 
-class ACE_Export egpNeighborLossOid: public snmpTrapsOid 
+class ACE_Export egpNeighborLossOid: public snmpTrapsOid
   // = TITLE
-  //     Defines the RFC 1215 Exterior Gateway Protocol neighbor loss trap 
+  //     Defines the RFC 1215 Exterior Gateway Protocol neighbor loss trap
 {
-   public: 
+   public:
    egpNeighborLossOid( void){*this+=".6";}
 };
 
@@ -113,6 +113,6 @@ const authenticationFailureOid authenticationFailure;
 const egpNeighborLossOid egpNeighborLoss;
 const snmpTrapEnterpriseOid snmpTrapEnterprise;
 
-#endif 
+#endif
 
 #endif // ENTTRAPS_
diff --git a/ASNMP/asnmp/gauge.h b/ASNMP/asnmp/gauge.h
index 612f4b1c3c5..765a713736c 100644
--- a/ASNMP/asnmp/gauge.h
+++ b/ASNMP/asnmp/gauge.h
@@ -16,7 +16,7 @@
 //  in RFC 1155 section 3.2.3.4 (ie the value doesn't latch on the max value)
 //
 // = AUTHOR
-//    Peter E Mellquist 
+//    Peter E Mellquist
 //
 // ============================================================================
 /*===================================================================
@@ -24,15 +24,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 #include "asnmp/integer.h"
@@ -45,7 +45,7 @@
 
 class ACE_Export Gauge32: public SnmpUInt32
   // = TITLE
-  //     Define RFC1902 Gauge datatype from RFC 1155 section 3.2.3.4 
+  //     Define RFC1902 Gauge datatype from RFC 1155 section 3.2.3.4
   //     Note that this datatype does not behave exactly (acts like a long)
 {
   public:
diff --git a/ASNMP/asnmp/integer.h b/ASNMP/asnmp/integer.h
index 38d94bf7d68..d0dc2972742 100644
--- a/ASNMP/asnmp/integer.h
+++ b/ASNMP/asnmp/integer.h
@@ -22,16 +22,16 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
-=====================================================================*/ 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
+=====================================================================*/
 
 #include "asnmp/smival.h"
 
@@ -43,35 +43,35 @@
 // integers but is contained in a Value object for consistency
 // among the various types.
 // class objects may be set or get into Vb objects.
-// 
+//
 
 // 32 bit unsigned integer class
 class ACE_Export SnmpUInt32: public SnmpSyntax
   // = TITLE
-  //      Implement RFC 1920 Unsigned Integer SMI datatype 
+  //      Implement RFC 1920 Unsigned Integer SMI datatype
 {
-     
-  public: 
+
+  public:
      SnmpUInt32 (const unsigned long i = 0);
-     // default constructor 
+     // default constructor
 
      SnmpUInt32( const SnmpUInt32 &c);
      // copy constructor
-        
+
      virtual ~SnmpUInt32();
      // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
 
      virtual SmiUINT32 get_syntax();
      // syntax type
 
-     SnmpUInt32& operator=( const unsigned long i); 
-     // overloaded assignment   
-        
-     SnmpUInt32& operator=( const SnmpUInt32 &uli); 
-     // overloaded assignment   
-        
+     SnmpUInt32& operator=( const unsigned long i);
+     // overloaded assignment
+
+     SnmpUInt32& operator=( const SnmpUInt32 &uli);
+     // overloaded assignment
+
      operator unsigned long();
-     // otherwise, behave like an unsigned long int    
+     // otherwise, behave like an unsigned long int
 
      virtual char *to_string();
      // get a printable ASCII value
@@ -89,14 +89,14 @@ class ACE_Export SnmpUInt32: public SnmpSyntax
     int valid_flag;
     char output_buffer[INTOUTBUF];
     // contain string representation of object
-}; 
+};
 
 
 // 32 bit signed integer class
 class ACE_Export SnmpInt32: public SnmpSyntax
 {
   // = TITLE
-  //      Implement RFC 1902 32 bit Integer SMI data object 
+  //      Implement RFC 1902 32 bit Integer SMI data object
   public:
      SnmpInt32 (const long i = 0);
      // constructor with value
@@ -110,14 +110,14 @@ class ACE_Export SnmpInt32: public SnmpSyntax
      virtual SmiUINT32 get_syntax();
      // syntax type
 
-     SnmpInt32& operator=( const long i); 
-     // overloaded assignment   
-        
-     SnmpInt32& operator=( const SnmpInt32 &li); 
-     // overloaded assignment   
-        
+     SnmpInt32& operator=( const long i);
+     // overloaded assignment
+
+     SnmpInt32& operator=( const SnmpInt32 &li);
+     // overloaded assignment
+
      operator long();
-     // otherwise, behave like a long int    
+     // otherwise, behave like a long int
 
      SnmpSyntax *clone() const;
      // create a new instance of this Value
@@ -129,12 +129,12 @@ class ACE_Export SnmpInt32: public SnmpSyntax
      // get a printable ASCII value
 
      int valid() const;
-     // logical state of object 
+     // logical state of object
 
  protected:
     int valid_flag;
     char output_buffer[INTOUTBUF];
-    // contain string representation of object  
+    // contain string representation of object
 };
 
-#endif       
+#endif
diff --git a/ASNMP/asnmp/octet.h b/ASNMP/asnmp/octet.h
index d17290dc646..28b3d9fda21 100644
--- a/ASNMP/asnmp/octet.h
+++ b/ASNMP/asnmp/octet.h
@@ -25,15 +25,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 //------------------------------------------------------------------------
@@ -41,12 +41,12 @@
 
 class ACE_Export OctetStr: public  SnmpSyntax
   // = TITLE
-  //      Implement RFC1155 Octet SMI data object 
+  //      Implement RFC1155 Octet SMI data object
 
 {
 public:
   OctetStr( const char *string = "", long size = -1);
-  // construct octet from byte buffer, assume c style string if size == -1  
+  // construct octet from byte buffer, assume c style string if size == -1
 
   OctetStr ( const OctetStr &octet);
   // constructor using another octet object
@@ -58,7 +58,7 @@ public:
   // syntax type
 
   void set_data( const SmiBYTE* string, long int size = -1);
-  // set octet from byte buffer, assume c style string if size == -1  
+  // set octet from byte buffer, assume c style string if size == -1
 
   OctetStr& operator=( const char *string);
   // assignment to a string operator overloaded
@@ -135,7 +135,7 @@ public:
   char *to_string_hex();
   // get an ASCII formattted hex dump of the contents
 
-  SnmpSyntax  *clone() const; 
+  SnmpSyntax  *clone() const;
   // create a new instance of this Value
 
   SnmpSyntax& operator=( SnmpSyntax &val);
@@ -143,8 +143,8 @@ public:
 
 protected:
   //----[ instance variables ]
-  char *output_buffer;	   // formatted Octet value
-  int validity;		       // validity boolean
+  char *output_buffer;     // formatted Octet value
+  int validity;                // validity boolean
 };
 
 #endif // OCTET_CLS_
diff --git a/ASNMP/asnmp/oid.h b/ASNMP/asnmp/oid.h
index c1a3af2131b..16020e374c0 100644
--- a/ASNMP/asnmp/oid.h
+++ b/ASNMP/asnmp/oid.h
@@ -8,18 +8,18 @@
 //    asnmp
 //
 // = FILENAME
-//    oid.h 
+//    oid.h
 //
 // = DESCRIPTION
 // This class is fully contained and does not rely on or any other
 // SNMP libraries. This class is portable across any platform
-// which supports C++. Ported to ACE by Mike MacFaden mrm@cisco.com 
+// which supports C++. Ported to ACE by Mike MacFaden mrm@cisco.com
 // and modified for MT. Some API cleanup: collapse constructors,
-// add suboid() method remove unnecessary overload, and update a few 
-// names and types to improve clarity. 
+// add suboid() method remove unnecessary overload, and update a few
+// names and types to improve clarity.
 //
 // = AUTHOR
-//    Peter E Mellquist 
+//    Peter E Mellquist
 //
 // ============================================================================
 /*===================================================================
@@ -27,24 +27,29 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 //----------[ extern C libraries Needed ]---------------------------------
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "asnmp/smival.h"                // derived class for all values
 
-class ACE_Export Oid: public  SnmpSyntax 
+class ACE_Export Oid: public  SnmpSyntax
   // = TITLE
-  //      Implement RFC 1155 Object Identifier (OID) datatype 
+  //      Implement RFC 1155 Object Identifier (OID) datatype
 {
 public:
   Oid( const char * dotted_oid_string = "", size_t size = unsigned(-1) );
@@ -94,7 +99,7 @@ public:
 
   unsigned long & operator[]( size_t position);
   // allows element access
-  
+
   SmiLPOID oidval();
   // return the WinSnmp oid part
 
@@ -103,7 +108,7 @@ public:
 
   void set_data( const unsigned long *raw_oid, const size_t oid_len);
   // reset the data from raw 4byte integer format
- 
+
   size_t length() const;
   // return the len of the oid
 
@@ -111,16 +116,16 @@ public:
   // trim off the n rightmost values of an oid
 
   int suboid(Oid& oid, size_t start = 0, size_t how_many = -1);
-  // the equivalent of a substr(new_str, 0, 1) 
+  // the equivalent of a substr(new_str, 0, 1)
 
-  int left_comparison( const unsigned long n, const Oid &o) const; 
+  int left_comparison( const unsigned long n, const Oid &o) const;
   // compare the n leftmost bytes (left-to-right)
   // returns 0, equal
   // returns -1, <
   // returns 1 , >
 
-  
-  int right_comparison( const unsigned long n, const Oid &o) const; 
+
+  int right_comparison( const unsigned long n, const Oid &o) const;
   // compare the n rightmost bytes (right-to-left)
   // returns 0, equal
   // returns -1, <
@@ -129,7 +134,7 @@ public:
   int valid() const;
   // is the Oid object valid
 
-  char *to_string(); 
+  char *to_string();
   // return dotted string value from the right
   // where the user specifies how many positions to print
 
@@ -140,7 +145,7 @@ public:
   // copy an instance of this Value
 
 protected:
-  char *iv_str;             
+  char *iv_str;
   // used for returning oid string
 
   int StrToOid( const char *string, SmiLPOID dstOid, size_t& how_many_bytes);
@@ -153,10 +158,10 @@ protected:
   // convert an smi oid to its string representation
 
   private:
-    void set_invalid();  
-    // release memory, re-init data members 
+    void set_invalid();
+    // release memory, re-init data members
 
-    void set_null();  
+    void set_null();
     // initialize object data members
     void init_value( const SmiLPOID srcOid, size_t len);
     void init_value(const unsigned long *raw_oid, size_t oid_len);
diff --git a/ASNMP/asnmp/oid_def.h b/ASNMP/asnmp/oid_def.h
index c32c4d0e1f8..bdf46ec4f88 100644
--- a/ASNMP/asnmp/oid_def.h
+++ b/ASNMP/asnmp/oid_def.h
@@ -14,7 +14,7 @@
 //   Well known Oids defined in RFC 1215
 //
 // = AUTHOR
-//    Peter E Mellquist 
+//    Peter E Mellquist
 //
 // ============================================================================
 /*===================================================================
@@ -36,50 +36,50 @@
 
 // SMI trap oid def
 class snmpTrapsOid: public Oid {
-   public: 
+   public:
    snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){};
-}; 
+};
 
 // SMI Enterprose Oid
 class snmpTrapEnterpriseOid: public Oid {
-   public: 
+   public:
    snmpTrapEnterpriseOid(void):Oid("1.3.6.1.6.3.1.1.4.3.0"){};
-}; 
+};
 
 // SMI Cold Start Oid
 class coldStartOid: public snmpTrapsOid {
-   public: 
+   public:
    coldStartOid( void){*this+=".1";};
 };
 
 // SMI WarmStart Oid
 class warmStartOid: public snmpTrapsOid {
-   public: 
+   public:
    warmStartOid( void){*this+=".2";};
 };
 
 // SMI LinkDown Oid
 class linkDownOid: public snmpTrapsOid {
-   public: 
+   public:
    linkDownOid( void){*this+=".3";};
-}; 
+};
 
 
 // SMI LinkUp Oid
 class linkUpOid: public snmpTrapsOid {
-   public: 
+   public:
    linkUpOid( void){*this+=".4";};
 };
 
 // SMI Authentication Failure Oid
 class authenticationFailureOid: public snmpTrapsOid {
-   public: 
+   public:
    authenticationFailureOid( void){*this+=".5";};
-}; 
+};
 
 // SMI egpneighborloss Oid
 class egpNeighborLossOid: public snmpTrapsOid {
-   public: 
+   public:
    egpNeighborLossOid( void){*this+=".6";};
 };
 
diff --git a/ASNMP/asnmp/pdu.h b/ASNMP/asnmp/pdu.h
index c778b83f241..e748ac5b528 100644
--- a/ASNMP/asnmp/pdu.h
+++ b/ASNMP/asnmp/pdu.h
@@ -23,27 +23,27 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 // TODO: this needs to be moved into the CLASS and modifyable at runtime
 // TODO: define an iterator object to traverse the vbs in a pdu
 
 #define MAX_VBS 25
-#include "asnmp/vb.h"	      // include Vb class definition
+#include "asnmp/vb.h"         // include Vb class definition
 
-class ACE_Export Pdu 
+class ACE_Export Pdu
   // = TITLE
   //      Protocol Data Unit (PDU) concrete class. An abstraction of the
-  //      data packet used to by two SNMP sessions to communicate. 
+  //      data packet used to by two SNMP sessions to communicate.
 {
 public:
   Pdu( void);
@@ -87,7 +87,7 @@ public:
   // return the error status
 
   char *agent_error_reason();
-  // return the complete error info from this pdu 
+  // return the complete error info from this pdu
 
   friend void set_error_status( Pdu *pdu, const int status);
   // set the error status
@@ -126,7 +126,7 @@ public:
   // delete a Vb anywhere within the Pdu
 
   void delete_all_vbs();
-  // delete_all vbs in pdu 
+  // delete_all vbs in pdu
 
   void set_notify_timestamp( const TimeTicks & timestamp);
   // set notify timestamp
@@ -151,51 +151,51 @@ public:
 
 
   protected:
-    Vb *vbs_[MAX_VBS];	         
+    Vb *vbs_[MAX_VBS];
     // pointer to array of Vbs
 
-    int vb_count_;		 
+    int vb_count_;
     // count of Vbs
 
-    int error_status_;		 
+    int error_status_;
     // SMI error status
 
-    int error_index_;		 
+    int error_index_;
     // SMI error index
 
-    int validity_;		 
-    // valid boolean status of object construction 
-    unsigned long request_id_;	 
+    int validity_;
+    // valid boolean status of object construction
+    unsigned long request_id_;
     // SMI request id
 
-    unsigned short pdu_type_;	 
+    unsigned short pdu_type_;
     // derived at run time based on request type
 
-    TimeTicks notify_timestamp_; 
+    TimeTicks notify_timestamp_;
     // a timestamp associated with an infor
     // for notify Pdu objects only
     // traps & notifies
 
-    Oid notify_id_;               
-    // an id 
+    Oid notify_id_;
+    // an id
 
     Oid notify_enterprise_;
-    
+
    private:
-   char *output_;                 
+   char *output_;
    // buffer for to_string()
 };
 
 
-class VbIter 
+class VbIter
   // = TITLE
-  //      Utility class to iterate once through a PDU varbind list 
+  //      Utility class to iterate once through a PDU varbind list
 {
    public:
    VbIter(Pdu& pdu);
    // default constructor
 
-   int next(Vb& vb);  
+   int next(Vb& vb);
    // returns 1 if ok, else 0 if none left
 
   private:
@@ -206,7 +206,7 @@ class VbIter
    // current object in list
 
    Pdu *pdu_;
-   // ptr to pdu being interated over 
+   // ptr to pdu being interated over
 };
 
 #endif //PDU_CLS_
diff --git a/ASNMP/asnmp/sagent.h b/ASNMP/asnmp/sagent.h
index d2b64492679..e97d7839be5 100644
--- a/ASNMP/asnmp/sagent.h
+++ b/ASNMP/asnmp/sagent.h
@@ -13,56 +13,61 @@
 // = DESCRIPTION
 //   SNMP agent class defintion. The sagent class provides an object oriented
 //   approach for creating SNMP Agents. The sagent class is an encapsulation of SNMP
-//   sessions, gets, sets, etc. 
+//   sessions, gets, sets, etc.
 //
 // = AUTHOR
-//    Michael R. MacFaden 
+//    Michael R. MacFaden
 //
 // ============================================================================
 #include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Dgram.h"
 
 #include "asnmp/oid.h"                // snmp++ oid class
 #include "asnmp/vb.h"                 // snbmp++ vb class
 #include "asnmp/target.h"             // snmp++ target class
 #include "asnmp/pdu.h"                // snmp++ pdu class
-#include "asnmp/snmperrs.h"           // error macros and strings 
+#include "asnmp/snmperrs.h"           // error macros and strings
 #include "asnmp/address.h"            // snmp++ address class defs
-#include "asnmp/snmp.h"               // snmp interface 
+#include "asnmp/snmp.h"               // snmp interface
 
-// sagent - supports Version 1 operations in blocking mode 
+// sagent - supports Version 1 operations in blocking mode
 
 #define DEF_AGENT_PORT (161)
 
 class ACE_Export sagent : public ACE_Event_Handler, Snmp
   // = TITLE
   //      Concrete class sagent defines the session and interface to
-  //      communicate with another SNMP Version 1 manager 
+  //      communicate with another SNMP Version 1 manager
 {
  public:
 
 
     // override the next three methods (callbacks) to implment your agent
     //
-    
+
     virtual int handle_get( Pdu &pdu, UdpTarget &target) = 0;
     // retrieve data from a peer agent for a given list of oid values
 
-    virtual int handle_get_next( Pdu &pdu, UdpTarget &target) = 0; 
+    virtual int handle_get_next( Pdu &pdu, UdpTarget &target) = 0;
     // retrieve data lexically adjacent to the oids specified in the pdu
-    // from the peer agent 
+    // from the peer agent
 
-    virtual int handle_set( Pdu &pdu, UdpTarget &target) = 0; 
+    virtual int handle_set( Pdu &pdu, UdpTarget &target) = 0;
     // set data in the agent from the list of oids in the pdu
 
-    virtual int handle_input(ACE_HANDLE); 
+    virtual int handle_input(ACE_HANDLE);
     // new pdu received from mgr (reactor calls this)
 
     virtual ACE_HANDLE get_handle() const;
     // retrieve io descriptor (reactor uses this)
 
     int respond(Pdu& pdu, UdpTarget& tgt);
-    // send a response pdu to the mgr 
+    // send a response pdu to the mgr
 
  protected:
     sagent(unsigned short port = DEF_AGENT_PORT);
@@ -70,8 +75,8 @@ class ACE_Export sagent : public ACE_Event_Handler, Snmp
 
 private:
   sagent(const sagent&);
-  Pdu pdu_;			// current input pdu
-  UdpTarget tgt_;		//  addr & com strs
+  Pdu pdu_;                     // current input pdu
+  UdpTarget tgt_;               //  addr & com strs
 };
 
 #endif //SAGENT_CLS_
diff --git a/ASNMP/asnmp/smi.h b/ASNMP/asnmp/smi.h
index 6a67ebcd061..09b3927b220 100644
--- a/ASNMP/asnmp/smi.h
+++ b/ASNMP/asnmp/smi.h
@@ -8,14 +8,14 @@
 //    asnmp
 //
 // = FILENAME
-//    smi.h 
+//    smi.h
 //
 // = DESCRIPTION
-// Address class definition. Encapsulates various network 
+// Address class definition. Encapsulates various network
 // addresses into easy to use, safe and portable classes.
 //
 // = AUTHOR
-//    ?? 
+//    ??
 //
 // ============================================================================
 /*===================================================================
@@ -23,52 +23,56 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
-      
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
+
 =====================================================================*/
- 
+
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 //----------[ ASN/BER Base Types ]-----------------------------------------
 // Basic Encoding Rules (BER)
-// (used in forming SYNTAXes and certain SNMP types/values) 
+// (used in forming SYNTAXes and certain SNMP types/values)
 #define aSN_UNIVERSAL    (0x00)
 #define aSN_APPLICATION  (0x40)
 #define aSN_CONTEXT      (0x80)
 #define aSN_PRIVATE      (0xC0)
 #define aSN_PRIMITIVE    (0x00)
-#define aSN_CONSTRUCTOR  (0x20) 
+#define aSN_CONSTRUCTOR  (0x20)
 
 //------[ SNMP ObjectSyntax Values ]---------------------------------------
-#define sNMP_SYNTAX_SEQUENCE  (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x10) 
+#define sNMP_SYNTAX_SEQUENCE  (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x10)
 
 
 //-------------------------------------------------------------------------
-// These values are used in the "syntax" member 
-// of the smiVALUE structure which follows.     
+// These values are used in the "syntax" member
+// of the smiVALUE structure which follows.
 // Note: UInt32 is indistinguishable from Gauge32 per SNMPv2 Draft Standard
 //       NsapAddr is obsoleted as unique SMI type per SNMPv2 Draft Standard
-#define sNMP_SYNTAX_INT		(aSN_UNIVERSAL | aSN_PRIMITIVE | 0x02)
-#define sNMP_SYNTAX_BITS	(aSN_UNIVERSAL | aSN_PRIMITIVE | 0x03)
-#define sNMP_SYNTAX_OCTETS	(aSN_UNIVERSAL | aSN_PRIMITIVE | 0x04)
-#define sNMP_SYNTAX_NULL	(aSN_UNIVERSAL | aSN_PRIMITIVE | 0x05)
-#define sNMP_SYNTAX_OID		(aSN_UNIVERSAL | aSN_PRIMITIVE | 0x06)
-#define sNMP_SYNTAX_INT32	sNMP_SYNTAX_INT
-#define sNMP_SYNTAX_IPADDR	(aSN_APPLICATION | aSN_PRIMITIVE | 0x00)
-#define sNMP_SYNTAX_CNTR32	(aSN_APPLICATION | aSN_PRIMITIVE | 0x01)
-#define sNMP_SYNTAX_GAUGE32	(aSN_APPLICATION | aSN_PRIMITIVE | 0x02)
-#define sNMP_SYNTAX_TIMETICKS	(aSN_APPLICATION | aSN_PRIMITIVE | 0x03)
-#define sNMP_SYNTAX_OPAQUE	(aSN_APPLICATION | aSN_PRIMITIVE | 0x04)
-#define sNMP_SYNTAX_CNTR64	(aSN_APPLICATION | aSN_PRIMITIVE | 0x06)
-#define sNMP_SYNTAX_UINT32	(aSN_APPLICATION | aSN_PRIMITIVE | 0x07)
+#define sNMP_SYNTAX_INT         (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x02)
+#define sNMP_SYNTAX_BITS        (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x03)
+#define sNMP_SYNTAX_OCTETS      (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x04)
+#define sNMP_SYNTAX_NULL        (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x05)
+#define sNMP_SYNTAX_OID         (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x06)
+#define sNMP_SYNTAX_INT32       sNMP_SYNTAX_INT
+#define sNMP_SYNTAX_IPADDR      (aSN_APPLICATION | aSN_PRIMITIVE | 0x00)
+#define sNMP_SYNTAX_CNTR32      (aSN_APPLICATION | aSN_PRIMITIVE | 0x01)
+#define sNMP_SYNTAX_GAUGE32     (aSN_APPLICATION | aSN_PRIMITIVE | 0x02)
+#define sNMP_SYNTAX_TIMETICKS   (aSN_APPLICATION | aSN_PRIMITIVE | 0x03)
+#define sNMP_SYNTAX_OPAQUE      (aSN_APPLICATION | aSN_PRIMITIVE | 0x04)
+#define sNMP_SYNTAX_CNTR64      (aSN_APPLICATION | aSN_PRIMITIVE | 0x06)
+#define sNMP_SYNTAX_UINT32      (aSN_APPLICATION | aSN_PRIMITIVE | 0x07)
 
 //-------------------------------------------------------------------------
 
@@ -80,23 +84,23 @@
 
 
 //--------------[ different types of PDU's ]-------------------------------
-#define sNMP_PDU_GET		(aSN_CONTEXT | aSN_CONSTRUCTOR | 0x0)
-#define sNMP_PDU_GETNEXT	(aSN_CONTEXT | aSN_CONSTRUCTOR | 0x1)
-#define sNMP_PDU_RESPONSE	(aSN_CONTEXT | aSN_CONSTRUCTOR | 0x2)
-#define sNMP_PDU_SET		(aSN_CONTEXT | aSN_CONSTRUCTOR | 0x3)
+#define sNMP_PDU_GET            (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x0)
+#define sNMP_PDU_GETNEXT        (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x1)
+#define sNMP_PDU_RESPONSE       (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x2)
+#define sNMP_PDU_SET            (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x3)
 #define sNMP_PDU_V1TRAP     (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x4)
 #define sNMP_PDU_GETBULK    (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x5)
 #define sNMP_PDU_INFORM     (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x6)
 #define sNMP_PDU_TRAP       (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x7)
 
- 
+
 //------[ smi typedefs ]---------------------------------------------------
-// SNMP-related types from RFC1442 (SMI) 
+// SNMP-related types from RFC1442 (SMI)
 
 typedef unsigned char    SmiBYTE,        *SmiLPBYTE;
 
 //-------------------------------------------------------------------------
-// SNMP-related types from RFC1442 (SMI) 
+// SNMP-related types from RFC1442 (SMI)
 
 // int
 typedef long             SmiINT,         *SmiLPINT;
@@ -112,7 +116,7 @@ typedef struct {
      SmiUINT32 len;
      SmiLPBYTE ptr;}     SmiOCTETS,      *SmiLPOCTETS;
 
-// bits     
+// bits
 typedef SmiOCTETS        SmiBITS,        *SmiLPBITS;
 
 // SMI oid struct
@@ -120,7 +124,7 @@ typedef struct {
      SmiUINT32   len;
      SmiLPUINT32 ptr;}   SmiOID,         *SmiLPOID;
 
-// ipaddr     
+// ipaddr
 typedef SmiOCTETS        SmiIPADDR,      *SmiLPIPADDR;
 
 // 32bit counter
@@ -143,7 +147,7 @@ typedef struct {
         SmiUINT32 hipart;
         SmiUINT32 lopart;
 } SmiCNTR64,    *SmiLPCNTR64;
-        
+
 #endif // SMIDEF_
 
-        
+
diff --git a/ASNMP/asnmp/smival.h b/ASNMP/asnmp/smival.h
index dff38438490..6e7c8c4c1b9 100644
--- a/ASNMP/asnmp/smival.h
+++ b/ASNMP/asnmp/smival.h
@@ -24,16 +24,16 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
-=====================================================================*/ 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
+=====================================================================*/
 
 //----[ includes ]-----------------------------------------------------
 #include "asnmp/smi.h"
@@ -42,10 +42,10 @@
 
 //======================================================================
 // SMI value structure conforming with SMI RFC
-//  
-typedef struct {		/* smiVALUE portion of VarBind */
-	  SmiUINT32 syntax;	/* Insert SNMP_SYNTAX_<type> */
-        union	{
+//
+typedef struct {                /* smiVALUE portion of VarBind */
+          SmiUINT32 syntax;     /* Insert SNMP_SYNTAX_<type> */
+        union   {
           SmiINT    sNumber;    /* SNMP_SYNTAX_INT
                                    SNMP_SYNTAX_INT32 */
           SmiUINT32 uNumber;    /* SNMP_SYNTAX_UINT32
@@ -63,9 +63,9 @@ typedef struct {		/* smiVALUE portion of VarBind */
                                    SNMP_SYNTAX_NOSUCHOBJECT
                                    SNMP_SYNTAX_NOSUCHINSTANCE
                                    SNMP_SYNTAX_ENDOFMIBVIEW */
-		  }   value;
+                  }   value;
 }    SmiVALUE, *SmiLPVALUE;
- 
+
 // An "abstract" (pure virtual) class that serves as the base class
 // for all specific SNMP syntax types.
 //
@@ -76,7 +76,7 @@ public:
   // virtual function for getting a printable ASCII value for any SNMP Value
 
   virtual SmiUINT32 get_syntax() = 0;
-  // return the current syntax    
+  // return the current syntax
 
   virtual  SnmpSyntax * clone() const = 0;
   // virtual clone operation for creating a new Value from an existing
@@ -87,8 +87,8 @@ public:
   // virtual destructor to ensure deletion of derived classes...
 
   virtual SnmpSyntax& operator=( SnmpSyntax &/*val*/)
-  { 
-      return *this; 
+  {
+      return *this;
   }
   // overloaded assignment operator
   // This should be pure virtual, but WinNT compiler
diff --git a/ASNMP/asnmp/snmp.h b/ASNMP/asnmp/snmp.h
index 725a80dfadb..65a7700721b 100644
--- a/ASNMP/asnmp/snmp.h
+++ b/ASNMP/asnmp/snmp.h
@@ -18,7 +18,7 @@
 //
 // = AUTHOR
 //    Peter E Mellquist  design, first implementation
-//    Michael R. MacFaden port to ACE / use Reactor pattern 
+//    Michael R. MacFaden port to ACE / use Reactor pattern
 //
 // ============================================================================
 /*===================================================================
@@ -26,25 +26,30 @@
    Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 #include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Dgram.h"
 
 #include "asnmp/oid.h"                // snmp++ oid class
 #include "asnmp/vb.h"                 // snbmp++ vb class
 #include "asnmp/target.h"             // snmp++ target class
 #include "asnmp/pdu.h"                // snmp++ pdu class
-#include "asnmp/snmperrs.h"           // error macros and strings 
+#include "asnmp/snmperrs.h"           // error macros and strings
 #include "asnmp/address.h"            // snmp++ address class defs
 #include "asnmp/transaction_result.h"
 
@@ -56,11 +61,11 @@ class ACE_Export Snmp_Result
     virtual void result(Snmp *snmp, int result) = 0;
 };
 
-// Snmp session class - supports Version 1 operations in blocking mode 
+// Snmp session class - supports Version 1 operations in blocking mode
 class ACE_Export Snmp : public transaction_result
   // = TITLE
   //      Concrete class Snmp defined the session and interface to
-  //      communicate with another SNMP Version 1 agent 
+  //      communicate with another SNMP Version 1 agent
 {
    Snmp_Result * result_;
    Pdu * pdu_;
@@ -73,25 +78,25 @@ class ACE_Export Snmp : public transaction_result
     // retrieve data from a peer agent for a given list of oid values
     // default port 161
 
-    int get_next( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0); 
+    int get_next( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0);
     // retrieve data lexically adjacent to the oids specified in the pdu
-    // from the peer agent 
+    // from the peer agent
     // default port 161
 
-    int set( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0); 
+    int set( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0);
     // set data in the agent from the list of oids in the pdu
     // default port 161
 
     int trap( Pdu &pdu, UdpTarget &target);
     // send an SNMPv1 trap (unreliable) to a remote system (def port 162)
 
-    int valid() const; 
-    // status of object after construction 
+    int valid() const;
+    // status of object after construction
 
-    static char * error_string(int code);  
+    static char * error_string(int code);
     // given error code, return string reason
 
-    char * error_string();  
+    char * error_string();
     // retrieve a reason string if any of the above commands fail
 
     void result(transaction * t, int rc);
@@ -105,17 +110,17 @@ class ACE_Export Snmp : public transaction_result
 
   Snmp(const Snmp&);
 
-  ACE_SOCK_Dgram iv_snmp_session_;    
-  // io object 
+  ACE_SOCK_Dgram iv_snmp_session_;
+  // io object
 
-  int construct_status_;              
+  int construct_status_;
   // status of construction
 
-  int last_transaction_status_;       
-  // result code from last transaction 
+  int last_transaction_status_;
+  // result code from last transaction
 
-  unsigned req_id_;                   
-  // transaction request id 
+  unsigned req_id_;
+  // transaction request id
 };
 
 #endif //SNMP_CLS_
diff --git a/ASNMP/asnmp/snmperrs.h b/ASNMP/asnmp/snmperrs.h
index a51fcc68f48..bd7a5e9df56 100644
--- a/ASNMP/asnmp/snmperrs.h
+++ b/ASNMP/asnmp/snmperrs.h
@@ -22,15 +22,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 ============================================================================*/
 
 
@@ -39,11 +39,11 @@
 //
 // The values can be returned via Pdu::get_error_status()
 //
-#define SNMP_ERROR_SUCCESS	     0   // Success Status
-#define SNMP_ERROR_TOO_BIG	     1   // Pdu encoding too big
-#define SNMP_ERROR_NO_SUCH_NAME	     2   // No such VB name, see error index
+#define SNMP_ERROR_SUCCESS           0   // Success Status
+#define SNMP_ERROR_TOO_BIG           1   // Pdu encoding too big
+#define SNMP_ERROR_NO_SUCH_NAME      2   // No such VB name, see error index
 #define SNMP_ERROR_BAD_VALUE         3   // Bad Vb
-#define SNMP_ERROR_READ_ONLY	     4   // VB is read only, see error index
+#define SNMP_ERROR_READ_ONLY         4   // VB is read only, see error index
 #define SNMP_ERROR_GENERAL_VB_ERR    5   // General VB error, see error index
 #define SNMP_ERROR_NO_ACCESS         6   // No access to MIBs data
 #define SNMP_ERROR_WRONG_TYPE        7   // Requested type was incorrect
@@ -52,8 +52,8 @@
 #define SNMP_ERROR_WRONG_VALUE      10   // Request Pdu has wrong value
 #define SNMP_ERROR_NO_CREATION      11   // Unable to create object specified
 #define SNMP_ERROR_INCONSIST_VAL    12   // Inconsistent value in request
-#define SNMP_ERROR_RESOURCE_UNAVAIL 13   // Resources unavailable 
-#define SNMP_ERROR_COMITFAIL        14   // Unable to comit 
+#define SNMP_ERROR_RESOURCE_UNAVAIL 13   // Resources unavailable
+#define SNMP_ERROR_COMITFAIL        14   // Unable to comit
 #define SNMP_ERROR_UNDO_FAIL        15   // Unable to undo
 #define SNMP_ERROR_AUTH_ERR         16   // Authentication failure
 #define SNMP_ERROR_NOT_WRITEABLE    17   // Mib Object not writeable
@@ -65,7 +65,7 @@
 // General
 #define SNMP_CLASS_SUCCESS                 0  // success
 #define SNMP_CLASS_ERROR                  -1  // general error
-#define SNMP_CLASS_RESOURCE_UNAVAIL       -2  // e.g., malloc failed 
+#define SNMP_CLASS_RESOURCE_UNAVAIL       -2  // e.g., malloc failed
 #define SNMP_CLASS_INTERNAL_ERROR         -3  // unexpected / internal error
 #define SNMP_CLASS_UNSUPPORTED            -4  // unsupported function
 
@@ -74,7 +74,7 @@
 #define SNMP_CLASS_ASYNC_RESPONSE         -6  // received response for outstd request
 #define SNMP_CLASS_NOTIFICATION           -7  // received notification (trap/inform)
 #define SNMP_CLASS_SESSION_DESTROYED      -8  // snmp::destroyed with oustanding reqs pending
-					
+
 // Snmp Class:
 #define SNMP_CLASS_INVALID                -10 // snmp::mf called on invalid instance
 #define SNMP_CLASS_INVALID_PDU            -11 // invalid pdu passed to mf
@@ -82,14 +82,14 @@
 #define SNMP_CLASS_INVALID_CALLBACK       -13 // invalid callback to mf
 #define SNMP_CLASS_INVALID_REQID          -14 // invalid request id to cancel
 #define SNMP_CLASS_INVALID_NOTIFYID       -15 // missing trap/inform oid
-#define SNMP_CLASS_INVALID_OPERATION      -16 // snmp operation not allowed for specified target 
-#define SNMP_CLASS_INVALID_OID	          -17 // invalid oid passed to mf
+#define SNMP_CLASS_INVALID_OPERATION      -16 // snmp operation not allowed for specified target
+#define SNMP_CLASS_INVALID_OID            -17 // invalid oid passed to mf
 #define SNMP_CLASS_INVALID_ADDRESS        -18 // invalid address passed to mf
 #define SNMP_CLASS_ERR_STATUS_SET         -19 // agent returned response pdu with error_status set
 
 // Transport Errors:
-#define SNMP_CLASS_TL_UNSUPPORTED         -20 // transport unsupported 
-#define SNMP_CLASS_TL_IN_USE              -21 // transport in use 
+#define SNMP_CLASS_TL_UNSUPPORTED         -20 // transport unsupported
+#define SNMP_CLASS_TL_IN_USE              -21 // transport in use
 #define SNMP_CLASS_TL_FAILED              -22 // transport operation failed
 
 // extras
@@ -106,12 +106,12 @@
 #define MAX_NEG_ERROR                    SNMP_CLASS_SHUTDOWN
 
 static char * pErrs[] = {
-  "Success",				                      // 0
+  "Success",                                                  // 0
   "SNMP: Response PDU Too Big",                               // 1
-  "SNMP: Variable does not exist",  	      		      // 2
-  "SNMP: Cannot modify variable: Bad Value",     	      // 3
-  "SNMP: Cannot modify object, Read Only",  		      // 4
-  "SNMP: Cannot perform operation, General Error",	      // 5
+  "SNMP: Variable does not exist",                            // 2
+  "SNMP: Cannot modify variable: Bad Value",                  // 3
+  "SNMP: Cannot modify object, Read Only",                    // 4
+  "SNMP: Cannot perform operation, General Error",            // 5
   "SNMP: Cannot access variable, No Access",                  // 6
   "SNMP: Cannot create/modify variable, Wrong Type",          // 7
   "SNMP: Cannot create/set variable, Wrong Length",           // 8
@@ -146,24 +146,24 @@ static char * nErrs[] = {
   "ASNMP: Unsupported function",
 
   // Callback reasons:
-  // 5  SNMP_CLASS_TIMEOUT 
+  // 5  SNMP_CLASS_TIMEOUT
   "ASNMP: SNMP request timed out",
 
-  // 6  SNMP_CLASS_ASYNC_RESPONSE 
-  "ASNMP: Received SNMP Response", 
+  // 6  SNMP_CLASS_ASYNC_RESPONSE
+  "ASNMP: Received SNMP Response",
 
-  // 7  SNMP_CLASS_NOTIFICATION	 
+  // 7  SNMP_CLASS_NOTIFICATION
   "ASNMP: Received SNMP Notification (trap or inform)",
 
-  // 8  SNMP_CLASS_SESSION_DESTROYED 
+  // 8  SNMP_CLASS_SESSION_DESTROYED
   "ASNMP: Closing session with outstanding requests",
 
   // 9  reserved for future
-  "Unknown error code", 
+  "Unknown error code",
 
   // Snmp Class errors:
   // 10 SNMP_CLASS_INVALID
-  "ASNMP: Class not valid", 
+  "ASNMP: Class not valid",
 
   // 11 SNMP_CLASS_INVALID_PDU
   "ASNMP: Invalid Pdu",
@@ -181,30 +181,30 @@ static char * nErrs[] = {
   "ASNMP: Invalid Notification Id",
 
   // 16 SNMP_CLASS_INVALID_OPERATION
-  "ASNMP: SNMP Operation not supported on specified Target", 
+  "ASNMP: SNMP Operation not supported on specified Target",
 
-  // 17 SNMP_CLASS_INVALID_OID 
+  // 17 SNMP_CLASS_INVALID_OID
   "ASNMP: Invalid Object Identifier",
 
-  // 18 SNMP_CLASS_INVALID_ADDRESS 
+  // 18 SNMP_CLASS_INVALID_ADDRESS
   "ASNMP: Invalid Address",
 
-  // 19 SNMP_CLASS_ERR_STATUS_SET 
+  // 19 SNMP_CLASS_ERR_STATUS_SET
   "ASNMP: Agent indicates error in SNMP request",
 
   // Transport Errors:
-  // 20 SNMP_CLASS_TL_UNSUPPORTED 
+  // 20 SNMP_CLASS_TL_UNSUPPORTED
   "ASNMP: Transport is not supported",
 
-  // 21 SNMP_CLASS_TL_IN_USE 
+  // 21 SNMP_CLASS_TL_IN_USE
   "ASNMP: Transport is in use",
 
-  // 22 SNMP_CLASS_TL_FAILED 
+  // 22 SNMP_CLASS_TL_FAILED
   "ASNMP: Transport operation failed",
 
   // 23 SNMP_CLASS_SHUTDOWN
   "ASNMP: Blocked Mode Shutdown",
-  
+
   // unknown error code
   "Unknown error code",
 };
diff --git a/ASNMP/asnmp/target.h b/ASNMP/asnmp/target.h
index fe1e3f8898d..7dfc14ab5d8 100644
--- a/ASNMP/asnmp/target.h
+++ b/ASNMP/asnmp/target.h
@@ -13,7 +13,7 @@
 // = DESCRIPTION
 //
 // = AUTHOR
-//    Peter E Mellquist 
+//    Peter E Mellquist
 //    Michael R. MacFaden (ported to ACE)
 // ============================================================================
 /*===================================================================
@@ -21,20 +21,25 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS" without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
-=====================================================================*/ 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS" without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
+=====================================================================*/
 
 //----[ includes ]------------------------------------------------
 #include "ace/INET_Addr.h"
-#include "asnmp/address.h" 
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "asnmp/address.h"
 #include "asnmp/oid.h"
 #include "asnmp/octet.h"
 
@@ -46,38 +51,38 @@ enum snmp_version {
 };
 
 // targets contain the following default properties
-enum ASNMP_Defs { 
-  DEF_TIMEOUT = 1,		// unit: seconds
-  DEF_RETRIES = 1,		// no retry default
-  DEF_MAX_SNMP_PACKET = 1430,	// maximum pdu len on the wire (eth mtu-ip hdr)
+enum ASNMP_Defs {
+  DEF_TIMEOUT = 1,              // unit: seconds
+  DEF_RETRIES = 1,              // no retry default
+  DEF_MAX_SNMP_PACKET = 1430,   // maximum pdu len on the wire (eth mtu-ip hdr)
                                 // split bigger pdus (not implemented yet)
-  DEF_AGENT_PORT = 161,		// port # for SNMP agent
+  DEF_AGENT_PORT = 161,         // port # for SNMP agent
   DEF_TRAP_PORT = 162,          // port # for SNMP trap receiver
   DEF_VERSION = version1,       // default SNMP version
-  MAX_COMM_STR_LEN = 255,       // max value this impl will accept from client 
-  MAX_TARGET_STRING_REP = 2048  // max value this impl will accept from client  
+  MAX_COMM_STR_LEN = 255,       // max value this impl will accept from client
+  MAX_TARGET_STRING_REP = 2048  // max value this impl will accept from client
 };
 
 #define READ_COMM_STR "public"
 #define WRITE_COMM_STR "private"
- 
+
 // Abstract class used to provide a virtual interface into Targets
-// 
-class ACE_Export SnmpTarget 
+//
+class ACE_Export SnmpTarget
   // = TITLE
-  //      Abstract Base class SnmpTarget is used to Collect all transmission 
-  //      details to communicate with an SNMP  
-{ 
+  //      Abstract Base class SnmpTarget is used to Collect all transmission
+  //      details to communicate with an SNMP
+{
  public:
 
     virtual ~SnmpTarget();
     // allow destruction of derived classes
 
-    int valid() const; 
+    int valid() const;
     // return validity of target
 
     void set_retry( const int r);
-    // set the retry value       
+    // set the retry value
 
     void set_timeout( const unsigned long t);
     // set the object's timeout (in seconds)
@@ -85,16 +90,16 @@ class ACE_Export SnmpTarget
     void set_version( const snmp_version v);
     // set the instance version
 
-    void set_max_pdu_size(const unsigned long max_pdu_sz); 
+    void set_max_pdu_size(const unsigned long max_pdu_sz);
     // all classes constructed will have this write community string
 
     void set_default_timeout( const unsigned long t);
     // change the "class" default default timeout (in seconds)
 
     void set_default_retry( const int r);
-    // change the default send retries 
+    // change the default send retries
 
-    void set_default_max_pdu_size(const unsigned long max_pdu_sz); 
+    void set_default_max_pdu_size(const unsigned long max_pdu_sz);
     // all classes constructed will have this write community string
 
     void set_default_version( const snmp_version v);
@@ -104,24 +109,24 @@ class ACE_Export SnmpTarget
 
     int get_default_retry() const;
     // get the retry value
-       
+
     unsigned long get_timeout() const;
     // get the timeout (seconds)
 
-    unsigned long get_max_pdu_size() const; 
+    unsigned long get_max_pdu_size() const;
     // get instance max buffer size
 
-    void get_default_max_pdu_size(const unsigned long max_pdu_sz); 
+    void get_default_max_pdu_size(const unsigned long max_pdu_sz);
     // all classes constructed will have this write community string
 
     snmp_version get_version() const;
     // get the version
 
     snmp_version get_default_version() const;
- 
+
     int get_retry() const;
     // return send retry number for this instancd
-    
+
     virtual SnmpTarget *clone() const = 0;
     // virtual clone operation for creating a new SnmpTarget from an existing
     // SnmpTarget.  The caller MUST use the delete operation on the return
@@ -136,57 +141,57 @@ class ACE_Export SnmpTarget
      SnmpTarget();
      //     SnmpTarget(const SnmpTarget &);
 
-    int validity_;  
+    int validity_;
     // used by derived class instances
 
-    unsigned long timeout_; 
+    unsigned long timeout_;
     // instance value xmit timeout in milli secs
 
-    int retries_;           
-    // instance value number of retries 
+    int retries_;
+    // instance value number of retries
 
-    unsigned max_pdu_size_; 
+    unsigned max_pdu_size_;
     // size of pdu
 
-    snmp_version version_;  
-    // instance value the snmp version 
+    snmp_version version_;
+    // instance value the snmp version
 
-    // class wide default values 
-    static unsigned long default_timeout_; 
+    // class wide default values
+    static unsigned long default_timeout_;
     // xmit timeout in secs
 
-    static int default_retries_;           
-    // number of retries 
+    static int default_retries_;
+    // number of retries
 
     static unsigned long default_max_pdu_size_;
-    static snmp_version default_version_;  
-    // snmp protocol version 
+    static snmp_version default_version_;
+    // snmp protocol version
 };
- 
-//----[  UdpTarget class ]---------------------------------------------- 
+
+//----[  UdpTarget class ]----------------------------------------------
 // UDP/IP transport using "community string" based agents  (targets)
 //
-class ACE_Export UdpTarget: public SnmpTarget 
+class ACE_Export UdpTarget: public SnmpTarget
   // = TITLE
-  //      Concrete class UdpTarget contains all Details for communicating 
+  //      Concrete class UdpTarget contains all Details for communicating
   //      with a SNMPv1 agent over UDP/IPv4 transport
-{ 
-  public: 
+{
+  public:
     UdpTarget();
 
     UdpTarget( const UdpAddress& udp);
     // constructor with only address
-    // assumes default as public, public              
+    // assumes default as public, public
     // can be constructed with IP address object
 
-    UdpTarget( ACE_INET_Addr& ace_inet_addr); 
+    UdpTarget( ACE_INET_Addr& ace_inet_addr);
     // can be constructed with Udp address object TODO: merge addresses
-     
+
     ~UdpTarget();
     // destructor
 
-    // ** set *** 
-    
+    // ** set ***
+
     void set_read_community( const OctetStr& new_read_community);
     // set the read community using an OctetStr
 
@@ -196,7 +201,7 @@ class ACE_Export UdpTarget: public SnmpTarget
     int set_address( UdpAddress &udp_address);
     // set the address
 
-    // ** get *** 
+    // ** get ***
 
     void get_read_community( OctetStr& read_community_oct) const;
     // get the read community as an Octet Str object
@@ -220,27 +225,27 @@ class ACE_Export UdpTarget: public SnmpTarget
     // all classes constructed will have this write community string
 
     UdpTarget& operator=( const UdpTarget& target);
-    // overloaded assignment    
+    // overloaded assignment
 
     friend int operator==( const UdpTarget &lhs, const UdpTarget &rhs);
     // compare two C targets
-   
-    char *to_string(); 
-    // string representation of object 
-    
+
+    char *to_string();
+    // string representation of object
+
     SnmpTarget *clone() const;
     // clone from existing UdpTarget
-                
+
   protected:
     static OctetStr default_rd_community_;
     static OctetStr default_wr_community_;
-    OctetStr read_community_;       
-    OctetStr write_community_;     
-    UdpAddress udp_address_;      
-    snmp_version version_;           
+    OctetStr read_community_;
+    OctetStr write_community_;
+    UdpAddress udp_address_;
+    snmp_version version_;
 
-    char output_buffer_[MAX_TARGET_STRING_REP]; 
-    // to_string() rep of data 
+    char output_buffer_[MAX_TARGET_STRING_REP];
+    // to_string() rep of data
 };
 
 
diff --git a/ASNMP/asnmp/timetick.h b/ASNMP/asnmp/timetick.h
index cc959df4f8b..8e4609c124b 100644
--- a/ASNMP/asnmp/timetick.h
+++ b/ASNMP/asnmp/timetick.h
@@ -22,15 +22,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
 =====================================================================*/
 
 #include "asnmp/integer.h"
@@ -44,18 +44,18 @@
 //
 class ACE_Export TimeTicks: public SnmpUInt32
   // = TITLE
-  //      Define RFC1155 TimeTicks Data object 
+  //      Define RFC1155 TimeTicks Data object
 
 {
-    
+
   public:
      TimeTicks( const unsigned long i = 0);
-        
+
      TimeTicks( const TimeTicks &t);
      // copy constructor
 
      ~TimeTicks();
-     // destructor 
+     // destructor
 
      SmiUINT32 get_syntax();
      // syntax type
@@ -68,18 +68,18 @@ class ACE_Export TimeTicks: public SnmpUInt32
 
      SnmpSyntax& operator=(SnmpSyntax &val);
      // copy an instance of this Value
-    
-     TimeTicks& operator=( const TimeTicks &uli); 
+
+     TimeTicks& operator=( const TimeTicks &uli);
      // overloaded assignment
-        
-     TimeTicks& operator=( const unsigned long int i); 
+
+     TimeTicks& operator=( const unsigned long int i);
      // overloaded assignment
-        
+
      operator unsigned long();
-     // otherwise, behave like an unsigned long    
+     // otherwise, behave like an unsigned long
 
   protected:
-    char output_buffer[TICKOUTBUF];  
+    char output_buffer[TICKOUTBUF];
     // for storing printed form
-}; 
+};
 #endif // TIMETICKS_
diff --git a/ASNMP/asnmp/transaction.h b/ASNMP/asnmp/transaction.h
index 4db2e83f63c..4ded5f34e1b 100644
--- a/ASNMP/asnmp/transaction.h
+++ b/ASNMP/asnmp/transaction.h
@@ -13,21 +13,26 @@
 // = DESCRIPTION
 //
 // = AUTHOR
-//    Michael R. MacFaden port to ACE / use Reactor pattern 
+//    Michael R. MacFaden port to ACE / use Reactor pattern
 //
 // ============================================================================
 
 #include "ace/Event_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "asnmp/target.h"
 #include "asnmp/pdu.h"
 #include "asnmp/transaction_result.h"
-#include "asnmp/wpdu.h"		// cmu adapter class
+#include "asnmp/wpdu.h"         // cmu adapter class
 #include "ace/SOCK_Dgram.h"
 
-class ACE_Export transaction : public ACE_Event_Handler  
+class ACE_Export transaction : public ACE_Event_Handler
   // = TITLE
   //      Used to manage the details of a particular transaction betwen
-  //       two SNMP agents. Uses SnmpTarget class to implement retry/timeout  
+  //       two SNMP agents. Uses SnmpTarget class to implement retry/timeout
 
 {
     int retry_counter_;
@@ -40,11 +45,11 @@ class ACE_Export transaction : public ACE_Event_Handler
   ~transaction();
   // destructor
 
-   int run();    
+   int run();
    int run(transaction_result *r); // Async interface, with callback object
    // begin polling for values
 
-   int result(Pdu& pdu, char *comm_str = 0, ACE_INET_Addr *from_addr = 0); 
+   int result(Pdu& pdu, char *comm_str = 0, ACE_INET_Addr *from_addr = 0);
    // return pdu with result from agent after run() is completed rc = 0
    // optionally get community str
 
@@ -58,18 +63,18 @@ class ACE_Export transaction : public ACE_Event_Handler
 
    const ACE_INET_Addr& get_from_addr() const;
    // pre: handle_input called
-   // retrieve the sender's from address from the last pkt 
+   // retrieve the sender's from address from the last pkt
 
  private:
   transaction(const transaction&);
   // disallow copy construction
 
-  wpdu wp_;			// wire pdu
-  UdpTarget params_;		// params
-  ACE_INET_Addr addr_;		// to address
-  ACE_SOCK_Dgram session_;      // io object 
-  iovec receive_iovec_;		// receive buffer
-  ACE_INET_Addr receive_addr_;	// from address
+  wpdu wp_;                     // wire pdu
+  UdpTarget params_;            // params
+  ACE_INET_Addr addr_;          // to address
+  ACE_SOCK_Dgram session_;      // io object
+  iovec receive_iovec_;         // receive buffer
+  ACE_INET_Addr receive_addr_;  // from address
 };
 
 #endif // TRANSACTION_
diff --git a/ASNMP/asnmp/transaction_result.h b/ASNMP/asnmp/transaction_result.h
index 9d0dbfc40b8..1c0472675ea 100644
--- a/ASNMP/asnmp/transaction_result.h
+++ b/ASNMP/asnmp/transaction_result.h
@@ -11,10 +11,10 @@
 //    transaction_result.h
 //
 // = DESCRIPTION
-//  An object respresenting a request/reply operation between mgr/agent  
+//  An object respresenting a request/reply operation between mgr/agent
 //
 // = AUTHOR
-//    Michael R. MacFaden 
+//    Michael R. MacFaden
 //
 // ============================================================================
 
diff --git a/ASNMP/asnmp/vb.h b/ASNMP/asnmp/vb.h
index 1dd823fb2d6..dca6e7ae985 100644
--- a/ASNMP/asnmp/vb.h
+++ b/ASNMP/asnmp/vb.h
@@ -12,9 +12,9 @@
 //
 // = DESCRIPTION
 // This module contains the class definition for the variable binding (VB)
-// class. The VB class is an encapsulation of a SNMP VB. A VB object is 
+// class. The VB class is an encapsulation of a SNMP VB. A VB object is
 // composed of one SNMP++ Oid and one SMI value. The Vb class utilizes Oid
-// objects and thus requires the Oid class. To use this class, 
+// objects and thus requires the Oid class. To use this class,
 // set oid, value then call valid() to be sure object was constructed correctly.
 //
 // = AUTHOR
@@ -25,28 +25,32 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software 
-  and/or its documentation is hereby granted without fee. User agrees 
-  to display the above copyright notice and this license notice in all 
-  copies of the software and any documentation of the software. User 
-  agrees to assume all liability for the use of the software; Hewlett-Packard 
-  makes no representations about the suitability of this software for any 
-  purpose. It is provided "AS-IS without warranty of any kind,either express 
-  or implied. User hereby grants a royalty-free license to any and all 
-  derivatives based upon this software code base. 
-=====================================================================*/ 
- 
+  Permission to use, copy, modify, distribute and/or sell this software
+  and/or its documentation is hereby granted without fee. User agrees
+  to display the above copyright notice and this license notice in all
+  copies of the software and any documentation of the software. User
+  agrees to assume all liability for the use of the software; Hewlett-Packard
+  makes no representations about the suitability of this software for any
+  purpose. It is provided "AS-IS without warranty of any kind,either express
+  or implied. User hereby grants a royalty-free license to any and all
+  derivatives based upon this software code base.
+=====================================================================*/
+
 //----[ external calls ]----------------------------------------------
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "asnmp/smival.h"
 #include "asnmp/snmperrs.h"            // V2c error def
-#include "asnmp/oid.h"                 // oid class def 
+#include "asnmp/oid.h"                 // oid class def
 #include "asnmp/timetick.h"            // time ticks
-#include "asnmp/counter.h"             // counter  
+#include "asnmp/counter.h"             // counter
 #include "asnmp/gauge.h"               // gauge class
 #include "asnmp/ctr64.h"               // 64 bit counters
-#include "asnmp/octet.h"               // octet class 
+#include "asnmp/octet.h"               // octet class
 #include "asnmp/address.h"             // address class def
 #include "asnmp/integer.h"             // integer class
 
@@ -56,63 +60,63 @@
 // Variable binding lists in SNMP++ are represented as arrays of
 // Vb objects. Vb objects are passed to and from SNMP objects to
 // provide getting or setting MIB values.
-// The vb class keeps its own memory for objects and does not 
+// The vb class keeps its own memory for objects and does not
 // utilize pointers to external data structures.
 //
-class ACE_Export Vb 
+class ACE_Export Vb
   // = TITLE
-  //      Implement the concrete Variable Bindings aka Varbind  
+  //      Implement the concrete Variable Bindings aka Varbind
   //      composite type. Varbinds hold 1 Oid and 1 Value (Any SMI value)
 {
 public:
   Vb( void);
-  // constructor with no arguments  
+  // constructor with no arguments
   // makes an vb, unitialized (does not make object valid)
 
   Vb( const Oid &oid);
-  // constructor to initialize the oid  
+  // constructor to initialize the oid
   // makes a vb with oid portion initialized (does not make object valid)
-   
+
   Vb( const Oid& vb, const SnmpSyntax &val, const SmiUINT32=SNMP_CLASS_SUCCESS);
-  // constructor to initialize the oid  
+  // constructor to initialize the oid
   // makes a vb with oid portion and value portion initialized, (valid)
- 
+
   Vb( const Vb &vb);
   // copy constructor
-             
-  ~Vb();     
+
+  ~Vb();
   // destructor
   // if the vb has a oid or an octect string then
   // the associated memory needs to be freed
 
   int valid() const;
-  // return validity of Vb object (both oid and value set return 1 else 0) 
-  
+  // return validity of Vb object (both oid and value set return 1 else 0)
+
   Vb& operator=( const Vb &vb);
   // assignment to another Vb object overloaded
 
   friend int operator==( const Vb &lhs, const Vb &rhs);
   // equivlence operator overloaded
- 
+
   //-----[ set oid / get oid part]------------------------------------------
-    
+
   void set_oid( const Oid& oid);
   // set value oid only with another oid
-   
+
   void get_oid( Oid &oid) const;
   // get oid portion
-   
+
   //-----[ set value part]--------------------------------------------------
 
   void set_null();
   // set a Vb null, if its not already
-   
+
   void set_value( const TimeTicks& ticks);
   // returns 0 on success and a value
 
   void set_value( const Oid& oid);
   // returns 0 on success and a value
-  
+
   void set_value( const Counter32& ctr);
   // returns 0 on success and a value
 
@@ -127,9 +131,9 @@ public:
 
   void set_value( const SnmpInt32& ctr);
   // returns 0 on success and a value
-          
-  void set_value( const OctetStr& oct_str); 
-  // get an octet string object                        
+
+  void set_value( const OctetStr& oct_str);
+  // get an octet string object
 
   //----[ get value ]------------------------------------------------
 
@@ -138,7 +142,7 @@ public:
 
   int get_value( Oid& oid);
   // returns 0 on success and a value
-   
+
   int get_value( Counter32& ctr);
   // returns 0 on success and a value
 
@@ -153,11 +157,11 @@ public:
 
   int get_value( SnmpInt32& ctr);
   // returns 0 on success and a value
-          
-  int get_value( OctetStr& oct_str); 
-  // get an octet string object                        
 
-  // escape hatch 
+  int get_value( OctetStr& oct_str);
+  // get an octet string object
+
+  // escape hatch
   void set_value( const SnmpSyntax &val);
   // for other derived types  that can be casted
 
@@ -165,32 +169,32 @@ public:
   // gets a general value
 
   SmiUINT32 get_syntax();
-  // return the current syntax 
+  // return the current syntax
   // Or.. if a V2 VB exception is present then return the exception value
 
   friend void set_exception_status( Vb *vb, const SmiUINT32 status);
   // set the exception status
-   
+
   char *to_string();
-  // return fomatted version of this object 
+  // return fomatted version of this object
 
   char *to_string_value();
   // returns a formatted version of the value
-  
+
   char *to_string_oid();
   // returns a formatted version of the value
 
 protected:
-  char *output_;                
-  // display vb as  [ oid / value ] 
+  char *output_;
+  // display vb as  [ oid / value ]
 
-  Oid iv_vb_oid_;               
-  // a vb is made up of a oid 
+  Oid iv_vb_oid_;
+  // a vb is made up of a oid
 
-  SnmpSyntax *iv_vb_value_;     
+  SnmpSyntax *iv_vb_value_;
   // and a value...
 
-  SmiUINT32 exception_status_;  
+  SmiUINT32 exception_status_;
   // are there any vb exceptions??
 
   void free_vb();
diff --git a/ASNMP/asnmp/wpdu.h b/ASNMP/asnmp/wpdu.h
index 85caf6c33f7..a4d4bb1d0c1 100644
--- a/ASNMP/asnmp/wpdu.h
+++ b/ASNMP/asnmp/wpdu.h
@@ -21,6 +21,11 @@
 // ============================================================================
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "asnmp/asn1.h"
 #include "asnmp/pdu.h"
 #include "asnmp/target.h"
@@ -29,29 +34,29 @@
 // PDU / Target -> iovec buffer
 // iovec buffer -> PDU / Target
 struct snmp_pdu;
-class ACE_Export wpdu 
+class ACE_Export wpdu
   // = TITLE
-  //      Implement an Adapter pattern between CMU SNMP and HP SNMP++ 
-  // 
+  //      Implement an Adapter pattern between CMU SNMP and HP SNMP++
+  //
 {
 public:
 
   wpdu(const Pdu& pdu, const UdpTarget& target);
   // construct CMU data from HP SNMP++ objects
   wpdu(const iovec& buffer);
-  // construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes 
+  // construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes
   wpdu(); // same as using iovec?
 
   ~wpdu();
 
-  int valid() const;		
+  int valid() const;
   // constructor completed ok? rc = 1 else 0
 
-  const iovec& get_buffer() const; 
+  const iovec& get_buffer() const;
   // return raw data stream via CMU code
 
   int get_pdu(Pdu& pdu, snmp_version& version);
-  // return HP SNMP++ pdu 
+  // return HP SNMP++ pdu
 
   const unsigned char *get_community() const;
   // return community strptr
@@ -64,14 +69,14 @@ private:
   static void copy_iovec(iovec& dest, const iovec& src);
   int set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const;
 
-  iovec iovec_;			
+  iovec iovec_;
   // raw format
 
-  int valid_flag_;		
+  int valid_flag_;
   // object construction state
 
-  snmp_version version_;	
-  // snmp version 
+  snmp_version version_;
+  // snmp version
 
   unsigned char community_name[MAX_COMM_STR_LEN];
   unsigned long comm_len; // = MAX_COMM_STR_LEN;
diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h
index cec49951d40..b548ae88c22 100644
--- a/ASNMP/tests/test_config.h
+++ b/ASNMP/tests/test_config.h
@@ -8,10 +8,10 @@
 // = AUTHOR
 //    Prashant Jain <pjain@cs.wustl.edu>, Tim Harrison
 //    <harrison@cs.wustl.edu>, and David Levine <levine@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (ACE_TEST_CONFIG_H)
+#ifndef ACE_TEST_CONFIG_H
 #define ACE_TEST_CONFIG_H
 
 #include <iostream.h>
@@ -120,11 +120,11 @@ do {\
 #define ACE_INIT_LOG(NAME) \
   char temp[BUFSIZ]; \
   ACE_OS::sprintf (temp, "%s%s%s", \
-		   ACE_LOG_DIRECTORY_A, \
-		   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
-		   ".log"); \
+                   ACE_LOG_DIRECTORY_A, \
+                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
+                   ".log"); \
   ACE_DEBUG ((LM_DEBUG, "Deleting old log file %s (if any)\n\n", temp)); \
-  ACE_OS::unlink (temp); 
+  ACE_OS::unlink (temp);
 
 
 const int ACE_NS_MAX_ENTRIES = 1000;
@@ -153,23 +153,23 @@ private:
 static ACE_Test_Output ace_file_stream;
 
 ACE_Test_Output::ACE_Test_Output (void)
-{ 
+{
 }
 
-ACE_Test_Output::~ACE_Test_Output (void) 
-{ 
+ACE_Test_Output::~ACE_Test_Output (void)
+{
 }
 
-int 
+int
 ACE_Test_Output::set_output (const char *filename, int append)
 {
   char temp[BUFSIZ];
   // Ignore the error value since the directory may already exist.
   ACE_OS::mkdir (ACE_LOG_DIRECTORY_A);
-  ACE_OS::sprintf (temp, "%s%s%s", 
-		   ACE_LOG_DIRECTORY_A, 
-		   ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR_A),
-		   ".log");
+  ACE_OS::sprintf (temp, "%s%s%s",
+                   ACE_LOG_DIRECTORY_A,
+                   ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR_A),
+                   ".log");
 
   int flags = ios::out;
   if (append)
@@ -179,24 +179,24 @@ ACE_Test_Output::set_output (const char *filename, int append)
   if (this->output_file_.bad ())
     return -1;
 
-  ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ()); 
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); 
-  ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); 
+  ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ());
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
 }
 
 ofstream *
-ACE_Test_Output::output_file (void) 
-{ 
-  return &this->output_file_; 
+ACE_Test_Output::output_file (void)
+{
+  return &this->output_file_;
 }
-  
-void 
-ACE_Test_Output::close (void) 
-{ 
-  this->output_file_.flush (); 
-  this->output_file_.close (); 
+
+void
+ACE_Test_Output::close (void)
+{
+  this->output_file_.flush ();
+  this->output_file_.close ();
 }
 
 void
@@ -206,9 +206,9 @@ randomize (int array[], size_t size)
 
   for (i = 0; i < size; i++)
     array [i] = i;
-  
+
   ACE_OS::srand (ACE_OS::time (0L));
- 
+
   // Generate an array of random numbers from 0 .. size - 1.
 
   for (i = 0; i < size; i++)
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h b/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
index 4e07d507a8b..497c872001f 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
+++ b/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
@@ -134,7 +134,7 @@ class _IDL_SEQUENCE_any_var : public CORBA::_var
 class Marshal_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Marshal_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Marshal_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -149,12 +149,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Marshal_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Marshal_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -213,12 +213,12 @@ protected:
     }
 public:
     static Marshal_ptr _duplicate(
-            Marshal_ptr, 
+            Marshal_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Marshal* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Marshal* _bind (CORBA::Environment &IT_env);
    static Marshal* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -245,7 +245,7 @@ struct Marshal_Struct {
     void decodeOp (CORBA::Request &IT_r);
     void decodeInOutOp (CORBA::Request &IT_r);
     static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
+                        void *&, void*, const CORBA::Flags&);
     static const void *IT_fn;
     Marshal_Struct(const Marshal_Struct &);
     Marshal_Struct();
@@ -361,7 +361,7 @@ struct Marshal_Union {
     void decodeOp (CORBA::Request &IT_r);
     void decodeInOutOp (CORBA::Request &IT_r);
     static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
+                        void *&, void*, const CORBA::Flags&);
     static const void *IT_fn;
 
     private:
@@ -704,7 +704,7 @@ struct Marshal_Recursive {
     void decodeOp (CORBA::Request &IT_r);
     void decodeInOutOp (CORBA::Request &IT_r);
     static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
+                        void *&, void*, const CORBA::Flags&);
     static const void *IT_fn;
     Marshal_Recursive(const Marshal_Recursive &);
     Marshal_Recursive();
@@ -993,7 +993,7 @@ class Marshal_SeqElem : public CORBA::_SeqElem
     }
 
     operator Marshal_ptr () const {
-        return _ptr ? (Marshal_ptr) (*_ptr) : Marshal_nil(); 
+        return _ptr ? (Marshal_ptr) (*_ptr) : Marshal_nil();
     }
 
     Marshal_ptr operator->() const { return *_ptr;}
@@ -1009,108 +1009,108 @@ class Marshal_SeqElem : public CORBA::_SeqElem
 #define TIE_Marshal(X) Marshal##X
 
 #define DEF_TIE_Marshal(X) \
-	class Marshal##X : public virtual Marshal {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Marshal##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Marshal(), m_obj(objp) {	\
-		m_pptr = new Marshal_dispatch		\
-			(( Marshal*)this,(CORBA::Object*)this,m,l,Marshal_IR,m_obj);	\
-	   }								\
-	   Marshal##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Marshal() {	\
-		m_pptr = new Marshal_dispatch		\
-			(( Marshal*)this,(CORBA::Object*)this,IT_m,Marshal_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Marshal##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Marshal##X : public virtual Marshal {             \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Marshal##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Marshal(), m_obj(objp) {      \
+                m_pptr = new Marshal_dispatch           \
+                        (( Marshal*)this,(CORBA::Object*)this,m,l,Marshal_IR,m_obj);    \
+           }                                                            \
+           Marshal##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Marshal() {   \
+                m_pptr = new Marshal_dispatch           \
+                        (( Marshal*)this,(CORBA::Object*)this,IT_m,Marshal_IR,IT_p,IT_q);       \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Marshal##X  () {                            \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_short (  s1, s2,IT_env);\
 }\
-	\
+        \
 virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_long (  l1, l2,IT_env);\
 }\
-	\
+        \
 virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_octet (  o1, o2,IT_env);\
 }\
-	\
+        \
 virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_char (  c1, c2,IT_env);\
 }\
-	\
+        \
 virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_double (  d1, d2,IT_env);\
 }\
-	\
+        \
 virtual void test_struct (const Marshal::Marshal_Struct& ms1, Marshal::Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_struct (  ms1, ms2,IT_env);\
 }\
-	\
+        \
 virtual void test_union (const Marshal::Marshal_Union& u1, Marshal::Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_union (  u1, u2,IT_env);\
 }\
-	\
+        \
 virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_any (  a1, a2,IT_env);\
 }\
-	\
+        \
 virtual void test_sequence (const Marshal::AnySeq& as1, Marshal::AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_sequence (  as1, as2,IT_env);\
 }\
-	\
+        \
 virtual void test_recursive (const Marshal::Marshal_Recursive& mr1, Marshal::Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_recursive (  mr1, mr2,IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Marshal	\
+#define QUALS_Marshal   \
 virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_short (  s1, s2,IT_env);\
 }\
-	\
+        \
 virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_long (  l1, l2,IT_env);\
 }\
-	\
+        \
 virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_octet (  o1, o2,IT_env);\
 }\
-	\
+        \
 virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_char (  c1, c2,IT_env);\
 }\
-	\
+        \
 virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_double (  d1, d2,IT_env);\
 }\
-	\
+        \
 virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_struct (  ms1, ms2,IT_env);\
 }\
-	\
+        \
 virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_union (  u1, u2,IT_env);\
 }\
-	\
+        \
 virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_any (  a1, a2,IT_env);\
 }\
-	\
+        \
 virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_sequence (  as1, as2,IT_env);\
 }\
-	\
+        \
 virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->test_recursive (  mr1, mr2,IT_env);\
 }\
@@ -1121,19 +1121,19 @@ m_obj->test_recursive (  mr1, mr2,IT_env);\
 class MarshalProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    MarshalProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Marshal_IR, IT_p) {}
+                : CORBA::ProxyFactory (Marshal_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -1151,7 +1151,7 @@ public:
     MarshalBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Marshal_IR))
     m_pptr = new Marshal_dispatch ( (Marshal*)this,
-   	 (CORBA::Object*)this, m, l, Marshal_IR, this);
+         (CORBA::Object*)this, m, l, Marshal_IR, this);
 }
 
         virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h
index 9fce90ef265..c22f71f0d16 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h
+++ b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    CORBA Marshal Orbix Benchmark
-// 
+//
 // = FILENAME
 //    orbix_marshal_client.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined(_ORBIX_MARSHAL_CLIENT_H_)
+#ifndef _ORBIX_MARSHAL_CLIENT_H_
 #define _ORBIX_MARSHAL_CLIENT_H_
 
 // benchmark library includes
@@ -38,78 +38,78 @@ public:
   // destructor
 
   virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
+                   CORBA_Marshal_Proxy::RESULTS &results);
   // do the actual work
 
   virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
   // use the static invocation interface
 
   virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
   // use the dynamic invocation interface
 private:
   // =helper functions
   int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
+                    CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
+                         CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
+                          CORBA_Marshal_Proxy::RESULTS &results);
 
   // all the DII helpers
   int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
+                    CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
+                         CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
+                          CORBA_Marshal_Proxy::RESULTS &results);
 
   CORBA::ORB_ptr orb_;
   // handle to the underlying orb
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h
index a74866173d8..2b62f4bb81b 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h
+++ b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h
@@ -1,16 +1,20 @@
 // $Id$
 
-#if !defined (ORBIX_MARSHAL_IMPL_H)
+#ifndef ORBIX_MARSHAL_IMPL_H
 #define ORBIX_MARSHAL_IMPL_H
 
 // to include DSI related files
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "marshal.h"
 
 
-class Marshal_SSI_Impl 
+class Marshal_SSI_Impl
   : public virtual MarshalBOAImpl
 {
   // =TITLE
@@ -25,73 +29,73 @@ public:
   // destructor
 
   virtual void test_short (CORBA::Short s1,
-			   CORBA::Short& s2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                           CORBA::Short& s2,
+                           CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test short
-	
+
   virtual void test_long (CORBA::Long l1,
-			  CORBA::Long& l2,
-			  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                          CORBA::Long& l2,
+                          CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test long
-	
+
   virtual void test_octet (CORBA::Octet o1,
-			   CORBA::Octet& o2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                           CORBA::Octet& o2,
+                           CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test octet
-	
+
   virtual void test_char (CORBA::Char c1,
-			  CORBA::Char& c2,
-			  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                          CORBA::Char& c2,
+                          CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test char
-	
+
   virtual void test_double (CORBA::Double d1,
-			    CORBA::Double& d2,
-			    CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                            CORBA::Double& d2,
+                            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test double
-	
+
   virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			    Marshal::Marshal_Struct& ms2,
-			    CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                            Marshal::Marshal_Struct& ms2,
+                            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test struct
-	
+
   virtual void test_union (const Marshal::Marshal_Union& u1,
-			   Marshal::Marshal_Union& u2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                           Marshal::Marshal_Union& u2,
+                           CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test union
-	
+
   virtual void test_any (const CORBA::Any& a1,
-			 CORBA::Any *& a2,
-			 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                         CORBA::Any *& a2,
+                         CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test any
-	
+
   /*
   virtual void test_sequence (const Marshal::ShortSeq& s1,
-			     const Marshal::LongSeq& l1,
-			     const Marshal::OctetSeq& o1,
-			     const Marshal::CharSeq& c1,
-			     const Marshal::DoubleSeq& d1,
-			     const Marshal::StructSeq& S1,
-			     const Marshal::UnionSeq& U1,
-			     const Marshal::AnySeq& a1,
-			     Marshal::ShortSeq *& s2,
-			     Marshal::LongSeq *& l2,
-			     Marshal::OctetSeq *& o2,
-			     Marshal::CharSeq *& c2,
-			     Marshal::DoubleSeq *& d2,
-			     Marshal::StructSeq *& S2,
-			     Marshal::UnionSeq *& U2,
-			     Marshal::AnySeq *& a2);
-			     */
+                             const Marshal::LongSeq& l1,
+                             const Marshal::OctetSeq& o1,
+                             const Marshal::CharSeq& c1,
+                             const Marshal::DoubleSeq& d1,
+                             const Marshal::StructSeq& S1,
+                             const Marshal::UnionSeq& U1,
+                             const Marshal::AnySeq& a1,
+                             Marshal::ShortSeq *& s2,
+                             Marshal::LongSeq *& l2,
+                             Marshal::OctetSeq *& o2,
+                             Marshal::CharSeq *& c2,
+                             Marshal::DoubleSeq *& d2,
+                             Marshal::StructSeq *& S2,
+                             Marshal::UnionSeq *& U2,
+                             Marshal::AnySeq *& a2);
+                             */
   virtual void test_sequence (const Marshal::AnySeq& a1,
-			      Marshal::AnySeq *& a2,
-			      CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                              Marshal::AnySeq *& a2,
+                              CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test sequence
 
   virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2,
-			       CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                               Marshal::Marshal_Recursive *& mr2,
+                               CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
   // test struct
-	
+
 };
 
 class Marshal_DSI_Impl : public CORBA::DynamicImplementation
@@ -109,50 +113,50 @@ public:
 
 private:
   virtual void invoke (CORBA::ServerRequest& req, CORBA::Environment_ptr,
-		       CORBA::Environment&IT_env =
-		       CORBA::IT_chooseDefaultEnv()); 
+                       CORBA::Environment&IT_env =
+                       CORBA::IT_chooseDefaultEnv());
   // This method is a must
 
   void test_short (CORBA::Short s1,
-		   CORBA::Short& s2);
+                   CORBA::Short& s2);
   // test short
-	
+
   void test_long (CORBA::Long l1,
-		  CORBA::Long& l2);
+                  CORBA::Long& l2);
   // test long
-	
+
   void test_octet (CORBA::Octet o1,
-		   CORBA::Octet& o2);
+                   CORBA::Octet& o2);
   // test octet
-	
+
   void test_char (CORBA::Char c1,
-		  CORBA::Char& c2);
+                  CORBA::Char& c2);
   // test char
-	
+
   void test_double (CORBA::Double d1,
-		    CORBA::Double& d2);
+                    CORBA::Double& d2);
   // test double
-	
+
   void test_struct (const Marshal::Marshal_Struct& ms1,
-		    Marshal::Marshal_Struct& ms2);
+                    Marshal::Marshal_Struct& ms2);
   // test struct
-	
+
   void test_union (const Marshal::Marshal_Union& u1,
-		   Marshal::Marshal_Union& u2);
+                   Marshal::Marshal_Union& u2);
   // test union
-	
+
   void test_any (const CORBA::Any& a1,
-		 CORBA::Any *& a2);
+                 CORBA::Any *& a2);
   // test any
-	
+
   void test_sequence (const Marshal::AnySeq& a1,
-		      Marshal::AnySeq *& a2);
+                      Marshal::AnySeq *& a2);
   // test sequence
 
   void test_recursive (const Marshal::Marshal_Recursive& mr1,
-		       Marshal::Marshal_Recursive *& mr2);
+                       Marshal::Marshal_Recursive *& mr2);
   // test struct
-	
+
 private:
   //= helper functions - they behave as if they were skeletons
   void test_short_skel (CORBA::ServerRequest& req);
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h
index 09a64b4bbc8..3fb2fa83396 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h
+++ b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    CORBA Marshal Orbix Benchmark
-// 
+//
 // = FILENAME
 //    orbix_marshal_server.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined(_ORBIX_MARSHAL_SERVER_H_)
+#ifndef _ORBIX_MARSHAL_SERVER_H_
 #define _ORBIX_MARSHAL_SERVER_H_
 
 // benchmark library includes
@@ -37,7 +37,7 @@ public:
   // destructor
 
   virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
+                   CORBA_Marshal_Proxy::RESULTS &results);
   // do the actual work
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h b/TAO/Benchmark/Marshal_Test/TAO/marshalC.h
index 0831bd7f2b6..c2457cacc6e 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h
+++ b/TAO/Benchmark/Marshal_Test/TAO/marshalC.h
@@ -29,11 +29,11 @@ public:
   static Marshal_ptr _nil ();
 
   struct Marshal_Struct {
-    CORBA_Short	s;
-    CORBA_Long	l;
-    CORBA_Char	c;
-    CORBA_Octet	o;
-    CORBA_Double	d;
+    CORBA_Short s;
+    CORBA_Long  l;
+    CORBA_Char  c;
+    CORBA_Octet o;
+    CORBA_Double        d;
   };
   static CORBA_TypeCode_ptr _tc_Marshal_Struct;
 
@@ -52,61 +52,61 @@ public:
   class Marshal_Union
   {
   private:
-    discrim	_disc;
-    CORBA_Short	__s;
-    CORBA_Long	__l;
-    CORBA_Char	__c;
-    CORBA_Octet	__o;
-    CORBA_Double	__d;
-    Marshal::Marshal_Struct	__ms;
+    discrim     _disc;
+    CORBA_Short __s;
+    CORBA_Long  __l;
+    CORBA_Char  __c;
+    CORBA_Octet __o;
+    CORBA_Double        __d;
+    Marshal::Marshal_Struct     __ms;
   public:
     Marshal_Union() : _disc(discrim(0)) {}
     ~Marshal_Union() {}
     Marshal_Union(const Marshal_Union& obj);
     Marshal_Union& operator=(const Marshal_Union& obj);
-	
+
     void _d(discrim val) { _disc = val; }
     discrim _d() const { return _disc; }
-	
+
     void s(CORBA_Short val) {
       __s = val;
       _disc = Marshal::e_0th;
     }
     CORBA_Short s() const { return __s; }
-	
+
     void l(CORBA_Long val) {
       __l = val;
       _disc = Marshal::e_1st;
     }
     CORBA_Long l() const { return __l; }
-	
+
     void c(CORBA_Char val) {
       __c = val;
       _disc = Marshal::e_2nd;
     }
     CORBA_Char c() const { return __c; }
-	
+
     void o(CORBA_Octet val) {
       __o = val;
       _disc = Marshal::e_3rd;
     }
     CORBA_Octet o() const { return __o; }
-	
+
     void d(CORBA_Double val) {
       __d = val;
       _disc = Marshal::e_4th;
     }
     CORBA_Double d() const { return __d; }
-	
+
     void ms(const Marshal::Marshal_Struct& val) {
       __ms = val;
       _disc = Marshal::e_5th;
     }
     const Marshal::Marshal_Struct& ms() const { return __ms; }
     Marshal::Marshal_Struct& ms() { return __ms; }
-	
+
   };
-	
+
   static CORBA_TypeCode_ptr _tc_Marshal_Union;
 
   class AnySeq
@@ -116,10 +116,10 @@ public:
     static void freebuf (CORBA_Any *data);
     AnySeq (CORBA_ULong max=0);
     AnySeq (CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Any *value,
-	    CORBA_Boolean release = 0
-	    );
+            CORBA_ULong length,
+            CORBA_Any *value,
+            CORBA_Boolean release = 0
+            );
     //    AnySeq (const AnySeq&);
     ~AnySeq ();
     CORBA_ULong maximum () const;
@@ -138,45 +138,45 @@ public:
 
   // now the methods
   virtual void test_short(CORBA_Short s1,
-			  CORBA_Short& s2,
-			  CORBA_Environment &env);
-	
+                          CORBA_Short& s2,
+                          CORBA_Environment &env);
+
   virtual void test_long(CORBA_Long l1,
-			 CORBA_Long& l2,
-			 CORBA_Environment &env);
-	
+                         CORBA_Long& l2,
+                         CORBA_Environment &env);
+
   virtual void test_octet(CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			  CORBA_Environment &env);
-	
+                          CORBA_Octet& o2,
+                          CORBA_Environment &env);
+
   virtual void test_char(CORBA_Char c1,
-			 CORBA_Char& c2,
-			 CORBA_Environment &env);
-	
+                         CORBA_Char& c2,
+                         CORBA_Environment &env);
+
   virtual void test_double(CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env);
-	
+                           CORBA_Double& d2,
+                           CORBA_Environment &env);
+
   virtual void test_struct(const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env);
-	
+                           Marshal::Marshal_Struct& ms2,
+                           CORBA_Environment &env);
+
   virtual void test_union(const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			  CORBA_Environment &env);
-	
+                          Marshal::Marshal_Union& u2,
+                          CORBA_Environment &env);
+
   virtual void test_any(const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			CORBA_Environment &env);
-	
+                        CORBA_Any *& a2,
+                        CORBA_Environment &env);
+
   virtual void test_sequence(const Marshal::AnySeq& as1,
-			     Marshal::AnySeq *& as2,
-			     CORBA_Environment &env);
-	
+                             Marshal::AnySeq *& as2,
+                             CORBA_Environment &env);
+
 #if 0
   virtual void test_recursive(const Marshal::Marshal_Recursive& mr1,
-			      Marshal::Marshal_Recursive *& mr2,
-			      CORBA_Environment &env);
+                              Marshal::Marshal_Recursive *& mr2,
+                              CORBA_Environment &env);
 #endif
 
 protected:
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h b/TAO/Benchmark/Marshal_Test/TAO/marshalS.h
index 4f34a11d0ab..6ac48cf5ce8 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h
+++ b/TAO/Benchmark/Marshal_Test/TAO/marshalS.h
@@ -31,73 +31,73 @@ class _skel_Marshal: public Marshal
 public:
   // pure virtual functions implemented by the implementation class
   virtual void test_short(CORBA_Short s1,
-			  CORBA_Short& s2,
-			  CORBA_Environment &env) = 0;
-	
+                          CORBA_Short& s2,
+                          CORBA_Environment &env) = 0;
+
   virtual void test_long(CORBA_Long l1,
-			 CORBA_Long& l2,
-			 CORBA_Environment &env) = 0;
-	
+                         CORBA_Long& l2,
+                         CORBA_Environment &env) = 0;
+
   virtual void test_octet(CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			  CORBA_Environment &env) = 0;
-	
+                          CORBA_Octet& o2,
+                          CORBA_Environment &env) = 0;
+
   virtual void test_char(CORBA_Char c1,
-			 CORBA_Char& c2,
-			 CORBA_Environment &env) = 0;
-	
+                         CORBA_Char& c2,
+                         CORBA_Environment &env) = 0;
+
   virtual void test_double(CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env) = 0;
-	
+                           CORBA_Double& d2,
+                           CORBA_Environment &env) = 0;
+
   virtual void test_struct(const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env) = 0;
-	
+                           Marshal::Marshal_Struct& ms2,
+                           CORBA_Environment &env) = 0;
+
   virtual void test_union(const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			  CORBA_Environment &env) = 0;
-	
+                          Marshal::Marshal_Union& u2,
+                          CORBA_Environment &env) = 0;
+
   virtual void test_any(const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			CORBA_Environment &env) = 0;
-	
+                        CORBA_Any *& a2,
+                        CORBA_Environment &env) = 0;
+
   virtual void test_sequence(const Marshal::AnySeq& as1,
-			     Marshal::AnySeq *& as2,
-			     CORBA_Environment &env) = 0;
-	
+                             Marshal::AnySeq *& as2,
+                             CORBA_Environment &env) = 0;
+
 
   // skeletons that do the upcall
-  static void _Marshal_is_a_skel (CORBA_ServerRequest &req, 
-				  CORBA_Object_ptr obj,
-				  CORBA_Environment &env);
+  static void _Marshal_is_a_skel (CORBA_ServerRequest &req,
+                                  CORBA_Object_ptr obj,
+                                  CORBA_Environment &env);
   static void _Marshal_test_short_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_long_skel  (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_octet_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_char_skel (CORBA_ServerRequest &req,
-				       CORBA_Object_ptr obj,
-				       CORBA_Environment &env);
+                                       CORBA_Object_ptr obj,
+                                       CORBA_Environment &env);
   static void _Marshal_test_double_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
+                                         CORBA_Object_ptr obj,
+                                         CORBA_Environment &env);
   static void _Marshal_test_struct_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
+                                         CORBA_Object_ptr obj,
+                                         CORBA_Environment &env);
   static void _Marshal_test_union_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_any_skel (CORBA_ServerRequest &req,
-				      CORBA_Object_ptr obj,
-				      CORBA_Environment &env);
+                                      CORBA_Object_ptr obj,
+                                      CORBA_Environment &env);
   static void _Marshal_test_sequence_skel (CORBA_ServerRequest &req,
-					   CORBA_Object_ptr obj,
-					   CORBA_Environment &env);
+                                           CORBA_Object_ptr obj,
+                                           CORBA_Environment &env);
 protected:
   _skel_Marshal (const char *obj_name = 0);
   virtual ~_skel_Marshal () {}
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h
index d7b8269b2c2..b55e3f309de 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    CORBA Marshal Tao Benchmark
-// 
+//
 // = FILENAME
 //    tao_marshal_client.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined(_TAO_MARSHAL_CLIENT_H_)
+#ifndef _TAO_MARSHAL_CLIENT_H_
 #define _TAO_MARSHAL_CLIENT_H_
 
 // benchmark library includes
@@ -39,78 +39,78 @@ public:
   // destructor
 
   virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
+                   CORBA_Marshal_Proxy::RESULTS &results);
   // do the actual work
 
   virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
   // use the static invocation interface
 
   virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
   // use the dynamic invocation interface
 private:
   // =helper functions
   int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
+                    CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
+                         CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
+                          CORBA_Marshal_Proxy::RESULTS &results);
 
   // all the DII helpers
   int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
+                    CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
+                         CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
+                          CORBA_Marshal_Proxy::RESULTS &results);
 
   CORBA_ORB_ptr orb_;
   // handle to the underlying orb
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h
index dab7e662d74..9c5d9047120 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h
@@ -1,16 +1,20 @@
 // $Id$
 
-#if !defined (TAO_MARSHAL_IMPL_H)
+#ifndef TAO_MARSHAL_IMPL_H
 #define TAO_MARSHAL_IMPL_H
 
 // to include DSI related files
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "marshalS.h"
 //#include "tao/dynimpl.h"
 
-class Marshal_SSI_Impl 
+class Marshal_SSI_Impl
   : public virtual _skel_Marshal
 {
   // =TITLE
@@ -25,57 +29,57 @@ public:
   // destructor
 
   virtual void test_short (CORBA_Short s1,
-			  CORBA_Short& s2,
-			   CORBA_Environment &env);
+                          CORBA_Short& s2,
+                           CORBA_Environment &env);
   // test short
-	
+
   virtual void test_long (CORBA_Long l1,
-			 CORBA_Long& l2,
-			   CORBA_Environment &env);
+                         CORBA_Long& l2,
+                           CORBA_Environment &env);
   // test long
-	
+
   virtual void test_octet (CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			   CORBA_Environment &env);
+                          CORBA_Octet& o2,
+                           CORBA_Environment &env);
   // test octet
-	
+
   virtual void test_char (CORBA_Char c1,
-			 CORBA_Char& c2,
-			   CORBA_Environment &env);
+                         CORBA_Char& c2,
+                           CORBA_Environment &env);
   // test char
-	
+
   virtual void test_double (CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env);
+                           CORBA_Double& d2,
+                           CORBA_Environment &env);
   // test double
-	
+
   virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env);
+                           Marshal::Marshal_Struct& ms2,
+                           CORBA_Environment &env);
   // test struct
-	
+
   virtual void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			   CORBA_Environment &env);
+                          Marshal::Marshal_Union& u2,
+                           CORBA_Environment &env);
   // test union
-	
+
   virtual void test_any (const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			   CORBA_Environment &env);
+                        CORBA_Any *& a2,
+                           CORBA_Environment &env);
   // test any
-	
+
   virtual void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2,
-			   CORBA_Environment &env);
+                             Marshal::AnySeq *& a2,
+                           CORBA_Environment &env);
   // test sequence
 
 #if 0
   virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2,
-			   CORBA_Environment &env);
+                               Marshal::Marshal_Recursive *& mr2,
+                           CORBA_Environment &env);
   // test struct
 #endif
-	
+
 };
 
 class Marshal_DSI_Impl : public CORBA_Object //: public CORBA_DynamicImplementation
@@ -98,89 +102,89 @@ public:
   // This method is a must, but of no use
 
   // skeletons that do the upcall
-  static void _Marshal_is_a_skel (CORBA_ServerRequest &req, 
-				  CORBA_Object_ptr obj,
-				  CORBA_Environment &env);
+  static void _Marshal_is_a_skel (CORBA_ServerRequest &req,
+                                  CORBA_Object_ptr obj,
+                                  CORBA_Environment &env);
   static void _Marshal_test_short_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_long_skel  (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_octet_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_char_skel (CORBA_ServerRequest &req,
-				       CORBA_Object_ptr obj,
-				       CORBA_Environment &env);
+                                       CORBA_Object_ptr obj,
+                                       CORBA_Environment &env);
   static void _Marshal_test_double_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
+                                         CORBA_Object_ptr obj,
+                                         CORBA_Environment &env);
   static void _Marshal_test_struct_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
+                                         CORBA_Object_ptr obj,
+                                         CORBA_Environment &env);
   static void _Marshal_test_union_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _Marshal_test_any_skel (CORBA_ServerRequest &req,
-				      CORBA_Object_ptr obj,
-				      CORBA_Environment &env);
+                                      CORBA_Object_ptr obj,
+                                      CORBA_Environment &env);
   static void _Marshal_test_sequence_skel (CORBA_ServerRequest &req,
-					   CORBA_Object_ptr obj,
-					   CORBA_Environment &env);
+                                           CORBA_Object_ptr obj,
+                                           CORBA_Environment &env);
 private:
   void test_short (CORBA_Short s1,
-		   CORBA_Short& s2,
-		   CORBA_Environment &env);
+                   CORBA_Short& s2,
+                   CORBA_Environment &env);
   // test short
-	
+
   void test_long (CORBA_Long l1,
-		  CORBA_Long& l2,
-		  CORBA_Environment &env);
+                  CORBA_Long& l2,
+                  CORBA_Environment &env);
   // test long
-	
+
   void test_octet (CORBA_Octet o1,
-		   CORBA_Octet& o2,
-		   CORBA_Environment &env);
+                   CORBA_Octet& o2,
+                   CORBA_Environment &env);
   // test octet
-	
+
   void test_char (CORBA_Char c1,
-		  CORBA_Char& c2,
-		  CORBA_Environment &env);
+                  CORBA_Char& c2,
+                  CORBA_Environment &env);
   // test char
-	
+
   void test_double (CORBA_Double d1,
-		    CORBA_Double& d2,
-		    CORBA_Environment &env);
+                    CORBA_Double& d2,
+                    CORBA_Environment &env);
   // test double
-	
+
   void test_struct (const Marshal::Marshal_Struct& ms1,
-		    Marshal::Marshal_Struct& ms2,
-		    CORBA_Environment &env);
+                    Marshal::Marshal_Struct& ms2,
+                    CORBA_Environment &env);
   // test struct
-	
+
   void test_union (const Marshal::Marshal_Union& u1,
-		   Marshal::Marshal_Union& u2,
-		   CORBA_Environment &env);
+                   Marshal::Marshal_Union& u2,
+                   CORBA_Environment &env);
   // test union
-	
+
   void test_any (const CORBA_Any& a1,
-		 CORBA_Any *& a2,
-		 CORBA_Environment &env);
+                 CORBA_Any *& a2,
+                 CORBA_Environment &env);
   // test any
-	
+
   void test_sequence (const Marshal::AnySeq& a1,
-		      Marshal::AnySeq *& a2,
-		      CORBA_Environment &env);
+                      Marshal::AnySeq *& a2,
+                      CORBA_Environment &env);
   // test sequence
 
 #if 0
   void test_recursive (const Marshal::Marshal_Recursive& mr1,
-		       Marshal::Marshal_Recursive *& mr2,
-		       CORBA_Environment &env);
+                       Marshal::Marshal_Recursive *& mr2,
+                       CORBA_Environment &env);
   // test struct
 #endif
-	
+
   // we need the orb to create argument lists (NVList) for us
   CORBA_ORB_ptr orb_; // not owned by us
 };
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h
index 8bd965301ff..10442253e06 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    CORBA Marshal Tao Benchmark
-// 
+//
 // = FILENAME
 //    tao_marshal_server.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined(_TAO_MARSHAL_SERVER_H_)
+#ifndef _TAO_MARSHAL_SERVER_H_
 #define _TAO_MARSHAL_SERVER_H_
 
 // benchmark library includes
@@ -37,7 +37,7 @@ public:
   // destructor
 
   virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
+                   CORBA_Marshal_Proxy::RESULTS &results);
   // do the actual work
 private:
   CORBA_ORB_ptr orb_;
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h
index def1c6189c2..30e14db39a6 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    CORBA Marshal Visibroker Benchmark
-// 
+//
 // = FILENAME
 //    visi_marshal_client.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined(_VISI_MARSHAL_CLIENT_H_)
+#ifndef _VISI_MARSHAL_CLIENT_H_
 #define _VISI_MARSHAL_CLIENT_H_
 
 // benchmark library includes
@@ -36,7 +36,7 @@ class marshal_event_handler: public PMC_EXT::ClientEventHandler
   // flags
 public:
   void bind_succeeded(CORBA::Object_ptr obj,
-		      const PMC_EXT::ConnectionInfo &);
+                      const PMC_EXT::ConnectionInfo &);
   // on success from a bind call, set the desired quantities
 };
 #endif
@@ -55,78 +55,78 @@ public:
   // destructor
 
   virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
+                   CORBA_Marshal_Proxy::RESULTS &results);
   // do the actual work
 
   virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
   // use the static invocation interface
 
   virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
   // use the dynamic invocation interface
 private:
   // =helper functions
   int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
+                    CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
+                         CORBA_Marshal_Proxy::RESULTS &results);
 
   int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
+                          CORBA_Marshal_Proxy::RESULTS &results);
 
   // all the DII helpers
   int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
+                     CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
+                       CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
+                      CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
+                    CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
+                         CORBA_Marshal_Proxy::RESULTS &results);
 
   int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
+                          CORBA_Marshal_Proxy::RESULTS &results);
 
   CORBA::ORB_ptr orb_;
   // handle to the underlying orb
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h
index ec3b0ee0ef2..6599c5ae276 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h
@@ -1,16 +1,20 @@
 // $Id$
 
-#if !defined (VISI_MARSHAL_IMPL_H)
+#ifndef VISI_MARSHAL_IMPL_H
 #define VISI_MARSHAL_IMPL_H
 
 // to include DSI related files
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "marshalS.h"
 
 
-class Marshal_SSI_Impl 
+class Marshal_SSI_Impl
   : public virtual _sk_Marshal
 {
   // =TITLE
@@ -25,63 +29,63 @@ public:
   // destructor
 
   virtual void test_short (CORBA::Short s1,
-			  CORBA::Short& s2);
+                          CORBA::Short& s2);
   // test short
-	
+
   virtual void test_long (CORBA::Long l1,
-			 CORBA::Long& l2);
+                         CORBA::Long& l2);
   // test long
-	
+
   virtual void test_octet (CORBA::Octet o1,
-			  CORBA::Octet& o2);
+                          CORBA::Octet& o2);
   // test octet
-	
+
   virtual void test_char (CORBA::Char c1,
-			 CORBA::Char& c2);
+                         CORBA::Char& c2);
   // test char
-	
+
   virtual void test_double (CORBA::Double d1,
-			   CORBA::Double& d2);
+                           CORBA::Double& d2);
   // test double
-	
+
   virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2);
+                           Marshal::Marshal_Struct& ms2);
   // test struct
-	
+
   virtual void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2);
+                          Marshal::Marshal_Union& u2);
   // test union
-	
+
   virtual void test_any (const CORBA::Any& a1,
-			CORBA::Any *& a2);
+                        CORBA::Any *& a2);
   // test any
-	
+
   /*
   virtual void test_sequence (const Marshal::ShortSeq& s1,
-			     const Marshal::LongSeq& l1,
-			     const Marshal::OctetSeq& o1,
-			     const Marshal::CharSeq& c1,
-			     const Marshal::DoubleSeq& d1,
-			     const Marshal::StructSeq& S1,
-			     const Marshal::UnionSeq& U1,
-			     const Marshal::AnySeq& a1,
-			     Marshal::ShortSeq *& s2,
-			     Marshal::LongSeq *& l2,
-			     Marshal::OctetSeq *& o2,
-			     Marshal::CharSeq *& c2,
-			     Marshal::DoubleSeq *& d2,
-			     Marshal::StructSeq *& S2,
-			     Marshal::UnionSeq *& U2,
-			     Marshal::AnySeq *& a2);
-			     */
+                             const Marshal::LongSeq& l1,
+                             const Marshal::OctetSeq& o1,
+                             const Marshal::CharSeq& c1,
+                             const Marshal::DoubleSeq& d1,
+                             const Marshal::StructSeq& S1,
+                             const Marshal::UnionSeq& U1,
+                             const Marshal::AnySeq& a1,
+                             Marshal::ShortSeq *& s2,
+                             Marshal::LongSeq *& l2,
+                             Marshal::OctetSeq *& o2,
+                             Marshal::CharSeq *& c2,
+                             Marshal::DoubleSeq *& d2,
+                             Marshal::StructSeq *& S2,
+                             Marshal::UnionSeq *& U2,
+                             Marshal::AnySeq *& a2);
+                             */
   virtual void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2);
+                             Marshal::AnySeq *& a2);
   // test sequence
 
   virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2);
+                               Marshal::Marshal_Recursive *& mr2);
   // test struct
-	
+
 };
 
 class Marshal_DSI_Impl : public CORBA::DynamicImplementation
@@ -102,45 +106,45 @@ public:
 
 private:
   void test_short (CORBA::Short s1,
-			  CORBA::Short& s2);
+                          CORBA::Short& s2);
   // test short
-	
+
   void test_long (CORBA::Long l1,
-			 CORBA::Long& l2);
+                         CORBA::Long& l2);
   // test long
-	
+
   void test_octet (CORBA::Octet o1,
-			  CORBA::Octet& o2);
+                          CORBA::Octet& o2);
   // test octet
-	
+
   void test_char (CORBA::Char c1,
-			 CORBA::Char& c2);
+                         CORBA::Char& c2);
   // test char
-	
+
   void test_double (CORBA::Double d1,
-			   CORBA::Double& d2);
+                           CORBA::Double& d2);
   // test double
-	
+
   void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2);
+                           Marshal::Marshal_Struct& ms2);
   // test struct
-	
+
   void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2);
+                          Marshal::Marshal_Union& u2);
   // test union
-	
+
   void test_any (const CORBA::Any& a1,
-			CORBA::Any *& a2);
+                        CORBA::Any *& a2);
   // test any
-	
+
   void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2);
+                             Marshal::AnySeq *& a2);
   // test sequence
 
   void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2);
+                               Marshal::Marshal_Recursive *& mr2);
   // test struct
-	
+
 private:
   //= helper functions - they behave as if they were skeletons
   void test_short_skel (CORBA::ServerRequest_ptr req);
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h
index 36076c8fe90..d18feb277ea 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    CORBA Marshal Visibroker Benchmark
-// 
+//
 // = FILENAME
 //    visi_marshal_server.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined(_VISI_MARSHAL_SERVER_H_)
+#ifndef _VISI_MARSHAL_SERVER_H_
 #define _VISI_MARSHAL_SERVER_H_
 
 // benchmark library includes
@@ -38,7 +38,7 @@ public:
   // destructor
 
   virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
+                   CORBA_Marshal_Proxy::RESULTS &results);
   // do the actual work
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/Benchmark/benchmark/driver.h b/TAO/Benchmark/benchmark/driver.h
index 690041eac73..cb69ea098ce 100644
--- a/TAO/Benchmark/benchmark/driver.h
+++ b/TAO/Benchmark/benchmark/driver.h
@@ -6,20 +6,24 @@
 //
 // = LIBRARY
 //    CORBA Benchmark
-// 
+//
 // = FILENAME
 //    driver.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined (_CORBA_BENCHMARK_DRIVER_H_)
+#ifndef _CORBA_BENCHMARK_DRIVER_H_
 #define _CORBA_BENCHMARK_DRIVER_H_
 
 #include "ace/Log_Msg.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 template <class PROXY>
 class CORBA_Benchmark_Driver
 {
diff --git a/TAO/Benchmark/benchmark/marshal_options.h b/TAO/Benchmark/benchmark/marshal_options.h
index 51a02a38ffa..654b87070e0 100644
--- a/TAO/Benchmark/benchmark/marshal_options.h
+++ b/TAO/Benchmark/benchmark/marshal_options.h
@@ -4,19 +4,24 @@
 //
 // = LIBRARY
 //    CORBA Benchmark/Marshal
-// 
+//
 // = FILENAME
 //    marshal_options.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined (_CORBA_MARSHAL_OPTIONS_H_)
+#ifndef _CORBA_MARSHAL_OPTIONS_H_
 #define _CORBA_MARSHAL_OPTIONS_H_
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SString.h"
 
 class CORBA_Marshal_Options
@@ -31,7 +36,7 @@ class CORBA_Marshal_Options
   //    a "all-encompassing" class.
 public:
   // The following data types will be tested
-  enum DATATYPE 
+  enum DATATYPE
   {
     NO_DATATYPE,
     SHORT,
@@ -47,16 +52,16 @@ public:
   };
 
   // The following CORBA implementations will be tested
-  enum PROXY_TYPE 
+  enum PROXY_TYPE
   {
     NO_PROXY,
-    TAO, 
-    ORBIX, 
+    TAO,
+    ORBIX,
     VISIBROKER
   };
 
   // Invocation policy
-  enum POLICY 
+  enum POLICY
   {
     NO_POLICY,
     STATIC,  // SII, SSI
@@ -64,7 +69,7 @@ public:
   };
 
   // what role do we play?
-  enum ROLE 
+  enum ROLE
   {
     NO_ROLE,
     SENDER,
@@ -107,7 +112,7 @@ public:
   //= Get/set the port number on which the server listens
   short port (void);
   void port (short);
-  
+
   //= Get/Set the object name (to which to connect to)
   const char *object_name (void);
   void object_name (const char *);
@@ -154,10 +159,10 @@ public:
 private:
   const char *object_name_;
   // name of the object.
-  
+
   const char *service_name_;
   // name of the service.
-  
+
   CORBA_Marshal_Options::DATATYPE data_type_;
   // data type to send/receive
 
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.h b/TAO/Benchmark/benchmark/marshal_proxy.h
index 7b3951f4e11..3152a62f17d 100644
--- a/TAO/Benchmark/benchmark/marshal_proxy.h
+++ b/TAO/Benchmark/benchmark/marshal_proxy.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    CORBA Benchmark
-// 
+//
 // = FILENAME
 //    marshal_proxy.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined(_CORBA_MARSHAL_PROXY_H_)
+#ifndef _CORBA_MARSHAL_PROXY_H_
 #define _CORBA_MARSHAL_PROXY_H_
 
 #include "benchmark/marshal_options.h"
diff --git a/TAO/Benchmark/benchmark/marshal_results.h b/TAO/Benchmark/benchmark/marshal_results.h
index 5d635cf83d7..66de29e13bd 100644
--- a/TAO/Benchmark/benchmark/marshal_results.h
+++ b/TAO/Benchmark/benchmark/marshal_results.h
@@ -4,20 +4,24 @@
 //
 // = LIBRARY
 //    CORBA Benchmark
-// 
+//
 // = FILENAME
 //    marshal_results.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined (_CORBA_MARSHAL_RESULTS_H_)
+#ifndef _CORBA_MARSHAL_RESULTS_H_
 #define _CORBA_MARSHAL_RESULTS_H_
 
 #include "ace/Profile_Timer.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class CORBA_Marshal_Results
 {
 public:
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
index 4198fba9a10..8a4f73314ce 100644
--- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
+++ b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
@@ -3,7 +3,7 @@
 
 /* An interval timer class using C++. */
 
-#if !defined (ACE_PROFILE_TIMER_H)
+#ifndef ACE_PROFILE_TIMER_H
 #define ACE_PROFILE_TIMER_H
 
 #include <sys/types.h>
@@ -38,21 +38,21 @@ private:
   prusage_t begin_usage_;
   prusage_t end_usage_;
   prusage_t last_usage_;
-  int	    proc_fd_;
+  int       proc_fd_;
 };
 
 /* Start timing */
 
-inline int 
-Profile_Timer::start (void) 
+inline int
+Profile_Timer::start (void)
 {
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
 }
 
 /* Stop timing */
 
-inline int 
-Profile_Timer::stop (void) 
+inline int
+Profile_Timer::stop (void)
 {
   this->last_usage_ = this->end_usage_;
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
index 4198fba9a10..8a4f73314ce 100644
--- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
+++ b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
@@ -3,7 +3,7 @@
 
 /* An interval timer class using C++. */
 
-#if !defined (ACE_PROFILE_TIMER_H)
+#ifndef ACE_PROFILE_TIMER_H
 #define ACE_PROFILE_TIMER_H
 
 #include <sys/types.h>
@@ -38,21 +38,21 @@ private:
   prusage_t begin_usage_;
   prusage_t end_usage_;
   prusage_t last_usage_;
-  int	    proc_fd_;
+  int       proc_fd_;
 };
 
 /* Start timing */
 
-inline int 
-Profile_Timer::start (void) 
+inline int
+Profile_Timer::start (void)
 {
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
 }
 
 /* Stop timing */
 
-inline int 
-Profile_Timer::stop (void) 
+inline int
+Profile_Timer::stop (void)
 {
   this->last_usage_ = this->end_usage_;
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.h b/TAO/IIOP/test/Orbix/base_server/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/test/Orbix/base_server/cubit.h
+++ b/TAO/IIOP/test/Orbix/base_server/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.h b/TAO/IIOP/test/Orbix/base_server/cubitC.h
index 584efa67c8d..5c020bd0c4b 100644
--- a/TAO/IIOP/test/Orbix/base_server/cubitC.h
+++ b/TAO/IIOP/test/Orbix/base_server/cubitC.h
@@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef;
 class Cubit_var
 {
     public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
+        Cubit_var();
+        Cubit_var(Cubit_ptr);
+        Cubit_var(const Cubit_var&);
+        ~Cubit_var();
+        Cubit_var& operator=(Cubit_ptr);
+        operator Cubit_ptr() const { return _ptr; }
 #if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
+        operator Cubit *&() { return _ptr; }
 #else
-	operator Cubit_ptr&() { return _ptr; }
+        operator Cubit_ptr&() { return _ptr; }
 #endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
+        Cubit_ptr operator->() const { return _ptr;}
+        friend NCistream& operator>>(NCistream&, Cubit_var&);
+        friend NCostream& operator<<(NCostream&, const Cubit_var&);
+        friend istream& operator>>(istream&, Cubit_var&);
+        friend ostream& operator<<(ostream&, const Cubit_var&);
     private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
+        Cubit_ptr       _ptr;
+        void operator=(const Cubit_var&) {}
 };
 #endif
 class Cubit: public virtual CORBA_Object
 {
     private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
+        static const CORBA::TypeInfo _class_info;
+        Cubit(const Cubit&) {}
+        void operator=(const Cubit&){}
     public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
+        static const CORBA::TypeInfo *_desc();
+        virtual const CORBA::TypeInfo *_type_info() const;
+        virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
+        static CORBA::Object *_factory();
     protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
+        Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
+        Cubit(NCistream& strm) :CORBA_Object(strm) {}
+        virtual ~Cubit() {}
     public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
+        static Cubit_ptr _duplicate(Cubit_ptr obj) {
+                if (obj ) obj->_ref();
+                return obj;
+        }
+        static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
+        static Cubit_ptr _narrow(CORBA::Object *obj);
+        static Cubit_ptr _clone(Cubit_ptr obj) {
+                CORBA::Object_var obj_var(__clone(obj));
 
 #if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
+                return _narrow(obj_var.operator CORBA::Object_ptr());
 #else
-		return _narrow(obj_var);
+                return _narrow(obj_var);
 #endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
+        }
+        static Cubit_ptr _bind(const char *object_name = NULL,
+                const char *host_name = NULL,
+                const CORBA::BindOptions* opt = NULL);
+
+        virtual CORBA::Octet cube_octet(CORBA::Octet o);
+
+        virtual CORBA::Short cube_short(CORBA::Short s);
+
+        virtual CORBA::Long cube_long(CORBA::Long l);
+
+        struct Many {
+                CORBA::Octet    o;
+                CORBA::Long     l;
+                CORBA::Short    s;
+        };
+        friend NCostream& operator<<(NCostream&, const Many& );
+        friend NCistream& operator>>(NCistream&, Many& );
+
+        friend ostream& operator<<(ostream&, const Many& );
+        inline friend istream& operator>>(istream& _strm, Many& _obj) {
+                NCistream _istrm(_strm);
+                _istrm >> _obj;
+                return _strm;
+        }
+
+
+        typedef Many *Many_ptr;
+        class Many_var
+        {
+            public:
+                Many_var() { _ptr = (Many*)NULL;}
+                Many_var(Many *ptr) {
+                        _ptr = ptr;
+                }
+                Many_var(const Many_var& var) {
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                }
+                ~Many_var() {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                }
+                Many_var& operator=(Many *ptr) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                Many_var& operator=(const Many_var& var) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                        return *this;
+                }
+                Many *operator->() { return _ptr; }
+                operator Many () const { return *_ptr; }
+                operator Many& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const Many_var& var) {
+                        if (var._ptr == (Many *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                Many_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new Many;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                Many *_ptr;
+        };
+
+
+        virtual Cubit::Many cube_struct(const Cubit::Many& values);
+
+        enum discrim {
+                e_0th,
+                e_1st,
+                e_2nd,
+                e_3rd,
+                e_4th,
+                e_5th
+        };
+        inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
+                _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                if (_temp >= 6)
+                        throw CORBA::BAD_PARAM();
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+        inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
+                if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
+                        _strm << "discrim:";
+                        switch(_enum_type) {
+                                case e_0th:
+                                        _strm << "e_0th" << endl;
+                                        break;
+                                case e_1st:
+                                        _strm << "e_1st" << endl;
+                                        break;
+                                case e_2nd:
+                                        _strm << "e_2nd" << endl;
+                                        break;
+                                case e_3rd:
+                                        _strm << "e_3rd" << endl;
+                                        break;
+                                case e_4th:
+                                        _strm << "e_4th" << endl;
+                                        break;
+                                case e_5th:
+                                        _strm << "e_5th" << endl;
+                                        break;
+                        }
+                }
+                else
+                        _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+
+
+        class oneof
+        {
+            public:
+            private:
+                discrim _disc;
+                CORBA::Octet    __o;
+                CORBA::Short    __s;
+                CORBA::Long     __l;
+                Cubit::Many     __cm;
+            public:
+                oneof() : _disc(discrim(0)) {}
+                ~oneof() {}
+                oneof(const oneof& obj);
+                oneof& operator=(const oneof& obj);
+
+                void _d(discrim val) { _disc = val; }
+                discrim _d() const { return _disc; }
+
+                void o(CORBA::Octet val) {
+                        __o = val;
+                        _disc = Cubit::e_0th;
+                }
+                CORBA::Octet o() const { return __o; }
+
+                void s(CORBA::Short val) {
+                        __s = val;
+                        _disc = Cubit::e_1st;
+                }
+                CORBA::Short s() const { return __s; }
+
+                void l(CORBA::Long val) {
+                        __l = val;
+                        _disc = Cubit::e_2nd;
+                }
+                CORBA::Long l() const { return __l; }
+
+                void cm(const Cubit::Many& val) {
+                        __cm = val;
+                        _disc = Cubit::e_3rd;
+                }
+                const Cubit::Many& cm() const { return __cm; }
+                Cubit::Many& cm() { return __cm; }
+
+                friend NCostream& operator<<(NCostream&, const oneof& );
+                friend NCistream& operator>>(NCistream&, oneof& );
+                friend ostream& operator<<(ostream&, const oneof&);
+                inline friend istream& operator>>(istream& strm, oneof& obj) {
+                        NCistream istrm(strm);
+                        strm >> obj;
+                        return strm;
+                }
+        };
+
+        typedef oneof *oneof_ptr;
+        class oneof_var
+        {
+            public:
+                oneof_var() { _ptr = (oneof*)NULL;}
+                oneof_var(oneof *ptr) {
+                        _ptr = ptr;
+                }
+                oneof_var(const oneof_var& var) {
+                        _ptr = new oneof(*var._ptr);
+                }
+                ~oneof_var() {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                }
+                oneof_var& operator=(oneof *ptr) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                oneof_var& operator=(const oneof_var& var) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = new oneof(*var._ptr);
+                        return *this;
+                }
+                oneof *operator->() { return _ptr; }
+                operator oneof () const { return *_ptr; }
+                operator oneof& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const oneof_var& var) {
+                        if (var._ptr == (oneof *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                oneof_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new oneof;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                oneof *_ptr;
+        };
+
+
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values);
+
+        virtual void please_exit();
+
+        inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
+                CORBA::Object_var _obj(obj);
+                _obj = CORBA::Object::_read(strm, Cubit::_desc());
+                obj = Cubit::_narrow(_obj);
+                return strm;
+        }
+        inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
+                strm << (CORBA::Object_ptr)obj;
+                return strm;
+        }
+        inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
+                NCistream istrm(strm);
+                istrm >> obj;
+                return strm;
+        }
 };
 
 
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.h b/TAO/IIOP/test/Orbix/base_server/cubitS.h
index 3ca717e2b49..7132e9d229c 100644
--- a/TAO/IIOP/test/Orbix/base_server/cubitS.h
+++ b/TAO/IIOP/test/Orbix/base_server/cubitS.h
@@ -20,100 +20,100 @@
 class _sk_Cubit : public Cubit
 {
     protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
+        _sk_Cubit(const char *object_name = (const char *)NULL);
+        _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
+        virtual ~_sk_Cubit() {}
     public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
+        static const CORBA::TypeInfo _skel_info;
+
+        // The following operations need to be implemented by the server.
+        virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
+        virtual CORBA::Short cube_short(CORBA::Short s) = 0;
+        virtual CORBA::Long cube_long(CORBA::Long l) = 0;
+        virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
+        virtual void please_exit() = 0;
+
+        // Skeleton Operations implemented automatically
+
+        static void _cube_octet(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_short(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_long(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_struct(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_union(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _please_exit(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
 };
 template <class T>
 class _tie_Cubit : public Cubit
 {
     public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
+        _tie_Cubit(T& t, const char *obj_name=(char*)NULL) :
+                        Cubit(obj_name),
+                        _ref(t) {
+                _object_name(obj_name);
+        }
+        _tie_Cubit(T& t, const char *service_name,
+                        const CORBA::ReferenceData& id)
+                        :_ref(t) {
+                _service(service_name, id);
+        }
+        ~_tie_Cubit() {}
+        CORBA::Octet cube_octet(CORBA::Octet o) {
+                return _ref.cube_octet(
+                o);
+        }
+        CORBA::Short cube_short(CORBA::Short s) {
+                return _ref.cube_short(
+                s);
+        }
+        CORBA::Long cube_long(CORBA::Long l) {
+                return _ref.cube_long(
+                l);
+        }
+        Cubit::Many cube_struct(const Cubit::Many& values) {
+                return _ref.cube_struct(
+                values);
+        }
+        Cubit::oneof cube_union(const Cubit::oneof& values) {
+                return _ref.cube_union(
+                values);
+        }
+        void please_exit() {
+                _ref.please_exit();
+        }
 
     private:
-	T& _ref;
+        T& _ref;
 };
 
 #endif
diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.h b/TAO/IIOP/test/Orbix/base_server/tpr.h
index b5e8be94cf1..7912a2dc92c 100644
--- a/TAO/IIOP/test/Orbix/base_server/tpr.h
+++ b/TAO/IIOP/test/Orbix/base_server/tpr.h
@@ -2,11 +2,16 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 
 //
 // Create a thread filter to dispatch incoming calls
 //
 class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
+        virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
 };
diff --git a/TAO/IIOP/test/Orbix/client/cubit.h b/TAO/IIOP/test/Orbix/client/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/test/Orbix/client/cubit.h
+++ b/TAO/IIOP/test/Orbix/client/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.h b/TAO/IIOP/test/Orbix/factory_client/cubit.h
index 3a2dd546608..80e2c0590f5 100644
--- a/TAO/IIOP/test/Orbix/factory_client/cubit.h
+++ b/TAO/IIOP/test/Orbix/factory_client/cubit.h
@@ -14,7 +14,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -29,12 +29,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -93,12 +93,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -712,7 +712,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
@@ -732,7 +732,7 @@ public:
 class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -747,12 +747,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -811,12 +811,12 @@ protected:
     }
 public:
     static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
+            Cubit_Factory_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit_Factory* _bind (CORBA::Environment &IT_env);
    static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
+        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil();
     }
 
     Cubit_Factory_ptr operator->() const { return *_ptr;}
@@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit_Factory(X) Cubit_Factory##X
 
 #define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit_Factory##X : public virtual Cubit_Factory {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit_Factory(), m_obj(objp) {        \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);        \
+           }                                                            \
+           Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit_Factory() {     \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit_Factory##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit_Factory	\
+#define QUALS_Cubit_Factory     \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
@@ -1070,19 +1070,19 @@ return m_obj->create_cubit (  name,IT_env);\
 class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -1100,7 +1100,7 @@ public:
     Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
     m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
 }
 
         virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.h b/TAO/IIOP/test/Orbix/tpool/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/test/Orbix/tpool/cubit.h
+++ b/TAO/IIOP/test/Orbix/tpool/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.h b/TAO/IIOP/test/Orbix/tpool/tpool.h
index 337a7f54e65..536aeedad22 100644
--- a/TAO/IIOP/test/Orbix/tpool/tpool.h
+++ b/TAO/IIOP/test/Orbix/tpool/tpool.h
@@ -2,6 +2,11 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Task.h"
 
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.h b/TAO/IIOP/test/Orbix/tpr/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/test/Orbix/tpr/cubit.h
+++ b/TAO/IIOP/test/Orbix/tpr/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.h b/TAO/IIOP/test/Orbix/tpr/cubitC.h
index 584efa67c8d..5c020bd0c4b 100644
--- a/TAO/IIOP/test/Orbix/tpr/cubitC.h
+++ b/TAO/IIOP/test/Orbix/tpr/cubitC.h
@@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef;
 class Cubit_var
 {
     public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
+        Cubit_var();
+        Cubit_var(Cubit_ptr);
+        Cubit_var(const Cubit_var&);
+        ~Cubit_var();
+        Cubit_var& operator=(Cubit_ptr);
+        operator Cubit_ptr() const { return _ptr; }
 #if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
+        operator Cubit *&() { return _ptr; }
 #else
-	operator Cubit_ptr&() { return _ptr; }
+        operator Cubit_ptr&() { return _ptr; }
 #endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
+        Cubit_ptr operator->() const { return _ptr;}
+        friend NCistream& operator>>(NCistream&, Cubit_var&);
+        friend NCostream& operator<<(NCostream&, const Cubit_var&);
+        friend istream& operator>>(istream&, Cubit_var&);
+        friend ostream& operator<<(ostream&, const Cubit_var&);
     private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
+        Cubit_ptr       _ptr;
+        void operator=(const Cubit_var&) {}
 };
 #endif
 class Cubit: public virtual CORBA_Object
 {
     private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
+        static const CORBA::TypeInfo _class_info;
+        Cubit(const Cubit&) {}
+        void operator=(const Cubit&){}
     public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
+        static const CORBA::TypeInfo *_desc();
+        virtual const CORBA::TypeInfo *_type_info() const;
+        virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
+        static CORBA::Object *_factory();
     protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
+        Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
+        Cubit(NCistream& strm) :CORBA_Object(strm) {}
+        virtual ~Cubit() {}
     public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
+        static Cubit_ptr _duplicate(Cubit_ptr obj) {
+                if (obj ) obj->_ref();
+                return obj;
+        }
+        static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
+        static Cubit_ptr _narrow(CORBA::Object *obj);
+        static Cubit_ptr _clone(Cubit_ptr obj) {
+                CORBA::Object_var obj_var(__clone(obj));
 
 #if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
+                return _narrow(obj_var.operator CORBA::Object_ptr());
 #else
-		return _narrow(obj_var);
+                return _narrow(obj_var);
 #endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
+        }
+        static Cubit_ptr _bind(const char *object_name = NULL,
+                const char *host_name = NULL,
+                const CORBA::BindOptions* opt = NULL);
+
+        virtual CORBA::Octet cube_octet(CORBA::Octet o);
+
+        virtual CORBA::Short cube_short(CORBA::Short s);
+
+        virtual CORBA::Long cube_long(CORBA::Long l);
+
+        struct Many {
+                CORBA::Octet    o;
+                CORBA::Long     l;
+                CORBA::Short    s;
+        };
+        friend NCostream& operator<<(NCostream&, const Many& );
+        friend NCistream& operator>>(NCistream&, Many& );
+
+        friend ostream& operator<<(ostream&, const Many& );
+        inline friend istream& operator>>(istream& _strm, Many& _obj) {
+                NCistream _istrm(_strm);
+                _istrm >> _obj;
+                return _strm;
+        }
+
+
+        typedef Many *Many_ptr;
+        class Many_var
+        {
+            public:
+                Many_var() { _ptr = (Many*)NULL;}
+                Many_var(Many *ptr) {
+                        _ptr = ptr;
+                }
+                Many_var(const Many_var& var) {
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                }
+                ~Many_var() {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                }
+                Many_var& operator=(Many *ptr) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                Many_var& operator=(const Many_var& var) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                        return *this;
+                }
+                Many *operator->() { return _ptr; }
+                operator Many () const { return *_ptr; }
+                operator Many& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const Many_var& var) {
+                        if (var._ptr == (Many *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                Many_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new Many;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                Many *_ptr;
+        };
+
+
+        virtual Cubit::Many cube_struct(const Cubit::Many& values);
+
+        enum discrim {
+                e_0th,
+                e_1st,
+                e_2nd,
+                e_3rd,
+                e_4th,
+                e_5th
+        };
+        inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
+                _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                if (_temp >= 6)
+                        throw CORBA::BAD_PARAM();
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+        inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
+                if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
+                        _strm << "discrim:";
+                        switch(_enum_type) {
+                                case e_0th:
+                                        _strm << "e_0th" << endl;
+                                        break;
+                                case e_1st:
+                                        _strm << "e_1st" << endl;
+                                        break;
+                                case e_2nd:
+                                        _strm << "e_2nd" << endl;
+                                        break;
+                                case e_3rd:
+                                        _strm << "e_3rd" << endl;
+                                        break;
+                                case e_4th:
+                                        _strm << "e_4th" << endl;
+                                        break;
+                                case e_5th:
+                                        _strm << "e_5th" << endl;
+                                        break;
+                        }
+                }
+                else
+                        _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+
+
+        class oneof
+        {
+            public:
+            private:
+                discrim _disc;
+                CORBA::Octet    __o;
+                CORBA::Short    __s;
+                CORBA::Long     __l;
+                Cubit::Many     __cm;
+            public:
+                oneof() : _disc(discrim(0)) {}
+                ~oneof() {}
+                oneof(const oneof& obj);
+                oneof& operator=(const oneof& obj);
+
+                void _d(discrim val) { _disc = val; }
+                discrim _d() const { return _disc; }
+
+                void o(CORBA::Octet val) {
+                        __o = val;
+                        _disc = Cubit::e_0th;
+                }
+                CORBA::Octet o() const { return __o; }
+
+                void s(CORBA::Short val) {
+                        __s = val;
+                        _disc = Cubit::e_1st;
+                }
+                CORBA::Short s() const { return __s; }
+
+                void l(CORBA::Long val) {
+                        __l = val;
+                        _disc = Cubit::e_2nd;
+                }
+                CORBA::Long l() const { return __l; }
+
+                void cm(const Cubit::Many& val) {
+                        __cm = val;
+                        _disc = Cubit::e_3rd;
+                }
+                const Cubit::Many& cm() const { return __cm; }
+                Cubit::Many& cm() { return __cm; }
+
+                friend NCostream& operator<<(NCostream&, const oneof& );
+                friend NCistream& operator>>(NCistream&, oneof& );
+                friend ostream& operator<<(ostream&, const oneof&);
+                inline friend istream& operator>>(istream& strm, oneof& obj) {
+                        NCistream istrm(strm);
+                        strm >> obj;
+                        return strm;
+                }
+        };
+
+        typedef oneof *oneof_ptr;
+        class oneof_var
+        {
+            public:
+                oneof_var() { _ptr = (oneof*)NULL;}
+                oneof_var(oneof *ptr) {
+                        _ptr = ptr;
+                }
+                oneof_var(const oneof_var& var) {
+                        _ptr = new oneof(*var._ptr);
+                }
+                ~oneof_var() {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                }
+                oneof_var& operator=(oneof *ptr) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                oneof_var& operator=(const oneof_var& var) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = new oneof(*var._ptr);
+                        return *this;
+                }
+                oneof *operator->() { return _ptr; }
+                operator oneof () const { return *_ptr; }
+                operator oneof& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const oneof_var& var) {
+                        if (var._ptr == (oneof *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                oneof_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new oneof;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                oneof *_ptr;
+        };
+
+
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values);
+
+        virtual void please_exit();
+
+        inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
+                CORBA::Object_var _obj(obj);
+                _obj = CORBA::Object::_read(strm, Cubit::_desc());
+                obj = Cubit::_narrow(_obj);
+                return strm;
+        }
+        inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
+                strm << (CORBA::Object_ptr)obj;
+                return strm;
+        }
+        inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
+                NCistream istrm(strm);
+                istrm >> obj;
+                return strm;
+        }
 };
 
 
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.h b/TAO/IIOP/test/Orbix/tpr/cubitS.h
index 3ca717e2b49..7132e9d229c 100644
--- a/TAO/IIOP/test/Orbix/tpr/cubitS.h
+++ b/TAO/IIOP/test/Orbix/tpr/cubitS.h
@@ -20,100 +20,100 @@
 class _sk_Cubit : public Cubit
 {
     protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
+        _sk_Cubit(const char *object_name = (const char *)NULL);
+        _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
+        virtual ~_sk_Cubit() {}
     public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
+        static const CORBA::TypeInfo _skel_info;
+
+        // The following operations need to be implemented by the server.
+        virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
+        virtual CORBA::Short cube_short(CORBA::Short s) = 0;
+        virtual CORBA::Long cube_long(CORBA::Long l) = 0;
+        virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
+        virtual void please_exit() = 0;
+
+        // Skeleton Operations implemented automatically
+
+        static void _cube_octet(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_short(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_long(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_struct(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_union(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _please_exit(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
 };
 template <class T>
 class _tie_Cubit : public Cubit
 {
     public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
+        _tie_Cubit(T& t, const char *obj_name=(char*)NULL) :
+                        Cubit(obj_name),
+                        _ref(t) {
+                _object_name(obj_name);
+        }
+        _tie_Cubit(T& t, const char *service_name,
+                        const CORBA::ReferenceData& id)
+                        :_ref(t) {
+                _service(service_name, id);
+        }
+        ~_tie_Cubit() {}
+        CORBA::Octet cube_octet(CORBA::Octet o) {
+                return _ref.cube_octet(
+                o);
+        }
+        CORBA::Short cube_short(CORBA::Short s) {
+                return _ref.cube_short(
+                s);
+        }
+        CORBA::Long cube_long(CORBA::Long l) {
+                return _ref.cube_long(
+                l);
+        }
+        Cubit::Many cube_struct(const Cubit::Many& values) {
+                return _ref.cube_struct(
+                values);
+        }
+        Cubit::oneof cube_union(const Cubit::oneof& values) {
+                return _ref.cube_union(
+                values);
+        }
+        void please_exit() {
+                _ref.please_exit();
+        }
 
     private:
-	T& _ref;
+        T& _ref;
 };
 
 #endif
diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.h b/TAO/IIOP/test/Orbix/tpr/tpr.h
index b5e8be94cf1..7912a2dc92c 100644
--- a/TAO/IIOP/test/Orbix/tpr/tpr.h
+++ b/TAO/IIOP/test/Orbix/tpr/tpr.h
@@ -2,11 +2,16 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 
 //
 // Create a thread filter to dispatch incoming calls
 //
 class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
+        virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
 };
diff --git a/TAO/IIOP/test/Orbix/tps/cubit.h b/TAO/IIOP/test/Orbix/tps/cubit.h
index 3a2dd546608..80e2c0590f5 100644
--- a/TAO/IIOP/test/Orbix/tps/cubit.h
+++ b/TAO/IIOP/test/Orbix/tps/cubit.h
@@ -14,7 +14,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -29,12 +29,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -93,12 +93,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -712,7 +712,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
@@ -732,7 +732,7 @@ public:
 class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -747,12 +747,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -811,12 +811,12 @@ protected:
     }
 public:
     static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
+            Cubit_Factory_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit_Factory* _bind (CORBA::Environment &IT_env);
    static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
+        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil();
     }
 
     Cubit_Factory_ptr operator->() const { return *_ptr;}
@@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit_Factory(X) Cubit_Factory##X
 
 #define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit_Factory##X : public virtual Cubit_Factory {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit_Factory(), m_obj(objp) {        \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);        \
+           }                                                            \
+           Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit_Factory() {     \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit_Factory##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit_Factory	\
+#define QUALS_Cubit_Factory     \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
@@ -1070,19 +1070,19 @@ return m_obj->create_cubit (  name,IT_env);\
 class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -1100,7 +1100,7 @@ public:
     Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
     m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
 }
 
         virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.h b/TAO/IIOP/test/Orbix/tps/cubit_impl.h
index 0fea9857af3..13e65492916 100644
--- a/TAO/IIOP/test/Orbix/tps/cubit_impl.h
+++ b/TAO/IIOP/test/Orbix/tps/cubit_impl.h
@@ -7,6 +7,10 @@
 #include "cubit.h"
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #ifdef Cubit_USE_BOA
 class Cubit_Impl : public virtual CubitBOAImpl {
 #else
diff --git a/TAO/IIOP/test/Orbix/tps/tps.h b/TAO/IIOP/test/Orbix/tps/tps.h
index 362c9ed4e91..169b44dfd62 100644
--- a/TAO/IIOP/test/Orbix/tps/tps.h
+++ b/TAO/IIOP/test/Orbix/tps/tps.h
@@ -3,6 +3,11 @@
 #include "cubit.h"
 #include "cubit_impl.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Task.h"
 
diff --git a/TAO/IIOP/test/cubit.h b/TAO/IIOP/test/cubit.h
index 78d6b604052..12d99b4e403 100644
--- a/TAO/IIOP/test/cubit.h
+++ b/TAO/IIOP/test/cubit.h
@@ -1,6 +1,6 @@
 // $Id$
 
-// @(#)cubit.hh	1.1 95/09/10
+// @(#)cubit.hh 1.1 95/09/10
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
 //
@@ -15,12 +15,12 @@
 // mean lots of narrowing/widening/RTTI infrastructure.
 //
 
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
+#ifndef _CUBIT_HH
+#define _CUBIT_HH
 
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (push, 1)                  // VC++, known padding rules
+#endif  // VC++
 
 #include <corba/orb.h>
 #include <corba/stub.h>
@@ -30,16 +30,16 @@
 // C style binding
 //
 
-typedef CORBA_Object	Cubit;
+typedef CORBA_Object    Cubit;
 typedef Cubit *Cubit_ptr, *CubitRef;
 
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
+extern CORBA_TypeCode_ptr       TC_Cubit_Many;
+extern CORBA_TypeCode_ptr       TC_Cubit_oneof;
 
 struct Cubit_Many {
-    CORBA_Octet	o;
-    CORBA_Long	l;
-    CORBA_Short	s;
+    CORBA_Octet o;
+    CORBA_Long  l;
+    CORBA_Short s;
 };
 
 enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
@@ -48,61 +48,61 @@ enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
 struct Cubit_oneof {
     Cubit_discrim          _disc;
 
-    union {    
-        CORBA_Octet	o;
-        CORBA_Short	s;
-        CORBA_Long	l;
+    union {
+        CORBA_Octet     o;
+        CORBA_Short     s;
+        CORBA_Long      l;
         Cubit_Many      cm;
     };
 };
 
 CORBA_Octet
 Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet	o,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Octet o,
+    CORBA_Environment   &env
 );
 
 CORBA_Short
 Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA_Short	s,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Short s,
+    CORBA_Environment   &env
 );
 
 CORBA_Long
 Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA_Long		l,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Long          l,
+    CORBA_Environment   &env
 );
 
 Cubit_Many *
 Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    Cubit_Many          &values,
+    CORBA_Environment   &env
 );
 
 Cubit_oneof *
 Cubit_cube_union (
-    Cubit_ptr		target,
+    Cubit_ptr           target,
     Cubit_oneof         &values,
-    CORBA_Environment	&env
+    CORBA_Environment   &env
 );
 
 void
 Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Environment   &env
 );
 
-extern const CORBA_Char *Cubit__id;		// type ID
+extern const CORBA_Char *Cubit__id;             // type ID
 
 extern const TAO_Skel_Entry Cubit_operations [];
 
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (pop)                      // VC++, go back to other padding rules
+#endif  // VC++
 
-#endif	// _CUBIT_HH
+#endif  // _CUBIT_HH
diff --git a/TAO/IIOP/test/cubitC.h b/TAO/IIOP/test/cubitC.h
index 98610b55116..e80a1378bdb 100644
--- a/TAO/IIOP/test/cubitC.h
+++ b/TAO/IIOP/test/cubitC.h
@@ -9,25 +9,25 @@
 
 /**************************************************************************
 This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
+implementation
 ***************************************************************************/
 
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
+#ifndef _CUBIT_HH
+#define _CUBIT_HH
 
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (push, 1)                  // VC++, known padding rules
+#endif  // VC++
 
 #include "corba/orb.h"
 #include "corba/stub.h"
 
 #include <iostream.h>
 
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
+extern CORBA_TypeCode_ptr       TC_Cubit_Many;
+extern CORBA_TypeCode_ptr       TC_Cubit_oneof;
 
-struct Cubit_Many 
+struct Cubit_Many
 {
    CORBA_Octet o;
    CORBA_Long  l;
@@ -38,12 +38,12 @@ enum Cubit_discrim
   { e_0th = 0, e_1st = 1, e_2nd = 2,
     e_3rd = 3, e_4th = 4, e_5th = 5 };
 
-struct Cubit_oneof 
+struct Cubit_oneof
 {
    Cubit_discrim  _disc;
-   
-   union 
-   {    
+
+   union
+   {
       CORBA_Octet o;
       CORBA_Short s;
       CORBA_Long  l;
@@ -58,32 +58,32 @@ typedef Cubit_ptr Cubit_ref;
 class Cubit : public virtual CORBA_Object
 {
 public:
- 
+
    static Cubit_ptr _duplicate(Cubit_ptr obj);
    static Cubit_ptr _narrow(CORBA_Object_ptr obj);
    static Cubit_ptr _nil();
 
-   virtual 
+   virtual
    CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
                                  CORBA_Environment &env);
 
-   virtual 
+   virtual
    CORBA_Short Cubit_cube_short (CORBA_Short       s,
                                  CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    CORBA_Long Cubit_cube_long (CORBA_Long        l,
                                CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
                                   CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
                                   CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    void Cubit_please_exit (CORBA_Environment &env);
 
 protected:
@@ -92,13 +92,13 @@ protected:
       : CORBA_Object(objref) { }
    virtual ~Cubit() { }
 
-   
+
 };
 
-extern const CORBA_Char *Cubit__id;		// type ID
+extern const CORBA_Char *Cubit__id;             // type ID
 
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (pop)                      // VC++, go back to other padding rules
+#endif  // VC++
 
-#endif	// _CUBIT_HH
+#endif  // _CUBIT_HH
diff --git a/TAO/IIOP/test/cubitS.h b/TAO/IIOP/test/cubitS.h
index a4b4b853901..a35eeba4714 100644
--- a/TAO/IIOP/test/cubitS.h
+++ b/TAO/IIOP/test/cubitS.h
@@ -9,11 +9,11 @@
 
 /**************************************************************************
 This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
+implementation
 ***************************************************************************/
 
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
+#ifndef _SKEL_CUBIT_HH
+#define _SKEL_CUBIT_HH
 
 #include "cubitC.h"
 
@@ -27,7 +27,7 @@ public:
    virtual
    CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
                                  CORBA_Environment &env) = 0;
-   static 
+   static
    void _cube_octet_skel(CORBA_ServerRequest &req,
                          CORBA_Object_ptr    obj,
                          CORBA_Environment   &env);
@@ -35,7 +35,7 @@ public:
    virtual
    CORBA_Short Cubit_cube_short (CORBA_Short       s,
                                  CORBA_Environment &env) = 0;
-  
+
    static
    void _cube_short_skel (CORBA_ServerRequest &req,
                           CORBA_Object_ptr    obj,
@@ -44,8 +44,8 @@ public:
    virtual
    CORBA_Long Cubit_cube_long (CORBA_Long        l,
                                CORBA_Environment &env) = 0;
-  
-   static 
+
+   static
    void _cube_long_skel (CORBA_ServerRequest &req,
                          CORBA_Object_ptr    obj,
                          CORBA_Environment   &env);
@@ -53,25 +53,25 @@ public:
    virtual
    Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
                                   CORBA_Environment &env) = 0;
-  
-   static 
+
+   static
    void _cube_struct_skel (CORBA_ServerRequest &req,
                            CORBA_Object_ptr    obj,
                            CORBA_Environment   &env);
 
-   virtual 
+   virtual
    Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
                                   CORBA_Environment &env) = 0;
-  
-   static 
+
+   static
    void _cube_union_skel (CORBA_ServerRequest &req,
                           CORBA_Object_ptr    obj,
                           CORBA_Environment   &env);
 
-   virtual 
+   virtual
    void Cubit_please_exit (CORBA_Environment &env) = 0;
 
-   static 
+   static
    void _please_exit_skel (CORBA_ServerRequest  &req,
                            CORBA_Object_ptr     obj,
                            CORBA_Environment    &env);
@@ -81,4 +81,4 @@ protected:
 
 };
 
-#endif	// _SKEL_CUBIT_HH
+#endif  // _SKEL_CUBIT_HH
diff --git a/TAO/IIOP/test/cubit_i.h b/TAO/IIOP/test/cubit_i.h
index 7ddf1947cd3..5ae7d565be1 100644
--- a/TAO/IIOP/test/cubit_i.h
+++ b/TAO/IIOP/test/cubit_i.h
@@ -4,18 +4,18 @@
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
 //
-// TEST:	hand-written Cubit Implementation
+// TEST:        hand-written Cubit Implementation
 //
 // Modified version of Cubit Example written by Sun Microsystems Inc.
 // Modified by: Brian Mendel
 
 /**************************************************************************
 This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
+implementation
 ***************************************************************************/
 
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
+#ifndef _CUBIT_I_HH
+#define _CUBIT_I_HH
 
 #include "cubitS.h"
 
@@ -28,7 +28,7 @@ class Cubit_i : public _skel_Cubit
 public:
    Cubit_i(const char* obj_name = 0);
    ~Cubit_i();
-   
+
    virtual
    CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
                                  CORBA_Environment &env);
@@ -36,21 +36,21 @@ public:
    virtual
    CORBA_Short Cubit_cube_short (CORBA_Short       s,
                                  CORBA_Environment &env);
-  
+
    virtual
    CORBA_Long Cubit_cube_long (CORBA_Long        l,
                                CORBA_Environment &env);
-  
+
    virtual
    Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
                                   CORBA_Environment &env);
-  
+
    virtual
    Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
                                   CORBA_Environment &env);
-  
+
    virtual
    void Cubit_please_exit (CORBA_Environment &env);
 };
 
-#endif	// _CUBIT_I_HH
+#endif  // _CUBIT_I_HH
diff --git a/TAO/IIOP/test/test1.h b/TAO/IIOP/test/test1.h
index 63e409d36c3..513bffc82d7 100644
--- a/TAO/IIOP/test/test1.h
+++ b/TAO/IIOP/test/test1.h
@@ -1,41 +1,41 @@
 // $Id$
 
-// @(#)test1.hh	1.2 95/09/12
+// @(#)test1.hh 1.2 95/09/12
 // Copyright 1995 by Sun Microsystems, Inc.
 // All Rights Reserved
 //
-// TEST		interface for "test1"
+// TEST         interface for "test1"
 //
 
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
+#ifndef _TEST1_HH
+#define _TEST1_HH
 
 #include <corba/orb.h>
 #include <corba/stub.h>
 
 
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (push, 1)                  // VC++, known padding rules
+#endif  // VC++
 
-typedef CORBA_UShort		test1_ushort;
-typedef CORBA_ULong		test1_ulong;
+typedef CORBA_UShort            test1_ushort;
+typedef CORBA_ULong             test1_ulong;
 
-typedef CORBA_LongLong	test1_longlong;
-typedef CORBA_ULongLong 	test1_ulonglong;
-typedef CORBA_LongDouble	test1_longdouble;
+typedef CORBA_LongLong  test1_longlong;
+typedef CORBA_ULongLong         test1_ulonglong;
+typedef CORBA_LongDouble        test1_longdouble;
 
-typedef CORBA_Object		test1;
-typedef test1			*test1_ptr;
+typedef CORBA_Object            test1;
+typedef test1                   *test1_ptr;
 
-#define	DECL_TEST(typename, truetype) \
+#define DECL_TEST(typename, truetype) \
     truetype \
     test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA_Environment	&env \
+        test1_ptr               target, \
+        truetype                in_a1, \
+        truetype                &out_a2, \
+        truetype                &inout_a3, \
+        CORBA_Environment       &env \
     )
 
 void test_illegal (test1_ptr target, CORBA_Environment &env);
@@ -53,11 +53,11 @@ DECL_TEST (octet, CORBA_Octet);
 
 CORBA_Any *
 test1_test_any (
-    test1_ptr		target,
-    const CORBA_Any	&in_a1,
-    CORBA_Any		*&out_a2,
-    CORBA_Any		&inout_a3,
-    CORBA_Environment	&env
+    test1_ptr           target,
+    const CORBA_Any     &in_a1,
+    CORBA_Any           *&out_a2,
+    CORBA_Any           &inout_a3,
+    CORBA_Environment   &env
 );
 
 DECL_TEST (TypeCode, CORBA_TypeCode_ptr);
@@ -76,51 +76,51 @@ DECL_TEST (wstring, CORBA_WString);
 
 DECL_TEST (longdouble, CORBA_LongDouble);
 
-#undef	DECL_TEST
+#undef  DECL_TEST
 
-extern CORBA_TypeCode_ptr	_tc_test1_x1;
+extern CORBA_TypeCode_ptr       _tc_test1_x1;
 
 class test1_x1 : public CORBA_UserException {
   public:
-    CORBA_Long	case_num;
-			
-			test1_x1 (CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x1), case_num (n)
-			{ }
+    CORBA_Long  case_num;
+
+                        test1_x1 (CORBA_Long n)
+                        : CORBA_UserException (_tc_test1_x1), case_num (n)
+                        { }
 };
 
-extern CORBA_TypeCode_ptr	_tc_test1_x2;
+extern CORBA_TypeCode_ptr       _tc_test1_x2;
 
 class test1_x2 : public CORBA_UserException {
   public:
-    CORBA_Object_ptr	obj;
-    CORBA_Long	case_num;
+    CORBA_Object_ptr    obj;
+    CORBA_Long  case_num;
 
-			test1_x2 (CORBA_Object_ptr obj1,
-				CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
+                        test1_x2 (CORBA_Object_ptr obj1,
+                                CORBA_Long n)
+                        : CORBA_UserException (_tc_test1_x2),
+                            obj (obj1), case_num (n) { }
 
-			~test1_x2 ()
-			{ CORBA_release (obj); }
+                        ~test1_x2 ()
+                        { CORBA_release (obj); }
 };
 
 void
 test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
+    test1_ptr           target,
+    CORBA_Long  case_num,
+    CORBA_Environment   &env            // throw (x1, x2)
 );
 
 void
 test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
+    test1_ptr           target,
+    CORBA_Environment   &env
 );
 
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (pop)                      // VC++, go back to other padding rules
+#endif  // VC++
 
-#endif	// _TEST1_HH
+#endif  // _TEST1_HH
 
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h
index 584efa67c8d..5c020bd0c4b 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h
@@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef;
 class Cubit_var
 {
     public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
+        Cubit_var();
+        Cubit_var(Cubit_ptr);
+        Cubit_var(const Cubit_var&);
+        ~Cubit_var();
+        Cubit_var& operator=(Cubit_ptr);
+        operator Cubit_ptr() const { return _ptr; }
 #if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
+        operator Cubit *&() { return _ptr; }
 #else
-	operator Cubit_ptr&() { return _ptr; }
+        operator Cubit_ptr&() { return _ptr; }
 #endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
+        Cubit_ptr operator->() const { return _ptr;}
+        friend NCistream& operator>>(NCistream&, Cubit_var&);
+        friend NCostream& operator<<(NCostream&, const Cubit_var&);
+        friend istream& operator>>(istream&, Cubit_var&);
+        friend ostream& operator<<(ostream&, const Cubit_var&);
     private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
+        Cubit_ptr       _ptr;
+        void operator=(const Cubit_var&) {}
 };
 #endif
 class Cubit: public virtual CORBA_Object
 {
     private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
+        static const CORBA::TypeInfo _class_info;
+        Cubit(const Cubit&) {}
+        void operator=(const Cubit&){}
     public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
+        static const CORBA::TypeInfo *_desc();
+        virtual const CORBA::TypeInfo *_type_info() const;
+        virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
+        static CORBA::Object *_factory();
     protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
+        Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
+        Cubit(NCistream& strm) :CORBA_Object(strm) {}
+        virtual ~Cubit() {}
     public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
+        static Cubit_ptr _duplicate(Cubit_ptr obj) {
+                if (obj ) obj->_ref();
+                return obj;
+        }
+        static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
+        static Cubit_ptr _narrow(CORBA::Object *obj);
+        static Cubit_ptr _clone(Cubit_ptr obj) {
+                CORBA::Object_var obj_var(__clone(obj));
 
 #if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
+                return _narrow(obj_var.operator CORBA::Object_ptr());
 #else
-		return _narrow(obj_var);
+                return _narrow(obj_var);
 #endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
+        }
+        static Cubit_ptr _bind(const char *object_name = NULL,
+                const char *host_name = NULL,
+                const CORBA::BindOptions* opt = NULL);
+
+        virtual CORBA::Octet cube_octet(CORBA::Octet o);
+
+        virtual CORBA::Short cube_short(CORBA::Short s);
+
+        virtual CORBA::Long cube_long(CORBA::Long l);
+
+        struct Many {
+                CORBA::Octet    o;
+                CORBA::Long     l;
+                CORBA::Short    s;
+        };
+        friend NCostream& operator<<(NCostream&, const Many& );
+        friend NCistream& operator>>(NCistream&, Many& );
+
+        friend ostream& operator<<(ostream&, const Many& );
+        inline friend istream& operator>>(istream& _strm, Many& _obj) {
+                NCistream _istrm(_strm);
+                _istrm >> _obj;
+                return _strm;
+        }
+
+
+        typedef Many *Many_ptr;
+        class Many_var
+        {
+            public:
+                Many_var() { _ptr = (Many*)NULL;}
+                Many_var(Many *ptr) {
+                        _ptr = ptr;
+                }
+                Many_var(const Many_var& var) {
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                }
+                ~Many_var() {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                }
+                Many_var& operator=(Many *ptr) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                Many_var& operator=(const Many_var& var) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                        return *this;
+                }
+                Many *operator->() { return _ptr; }
+                operator Many () const { return *_ptr; }
+                operator Many& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const Many_var& var) {
+                        if (var._ptr == (Many *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                Many_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new Many;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                Many *_ptr;
+        };
+
+
+        virtual Cubit::Many cube_struct(const Cubit::Many& values);
+
+        enum discrim {
+                e_0th,
+                e_1st,
+                e_2nd,
+                e_3rd,
+                e_4th,
+                e_5th
+        };
+        inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
+                _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                if (_temp >= 6)
+                        throw CORBA::BAD_PARAM();
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+        inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
+                if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
+                        _strm << "discrim:";
+                        switch(_enum_type) {
+                                case e_0th:
+                                        _strm << "e_0th" << endl;
+                                        break;
+                                case e_1st:
+                                        _strm << "e_1st" << endl;
+                                        break;
+                                case e_2nd:
+                                        _strm << "e_2nd" << endl;
+                                        break;
+                                case e_3rd:
+                                        _strm << "e_3rd" << endl;
+                                        break;
+                                case e_4th:
+                                        _strm << "e_4th" << endl;
+                                        break;
+                                case e_5th:
+                                        _strm << "e_5th" << endl;
+                                        break;
+                        }
+                }
+                else
+                        _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+
+
+        class oneof
+        {
+            public:
+            private:
+                discrim _disc;
+                CORBA::Octet    __o;
+                CORBA::Short    __s;
+                CORBA::Long     __l;
+                Cubit::Many     __cm;
+            public:
+                oneof() : _disc(discrim(0)) {}
+                ~oneof() {}
+                oneof(const oneof& obj);
+                oneof& operator=(const oneof& obj);
+
+                void _d(discrim val) { _disc = val; }
+                discrim _d() const { return _disc; }
+
+                void o(CORBA::Octet val) {
+                        __o = val;
+                        _disc = Cubit::e_0th;
+                }
+                CORBA::Octet o() const { return __o; }
+
+                void s(CORBA::Short val) {
+                        __s = val;
+                        _disc = Cubit::e_1st;
+                }
+                CORBA::Short s() const { return __s; }
+
+                void l(CORBA::Long val) {
+                        __l = val;
+                        _disc = Cubit::e_2nd;
+                }
+                CORBA::Long l() const { return __l; }
+
+                void cm(const Cubit::Many& val) {
+                        __cm = val;
+                        _disc = Cubit::e_3rd;
+                }
+                const Cubit::Many& cm() const { return __cm; }
+                Cubit::Many& cm() { return __cm; }
+
+                friend NCostream& operator<<(NCostream&, const oneof& );
+                friend NCistream& operator>>(NCistream&, oneof& );
+                friend ostream& operator<<(ostream&, const oneof&);
+                inline friend istream& operator>>(istream& strm, oneof& obj) {
+                        NCistream istrm(strm);
+                        strm >> obj;
+                        return strm;
+                }
+        };
+
+        typedef oneof *oneof_ptr;
+        class oneof_var
+        {
+            public:
+                oneof_var() { _ptr = (oneof*)NULL;}
+                oneof_var(oneof *ptr) {
+                        _ptr = ptr;
+                }
+                oneof_var(const oneof_var& var) {
+                        _ptr = new oneof(*var._ptr);
+                }
+                ~oneof_var() {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                }
+                oneof_var& operator=(oneof *ptr) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                oneof_var& operator=(const oneof_var& var) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = new oneof(*var._ptr);
+                        return *this;
+                }
+                oneof *operator->() { return _ptr; }
+                operator oneof () const { return *_ptr; }
+                operator oneof& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const oneof_var& var) {
+                        if (var._ptr == (oneof *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                oneof_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new oneof;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                oneof *_ptr;
+        };
+
+
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values);
+
+        virtual void please_exit();
+
+        inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
+                CORBA::Object_var _obj(obj);
+                _obj = CORBA::Object::_read(strm, Cubit::_desc());
+                obj = Cubit::_narrow(_obj);
+                return strm;
+        }
+        inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
+                strm << (CORBA::Object_ptr)obj;
+                return strm;
+        }
+        inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
+                NCistream istrm(strm);
+                istrm >> obj;
+                return strm;
+        }
 };
 
 
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h
index 3ca717e2b49..7132e9d229c 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h
@@ -20,100 +20,100 @@
 class _sk_Cubit : public Cubit
 {
     protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
+        _sk_Cubit(const char *object_name = (const char *)NULL);
+        _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
+        virtual ~_sk_Cubit() {}
     public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
+        static const CORBA::TypeInfo _skel_info;
+
+        // The following operations need to be implemented by the server.
+        virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
+        virtual CORBA::Short cube_short(CORBA::Short s) = 0;
+        virtual CORBA::Long cube_long(CORBA::Long l) = 0;
+        virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
+        virtual void please_exit() = 0;
+
+        // Skeleton Operations implemented automatically
+
+        static void _cube_octet(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_short(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_long(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_struct(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_union(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _please_exit(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
 };
 template <class T>
 class _tie_Cubit : public Cubit
 {
     public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
+        _tie_Cubit(T& t, const char *obj_name=(char*)NULL) :
+                        Cubit(obj_name),
+                        _ref(t) {
+                _object_name(obj_name);
+        }
+        _tie_Cubit(T& t, const char *service_name,
+                        const CORBA::ReferenceData& id)
+                        :_ref(t) {
+                _service(service_name, id);
+        }
+        ~_tie_Cubit() {}
+        CORBA::Octet cube_octet(CORBA::Octet o) {
+                return _ref.cube_octet(
+                o);
+        }
+        CORBA::Short cube_short(CORBA::Short s) {
+                return _ref.cube_short(
+                s);
+        }
+        CORBA::Long cube_long(CORBA::Long l) {
+                return _ref.cube_long(
+                l);
+        }
+        Cubit::Many cube_struct(const Cubit::Many& values) {
+                return _ref.cube_struct(
+                values);
+        }
+        Cubit::oneof cube_union(const Cubit::oneof& values) {
+                return _ref.cube_union(
+                values);
+        }
+        void please_exit() {
+                _ref.please_exit();
+        }
 
     private:
-	T& _ref;
+        T& _ref;
 };
 
 #endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h
index b5e8be94cf1..7912a2dc92c 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h
@@ -2,11 +2,16 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 
 //
 // Create a thread filter to dispatch incoming calls
 //
 class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
+        virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
 };
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h
index 3a2dd546608..80e2c0590f5 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h
@@ -14,7 +14,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -29,12 +29,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -93,12 +93,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -712,7 +712,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
@@ -732,7 +732,7 @@ public:
 class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -747,12 +747,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -811,12 +811,12 @@ protected:
     }
 public:
     static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
+            Cubit_Factory_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit_Factory* _bind (CORBA::Environment &IT_env);
    static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
+        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil();
     }
 
     Cubit_Factory_ptr operator->() const { return *_ptr;}
@@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit_Factory(X) Cubit_Factory##X
 
 #define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit_Factory##X : public virtual Cubit_Factory {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit_Factory(), m_obj(objp) {        \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);        \
+           }                                                            \
+           Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit_Factory() {     \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit_Factory##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit_Factory	\
+#define QUALS_Cubit_Factory     \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
@@ -1070,19 +1070,19 @@ return m_obj->create_cubit (  name,IT_env);\
 class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -1100,7 +1100,7 @@ public:
     Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
     m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
 }
 
         virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h
index 337a7f54e65..536aeedad22 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h
@@ -2,6 +2,11 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Task.h"
 
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h
index 584efa67c8d..5c020bd0c4b 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h
@@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef;
 class Cubit_var
 {
     public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
+        Cubit_var();
+        Cubit_var(Cubit_ptr);
+        Cubit_var(const Cubit_var&);
+        ~Cubit_var();
+        Cubit_var& operator=(Cubit_ptr);
+        operator Cubit_ptr() const { return _ptr; }
 #if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
+        operator Cubit *&() { return _ptr; }
 #else
-	operator Cubit_ptr&() { return _ptr; }
+        operator Cubit_ptr&() { return _ptr; }
 #endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
+        Cubit_ptr operator->() const { return _ptr;}
+        friend NCistream& operator>>(NCistream&, Cubit_var&);
+        friend NCostream& operator<<(NCostream&, const Cubit_var&);
+        friend istream& operator>>(istream&, Cubit_var&);
+        friend ostream& operator<<(ostream&, const Cubit_var&);
     private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
+        Cubit_ptr       _ptr;
+        void operator=(const Cubit_var&) {}
 };
 #endif
 class Cubit: public virtual CORBA_Object
 {
     private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
+        static const CORBA::TypeInfo _class_info;
+        Cubit(const Cubit&) {}
+        void operator=(const Cubit&){}
     public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
+        static const CORBA::TypeInfo *_desc();
+        virtual const CORBA::TypeInfo *_type_info() const;
+        virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
+        static CORBA::Object *_factory();
     protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
+        Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
+        Cubit(NCistream& strm) :CORBA_Object(strm) {}
+        virtual ~Cubit() {}
     public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
+        static Cubit_ptr _duplicate(Cubit_ptr obj) {
+                if (obj ) obj->_ref();
+                return obj;
+        }
+        static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
+        static Cubit_ptr _narrow(CORBA::Object *obj);
+        static Cubit_ptr _clone(Cubit_ptr obj) {
+                CORBA::Object_var obj_var(__clone(obj));
 
 #if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
+                return _narrow(obj_var.operator CORBA::Object_ptr());
 #else
-		return _narrow(obj_var);
+                return _narrow(obj_var);
 #endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
+        }
+        static Cubit_ptr _bind(const char *object_name = NULL,
+                const char *host_name = NULL,
+                const CORBA::BindOptions* opt = NULL);
+
+        virtual CORBA::Octet cube_octet(CORBA::Octet o);
+
+        virtual CORBA::Short cube_short(CORBA::Short s);
+
+        virtual CORBA::Long cube_long(CORBA::Long l);
+
+        struct Many {
+                CORBA::Octet    o;
+                CORBA::Long     l;
+                CORBA::Short    s;
+        };
+        friend NCostream& operator<<(NCostream&, const Many& );
+        friend NCistream& operator>>(NCistream&, Many& );
+
+        friend ostream& operator<<(ostream&, const Many& );
+        inline friend istream& operator>>(istream& _strm, Many& _obj) {
+                NCistream _istrm(_strm);
+                _istrm >> _obj;
+                return _strm;
+        }
+
+
+        typedef Many *Many_ptr;
+        class Many_var
+        {
+            public:
+                Many_var() { _ptr = (Many*)NULL;}
+                Many_var(Many *ptr) {
+                        _ptr = ptr;
+                }
+                Many_var(const Many_var& var) {
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                }
+                ~Many_var() {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                }
+                Many_var& operator=(Many *ptr) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                Many_var& operator=(const Many_var& var) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                        return *this;
+                }
+                Many *operator->() { return _ptr; }
+                operator Many () const { return *_ptr; }
+                operator Many& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const Many_var& var) {
+                        if (var._ptr == (Many *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                Many_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new Many;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                Many *_ptr;
+        };
+
+
+        virtual Cubit::Many cube_struct(const Cubit::Many& values);
+
+        enum discrim {
+                e_0th,
+                e_1st,
+                e_2nd,
+                e_3rd,
+                e_4th,
+                e_5th
+        };
+        inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
+                _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                if (_temp >= 6)
+                        throw CORBA::BAD_PARAM();
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+        inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
+                if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
+                        _strm << "discrim:";
+                        switch(_enum_type) {
+                                case e_0th:
+                                        _strm << "e_0th" << endl;
+                                        break;
+                                case e_1st:
+                                        _strm << "e_1st" << endl;
+                                        break;
+                                case e_2nd:
+                                        _strm << "e_2nd" << endl;
+                                        break;
+                                case e_3rd:
+                                        _strm << "e_3rd" << endl;
+                                        break;
+                                case e_4th:
+                                        _strm << "e_4th" << endl;
+                                        break;
+                                case e_5th:
+                                        _strm << "e_5th" << endl;
+                                        break;
+                        }
+                }
+                else
+                        _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+
+
+        class oneof
+        {
+            public:
+            private:
+                discrim _disc;
+                CORBA::Octet    __o;
+                CORBA::Short    __s;
+                CORBA::Long     __l;
+                Cubit::Many     __cm;
+            public:
+                oneof() : _disc(discrim(0)) {}
+                ~oneof() {}
+                oneof(const oneof& obj);
+                oneof& operator=(const oneof& obj);
+
+                void _d(discrim val) { _disc = val; }
+                discrim _d() const { return _disc; }
+
+                void o(CORBA::Octet val) {
+                        __o = val;
+                        _disc = Cubit::e_0th;
+                }
+                CORBA::Octet o() const { return __o; }
+
+                void s(CORBA::Short val) {
+                        __s = val;
+                        _disc = Cubit::e_1st;
+                }
+                CORBA::Short s() const { return __s; }
+
+                void l(CORBA::Long val) {
+                        __l = val;
+                        _disc = Cubit::e_2nd;
+                }
+                CORBA::Long l() const { return __l; }
+
+                void cm(const Cubit::Many& val) {
+                        __cm = val;
+                        _disc = Cubit::e_3rd;
+                }
+                const Cubit::Many& cm() const { return __cm; }
+                Cubit::Many& cm() { return __cm; }
+
+                friend NCostream& operator<<(NCostream&, const oneof& );
+                friend NCistream& operator>>(NCistream&, oneof& );
+                friend ostream& operator<<(ostream&, const oneof&);
+                inline friend istream& operator>>(istream& strm, oneof& obj) {
+                        NCistream istrm(strm);
+                        strm >> obj;
+                        return strm;
+                }
+        };
+
+        typedef oneof *oneof_ptr;
+        class oneof_var
+        {
+            public:
+                oneof_var() { _ptr = (oneof*)NULL;}
+                oneof_var(oneof *ptr) {
+                        _ptr = ptr;
+                }
+                oneof_var(const oneof_var& var) {
+                        _ptr = new oneof(*var._ptr);
+                }
+                ~oneof_var() {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                }
+                oneof_var& operator=(oneof *ptr) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                oneof_var& operator=(const oneof_var& var) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = new oneof(*var._ptr);
+                        return *this;
+                }
+                oneof *operator->() { return _ptr; }
+                operator oneof () const { return *_ptr; }
+                operator oneof& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const oneof_var& var) {
+                        if (var._ptr == (oneof *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                oneof_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new oneof;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                oneof *_ptr;
+        };
+
+
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values);
+
+        virtual void please_exit();
+
+        inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
+                CORBA::Object_var _obj(obj);
+                _obj = CORBA::Object::_read(strm, Cubit::_desc());
+                obj = Cubit::_narrow(_obj);
+                return strm;
+        }
+        inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
+                strm << (CORBA::Object_ptr)obj;
+                return strm;
+        }
+        inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
+                NCistream istrm(strm);
+                istrm >> obj;
+                return strm;
+        }
 };
 
 
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h
index 3ca717e2b49..7132e9d229c 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h
@@ -20,100 +20,100 @@
 class _sk_Cubit : public Cubit
 {
     protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
+        _sk_Cubit(const char *object_name = (const char *)NULL);
+        _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
+        virtual ~_sk_Cubit() {}
     public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
+        static const CORBA::TypeInfo _skel_info;
+
+        // The following operations need to be implemented by the server.
+        virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
+        virtual CORBA::Short cube_short(CORBA::Short s) = 0;
+        virtual CORBA::Long cube_long(CORBA::Long l) = 0;
+        virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
+        virtual void please_exit() = 0;
+
+        // Skeleton Operations implemented automatically
+
+        static void _cube_octet(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_short(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_long(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_struct(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_union(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _please_exit(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
 };
 template <class T>
 class _tie_Cubit : public Cubit
 {
     public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
+        _tie_Cubit(T& t, const char *obj_name=(char*)NULL) :
+                        Cubit(obj_name),
+                        _ref(t) {
+                _object_name(obj_name);
+        }
+        _tie_Cubit(T& t, const char *service_name,
+                        const CORBA::ReferenceData& id)
+                        :_ref(t) {
+                _service(service_name, id);
+        }
+        ~_tie_Cubit() {}
+        CORBA::Octet cube_octet(CORBA::Octet o) {
+                return _ref.cube_octet(
+                o);
+        }
+        CORBA::Short cube_short(CORBA::Short s) {
+                return _ref.cube_short(
+                s);
+        }
+        CORBA::Long cube_long(CORBA::Long l) {
+                return _ref.cube_long(
+                l);
+        }
+        Cubit::Many cube_struct(const Cubit::Many& values) {
+                return _ref.cube_struct(
+                values);
+        }
+        Cubit::oneof cube_union(const Cubit::oneof& values) {
+                return _ref.cube_union(
+                values);
+        }
+        void please_exit() {
+                _ref.please_exit();
+        }
 
     private:
-	T& _ref;
+        T& _ref;
 };
 
 #endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h
index b5e8be94cf1..7912a2dc92c 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h
@@ -2,11 +2,16 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 
 //
 // Create a thread filter to dispatch incoming calls
 //
 class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
+        virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
 };
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h
index 3a2dd546608..80e2c0590f5 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h
@@ -14,7 +14,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -29,12 +29,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -93,12 +93,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -712,7 +712,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
@@ -732,7 +732,7 @@ public:
 class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -747,12 +747,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -811,12 +811,12 @@ protected:
     }
 public:
     static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
+            Cubit_Factory_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit_Factory* _bind (CORBA::Environment &IT_env);
    static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
+        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil();
     }
 
     Cubit_Factory_ptr operator->() const { return *_ptr;}
@@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit_Factory(X) Cubit_Factory##X
 
 #define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit_Factory##X : public virtual Cubit_Factory {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit_Factory(), m_obj(objp) {        \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);        \
+           }                                                            \
+           Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit_Factory() {     \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit_Factory##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit_Factory	\
+#define QUALS_Cubit_Factory     \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
@@ -1070,19 +1070,19 @@ return m_obj->create_cubit (  name,IT_env);\
 class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -1100,7 +1100,7 @@ public:
     Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
     m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
 }
 
         virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h
index 0fea9857af3..13e65492916 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h
@@ -7,6 +7,10 @@
 #include "cubit.h"
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #ifdef Cubit_USE_BOA
 class Cubit_Impl : public virtual CubitBOAImpl {
 #else
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h
index 362c9ed4e91..169b44dfd62 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h
+++ b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h
@@ -3,6 +3,11 @@
 #include "cubit.h"
 #include "cubit_impl.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Task.h"
 
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.h b/TAO/IIOP/tests/Cubit/TAO/cubit.h
index 78d6b604052..12d99b4e403 100644
--- a/TAO/IIOP/tests/Cubit/TAO/cubit.h
+++ b/TAO/IIOP/tests/Cubit/TAO/cubit.h
@@ -1,6 +1,6 @@
 // $Id$
 
-// @(#)cubit.hh	1.1 95/09/10
+// @(#)cubit.hh 1.1 95/09/10
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
 //
@@ -15,12 +15,12 @@
 // mean lots of narrowing/widening/RTTI infrastructure.
 //
 
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
+#ifndef _CUBIT_HH
+#define _CUBIT_HH
 
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (push, 1)                  // VC++, known padding rules
+#endif  // VC++
 
 #include <corba/orb.h>
 #include <corba/stub.h>
@@ -30,16 +30,16 @@
 // C style binding
 //
 
-typedef CORBA_Object	Cubit;
+typedef CORBA_Object    Cubit;
 typedef Cubit *Cubit_ptr, *CubitRef;
 
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
+extern CORBA_TypeCode_ptr       TC_Cubit_Many;
+extern CORBA_TypeCode_ptr       TC_Cubit_oneof;
 
 struct Cubit_Many {
-    CORBA_Octet	o;
-    CORBA_Long	l;
-    CORBA_Short	s;
+    CORBA_Octet o;
+    CORBA_Long  l;
+    CORBA_Short s;
 };
 
 enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
@@ -48,61 +48,61 @@ enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
 struct Cubit_oneof {
     Cubit_discrim          _disc;
 
-    union {    
-        CORBA_Octet	o;
-        CORBA_Short	s;
-        CORBA_Long	l;
+    union {
+        CORBA_Octet     o;
+        CORBA_Short     s;
+        CORBA_Long      l;
         Cubit_Many      cm;
     };
 };
 
 CORBA_Octet
 Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet	o,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Octet o,
+    CORBA_Environment   &env
 );
 
 CORBA_Short
 Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA_Short	s,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Short s,
+    CORBA_Environment   &env
 );
 
 CORBA_Long
 Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA_Long		l,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Long          l,
+    CORBA_Environment   &env
 );
 
 Cubit_Many *
 Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    Cubit_Many          &values,
+    CORBA_Environment   &env
 );
 
 Cubit_oneof *
 Cubit_cube_union (
-    Cubit_ptr		target,
+    Cubit_ptr           target,
     Cubit_oneof         &values,
-    CORBA_Environment	&env
+    CORBA_Environment   &env
 );
 
 void
 Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
+    Cubit_ptr           target,
+    CORBA_Environment   &env
 );
 
-extern const CORBA_Char *Cubit__id;		// type ID
+extern const CORBA_Char *Cubit__id;             // type ID
 
 extern const TAO_Skel_Entry Cubit_operations [];
 
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (pop)                      // VC++, go back to other padding rules
+#endif  // VC++
 
-#endif	// _CUBIT_HH
+#endif  // _CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.h b/TAO/IIOP/tests/Cubit/TAO/cubitC.h
index 98610b55116..e80a1378bdb 100644
--- a/TAO/IIOP/tests/Cubit/TAO/cubitC.h
+++ b/TAO/IIOP/tests/Cubit/TAO/cubitC.h
@@ -9,25 +9,25 @@
 
 /**************************************************************************
 This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
+implementation
 ***************************************************************************/
 
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
+#ifndef _CUBIT_HH
+#define _CUBIT_HH
 
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (push, 1)                  // VC++, known padding rules
+#endif  // VC++
 
 #include "corba/orb.h"
 #include "corba/stub.h"
 
 #include <iostream.h>
 
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
+extern CORBA_TypeCode_ptr       TC_Cubit_Many;
+extern CORBA_TypeCode_ptr       TC_Cubit_oneof;
 
-struct Cubit_Many 
+struct Cubit_Many
 {
    CORBA_Octet o;
    CORBA_Long  l;
@@ -38,12 +38,12 @@ enum Cubit_discrim
   { e_0th = 0, e_1st = 1, e_2nd = 2,
     e_3rd = 3, e_4th = 4, e_5th = 5 };
 
-struct Cubit_oneof 
+struct Cubit_oneof
 {
    Cubit_discrim  _disc;
-   
-   union 
-   {    
+
+   union
+   {
       CORBA_Octet o;
       CORBA_Short s;
       CORBA_Long  l;
@@ -58,32 +58,32 @@ typedef Cubit_ptr Cubit_ref;
 class Cubit : public virtual CORBA_Object
 {
 public:
- 
+
    static Cubit_ptr _duplicate(Cubit_ptr obj);
    static Cubit_ptr _narrow(CORBA_Object_ptr obj);
    static Cubit_ptr _nil();
 
-   virtual 
+   virtual
    CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
                                  CORBA_Environment &env);
 
-   virtual 
+   virtual
    CORBA_Short Cubit_cube_short (CORBA_Short       s,
                                  CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    CORBA_Long Cubit_cube_long (CORBA_Long        l,
                                CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
                                   CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
                                   CORBA_Environment &env);
-  
-   virtual 
+
+   virtual
    void Cubit_please_exit (CORBA_Environment &env);
 
 protected:
@@ -92,13 +92,13 @@ protected:
       : CORBA_Object(objref) { }
    virtual ~Cubit() { }
 
-   
+
 };
 
-extern const CORBA_Char *Cubit__id;		// type ID
+extern const CORBA_Char *Cubit__id;             // type ID
 
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (pop)                      // VC++, go back to other padding rules
+#endif  // VC++
 
-#endif	// _CUBIT_HH
+#endif  // _CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.h b/TAO/IIOP/tests/Cubit/TAO/cubitS.h
index a4b4b853901..a35eeba4714 100644
--- a/TAO/IIOP/tests/Cubit/TAO/cubitS.h
+++ b/TAO/IIOP/tests/Cubit/TAO/cubitS.h
@@ -9,11 +9,11 @@
 
 /**************************************************************************
 This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
+implementation
 ***************************************************************************/
 
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
+#ifndef _SKEL_CUBIT_HH
+#define _SKEL_CUBIT_HH
 
 #include "cubitC.h"
 
@@ -27,7 +27,7 @@ public:
    virtual
    CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
                                  CORBA_Environment &env) = 0;
-   static 
+   static
    void _cube_octet_skel(CORBA_ServerRequest &req,
                          CORBA_Object_ptr    obj,
                          CORBA_Environment   &env);
@@ -35,7 +35,7 @@ public:
    virtual
    CORBA_Short Cubit_cube_short (CORBA_Short       s,
                                  CORBA_Environment &env) = 0;
-  
+
    static
    void _cube_short_skel (CORBA_ServerRequest &req,
                           CORBA_Object_ptr    obj,
@@ -44,8 +44,8 @@ public:
    virtual
    CORBA_Long Cubit_cube_long (CORBA_Long        l,
                                CORBA_Environment &env) = 0;
-  
-   static 
+
+   static
    void _cube_long_skel (CORBA_ServerRequest &req,
                          CORBA_Object_ptr    obj,
                          CORBA_Environment   &env);
@@ -53,25 +53,25 @@ public:
    virtual
    Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
                                   CORBA_Environment &env) = 0;
-  
-   static 
+
+   static
    void _cube_struct_skel (CORBA_ServerRequest &req,
                            CORBA_Object_ptr    obj,
                            CORBA_Environment   &env);
 
-   virtual 
+   virtual
    Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
                                   CORBA_Environment &env) = 0;
-  
-   static 
+
+   static
    void _cube_union_skel (CORBA_ServerRequest &req,
                           CORBA_Object_ptr    obj,
                           CORBA_Environment   &env);
 
-   virtual 
+   virtual
    void Cubit_please_exit (CORBA_Environment &env) = 0;
 
-   static 
+   static
    void _please_exit_skel (CORBA_ServerRequest  &req,
                            CORBA_Object_ptr     obj,
                            CORBA_Environment    &env);
@@ -81,4 +81,4 @@ protected:
 
 };
 
-#endif	// _SKEL_CUBIT_HH
+#endif  // _SKEL_CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h b/TAO/IIOP/tests/Cubit/TAO/cubit_i.h
index 7ddf1947cd3..5ae7d565be1 100644
--- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h
+++ b/TAO/IIOP/tests/Cubit/TAO/cubit_i.h
@@ -4,18 +4,18 @@
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
 //
-// TEST:	hand-written Cubit Implementation
+// TEST:        hand-written Cubit Implementation
 //
 // Modified version of Cubit Example written by Sun Microsystems Inc.
 // Modified by: Brian Mendel
 
 /**************************************************************************
 This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
+implementation
 ***************************************************************************/
 
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
+#ifndef _CUBIT_I_HH
+#define _CUBIT_I_HH
 
 #include "cubitS.h"
 
@@ -28,7 +28,7 @@ class Cubit_i : public _skel_Cubit
 public:
    Cubit_i(const char* obj_name = 0);
    ~Cubit_i();
-   
+
    virtual
    CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
                                  CORBA_Environment &env);
@@ -36,21 +36,21 @@ public:
    virtual
    CORBA_Short Cubit_cube_short (CORBA_Short       s,
                                  CORBA_Environment &env);
-  
+
    virtual
    CORBA_Long Cubit_cube_long (CORBA_Long        l,
                                CORBA_Environment &env);
-  
+
    virtual
    Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
                                   CORBA_Environment &env);
-  
+
    virtual
    Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
                                   CORBA_Environment &env);
-  
+
    virtual
    void Cubit_please_exit (CORBA_Environment &env);
 };
 
-#endif	// _CUBIT_I_HH
+#endif  // _CUBIT_I_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.h b/TAO/IIOP/tests/Cubit/TAO/test1.h
index 63e409d36c3..513bffc82d7 100644
--- a/TAO/IIOP/tests/Cubit/TAO/test1.h
+++ b/TAO/IIOP/tests/Cubit/TAO/test1.h
@@ -1,41 +1,41 @@
 // $Id$
 
-// @(#)test1.hh	1.2 95/09/12
+// @(#)test1.hh 1.2 95/09/12
 // Copyright 1995 by Sun Microsystems, Inc.
 // All Rights Reserved
 //
-// TEST		interface for "test1"
+// TEST         interface for "test1"
 //
 
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
+#ifndef _TEST1_HH
+#define _TEST1_HH
 
 #include <corba/orb.h>
 #include <corba/stub.h>
 
 
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (push, 1)                  // VC++, known padding rules
+#endif  // VC++
 
-typedef CORBA_UShort		test1_ushort;
-typedef CORBA_ULong		test1_ulong;
+typedef CORBA_UShort            test1_ushort;
+typedef CORBA_ULong             test1_ulong;
 
-typedef CORBA_LongLong	test1_longlong;
-typedef CORBA_ULongLong 	test1_ulonglong;
-typedef CORBA_LongDouble	test1_longdouble;
+typedef CORBA_LongLong  test1_longlong;
+typedef CORBA_ULongLong         test1_ulonglong;
+typedef CORBA_LongDouble        test1_longdouble;
 
-typedef CORBA_Object		test1;
-typedef test1			*test1_ptr;
+typedef CORBA_Object            test1;
+typedef test1                   *test1_ptr;
 
-#define	DECL_TEST(typename, truetype) \
+#define DECL_TEST(typename, truetype) \
     truetype \
     test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA_Environment	&env \
+        test1_ptr               target, \
+        truetype                in_a1, \
+        truetype                &out_a2, \
+        truetype                &inout_a3, \
+        CORBA_Environment       &env \
     )
 
 void test_illegal (test1_ptr target, CORBA_Environment &env);
@@ -53,11 +53,11 @@ DECL_TEST (octet, CORBA_Octet);
 
 CORBA_Any *
 test1_test_any (
-    test1_ptr		target,
-    const CORBA_Any	&in_a1,
-    CORBA_Any		*&out_a2,
-    CORBA_Any		&inout_a3,
-    CORBA_Environment	&env
+    test1_ptr           target,
+    const CORBA_Any     &in_a1,
+    CORBA_Any           *&out_a2,
+    CORBA_Any           &inout_a3,
+    CORBA_Environment   &env
 );
 
 DECL_TEST (TypeCode, CORBA_TypeCode_ptr);
@@ -76,51 +76,51 @@ DECL_TEST (wstring, CORBA_WString);
 
 DECL_TEST (longdouble, CORBA_LongDouble);
 
-#undef	DECL_TEST
+#undef  DECL_TEST
 
-extern CORBA_TypeCode_ptr	_tc_test1_x1;
+extern CORBA_TypeCode_ptr       _tc_test1_x1;
 
 class test1_x1 : public CORBA_UserException {
   public:
-    CORBA_Long	case_num;
-			
-			test1_x1 (CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x1), case_num (n)
-			{ }
+    CORBA_Long  case_num;
+
+                        test1_x1 (CORBA_Long n)
+                        : CORBA_UserException (_tc_test1_x1), case_num (n)
+                        { }
 };
 
-extern CORBA_TypeCode_ptr	_tc_test1_x2;
+extern CORBA_TypeCode_ptr       _tc_test1_x2;
 
 class test1_x2 : public CORBA_UserException {
   public:
-    CORBA_Object_ptr	obj;
-    CORBA_Long	case_num;
+    CORBA_Object_ptr    obj;
+    CORBA_Long  case_num;
 
-			test1_x2 (CORBA_Object_ptr obj1,
-				CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
+                        test1_x2 (CORBA_Object_ptr obj1,
+                                CORBA_Long n)
+                        : CORBA_UserException (_tc_test1_x2),
+                            obj (obj1), case_num (n) { }
 
-			~test1_x2 ()
-			{ CORBA_release (obj); }
+                        ~test1_x2 ()
+                        { CORBA_release (obj); }
 };
 
 void
 test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
+    test1_ptr           target,
+    CORBA_Long  case_num,
+    CORBA_Environment   &env            // throw (x1, x2)
 );
 
 void
 test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
+    test1_ptr           target,
+    CORBA_Environment   &env
 );
 
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
+#ifdef  _MSC_VER
+#pragma pack (pop)                      // VC++, go back to other padding rules
+#endif  // VC++
 
-#endif	// _TEST1_HH
+#endif  // _TEST1_HH
 
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
index 4198fba9a10..8a4f73314ce 100644
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
+++ b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
@@ -3,7 +3,7 @@
 
 /* An interval timer class using C++. */
 
-#if !defined (ACE_PROFILE_TIMER_H)
+#ifndef ACE_PROFILE_TIMER_H
 #define ACE_PROFILE_TIMER_H
 
 #include <sys/types.h>
@@ -38,21 +38,21 @@ private:
   prusage_t begin_usage_;
   prusage_t end_usage_;
   prusage_t last_usage_;
-  int	    proc_fd_;
+  int       proc_fd_;
 };
 
 /* Start timing */
 
-inline int 
-Profile_Timer::start (void) 
+inline int
+Profile_Timer::start (void)
 {
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
 }
 
 /* Stop timing */
 
-inline int 
-Profile_Timer::stop (void) 
+inline int
+Profile_Timer::stop (void)
 {
   this->last_usage_ = this->end_usage_;
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h
index 4198fba9a10..8a4f73314ce 100644
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h
+++ b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h
@@ -3,7 +3,7 @@
 
 /* An interval timer class using C++. */
 
-#if !defined (ACE_PROFILE_TIMER_H)
+#ifndef ACE_PROFILE_TIMER_H
 #define ACE_PROFILE_TIMER_H
 
 #include <sys/types.h>
@@ -38,21 +38,21 @@ private:
   prusage_t begin_usage_;
   prusage_t end_usage_;
   prusage_t last_usage_;
-  int	    proc_fd_;
+  int       proc_fd_;
 };
 
 /* Start timing */
 
-inline int 
-Profile_Timer::start (void) 
+inline int
+Profile_Timer::start (void)
 {
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
 }
 
 /* Stop timing */
 
-inline int 
-Profile_Timer::stop (void) 
+inline int
+Profile_Timer::stop (void)
 {
   this->last_usage_ = this->end_usage_;
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.h b/TAO/IIOP/tests/Thruput_test/ttcpC.h
index b23be499c73..12767a52bfc 100644
--- a/TAO/IIOP/tests/Thruput_test/ttcpC.h
+++ b/TAO/IIOP/tests/Thruput_test/ttcpC.h
@@ -56,10 +56,10 @@ public:
     ShortSeq();
     ShortSeq(CORBA_ULong max);
     ShortSeq(CORBA_ULong max,
-	     CORBA_ULong length,
-	     CORBA_Short *value,
-	     CORBA_Boolean release = 0
-	     );
+             CORBA_ULong length,
+             CORBA_Short *value,
+             CORBA_Boolean release = 0
+             );
     //    ShortSeq(const ShortSeq&);
     ~ShortSeq();
     CORBA_ULong maximum() const;
@@ -81,10 +81,10 @@ public:
     LongSeq();
     LongSeq(CORBA_ULong max);
     LongSeq(CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Long *value,
-	    CORBA_Boolean release = 0
-	    );
+            CORBA_ULong length,
+            CORBA_Long *value,
+            CORBA_Boolean release = 0
+            );
     //    LongSeq(const LongSeq&);
     ~LongSeq();
     CORBA_ULong maximum() const;
@@ -106,10 +106,10 @@ public:
     DoubleSeq();
     DoubleSeq(CORBA_ULong max);
     DoubleSeq(CORBA_ULong max,
-	      CORBA_ULong length,
-	      CORBA_Double *value,
-	      CORBA_Boolean release = 0
-	      );
+              CORBA_ULong length,
+              CORBA_Double *value,
+              CORBA_Boolean release = 0
+              );
     //    DoubleSeq(const DoubleSeq&);
     ~DoubleSeq();
     CORBA_ULong maximum() const;
@@ -131,10 +131,10 @@ public:
     CharSeq();
     CharSeq(CORBA_ULong max);
     CharSeq(CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Char *value,
-	    CORBA_Boolean release = 0
-	    );
+            CORBA_ULong length,
+            CORBA_Char *value,
+            CORBA_Boolean release = 0
+            );
     //    CharSeq(const CharSeq&);
     ~CharSeq();
     CORBA_ULong maximum() const;
@@ -156,10 +156,10 @@ public:
     OctetSeq();
     OctetSeq(CORBA_ULong max);
     OctetSeq(CORBA_ULong max,
-	     CORBA_ULong length,
-	     CORBA_Octet *value,
-	     CORBA_Boolean release = 0
-	     );
+             CORBA_ULong length,
+             CORBA_Octet *value,
+             CORBA_Boolean release = 0
+             );
     //    OctetSeq(const OctetSeq&);
     ~OctetSeq();
     CORBA_ULong maximum() const;
@@ -181,10 +181,10 @@ public:
     StructSeq();
     StructSeq(CORBA_ULong max);
     StructSeq(CORBA_ULong max,
-	      CORBA_ULong length,
-	      PerfStruct *value,
-	      CORBA_Boolean release = 0
-	      );
+              CORBA_ULong length,
+              PerfStruct *value,
+              CORBA_Boolean release = 0
+              );
     //    StructSeq(const StructSeq&);
     ~StructSeq();
     CORBA_ULong maximum() const;
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.h b/TAO/IIOP/tests/Thruput_test/ttcpS.h
index 14ff95379e3..0b0ba100da0 100644
--- a/TAO/IIOP/tests/Thruput_test/ttcpS.h
+++ b/TAO/IIOP/tests/Thruput_test/ttcpS.h
@@ -31,33 +31,33 @@ public:
   virtual void stop_timer(CORBA_Environment &) = 0;
 
   // skeletons that do the upcall
-  static void _ttcp_sequence_is_a_skel (CORBA_ServerRequest &req, 
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
+  static void _ttcp_sequence_is_a_skel (CORBA_ServerRequest &req,
+                                        CORBA_Object_ptr obj,
+                                        CORBA_Environment &env);
   static void _ttcp_sequence_sendShortSeq_skel (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
+                                                CORBA_Object_ptr obj,
+                                                CORBA_Environment &env);
   static void _ttcp_sequence_sendLongSeq_skel  (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
+                                                CORBA_Object_ptr obj,
+                                                CORBA_Environment &env);
   static void _ttcp_sequence_sendDoubleSeq_skel (CORBA_ServerRequest &req,
-						 CORBA_Object_ptr obj,
-						 CORBA_Environment &env);
+                                                 CORBA_Object_ptr obj,
+                                                 CORBA_Environment &env);
   static void _ttcp_sequence_sendOctetSeq_skel (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
+                                                CORBA_Object_ptr obj,
+                                                CORBA_Environment &env);
   static void _ttcp_sequence_sendCharSeq_skel (CORBA_ServerRequest &req,
-					       CORBA_Object_ptr obj,
-					       CORBA_Environment &env);
+                                               CORBA_Object_ptr obj,
+                                               CORBA_Environment &env);
   static void _ttcp_sequence_sendStructSeq_skel (CORBA_ServerRequest &req,
-						 CORBA_Object_ptr obj,
-						 CORBA_Environment &env);
+                                                 CORBA_Object_ptr obj,
+                                                 CORBA_Environment &env);
   static void _ttcp_sequence_start_timer_skel (CORBA_ServerRequest &req,
-					       CORBA_Object_ptr obj,
-					       CORBA_Environment &env);
+                                               CORBA_Object_ptr obj,
+                                               CORBA_Environment &env);
   static void _ttcp_sequence_stop_timer_skel (CORBA_ServerRequest &req,
-					      CORBA_Object_ptr obj,
-					      CORBA_Environment &env);
+                                              CORBA_Object_ptr obj,
+                                              CORBA_Environment &env);
 protected:
   _skel_ttcp_sequence(const char *obj_name = 0);
   virtual ~_skel_ttcp_sequence() {}
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.h b/TAO/IIOP/tests/Thruput_test/ttcp_i.h
index 71d2266e334..758b616e4cd 100644
--- a/TAO/IIOP/tests/Thruput_test/ttcp_i.h
+++ b/TAO/IIOP/tests/Thruput_test/ttcp_i.h
@@ -3,11 +3,11 @@
 
 
 // ttcp_i.h
-// 
+//
 // This header file provides facility to use it either as a BOA approach or as
 // a TIE approach.
 //
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 #include "ttcp_decl.h"
@@ -22,23 +22,23 @@
 #define SEND_STRUCT ((unsigned long)(6))
 
 
-class ttcp_sequence_i: public _skel_ttcp_sequence 
+class ttcp_sequence_i: public _skel_ttcp_sequence
 {
 public:
   ttcp_sequence_i(const char *obj_name = 0);
 
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
+  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq,
+        CORBA_Environment &IT_env);
+  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq,
+        CORBA_Environment &IT_env);
+  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq,
+        CORBA_Environment &IT_env);
+  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq,
+        CORBA_Environment &IT_env);
+  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq,
+        CORBA_Environment &IT_env);
+  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq,
+        CORBA_Environment &IT_env);
 
   /* Routines to calculate the time required to transfer */
   virtual void start_timer (CORBA_Environment &IT_env);
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h
index b2922adee95..972dafa2e0d 100644
--- a/TAO/TAO_IDL/be_include/be.h
+++ b/TAO/TAO_IDL/be_include/be.h
@@ -77,6 +77,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // ACE includes
 
 #include        "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include        "ace/OS.h"
 #include        "ace/Singleton.h"
 #include        "ace/Synch.h"
@@ -90,29 +95,29 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include        "be_decl.h"             // class BE_Decl
 #include        "be_scope.h"            // class BE_Scope
-#include	"be_generator.h"	// BE generator class
+#include        "be_generator.h"        // BE generator class
 #include        "be_type.h"
-#include	"be_predefined_type.h"  // class BE_PredefinedType
-#include	"be_module.h"		// class BE_Module
-#include	"be_interface.h"	// class BE_Interface
-#include	"be_interface_fwd.h"	// class BE_InterfaceFwd
-#include	"be_structure.h"	// class BE_Structure
-#include	"be_exception.h"	// class BE_Exception
+#include        "be_predefined_type.h"  // class BE_PredefinedType
+#include        "be_module.h"           // class BE_Module
+#include        "be_interface.h"        // class BE_Interface
+#include        "be_interface_fwd.h"    // class BE_InterfaceFwd
+#include        "be_structure.h"        // class BE_Structure
+#include        "be_exception.h"        // class BE_Exception
 #include        "be_expression.h"       // class BE_Expr_val
-#include	"be_enum.h"		// class BE_Enum
-#include	"be_operation.h"	// class BE_Operation
-#include	"be_field.h"		// class BE_Field
-#include	"be_argument.h"	        // class BE_Argument
-#include	"be_attribute.h"	// class BE_Attribute
-#include	"be_union.h"		// class BE_Union
-#include	"be_union_branch.h"	// class BE_UnionBranch
-#include	"be_union_label.h"	// class BE_UnionLabel
-#include	"be_constant.h"	        // class BE_Constant
-#include	"be_enum_val.h"	        // class BE_EnumVal
-#include	"be_array.h"		// class BE_Array
-#include	"be_sequence.h"	        // class BE_Sequence
-#include	"be_string.h"		// class BE_String
-#include	"be_typedef.h"	        // class BE_Typedef
+#include        "be_enum.h"             // class BE_Enum
+#include        "be_operation.h"        // class BE_Operation
+#include        "be_field.h"            // class BE_Field
+#include        "be_argument.h"         // class BE_Argument
+#include        "be_attribute.h"        // class BE_Attribute
+#include        "be_union.h"            // class BE_Union
+#include        "be_union_branch.h"     // class BE_UnionBranch
+#include        "be_union_label.h"      // class BE_UnionLabel
+#include        "be_constant.h"         // class BE_Constant
+#include        "be_enum_val.h"         // class BE_EnumVal
+#include        "be_array.h"            // class BE_Array
+#include        "be_sequence.h"         // class BE_Sequence
+#include        "be_string.h"           // class BE_String
+#include        "be_typedef.h"          // class BE_Typedef
 #include        "be_root.h"             // class BE_Root
 #include        "be_native.h"           // class BE_Native
 
@@ -120,7 +125,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include        "be_codegen.h"          // code generator
 #include        "be_stream_factory.h"   // output stream factory
 
-#include 	"be_visitor.h"          // abstract visitor
+#include        "be_visitor.h"          // abstract visitor
 #include        "be_visitor_factory.h"  // visitor factory
 #include        "be_visitor_context.h"  // visitor context
 
diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h
index cbf2e30f249..f22f4fe1b72 100644
--- a/TAO/TAO_IDL/be_include/be_argument.h
+++ b/TAO/TAO_IDL/be_include/be_argument.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_ARGUMENT_H)
+#ifndef BE_ARGUMENT_H
 #define BE_ARGUMENT_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index b2e9dec8d73..a6862d1c227 100644
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ b/TAO/TAO_IDL/be_include/be_array.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_ARRAY_H)
+#ifndef BE_ARRAY_H
 #define BE_ARRAY_H
 
 class TAO_OutStream;
diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h
index 93f7d111279..fd228720030 100644
--- a/TAO/TAO_IDL/be_include/be_attribute.h
+++ b/TAO/TAO_IDL/be_include/be_attribute.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_ATTRIBUTE_H)
+#ifndef BE_ATTRIBUTE_H
 #define BE_ATTRIBUTE_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 0b8d75d60eb..d220a89a749 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_CODEGEN_H)
+#ifndef TAO_BE_CODEGEN_H
 #define TAO_BE_CODEGEN_H
 
 #define NAMEBUFSIZE 1024
@@ -313,7 +313,7 @@ public:
     TAO_CDR_INPUT,
     TAO_CDR_OUTPUT,
     TAO_CDR_SCOPE,
-    
+
     TAO_SUB_STATE_UNKNOWN
   };
 
diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h
index 75a503e3e19..0ac2e25c0b4 100644
--- a/TAO/TAO_IDL/be_include/be_constant.h
+++ b/TAO/TAO_IDL/be_include/be_constant.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_CONSTANT_H)
+#ifndef BE_CONSTANT_H
 #define BE_CONSTANT_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index dd534af3940..181fbe6ad16 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_DECL_H)
+#ifndef TAO_BE_DECL_H
 #define TAO_BE_DECL_H
 
 class be_scope;
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index 345f99620c1..354d155e25e 100644
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ b/TAO/TAO_IDL/be_include/be_enum.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_ENUM_H)
+#ifndef BE_ENUM_H
 #define BE_ENUM_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
index 45815eef998..e04b9e139c9 100644
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ b/TAO/TAO_IDL/be_include/be_enum_val.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_ENUM_VAL_H)
+#ifndef BE_ENUM_VAL_H
 #define BE_ENUM_VAL_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
index 118272d4065..bd24a6bbaa5 100644
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ b/TAO/TAO_IDL/be_include/be_exception.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (BE_EXCEPTION_H)
+#ifndef BE_EXCEPTION_H
 #define BE_EXCEPTION_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
index 01829d9b3bf..c3fcf04b5b9 100644
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ b/TAO/TAO_IDL/be_include/be_expression.h
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    TAO IDL
-// 
+//
 // = FILENAME
 //    be_expression.h
 //
@@ -14,18 +14,18 @@
 //
 // = AUTHOR
 //    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
+//    and
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined (BE_EXPRESSION_H)
+#ifndef BE_EXPRESSION_H
 #define BE_EXPRESSION_H
 
 /*
  * BE_Expression
  */
-class be_expression : public virtual AST_Expression 
+class be_expression : public virtual AST_Expression
 {
 public:
   // Operations
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
index b5802574bad..526cab7c19b 100644
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ b/TAO/TAO_IDL/be_include/be_field.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_FIELD_H)
+#ifndef BE_FIELD_H
 #define BE_FIELD_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index a4d6d22f636..d28bf650f1d 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -80,85 +80,85 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from be.h
 */
 
-class	be_generator : public AST_Generator {
+class   be_generator : public AST_Generator {
 public:
-  virtual AST_Root	*create_root(UTL_ScopedName *n,
-				     UTL_StrList *p);
+  virtual AST_Root      *create_root(UTL_ScopedName *n,
+                                     UTL_StrList *p);
   // Create a node representing a module which is the root of an AST made up of
   // BE nodes
 
   // Operations
   virtual AST_PredefinedType
     *create_predefined_type(AST_PredefinedType::PredefinedType t,
-			    UTL_ScopedName *n,
-			    UTL_StrList *p);
-
-  virtual AST_Module	*create_module(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Interface	*create_interface(UTL_ScopedName *n,
-					  AST_Interface **ih,
-					  long nih,
-					  UTL_StrList *p);
+                            UTL_ScopedName *n,
+                            UTL_StrList *p);
+
+  virtual AST_Module    *create_module(UTL_ScopedName *n, UTL_StrList *p);
+  virtual AST_Interface *create_interface(UTL_ScopedName *n,
+                                          AST_Interface **ih,
+                                          long nih,
+                                          UTL_StrList *p);
   virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
-						 UTL_StrList *p);
-  virtual AST_Exception	*create_exception(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Structure	*create_structure(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Enum	*create_enum(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Operation	*create_operation(AST_Type *rt,
-					  AST_Operation::Flags fl,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-  virtual AST_Field	*create_field(AST_Type *ft, UTL_ScopedName *n,
-				      UTL_StrList *p);
-  virtual AST_Argument	*create_argument(AST_Argument::Direction d,
-					 AST_Type *ft,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-  virtual AST_Attribute	*create_attribute(idl_bool ro,
-					  AST_Type *ft,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-  virtual AST_Union	*create_union(AST_ConcreteType *dt,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
+                                                 UTL_StrList *p);
+  virtual AST_Exception *create_exception(UTL_ScopedName *n, UTL_StrList *p);
+  virtual AST_Structure *create_structure(UTL_ScopedName *n, UTL_StrList *p);
+  virtual AST_Enum      *create_enum(UTL_ScopedName *n, UTL_StrList *p);
+  virtual AST_Operation *create_operation(AST_Type *rt,
+                                          AST_Operation::Flags fl,
+                                          UTL_ScopedName *n,
+                                          UTL_StrList *p);
+  virtual AST_Field     *create_field(AST_Type *ft, UTL_ScopedName *n,
+                                      UTL_StrList *p);
+  virtual AST_Argument  *create_argument(AST_Argument::Direction d,
+                                         AST_Type *ft,
+                                         UTL_ScopedName *n,
+                                         UTL_StrList *p);
+  virtual AST_Attribute *create_attribute(idl_bool ro,
+                                          AST_Type *ft,
+                                          UTL_ScopedName *n,
+                                          UTL_StrList *p);
+  virtual AST_Union     *create_union(AST_ConcreteType *dt,
+                                      UTL_ScopedName *n,
+                                      UTL_StrList *p);
   virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab,
-					       AST_Type *ft,
-					       UTL_ScopedName *n,
-					       UTL_StrList *p);
+                                               AST_Type *ft,
+                                               UTL_ScopedName *n,
+                                               UTL_StrList *p);
   virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul,
-					     AST_Expression *lv);
-  virtual AST_Constant	*create_constant(AST_Expression::ExprType et,
-					 AST_Expression *ev,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  virtual AST_Expression	*create_expr(UTL_ScopedName *n);
-  virtual AST_Expression	*create_expr(AST_Expression *v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(AST_Expression::ExprComb c,
-					     AST_Expression *v1,
-					     AST_Expression *v2);
-  virtual AST_Expression	*create_expr(long v);
-  virtual AST_Expression	*create_expr(long v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(unsigned long v);
-  virtual AST_Expression	*create_expr(String *s);
-  virtual AST_Expression	*create_expr(char c);
-  virtual AST_Expression	*create_expr(double d);
-
-  virtual AST_EnumVal	*create_enum_val(unsigned long v,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-  virtual AST_Array	*create_array(UTL_ScopedName *n,
-				      unsigned long ndims,
-				      UTL_ExprList *dims);
-  virtual AST_Sequence	*create_sequence(AST_Expression *v, AST_Type *bt);
-  virtual AST_String	*create_string(AST_Expression *v);
-  virtual AST_String	*create_wstring(AST_Expression *v);
-  virtual AST_Typedef	*create_typedef(AST_Type *bt,
-					UTL_ScopedName *n,
-					UTL_StrList *p);
+                                             AST_Expression *lv);
+  virtual AST_Constant  *create_constant(AST_Expression::ExprType et,
+                                         AST_Expression *ev,
+                                         UTL_ScopedName *n,
+                                         UTL_StrList *p);
+
+  virtual AST_Expression        *create_expr(UTL_ScopedName *n);
+  virtual AST_Expression        *create_expr(AST_Expression *v,
+                                             AST_Expression::ExprType t);
+  virtual AST_Expression        *create_expr(AST_Expression::ExprComb c,
+                                             AST_Expression *v1,
+                                             AST_Expression *v2);
+  virtual AST_Expression        *create_expr(long v);
+  virtual AST_Expression        *create_expr(long v,
+                                             AST_Expression::ExprType t);
+  virtual AST_Expression        *create_expr(unsigned long v);
+  virtual AST_Expression        *create_expr(String *s);
+  virtual AST_Expression        *create_expr(char c);
+  virtual AST_Expression        *create_expr(double d);
+
+  virtual AST_EnumVal   *create_enum_val(unsigned long v,
+                                         UTL_ScopedName *n,
+                                         UTL_StrList *p);
+  virtual AST_Array     *create_array(UTL_ScopedName *n,
+                                      unsigned long ndims,
+                                      UTL_ExprList *dims);
+  virtual AST_Sequence  *create_sequence(AST_Expression *v, AST_Type *bt);
+  virtual AST_String    *create_string(AST_Expression *v);
+  virtual AST_String    *create_wstring(AST_Expression *v);
+  virtual AST_Typedef   *create_typedef(AST_Type *bt,
+                                        UTL_ScopedName *n,
+                                        UTL_StrList *p);
   // Create a node representing a native
-  virtual AST_Native	*create_native (UTL_ScopedName *n,
+  virtual AST_Native    *create_native (UTL_ScopedName *n,
                                         UTL_StrList *p);
 
 };
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index 1042e5d8ef6..f33c4711120 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_OUTSTRM_H)
+#ifndef TAO_BE_OUTSTRM_H
 #define TAO_BE_OUTSTRM_H
 
 // a dummy structure to inform TAO_OutStream's << operator to  put a newline
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index c3004944b60..1def2b42ea5 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_INTERFACE_H)
+#ifndef TAO_BE_INTERFACE_H
 #define TAO_BE_INTERFACE_H
 
 class TAO_OutStream;
@@ -130,8 +130,8 @@ public:
   // is_a method
 
   static int downcast_helper (be_interface *,
-			      be_interface *,
-			      TAO_OutStream *os);
+                              be_interface *,
+                              TAO_OutStream *os);
   // helper method passed to the template method that generates code for the
   // downcast.
 
@@ -154,8 +154,8 @@ public:
   // base classes.
 
   static int copy_ctor_helper (be_interface *,
-			       be_interface *,
-			       TAO_OutStream *os);
+                               be_interface *,
+                               TAO_OutStream *os);
   // helper method passed to the template method to invoke ctors of all the
   // base classes.
 
@@ -172,7 +172,7 @@ public:
   // generate the operation table including entries for inherited interfaces
 
   static const char *relative_name (const char* our_name,
-				    const char *other_class_name);
+                                    const char *other_class_name);
   // relative name for collocated class.
 
   int gen_optable_entries (be_interface *);
@@ -189,16 +189,16 @@ private:
   int gen_gperf_things (void);
   // Run GPERF and get the correct lookup and other operations
   // depending on which strategy we are using. Returns 0 on sucess, -1
-  // on error. 
+  // on error.
 
   void gen_perfect_hash_class_definition (void);
   // Outputs the class definition for the perfect hashing. This class
   // will inherit from the TAO_Perfect_Hash_OpTable.
-  
+
   void gen_binary_search_class_definition (void);
   // Outputs the class definition for the binary search . This class
   // will inherit from the TAO_Binary_Search_OpTable.
-  
+
   void gen_linear_search_class_definition (void);
   // Outputs the class defintion for the linear search. This class
   // will inherit from the TAO_Linear_Search.
@@ -209,12 +209,12 @@ private:
 
   void gen_perfect_hash_instance (void);
   // Create an instance of this perfect hash table.
-  
+
   void gen_binary_search_instance (void);
-  // Create an instance of the binary search optable. 
-  
+  // Create an instance of the binary search optable.
+
   void gen_linear_search_instance (void);
-  // Create an instance of the linear search optable. 
+  // Create an instance of the linear search optable.
 
   char *full_skel_name_;
   // Fully scoped skeleton name.
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index db325a152bf..fa17cd7663f 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_INTERFACE_FWD_H)
+#ifndef BE_INTERFACE_FWD_H
 #define BE_INTERFACE_FWD_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h
index 68190f9406b..944f85eb302 100644
--- a/TAO/TAO_IDL/be_include/be_module.h
+++ b/TAO/TAO_IDL/be_include/be_module.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_MODULE_H)
+#ifndef _BE_MODULE_H
 #define _BE_MODULE_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h
index e049c3d308c..63c043edf5e 100644
--- a/TAO/TAO_IDL/be_include/be_native.h
+++ b/TAO/TAO_IDL/be_include/be_native.h
@@ -18,7 +18,7 @@
 // ============================================================================
 
 
-#if !defined (BE_NATIVE_H)
+#ifndef BE_NATIVE_H
 #define BE_NATIVE_H
 
 // Representation of "native" IDL type added by the POA spec
diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h
index 21859abdd96..93f2c2d665e 100644
--- a/TAO/TAO_IDL/be_include/be_operation.h
+++ b/TAO/TAO_IDL/be_include/be_operation.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_OPERATION_H)
+#ifndef BE_OPERATION_H
 #define BE_OPERATION_H
 
 class be_argument;
diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h
index 76cc10680e2..c0b2014aead 100644
--- a/TAO/TAO_IDL/be_include/be_predefined_type.h
+++ b/TAO/TAO_IDL/be_include/be_predefined_type.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_PREDEFINED_TYPE_H)
+#ifndef _BE_PREDEFINED_TYPE_H
 #define _BE_PREDEFINED_TYPE_H
 
 // be_classes.hh
@@ -40,7 +40,7 @@ public:
   // default constructor
 
   be_predefined_type (AST_PredefinedType::PredefinedType t,
-		      UTL_ScopedName *n,
+                      UTL_ScopedName *n,
                       UTL_StrList *p);
   // constructor
 
diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h
index d0d1221b7f2..c325419ee3d 100644
--- a/TAO/TAO_IDL/be_include/be_root.h
+++ b/TAO/TAO_IDL/be_include/be_root.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_ROOT_H)
+#ifndef TAO_BE_ROOT_H
 #define TAO_BE_ROOT_H
 
 class be_root : public virtual AST_Root,
diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h
index 0378a5dec80..f8aa25516fd 100644
--- a/TAO/TAO_IDL/be_include/be_scope.h
+++ b/TAO/TAO_IDL/be_include/be_scope.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_SCOPE_H)
+#ifndef TAO_BE_SCOPE_H
 #define TAO_BE_SCOPE_H
 
 class be_decl;
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index 3bd5ac71433..8edeeb6ba5b 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_SEQUENCE_H)
+#ifndef BE_SEQUENCE_H
 #define BE_SEQUENCE_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_state.h b/TAO/TAO_IDL/be_include/be_state.h
index 48284bd7813..2b0fc01ce57 100644
--- a/TAO/TAO_IDL/be_include/be_state.h
+++ b/TAO/TAO_IDL/be_include/be_state.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_STATE_H)
+#ifndef TAO_BE_STATE_H
 #define TAO_BE_STATE_H
 
 class be_state
@@ -273,7 +273,7 @@ public:
 };
 
 typedef ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>
-	TAO_BE_STATE_ATTRIBUTE;
+        TAO_BE_STATE_ATTRIBUTE;
 
 class be_state_exception : public be_state
 {
@@ -291,6 +291,6 @@ public:
 };
 
 typedef ACE_Singleton<be_state_exception, ACE_SYNCH_RECURSIVE_MUTEX>
-	TAO_BE_STATE_EXCEPTION;
+        TAO_BE_STATE_EXCEPTION;
 
 #endif /* end of be_state */
diff --git a/TAO/TAO_IDL/be_include/be_stream_factory.h b/TAO/TAO_IDL/be_include/be_stream_factory.h
index 7654afca4fc..4fc14bc1e13 100644
--- a/TAO/TAO_IDL/be_include/be_stream_factory.h
+++ b/TAO/TAO_IDL/be_include/be_stream_factory.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_FACTORY_H)
+#ifndef TAO_BE_FACTORY_H
 #define TAO_BE_FACTORY_H
 
 class TAO_OutStream_Factory
diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h
index 7d1067d8d5c..771da6c5c35 100644
--- a/TAO/TAO_IDL/be_include/be_string.h
+++ b/TAO/TAO_IDL/be_include/be_string.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_STRING_H)
+#ifndef BE_STRING_H
 #define BE_STRING_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
index 06d7ea5af1f..4d20ad82671 100644
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ b/TAO/TAO_IDL/be_include/be_structure.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_STRUCTURE_H)
+#ifndef BE_STRUCTURE_H
 #define BE_STRUCTURE_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_sunsoft.h b/TAO/TAO_IDL/be_include/be_sunsoft.h
index 15b9b9a2568..4686c00750c 100644
--- a/TAO/TAO_IDL/be_include/be_sunsoft.h
+++ b/TAO/TAO_IDL/be_include/be_sunsoft.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO IDL
-// 
+//
 // = FILENAME
 //    be_sunsoft.h
 //
@@ -14,10 +14,10 @@
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined (TAO_BE_HELPER_H)
+#ifndef TAO_BE_HELPER_H
 #define TAO_BE_HELPER_H
 
 class TAO_SunSoft_OutStream : public TAO_OutStream
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index 20caba78b32..4abcf2e7037 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_TYPE_H)
+#ifndef BE_TYPE_H
 #define BE_TYPE_H
 
 class TAO_OutStream;
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
index 83fcfd79160..a0b8dca12c9 100644
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_typedef.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_TYPEDEF_H)
+#ifndef BE_TYPEDEF_H
 #define BE_TYPEDEF_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index 332c92d44a0..ee92ff75fa6 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_UNION_H)
+#ifndef BE_UNION_H
 #define BE_UNION_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h
index 349db9ff58f..f31fb468ff6 100644
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_union_branch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (BE_UNION_BRANCH_H)
+#ifndef BE_UNION_BRANCH_H
 #define BE_UNION_BRANCH_H
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h
index 311e6b94dc9..7f5629ab15b 100644
--- a/TAO/TAO_IDL/be_include/be_union_label.h
+++ b/TAO/TAO_IDL/be_include/be_union_label.h
@@ -1,12 +1,12 @@
 // $Id$
 
-#if !defined(BE_UNION_LABEL_H)
+#ifndef BE_UNION_LABEL_H
 #define BE_UNION_LABEL_H
 
 /*
  * BE_UnionLabel
  */
-class	be_union_label : public virtual AST_UnionLabel {
+class   be_union_label : public virtual AST_UnionLabel {
 public:
   // Operations
   be_union_label();
diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h
index 4f8f6d9844b..c6d0b00d9fd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor.h
@@ -22,7 +22,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_H)
+#ifndef TAO_BE_VISITOR_H
 #define TAO_BE_VISITOR_H
 
 class be_decl;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument.h
index ca44eadd9ea..7528d8e9716 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_H)
+#ifndef _BE_VISITOR_ARGUMENT_H
 #define _BE_VISITOR_ARGUMENT_H
 
 #include "be_visitor_decl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
index 7042280a22e..fe811e1104c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_ARGLIST_H_)
+#ifndef _BE_VISITOR_ARGUMENT_ARGLIST_H_
 #define _BE_VISITOR_ARGUMENT_ARGLIST_H_
 
 class be_visitor_args_arglist : public be_visitor_args
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
index 537811f8b94..882c8003b4a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_ARGUMENT_H_)
+#ifndef _BE_VISITOR_ARGUMENT_ARGUMENT_H_
 #define _BE_VISITOR_ARGUMENT_ARGUMENT_H_
 
 class be_visitor_args : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
index 3c64dfa570a..e06bfc3baa8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined  (_BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_CS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_CS_H_
 #define _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
index c588cdb2d52..db6f8da19dd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined  (_BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_SS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_SS_H_
 #define _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_SS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h
index 0b876370660..03054f5ee01 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined  (_BE_VISITOR_ARGUMENT_DOCALL_CS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_DOCALL_CS_H_
 #define _BE_VISITOR_ARGUMENT_DOCALL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
index ea26a66fde3..e116238f598 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_MARSHAL_SS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_
 #define _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h
index e292de4fa0a..b84459c3101 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_POST_DOCALL_CS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_POST_DOCALL_CS_H_
 #define _BE_VISITOR_ARGUMENT_POST_DOCALL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h
index 4988ff66ad2..3b9aa9c8b63 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_POST_MARSHAL_SS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_POST_MARSHAL_SS_H_
 #define _BE_VISITOR_ARGUMENT_POST_MARSHAL_SS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
index 7b87ba9bf35..55805fb04f2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
@@ -20,7 +20,7 @@
 // ============================================================================
 
 
-#if !defined (_BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_
 #define _BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h
index f5238423590..fb5acb67951 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_PRE_DOCALL_CS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_PRE_DOCALL_CS_H_
 #define _BE_VISITOR_ARGUMENT_PRE_DOCALL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h
index 6e938db5e6f..9edb4b60288 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_PRE_INVOKE_CS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_PRE_INVOKE_CS_H_
 #define _BE_VISITOR_ARGUMENT_PRE_INVOKE_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h
index 24bf3e88054..bb2b3430e79 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_PRE_UPCALL_SS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_PRE_UPCALL_SS_H_
 #define _BE_VISITOR_ARGUMENT_PRE_UPCALL_SS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
index 5bd504fcded..cd7707f74f3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_UPCALL_SS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_UPCALL_SS_H_
 #define _BE_VISITOR_ARGUMENT_UPCALL_SS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
index 73e301441f5..a09695a383c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARGUMENT_VARDECL_SS_H_)
+#ifndef _BE_VISITOR_ARGUMENT_VARDECL_SS_H_
 #define _BE_VISITOR_ARGUMENT_VARDECL_SS_H_
 
 // ************************************************************
@@ -89,7 +89,7 @@ class be_compiled_visitor_args_vardecl_ss : public be_visitor_args_vardecl_ss
   //
   // = DESCRIPTION
   //   Visitor for variable declaration for argument for compiled marshaling
-  //   skeletons 
+  //   skeletons
   //
 public:
   be_compiled_visitor_args_vardecl_ss (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array.h b/TAO/TAO_IDL/be_include/be_visitor_array.h
index 506bde6b54b..3e905175e85 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_ARRAY_H)
+#ifndef TAO_BE_VISITOR_ARRAY_H
 #define TAO_BE_VISITOR_ARRAY_H
 
 #include "be_visitor_decl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
index dffce321f77..8030e83f6cc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_ANY_OP_CH_H_)
+#ifndef _BE_VISITOR_ARRAY_ANY_OP_CH_H_
 #define _BE_VISITOR_ARRAY_ANY_OP_CH_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
index fc3c814c0d6..58b310587e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_ANY_OP_CS_H_)
+#ifndef _BE_VISITOR_ARRAY_ANY_OP_CS_H_
 #define _BE_VISITOR_ARRAY_ANY_OP_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array.h b/TAO/TAO_IDL/be_include/be_visitor_array/array.h
index 0a9510ce383..5fa6a4aab4c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_ARRAY_H_)
+#ifndef _BE_VISITOR_ARRAY_ARRAY_H_
 #define _BE_VISITOR_ARRAY_ARRAY_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
index 7a859d85527..7882a381546 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_CH_H_)
+#ifndef _BE_VISITOR_ARRAY_CH_H_
 #define _BE_VISITOR_ARRAY_CH_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
index 3cb5f06cb6d..887540367e7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_CI_H_)
+#ifndef _BE_VISITOR_ARRAY_CI_H_
 #define _BE_VISITOR_ARRAY_CI_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
index 101ce40ce31..98c3e8f6c2c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_CS_H_)
+#ifndef _BE_VISITOR_ARRAY_CS_H_
 #define _BE_VISITOR_ARRAY_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
index 53766d3be77..a45af118541 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_ARRAY_CDR_OP_CH_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CH_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
index c02c51112f5..b68754ae0d3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ARRAY_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_ARRAY_CDR_OP_CS_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute.h
index 0e9fb275ae6..9c5aa46988e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_ATTRIBUTE_H)
+#ifndef TAO_BE_VISITOR_ATTRIBUTE_H
 #define TAO_BE_VISITOR_ATTRIBUTE_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
index c330de69537..1c2493722c0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H)
+#ifndef _BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H
 #define _BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant.h b/TAO/TAO_IDL/be_include/be_visitor_constant.h
index 4bd864c7aa3..acc6f65d31f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_CONSTANT_H)
+#ifndef TAO_BE_VISITOR_CONSTANT_H
 #define TAO_BE_VISITOR_CONSTANT_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
index 3d6113ddbd6..c0e53447176 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_CONSTANT_CONSTANT_CH_H_)
+#ifndef _BE_VISITOR_CONSTANT_CONSTANT_CH_H_
 #define _BE_VISITOR_CONSTANT_CONSTANT_CH_H_
 
 class be_visitor_constant_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
index 104614536a1..db2fccf96ca 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_CONSTANT_CONSTANT_CS_H_)
+#ifndef _BE_VISITOR_CONSTANT_CONSTANT_CS_H_
 #define _BE_VISITOR_CONSTANT_CONSTANT_CS_H_
 
 class be_visitor_constant_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h
index 02e07dda533..0487711615a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_context.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_context.h
@@ -23,7 +23,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_CONTEXT_H)
+#ifndef TAO_BE_VISITOR_CONTEXT_H
 #define TAO_BE_VISITOR_CONTEXT_H
 
 class be_visitor_context
diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h
index 4c8f575cacd..34cf441e82f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_DECL_H)
+#ifndef TAO_BE_VISITOR_DECL_H
 #define TAO_BE_VISITOR_DECL_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum.h b/TAO/TAO_IDL/be_include/be_visitor_enum.h
index a195680786f..6b0ea40bce4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_ENUM_H)
+#ifndef TAO_BE_VISITOR_ENUM_H
 #define TAO_BE_VISITOR_ENUM_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
index 469e661bb2c..f9d25ecf81c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ENUM_ANY_OP_CH_H_)
+#ifndef _BE_VISITOR_ENUM_ANY_OP_CH_H_
 #define _BE_VISITOR_ENUM_ANY_OP_CH_H_
 
 class be_visitor_enum_any_op_ch : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
index aab50eb6305..f3db76c2be4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ENUM_ANY_OP_CS_H_)
+#ifndef _BE_VISITOR_ENUM_ANY_OP_CS_H_
 #define _BE_VISITOR_ENUM_ANY_OP_CS_H_
 
 class be_visitor_enum_any_op_cs : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
index 883b226c9f1..c8ba0e49f81 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ENUM_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_ENUM_CDR_OP_CH_H_
 #define _BE_VISITOR_ENUM_CDR_OP_CH_H_
 
 class be_visitor_enum_cdr_op_ch : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
index 5e995f7a117..41c89b9c605 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ENUM_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_ENUM_CDR_OP_CS_H_
 #define _BE_VISITOR_ENUM_CDR_OP_CS_H_
 
 class be_visitor_enum_cdr_op_cs : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
index 29f05b68b68..8a3f922dce4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ENUM_ENUM_CH_H_)
+#ifndef _BE_VISITOR_ENUM_ENUM_CH_H_
 #define _BE_VISITOR_ENUM_ENUM_CH_H_
 
 class be_visitor_enum_ch : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
index f1684ff1d01..a40455f2190 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ENUM_ENUM_CS_H_)
+#ifndef _BE_VISITOR_ENUM_ENUM_CS_H_
 #define _BE_VISITOR_ENUM_ENUM_CS_H_
 
 class be_visitor_enum_cs : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception.h
index 30ae6f06733..36e4e25a2a9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_EXCEPTION_H)
+#ifndef TAO_BE_VISITOR_EXCEPTION_H
 #define TAO_BE_VISITOR_EXCEPTION_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
index 6ad35719449..ee3ff396dc1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_ANY_OP_CH_H_)
+#ifndef _BE_VISITOR_EXCEPTION_ANY_OP_CH_H_
 #define _BE_VISITOR_EXCEPTION_ANY_OP_CH_H_
 
 class be_visitor_exception_any_op_ch : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
index dc96479b918..45a82cb7e23 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_ANY_OP_CS_H_)
+#ifndef _BE_VISITOR_EXCEPTION_ANY_OP_CS_H_
 #define _BE_VISITOR_EXCEPTION_ANY_OP_CS_H_
 
 class be_visitor_exception_any_op_cs : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
index e24b4299deb..dd5df6266e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_EXCEPTION_CDR_OP_CH_H_
 #define _BE_VISITOR_EXCEPTION_CDR_OP_CH_H_
 
 class be_visitor_exception_cdr_op_ch : public be_visitor_exception
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
index b9d3b09df8f..a77f6c4bdf7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_EXCEPTION_CDR_OP_CS_H_
 #define _BE_VISITOR_EXCEPTION_CDR_OP_CS_H_
 
 class be_visitor_exception_cdr_op_cs : public be_visitor_exception
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
index 00e55741db1..80529d2a203 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_CTOR_H_)
+#ifndef _BE_VISITOR_EXCEPTION_CTOR_H_
 #define _BE_VISITOR_EXCEPTION_CTOR_H_
 
 class be_visitor_exception_ctor : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
index e40610ac2fb..52b6ab67dd7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_)
+#ifndef _BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_
 #define _BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_
 
 class be_visitor_exception_ctor_assign : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
index f7e4bab2d26..c4be6b317dc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_H_)
+#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_H_
 
 class be_visitor_exception : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
index 9211782a96e..c664d166593 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_)
+#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_
 
 class be_visitor_exception_ch : public be_visitor_exception
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
index 67ca3e1c449..ccd48fbb07b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_)
+#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_
 
 class be_visitor_exception_ci : public be_visitor_exception
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
index 0b1edd4cc6c..a3d0c0e9c62 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_)
+#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_
 
 class be_visitor_exception_cs : public be_visitor_exception
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
index 539d12efa79..fd0ddf8ff0c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_)
+#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_
 
 class be_visitor_exception_ctor : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_factory.h b/TAO/TAO_IDL/be_include/be_visitor_factory.h
index ad4c6e9a385..2061b51bb04 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_factory.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_factory.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_FACTORY_H)
+#ifndef TAO_BE_VISITOR_FACTORY_H
 #define TAO_BE_VISITOR_FACTORY_H
 
 class TAO_Visitor_Factory
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field.h b/TAO/TAO_IDL/be_include/be_visitor_field.h
index 2aac718e368..4add3db5af9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_FIELD_H)
+#ifndef TAO_BE_VISITOR_FIELD_H
 #define TAO_BE_VISITOR_FIELD_H
 
 #include "be_visitor_decl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
index e9fb3139e6a..0e3a9555fd6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_FIELD_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_FIELD_CDR_OP_CH_H_
 #define _BE_VISITOR_FIELD_CDR_OP_CH_H_
 
 class be_visitor_field_cdr_op_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
index 7b4ac51064d..a8f40964b3a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_FIELD_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_FIELD_CDR_OP_CS_H_
 #define _BE_VISITOR_FIELD_CDR_OP_CS_H_
 
 class be_visitor_field_cdr_op_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
index aa72105c520..a3fc7ce30db 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_FIELD_CH_H_)
+#ifndef _BE_VISITOR_FIELD_CH_H_
 #define _BE_VISITOR_FIELD_CH_H_
 
 class be_visitor_field_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
index 0e2c3797a5e..b2b71678b70 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_FIELD_CI_H_)
+#ifndef _BE_VISITOR_FIELD_CI_H_
 #define _BE_VISITOR_FIELD_CI_H_
 
 class be_visitor_field_ci : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
index 7edaae3b4c2..c48a1fd5969 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_FIELD_CS_H_)
+#ifndef _BE_VISITOR_FIELD_CS_H_
 #define _BE_VISITOR_FIELD_CS_H_
 
 class be_visitor_field_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 622bda773c9..5b75ba2275f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_INTERFACE_H)
+#ifndef TAO_BE_VISITOR_INTERFACE_H
 #define TAO_BE_VISITOR_INTERFACE_H
 
 #include "be_visitor_scope.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
index 4e635bfd8a3..0b25ff3f3be 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_ANY_OP_CH_H_)
+#ifndef _BE_INTERFACE_ANY_OP_CH_H_
 #define _BE_INTERFACE_ANY_OP_CH_H_
 
 class be_visitor_interface_any_op_ch : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
index 012aca9d3f8..aa84f6fd2c9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_ANY_OP_CS_H_)
+#ifndef _BE_INTERFACE_ANY_OP_CS_H_
 #define _BE_INTERFACE_ANY_OP_CS_H_
 
 class be_visitor_interface_any_op_cs : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
index e8b3777cfe0..353659c3bcc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_INTERFACE_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_INTERFACE_CDR_OP_CH_H_
 #define _BE_VISITOR_INTERFACE_CDR_OP_CH_H_
 
 class be_visitor_interface_cdr_op_ch : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
index e83f6546892..05a062d594f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_INTERFACE_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_INTERFACE_CDR_OP_CS_H_
 #define _BE_VISITOR_INTERFACE_CDR_OP_CS_H_
 
 class be_visitor_interface_cdr_op_cs : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h
index a96c5a6701d..a050c3fb47f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_COLLOCATED_SH_H_)
+#ifndef _BE_INTERFACE_COLLOCATED_SH_H_
 #define _BE_INTERFACE_COLLOCATED_SH_H_
 
 class be_visitor_interface_collocated_sh : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h
index ad49cbb1448..a7ffeb3149e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_COLLOCATED_SS_H_)
+#ifndef _BE_INTERFACE_COLLOCATED_SS_H_
 #define _BE_INTERFACE_COLLOCATED_SS_H_
 
 class be_visitor_interface_collocated_ss : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
index 086c8f1b56b..41dfd82b0a5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_H_)
+#ifndef _BE_INTERFACE_INTERFACE_H_
 #define _BE_INTERFACE_INTERFACE_H_
 
 // = DESCRIPTION
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
index 7dc997f7f15..34bea04cac1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_CH_H_)
+#ifndef _BE_INTERFACE_INTERFACE_CH_H_
 #define _BE_INTERFACE_INTERFACE_CH_H_
 
 // we need derived interface visitors for the client and server header files. For
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
index 4eff86b2099..ad1a5b31063 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_CI_H_)
+#ifndef _BE_INTERFACE_INTERFACE_CI_H_
 #define _BE_INTERFACE_INTERFACE_CI_H_
 
 class be_visitor_interface_ci : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
index 7acede89420..51e3f8a7a88 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_CS_H_)
+#ifndef _BE_INTERFACE_INTERFACE_CS_H_
 #define _BE_INTERFACE_INTERFACE_CS_H_
 
 class be_visitor_interface_cs : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
index a2f09833147..526a92af825 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_SH_H_)
+#ifndef _BE_INTERFACE_INTERFACE_SH_H_
 #define _BE_INTERFACE_INTERFACE_SH_H_
 
 class be_visitor_interface_sh : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
index e8c7bae245c..c46560a433d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_SI_H_)
+#ifndef _BE_INTERFACE_INTERFACE_SI_H_
 #define _BE_INTERFACE_INTERFACE_SI_H_
 
 class be_visitor_interface_si : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
index 78c5d48cbab..e57a272a3be 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_SS_H_)
+#ifndef _BE_INTERFACE_INTERFACE_SS_H_
 #define _BE_INTERFACE_INTERFACE_SS_H_
 
 class be_visitor_interface_ss : public be_visitor_interface
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
index 7516337310e..bd2fbfbae13 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_TIE_SH_H_)
+#ifndef _BE_INTERFACE_TIE_SH_H_
 #define _BE_INTERFACE_TIE_SH_H_
 
 class be_visitor_interface_tie_sh : public be_visitor_interface
@@ -43,8 +43,8 @@ public:
   // set the right context and make a visitor
 
   static int method_helper (be_interface *,
-			    be_interface *,
-			    TAO_OutStream *os);
+                            be_interface *,
+                            TAO_OutStream *os);
   // helper method to generate method declaration in the TIE classes.
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
index fe3fb0ac09b..f8a9f982946 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_TIE_SI_H_)
+#ifndef _BE_INTERFACE_TIE_SI_H_
 #define _BE_INTERFACE_TIE_SI_H_
 
 class be_visitor_interface_tie_si : public be_visitor_interface
@@ -44,8 +44,8 @@ public:
   // set the right context and make a visitor
 
   static int method_helper (be_interface *,
-			    be_interface *,
-			    TAO_OutStream *os);
+                            be_interface *,
+                            TAO_OutStream *os);
   // helper method to generate method declaration in the TIE classes.
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
index e139af36707..14104e4d229 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_INTERFACE_FWD_H)
+#ifndef TAO_BE_VISITOR_INTERFACE_FWD_H
 #define TAO_BE_VISITOR_INTERFACE_FWD_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
index 788faa611db..02c788c071b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_FWD_CH_H_)
+#ifndef _BE_INTERFACE_INTERFACE_FWD_CH_H_
 #define _BE_INTERFACE_INTERFACE_FWD_CH_H_
 
 class be_visitor_interface_fwd_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h
index a53bd7d7a05..f8c765d986f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_INTERFACE_INTERFACE_FWD_CI_H_)
+#ifndef _BE_INTERFACE_INTERFACE_FWD_CI_H_
 #define _BE_INTERFACE_INTERFACE_FWD_CI_H_
 
 class be_visitor_interface_fwd_ci : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module.h b/TAO/TAO_IDL/be_include/be_visitor_module.h
index e118aa98a0a..3e1dd4c85f9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_MODULE_H)
+#ifndef TAO_BE_VISITOR_MODULE_H
 #define TAO_BE_VISITOR_MODULE_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
index ab941bc345b..a41fec48195 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_MODULE_ANY_OP_H_)
+#ifndef _BE_VISITOR_MODULE_ANY_OP_H_
 #define _BE_VISITOR_MODULE_ANY_OP_H_
 
 class be_visitor_module_any_op : public be_visitor_module
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
index 71aef9e34a4..78a56a082f9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_MODULE_CDR_OP_H_)
+#ifndef _BE_VISITOR_MODULE_CDR_OP_H_
 #define _BE_VISITOR_MODULE_CDR_OP_H_
 
 class be_visitor_module_cdr_op : public be_visitor_module
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
index 58c4f951cb8..1949e865ef7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_MODULE_MODULE_H_)
+#ifndef _BE_VISITOR_MODULE_MODULE_H_
 #define _BE_VISITOR_MODULE_MODULE_H_
 
 class be_visitor_module : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
index f001d3e4900..5de940fa34f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_MODULE_MODULE_CH_H_)
+#ifndef _BE_VISITOR_MODULE_MODULE_CH_H_
 #define _BE_VISITOR_MODULE_MODULE_CH_H_
 
 class be_visitor_module_ch : public be_visitor_module
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
index 0ee2c25379c..c0b6dfc5b37 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_MODULE_MODULE_SH_H_)
+#ifndef _BE_VISITOR_MODULE_MODULE_SH_H_
 #define _BE_VISITOR_MODULE_MODULE_SH_H_
 
 class be_visitor_module_sh : public be_visitor_module
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index 321b70b551f..50cc82bde56 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_OPERATION_H)
+#ifndef TAO_BE_VISITOR_OPERATION_H
 #define TAO_BE_VISITOR_OPERATION_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
index 42f418a97ed..67de889815a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_ARGLIST_H_)
+#ifndef _BE_VISITOR_OPERATION_ARGLIST_H_
 #define _BE_VISITOR_OPERATION_ARGLIST_H_
 
 // ******************************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
index d8c91145465..08e41106e3f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_ARGUMENT_H_)
+#ifndef _BE_VISITOR_OPERATION_ARGUMENT_H_
 #define _BE_VISITOR_OPERATION_ARGUMENT_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
index ecbea2acdc6..06e47f6b16a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
@@ -13,21 +13,21 @@
 // = DESCRIPTION
 //    Visitor for generating code for IDL operations. This is a visitor for
 //    passing arguments to the CDR operators in a compiled marshaling
-//    stub/skeleton 
+//    stub/skeleton
 //
 // = AUTHOR
 //    Aniruddha Gokhale
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_)
+#ifndef _BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_
 #define _BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_
 
 // ************************************************************
 // generic operation visitor for docall, upcall, pre/post
 // ************************************************************
 
-class be_compiled_visitor_operation_argument_invoke 
+class be_compiled_visitor_operation_argument_invoke
   : public be_visitor_operation_argument
 {
   //
@@ -51,7 +51,7 @@ public:
   virtual int post_process (be_decl *bd);
   // stuff to o/p after each element of the scope is handled
 
-  enum LAST_ARG_PRINTED 
+  enum LAST_ARG_PRINTED
   {
     TAO_ARG_NONE,
     TAO_ARG_IN,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
index ef4d1551480..e483d001735 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
@@ -13,21 +13,21 @@
 // = DESCRIPTION
 //    Visitor for generating code for IDL operations. This is a visitor for
 //    passing arguments to the CDR operators in a compiled marshaling
-//    stub/skeleton 
+//    stub/skeleton
 //
 // = AUTHOR
 //    Aniruddha Gokhale
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_)
+#ifndef _BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_
 #define _BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_
 
 // ************************************************************
 // generic operation visitor for docall, upcall, pre/post
 // ************************************************************
 
-class be_compiled_visitor_operation_argument_marshal 
+class be_compiled_visitor_operation_argument_marshal
   : public be_visitor_operation_argument
 {
   //
@@ -51,7 +51,7 @@ public:
   virtual int post_process (be_decl *bd);
   // stuff to o/p after each element of the scope is handled
 
-  enum LAST_ARG_PRINTED 
+  enum LAST_ARG_PRINTED
   {
     TAO_ARG_NONE,
     TAO_ARG_IN,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h
index dc31959e345..805846419e4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_COLLOCATED_SH_H_)
+#ifndef _BE_VISITOR_OPERATION_COLLOCATED_SH_H_
 #define _BE_VISITOR_OPERATION_COLLOCATED_SH_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
index 48b7966e9aa..e0aac140703 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_COLLOCATED_SS_H_)
+#ifndef _BE_VISITOR_OPERATION_COLLOCATED_SS_H_
 #define _BE_VISITOR_OPERATION_COLLOCATED_SS_H_
 
 // *****************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
index c6d1477c585..6ebfa0a3e80 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
index 32c9e1c3d22..9e6d44f8848 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_
 #define _BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_
 
 // ******************************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
index e0b0be28792..79e63a0ba13 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_OPERATION_H_)
+#ifndef _BE_VISITOR_OPERATION_OPERATION_H_
 #define _BE_VISITOR_OPERATION_OPERATION_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
index 9ba8128f0c6..1567182e5d6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_OPERATION_CH_H_)
+#ifndef _BE_VISITOR_OPERATION_OPERATION_CH_H_
 #define _BE_VISITOR_OPERATION_OPERATION_CH_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
index e5f9ae92f07..e8d029f8a35 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_OPERATION_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_OPERATION_CS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_CS_H_
 
 // ************************************************************
@@ -59,7 +59,7 @@ public:
   virtual int post_process (be_decl *);
   // stuff to output after every member of the scope is handled
 
-  virtual int gen_raise_exception (be_type *, 
+  virtual int gen_raise_exception (be_type *,
                                    const char * excep,
                                    const char * status);
   // helper that generates code for raising an exception
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
index cf2e06f4b28..9f5b04a6997 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_OPERATION_SH_H_)
+#ifndef _BE_VISITOR_OPERATION_OPERATION_SH_H_
 #define _BE_VISITOR_OPERATION_OPERATION_SH_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
index 03124ef8b4b..aac5af2ed74 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_OPERATION_SS_H_)
+#ifndef _BE_VISITOR_OPERATION_OPERATION_SS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_SS_H_
 
 // ************************************************************
@@ -63,7 +63,7 @@ public:
   virtual int post_process (be_decl *);
   // stuff to output after every member of the scope is handled
 
-  virtual int gen_raise_exception (be_type *, 
+  virtual int gen_raise_exception (be_type *,
                                    const char * excep,
                                    const char * status,
                                    const char * env);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
index 9a4fc0a8ac3..9a196b55d48 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_H_
 
 // ***********************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
index ff35c744e62..c43e3094c57 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_ASSIGN_SS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_ASSIGN_SS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_ASSIGN_SS_H_
 
 // ***********************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h
index eb3b287ce9c..bb7de8fe3ad 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
index b3f95579a6a..644f9d27fbd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SSH_
 
 // ***********************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
index e2299617a35..5efdc22d2a2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
index 6cfbd7566ed..1895cb7983d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_
 
 // ***********************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h
index 5c6f3723448..2a11b2cd605 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h
index 1d5306ad9e1..2abe28ed76f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_PRE_INVOKE_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_PRE_INVOKE_CS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_PRE_INVOKE_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
index ec9b8383342..05626351ea5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_RETURN_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_RETURN_CS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
index ca9b7ba99e7..f7bce1756ab 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_VARDECL_CS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_VARDECL_CS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_VARDECL_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
index 4cef49b9bde..ba942a2bbfd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_RETTYPE_VARDECL_SS_H_)
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_VARDECL_SS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_VARDECL_SS_H_
 
 // ************************************************************
@@ -79,10 +79,10 @@ public:
 // ************************************************************
 // Operation visitor for return type variable declaration in the server
 // skeleton using compiled marshaling. This one overrides 2 methods of the base
-// class 
+// class
 // ************************************************************
 
-class be_compiled_visitor_operation_rettype_vardecl_ss : 
+class be_compiled_visitor_operation_rettype_vardecl_ss :
   public be_visitor_operation_rettype_vardecl_ss
 {
   //
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
index f5329bfe963..14d0f2a4243 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_TIE_SH_H_)
+#ifndef _BE_VISITOR_OPERATION_TIE_SH_H_
 #define _BE_VISITOR_OPERATION_TIE_SH_H_
 
 // ***********************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
index f6168878069..e38012009a7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_OPERATION_TIE_SI_H_)
+#ifndef _BE_VISITOR_OPERATION_TIE_SI_H_
 #define _BE_VISITOR_OPERATION_TIE_SI_H_
 
 // ***********************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root.h b/TAO/TAO_IDL/be_include/be_visitor_root.h
index 0bc0434cfe8..5a006875e0d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_ROOT_H)
+#ifndef TAO_BE_VISITOR_ROOT_H
 #define TAO_BE_VISITOR_ROOT_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
index 55bea266f7b..e7c0ea72c0c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ANY_OP_H_)
+#ifndef _BE_VISITOR_ROOT_ANY_OP_H_
 #define _BE_VISITOR_ROOT_ANY_OP_H_
 
 class be_visitor_root_any_op : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
index 2c6675c0206..2df86ebcdfe 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_CDR_OP_H_)
+#ifndef _BE_VISITOR_ROOT_CDR_OP_H_
 #define _BE_VISITOR_ROOT_CDR_OP_H_
 
 class be_visitor_root_cdr_op : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
index 106bf26355d..79507d2254b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ROOT_H_)
+#ifndef _BE_VISITOR_ROOT_ROOT_H_
 #define _BE_VISITOR_ROOT_ROOT_H_
 
 class be_visitor_root : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
index 47dd1f09b56..c36cf7f5192 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ROOT_CH_H_)
+#ifndef _BE_VISITOR_ROOT_ROOT_CH_H_
 #define _BE_VISITOR_ROOT_ROOT_CH_H_
 
 class be_visitor_root_ch : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
index 1362397511b..e39eab1ac4f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ROOT_CI_H_)
+#ifndef _BE_VISITOR_ROOT_ROOT_CI_H_
 #define _BE_VISITOR_ROOT_ROOT_CI_H_
 
 class be_visitor_root_ci : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
index e8462a0df49..64b5df10792 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ROOT_CS_H_)
+#ifndef _BE_VISITOR_ROOT_ROOT_CS_H_
 #define _BE_VISITOR_ROOT_ROOT_CS_H_
 
 class be_visitor_root_cs : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
index 45a15201de8..d1c42ca580e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ROOT_SH_H_)
+#ifndef _BE_VISITOR_ROOT_ROOT_SH_H_
 #define _BE_VISITOR_ROOT_ROOT_SH_H_
 
 class be_visitor_root_sh : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
index 5ff6648ebb8..b615a08d69d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ROOT_SI_H_)
+#ifndef _BE_VISITOR_ROOT_ROOT_SI_H_
 #define _BE_VISITOR_ROOT_ROOT_SI_H_
 
 class be_visitor_root_si : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
index 412f93df56b..0c75d137122 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_ROOT_ROOT_SS_H_)
+#ifndef _BE_VISITOR_ROOT_ROOT_SS_H_
 #define _BE_VISITOR_ROOT_ROOT_SS_H_
 
 class be_visitor_root_ss : public be_visitor_root
diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h
index 900dbc7a6f3..095dee0ae32 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_scope.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_SCOPE_H)
+#ifndef TAO_BE_VISITOR_SCOPE_H
 #define TAO_BE_VISITOR_SCOPE_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence.h b/TAO/TAO_IDL/be_include/be_visitor_sequence.h
index a2e1a502a14..e8ec94d7573 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence.h
@@ -3,7 +3,7 @@
 // $Id$
 //
 
-#if !defined (TAO_BE_VISITOR_SEQUENCE_H)
+#ifndef TAO_BE_VISITOR_SEQUENCE_H
 #define TAO_BE_VISITOR_SEQUENCE_H
 
 #include "be_visitor_decl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
index b0b1f8a666e..71cc3bf65c5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_ANY_OP_CH_H_)
+#ifndef _BE_VISITOR_SEQUENCE_ANY_OP_CH_H_
 #define _BE_VISITOR_SEQUENCE_ANY_OP_CH_H_
 
 class be_visitor_sequence_any_op_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
index 4252635baef..fdb3e422d14 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_ANY_OP_CS_H_)
+#ifndef _BE_VISITOR_SEQUENCE_ANY_OP_CS_H_
 #define _BE_VISITOR_SEQUENCE_ANY_OP_CS_H_
 
 class be_visitor_sequence_any_op_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
index 449e5efd482..1fe1880f3dd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_)
+#ifndef _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_
 #define _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_
 
 class be_visitor_sequence_buffer_type : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
index 8503f16471f..ca3f1b85856 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_SEQUENCE_CDR_OP_CH_H_
 #define _BE_VISITOR_SEQUENCE_CDR_OP_CH_H_
 
 class be_visitor_sequence_cdr_op_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
index 4015f388910..1a36b175013 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_
 #define _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h
index 88212e3ac0e..c307db5fa6e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_ELEMTYPE_H_)
+#ifndef _BE_VISITOR_SEQUENCE_ELEMTYPE_H_
 #define _BE_VISITOR_SEQUENCE_ELEMTYPE_H_
 
 class be_visitor_sequence_elemtype : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
index 71673e2c230..ef1ac6a4cd2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_)
+#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_
 #define _BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_
 
 class be_visitor_sequence_base : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
index 412b9c6ad57..5babfec9fd9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_)
+#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_
 #define _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_
 
 class be_visitor_sequence_ch : public be_visitor_decl
@@ -57,10 +57,10 @@ public:
   // generate a instance of the bounded object sequence
 
   virtual int gen_bounded_str_sequence (be_sequence *node);
-  // generate a instance of the bounded string sequence 
+  // generate a instance of the bounded string sequence
 
   virtual int instantiate_sequence (be_sequence *node);
-  // determine which sequence to instantiate 
+  // determine which sequence to instantiate
 
   virtual int gen_object_manager (be_sequence *node);
   // generate a instance of the object manager
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
index fbe8890c7c8..c2b8508fe7a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_CI_H_)
+#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CI_H_
 #define _BE_VISITOR_SEQUENCE_SEQUENCE_CI_H_
 
 class be_visitor_sequence_ci : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
index c159491108d..6751e0ca749 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_)
+#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_
 #define _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_
 
 class be_visitor_sequence_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure.h
index c4c69c57013..b4e229b481c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_STRUCTURE_H)
+#ifndef TAO_BE_VISITOR_STRUCTURE_H
 #define TAO_BE_VISITOR_STRUCTURE_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
index 1bd7384f191..935a74aedc8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_ANY_OP_CH_H_)
+#ifndef _BE_VISITOR_STRUCTURE_ANY_OP_CH_H_
 #define _BE_VISITOR_STRUCTURE_ANY_OP_CH_H_
 
 class be_visitor_structure_any_op_ch : public be_visitor_structure
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
index 1ee098a905a..65829b3ff15 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_ANY_OP_CS_H_)
+#ifndef _BE_VISITOR_STRUCTURE_ANY_OP_CS_H_
 #define _BE_VISITOR_STRUCTURE_ANY_OP_CS_H_
 
 class be_visitor_structure_any_op_cs : public be_visitor_structure
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
index 029c6ef3a51..4c082357b19 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_STRUCTURE_CDR_OP_CH_H_
 #define _BE_VISITOR_STRUCTURE_CDR_OP_CH_H_
 
 class be_visitor_structure_cdr_op_ch : public be_visitor_structure
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
index 9510c2d91be..3a7ca3d24a3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_STRUCTURE_CDR_OP_CS_H_
 #define _BE_VISITOR_STRUCTURE_CDR_OP_CS_H_
 
 class be_visitor_structure_cdr_op_cs : public be_visitor_structure
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
index a10531ccf9c..01a64e3f342 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_H_)
+#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_H_
 
 class be_visitor_structure : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
index f946d033288..1ec6f9d6ccb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_)
+#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_
 
 class be_visitor_structure_ch : public be_visitor_structure
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
index ac47118f00d..8665832e078 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_)
+#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_
 
 class be_visitor_structure_ci : public be_visitor_structure
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
index a2fb142c02e..bf4adfa0000 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_)
+#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_
 
 class be_visitor_structure_cs : public be_visitor_structure
@@ -41,7 +41,7 @@ public:
   // destructor
 
   virtual int visit_structure (be_structure *node);
-  // visit structure. 
+  // visit structure.
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode.h
index cbd083c4fb7..3f00ab6a94a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_TYPECODE_H)
+#ifndef TAO_BE_VISITOR_TYPECODE_H
 #define TAO_BE_VISITOR_TYPECODE_H
 
 #include "be_visitor_decl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
index c6f67b4fc4a..85e3f6bcea4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPECODE_TYPECODE_DECL_H_)
+#ifndef _BE_VISITOR_TYPECODE_TYPECODE_DECL_H_
 #define _BE_VISITOR_TYPECODE_TYPECODE_DECL_H_
 
 class be_visitor_typecode_decl : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
index b87b57dfa05..e3a1765d864 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_)
+#ifndef _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
 #define _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
 
 class be_visitor_typecode_defn : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef.h
index 26a89412edd..e333e4d8e08 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_TYPEDEF_H)
+#ifndef TAO_BE_VISITOR_TYPEDEF_H
 #define TAO_BE_VISITOR_TYPEDEF_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
index 915465ed1fb..a614a30f71a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
@@ -22,7 +22,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_ANY_OP_CH_H_)
+#ifndef _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_
 #define _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_
 
 class be_visitor_typedef_any_op_ch : public be_visitor_typedef
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
index 9014b277d1d..f99033d4f43 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
@@ -22,7 +22,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_ANY_OP_CS_H_)
+#ifndef _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_
 #define _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_
 
 class be_visitor_typedef_any_op_cs : public be_visitor_typedef
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
index 82f72053396..87eb5834063 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
@@ -22,7 +22,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_TYPEDEF_CDR_OP_CH_H_
 #define _BE_VISITOR_TYPEDEF_CDR_OP_CH_H_
 
 class be_visitor_typedef_cdr_op_ch : public be_visitor_typedef
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
index 2301ba617a5..09269214b96 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
@@ -22,7 +22,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_TYPEDEF_CDR_OP_CS_H_
 #define _BE_VISITOR_TYPEDEF_CDR_OP_CS_H_
 
 class be_visitor_typedef_cdr_op_cs : public be_visitor_typedef
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
index 4b9f9f48507..d0d1b297ae2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_H_)
+#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_H_
 
 class be_visitor_typedef : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
index a18b580d489..eda0adf5441 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_)
+#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_
 
 class be_visitor_typedef_ch : public be_visitor_typedef
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
index 38c0276c33a..9f308d33d52 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
@@ -22,7 +22,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_)
+#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_
 
 class be_visitor_typedef_ci : public be_visitor_typedef
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
index 091ac01e22c..a546de4c38d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
@@ -22,7 +22,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_)
+#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_
 
 class be_visitor_typedef_cs : public be_visitor_typedef
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union.h b/TAO/TAO_IDL/be_include/be_visitor_union.h
index 6677a26284d..e235ec7cbff 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_UNION_H)
+#ifndef TAO_BE_VISITOR_UNION_H
 #define TAO_BE_VISITOR_UNION_H
 
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
index 2f045164396..20d7ed97b4f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_ANY_OP_CH_H_)
+#ifndef _BE_VISITOR_UNION_ANY_OP_CH_H_
 #define _BE_VISITOR_UNION_ANY_OP_CH_H_
 
 class be_visitor_union_any_op_ch : public be_visitor_union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
index 95bf8baaa82..7f6ea89b519 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_ANY_OP_CS_H_)
+#ifndef _BE_VISITOR_UNION_ANY_OP_CS_H_
 #define _BE_VISITOR_UNION_ANY_OP_CS_H_
 
 class be_visitor_union_any_op_cs : public be_visitor_union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
index 3f92aefd860..972dacf1335 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_UNION_CDR_OP_CH_H_
 #define _BE_VISITOR_UNION_CDR_OP_CH_H_
 
 class be_visitor_union_cdr_op_ch : public be_visitor_union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
index da3d1ea6404..a57a7dfb859 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_UNION_CDR_OP_CS_H_
 #define _BE_VISITOR_UNION_CDR_OP_CS_H_
 
 class be_visitor_union_cdr_op_cs : public be_visitor_union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
index 5c46ba2cd58..950deb597cd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_DISCRIMINANT_CH_H_)
+#ifndef _BE_VISITOR_UNION_DISCRIMINANT_CH_H_
 #define _BE_VISITOR_UNION_DISCRIMINANT_CH_H_
 
 class be_visitor_union_discriminant_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
index bb44c2f12ee..3e7619a939e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_DISCRIMINANT_CI_H_)
+#ifndef _BE_VISITOR_UNION_DISCRIMINANT_CI_H_
 #define _BE_VISITOR_UNION_DISCRIMINANT_CI_H_
 
 class be_visitor_union_discriminant_ci : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
index 23cbe129a22..af61beb8b4d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_DISCRIMINANT_CS_H_)
+#ifndef _BE_VISITOR_UNION_DISCRIMINANT_CS_H_
 #define _BE_VISITOR_UNION_DISCRIMINANT_CS_H_
 
 class be_visitor_union_discriminant_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union.h b/TAO/TAO_IDL/be_include/be_visitor_union/union.h
index 568f32b6d8b..5e669ac9327 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_UNION_H_)
+#ifndef _BE_VISITOR_UNION_UNION_H_
 #define _BE_VISITOR_UNION_UNION_H_
 
 class be_visitor_union : public be_visitor_scope
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
index 5d2f389fb5e..86813169ff1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_UNION_CH_H_)
+#ifndef _BE_VISITOR_UNION_UNION_CH_H_
 #define _BE_VISITOR_UNION_UNION_CH_H_
 
 class be_visitor_union_ch : public be_visitor_union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
index b0a2c52afe5..d0d138f583d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_UNION_CI_H_)
+#ifndef _BE_VISITOR_UNION_UNION_CI_H_
 #define _BE_VISITOR_UNION_UNION_CI_H_
 
 class be_visitor_union_ci : public be_visitor_union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
index 3a6ef0322aa..04783afa7d9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_UNION_CS_H_)
+#ifndef _BE_VISITOR_UNION_UNION_CS_H_
 #define _BE_VISITOR_UNION_UNION_CS_H_
 
 class be_visitor_union_cs : public be_visitor_union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
index 970addf09a5..55d525a11a1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_BE_VISITOR_UNION_BRANCH_H)
+#ifndef TAO_BE_VISITOR_UNION_BRANCH_H
 #define TAO_BE_VISITOR_UNION_BRANCH_H
 
 #include "be_visitor_decl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
index 09ccb3bf744..e325b41f912 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_)
+#ifndef _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_
 #define _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_
 
 class be_visitor_union_branch_cdr_op_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
index c679327e1e0..2a912a3c138 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_)
+#ifndef _BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_
 
 class be_visitor_union_branch_cdr_op_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
index 5037fb586ea..fdc7e9f2070 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_)
+#ifndef _BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_
 #define _BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_
 
 class be_visitor_union_branch_private_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h
index 39a2085dd8b..b1d76206108 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_ACCESS_CS_H_)
+#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_ACCESS_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_ACCESS_CS_H_
 
 class be_visitor_union_branch_public_access_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
index 8bf78d57eb1..fe324e600d0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_)
+#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_
 
 class be_visitor_union_branch_public_assign_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
index 43387f44cfa..d0deb7bc4f6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_)
+#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_
 
 class be_visitor_union_branch_public_ch : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
index 7462bdfe3de..585d8f0453d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_)
+#ifndef _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_
 #define _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_
 
 class be_visitor_union_branch_public_ci : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
index f727b019644..c66e142c280 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_)
+#ifndef _BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_
 #define _BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_
 
 class be_visitor_union_branch_public_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
index 6e92074db2a..e7fa0b7733a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_)
+#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_
 
 class be_visitor_union_branch_public_reset_cs : public be_visitor_decl
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 88a7834e196..4747b1ed899 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -1,33 +1,33 @@
 // $Id$
 typedef union
 #ifdef __cplusplus
-	TAO_YYSTYPE
+        TAO_YYSTYPE
 #endif
  {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
+  AST_Decl              *dcval;         /* Decl value           */
+  UTL_StrList           *slval;         /* String list          */
+  UTL_NameList          *nlval;         /* Name list            */
+  UTL_ExprList          *elval;         /* Expression list      */
+  UTL_LabelList         *llval;         /* Label list           */
+  UTL_DeclList          *dlval;         /* Declaration list     */
+  FE_InterfaceHeader    *ihval;         /* Interface header     */
+  AST_Expression        *exval;         /* Expression value     */
+  AST_UnionLabel        *ulval;         /* Union label          */
+  AST_Field             *ffval;         /* Field value          */
+  AST_Expression::ExprType etval;       /* Expression type      */
+  AST_Argument::Direction dival;        /* Argument direction   */
+  AST_Operation::Flags  ofval;          /* Operation flags      */
+  FE_Declarator         *deval;         /* Declarator value     */
+  idl_bool              bval;           /* Boolean value        */
+  long                  ival;           /* Long value           */
+  double                dval;           /* Double value         */
+  float                 fval;           /* Float value          */
+  char                  cval;           /* Char value           */
 
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
+  String                *sval;          /* String value         */
+  char                  *strval;        /* char * value         */
+  Identifier            *idval;         /* Identifier           */
+  UTL_IdList            *idlist;        /* Identifier list      */
 } TAO_YYSTYPE;
 extern TAO_YYSTYPE tao_yylval;
 # define IDENTIFIER 257
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h
index fc05323e075..0f95cb271d0 100644
--- a/TAO/TAO_IDL/include/ast.h
+++ b/TAO/TAO_IDL/include/ast.h
@@ -78,43 +78,43 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from idl.hh
 */
 
-#include	"utl_scoped_name.h"	// Define UTL_ScopedName
-
-#include	"ast_decl.h"		// class AST_Decl
-
-#include	"ast_expression.h"	// class AST_Expression
-
-#include	"utl_scope.h"		// class UTL_Scope
-
-#include	"ast_type.h"		// class AST_Type
-#include	"ast_concrete_type.h"	// class AST_ConcreteType
-#include	"ast_predefined_type.h"// class AST_PredefinedType
-#include	"ast_module.h"		// class AST_Module
-#include	"ast_root.h"		// class AST_Root
-#include	"ast_interface.h"	// class AST_Interface
-#include	"ast_interface_fwd.h"	// class AST_InterfaceFwd
-#include	"ast_structure.h"	// class AST_Structure
-#include	"ast_exception.h"	// class AST_Exception
-#include	"ast_enum.h"		// class AST_Enum
-#include	"ast_operation.h"	// class AST_Operation
-#include	"ast_field.h"		// class AST_Field
-#include	"ast_argument.h"	// class AST_Argument
-#include	"ast_attribute.h"	// class AST_Attribute
-#include	"ast_union.h"		// class AST_Union
-#include	"ast_union_branch.h"	// class AST_UnionBranch
-#include	"ast_union_label.h"	// class AST_UnionLabel
-#include	"ast_constant.h"	// class AST_Constant
-#include	"ast_enum_val.h"	// class AST_EnumVal
-#include	"ast_array.h"		// class AST_Array
-#include	"ast_sequence.h"	// class AST_Sequence
-#include	"ast_string.h"		// class AST_String
-#include	"ast_typedef.h"	// class AST_Typedef
+#include        "utl_scoped_name.h"     // Define UTL_ScopedName
+
+#include        "ast_decl.h"            // class AST_Decl
+
+#include        "ast_expression.h"      // class AST_Expression
+
+#include        "utl_scope.h"           // class UTL_Scope
+
+#include        "ast_type.h"            // class AST_Type
+#include        "ast_concrete_type.h"   // class AST_ConcreteType
+#include        "ast_predefined_type.h"// class AST_PredefinedType
+#include        "ast_module.h"          // class AST_Module
+#include        "ast_root.h"            // class AST_Root
+#include        "ast_interface.h"       // class AST_Interface
+#include        "ast_interface_fwd.h"   // class AST_InterfaceFwd
+#include        "ast_structure.h"       // class AST_Structure
+#include        "ast_exception.h"       // class AST_Exception
+#include        "ast_enum.h"            // class AST_Enum
+#include        "ast_operation.h"       // class AST_Operation
+#include        "ast_field.h"           // class AST_Field
+#include        "ast_argument.h"        // class AST_Argument
+#include        "ast_attribute.h"       // class AST_Attribute
+#include        "ast_union.h"           // class AST_Union
+#include        "ast_union_branch.h"    // class AST_UnionBranch
+#include        "ast_union_label.h"     // class AST_UnionLabel
+#include        "ast_constant.h"        // class AST_Constant
+#include        "ast_enum_val.h"        // class AST_EnumVal
+#include        "ast_array.h"           // class AST_Array
+#include        "ast_sequence.h"        // class AST_Sequence
+#include        "ast_string.h"          // class AST_String
+#include        "ast_typedef.h" // class AST_Typedef
 #include        "ast_native.h"          // class AST_Native
 
-#include	"utl_list.h"		// class UTL_List
-#include	"utl_strlist.h"	// class UTL_StrList
-#include	"utl_exprlist.h"	// class UTL_ExprList
+#include        "utl_list.h"            // class UTL_List
+#include        "utl_strlist.h" // class UTL_StrList
+#include        "utl_exprlist.h"        // class UTL_ExprList
 
-#include	"ast_generator.h"	// class AST_Generator
+#include        "ast_generator.h"       // class AST_Generator
 
 #endif           // _AST_AST_HH
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
index 1f65d0ca9ac..e2d2663362d 100644
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ b/TAO/TAO_IDL/include/ast_argument.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,14 +73,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_field.hh, utl_scoped_name.hh, ast_type.hh
-**		 utl_strlist.hh, ast_decl.hh
+**               utl_strlist.hh, ast_decl.hh
 **
 ** USE: Included from ast.hh
 */
 
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_field.h"
+#include        "idl_fwd.h"
+#include        "idl_narrow.h"
+#include        "ast_field.h"
 
 
 class AST_Argument : public virtual AST_Field
@@ -94,7 +94,7 @@ public:
   // Constructor(s)
   AST_Argument();
   AST_Argument(Direction direction, AST_Type *ft, UTL_ScopedName *n,
-	       UTL_StrList *p);
+               UTL_StrList *p);
   virtual ~AST_Argument() {}
 
   // Data Accessors
@@ -105,11 +105,11 @@ public:
   DEF_NARROW_FROM_DECL(AST_Argument);
 
   // AST Dumping
-  virtual void		dump(ostream &o);
+  virtual void          dump(ostream &o);
 
 private:
   // Data
-  const Direction	pd_direction;	// Argument direction
+  const Direction       pd_direction;   // Argument direction
 };
 
 #endif           // _AST_ARGUMENT_AST_ARGUMENT_HH
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index 86d2387000b..a8f0b7a5002 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_concrete_type.hh, utl_exprlist.hh, ast_type.hh,
-**		 ast_decl.hh
+**               ast_decl.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_Array : public virtual AST_ConcreteType {
+class   AST_Array : public virtual AST_ConcreteType {
 public:
   // Operations
 
@@ -90,28 +90,28 @@ public:
   // Data Accessors
   unsigned long n_dims();
   AST_Expression **dims();
-  void		   set_dims(AST_Expression **, unsigned long);
-  AST_Type	  *base_type();
-  void		   set_base_type(AST_Type *nbt);
+  void             set_dims(AST_Expression **, unsigned long);
+  AST_Type        *base_type();
+  void             set_base_type(AST_Type *nbt);
 
   // Narrowing
   DEF_NARROW_METHODS1(AST_Array, AST_ConcreteType);
   DEF_NARROW_FROM_DECL(AST_Array);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  unsigned long			pd_n_dims;	// How many dimensions?
-  AST_Expression		**pd_dims;	// Their expressions
-  AST_Type			*pd_base_type;	// Base type of array
+  unsigned long                 pd_n_dims;      // How many dimensions?
+  AST_Expression                **pd_dims;      // Their expressions
+  AST_Type                      *pd_base_type;  // Base type of array
 
   // Operations
 
   // Compute how many dimensions
-  AST_Expression	       **compute_dims(UTL_ExprList *dims,
-					     unsigned long ndims);
+  AST_Expression               **compute_dims(UTL_ExprList *dims,
+                                             unsigned long ndims);
 };
 
 #endif           // _AST_ARRAY_AST_ARRAY_HH
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index 6abc58967d6..f9f5dd3f7cf 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_field.hh, ast_type.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh, ast_decl.hh
+**               utl_strlist.hh, ast_decl.hh
 **
 ** USE: Included from ast.h
 */
 
-class	AST_Attribute : public virtual AST_Field
+class   AST_Attribute : public virtual AST_Field
 {
 public:
   // Operations
@@ -86,9 +86,9 @@ public:
   // Constructor(s)
   AST_Attribute();
   AST_Attribute(idl_bool readonly,
-		AST_Type *ft,
-		UTL_ScopedName *n,
-		UTL_StrList *p);
+                AST_Type *ft,
+                UTL_ScopedName *n,
+                UTL_StrList *p);
   virtual ~AST_Attribute() {}
 
   // Data Accessors
@@ -99,11 +99,11 @@ public:
   DEF_NARROW_FROM_DECL(AST_Attribute);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  const idl_bool		pd_readonly;	// Is attribute read-only?
+  const idl_bool                pd_readonly;    // Is attribute read-only?
 };
 
 #endif           // _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index 410c2eabe16..660994ee572 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -77,7 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-class	AST_ConcreteType : public virtual AST_Type
+class   AST_ConcreteType : public virtual AST_Type
 {
 public:
   // Operations
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index 2f663c60a1e..afb73edeb58 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -79,12 +79,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_decl.hh, ast_expression.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
+**               utl_strlist.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_Constant : public virtual AST_Decl
+class   AST_Constant : public virtual AST_Decl
 {
 public:
   // Operations
@@ -92,9 +92,9 @@ public:
   // Constructor(s)
   AST_Constant();
   AST_Constant(AST_Expression::ExprType et, AST_Decl::NodeType nt,
-	       AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p);
+               AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p);
   AST_Constant(AST_Expression::ExprType et, AST_Expression *ev,
-	       UTL_ScopedName *n, UTL_StrList *p);
+               UTL_ScopedName *n, UTL_StrList *p);
   virtual ~AST_Constant() {}
 
   // Data Accessors
@@ -106,12 +106,12 @@ public:
   DEF_NARROW_FROM_DECL(AST_Constant);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  AST_Expression		*pd_constant_value;	// The value
-  AST_Expression::ExprType	pd_et;			// Its expr type
+  AST_Expression                *pd_constant_value;     // The value
+  AST_Expression::ExprType      pd_et;                  // Its expr type
 };
 
 #endif           // _AST_CONSTANT_AST_CONSTANT_HH
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 1177756ce85..8b7dde9d031 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -80,11 +80,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"idl_bool.h"
-#include	"utl_scoped_name.h"
-#include	"utl_string.h"
+#include        "idl_fwd.h"
+#include        "idl_narrow.h"
+#include        "idl_bool.h"
+#include        "utl_scoped_name.h"
+#include        "utl_string.h"
 
 // This class is needed (only for g++) to get around a bug in g++ which
 // causes virtual operations to not be looked up correctly if an operation
@@ -92,38 +92,38 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // the hierarchy rooted in a single class, thereby eliminating the situation
 // that causes the bug to appear
 
-class	COMMON_Base
+class   COMMON_Base
 {
   public:
         // Narrowing
     DEF_NARROW_METHODS0(COMMON_Base);
 };
 
-class	AST_Decl : public virtual COMMON_Base
+class   AST_Decl : public virtual COMMON_Base
 {
 public:
   // Enum defining the different kinds of AST nodes
   enum NodeType {
-        NT_module				// Denotes a module
-      , NT_root					// Denotes the root of AST
-      , NT_interface				// Denotes an interface
-      , NT_interface_fwd			// Fwd declared interface
-      , NT_const				// Denotes a constant
-      , NT_except				// Denotes an exception
-      , NT_attr					// Denotes an attribute
-      , NT_op					// Denotes an operation
-      , NT_argument				// Denotes an op. argument
-      , NT_union				// Denotes a union
-      , NT_union_branch				// Denotes a union branch
-      , NT_struct				// Denotes a structure
-      , NT_field				// Denotes a field in structure
-      , NT_enum					// Denotes an enumeration
-      , NT_enum_val				// Denotes an enum. value
-      , NT_string				// Denotes an IDL string
-      , NT_array				// Denotes an IDL array
-      , NT_sequence				// Denotes an IDL sequence
-      , NT_typedef				// Denotes a typedef
-      , NT_pre_defined				// Denotes a predefined type
+        NT_module                               // Denotes a module
+      , NT_root                                 // Denotes the root of AST
+      , NT_interface                            // Denotes an interface
+      , NT_interface_fwd                        // Fwd declared interface
+      , NT_const                                // Denotes a constant
+      , NT_except                               // Denotes an exception
+      , NT_attr                                 // Denotes an attribute
+      , NT_op                                   // Denotes an operation
+      , NT_argument                             // Denotes an op. argument
+      , NT_union                                // Denotes a union
+      , NT_union_branch                         // Denotes a union branch
+      , NT_struct                               // Denotes a structure
+      , NT_field                                // Denotes a field in structure
+      , NT_enum                                 // Denotes an enumeration
+      , NT_enum_val                             // Denotes an enum. value
+      , NT_string                               // Denotes an IDL string
+      , NT_array                                // Denotes an IDL array
+      , NT_sequence                             // Denotes an IDL sequence
+      , NT_typedef                              // Denotes a typedef
+      , NT_pre_defined                          // Denotes a predefined type
         , NT_native                             // Denotes a native type
                                                 // dependent on the programming
                                                 // language
@@ -161,30 +161,30 @@ public:
   DEF_NARROW_FROM_DECL(AST_Decl);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
   // Other operations
 
   // Return TRUE if "this" has "s" as an ancestor
-  idl_bool			has_ancestor(AST_Decl *s);
+  idl_bool                      has_ancestor(AST_Decl *s);
 
 private:
   // Data
-  idl_bool			pd_imported;    // Imported?
-  idl_bool			pd_in_main_file; // Defined in main file?
-  UTL_Scope			*pd_defined_in;	// Scope
-  NodeType			pd_node_type;	// What kind of node
-  long				pd_line;	// Line defined in
-  String			*pd_file_name;	// What file defined in
-  UTL_ScopedName		*pd_name;	// As given
-  Identifier			*pd_local_name;	// Name in scope
-  UTL_StrList			*pd_pragmas;	// Pragmas
-  idl_bool			pd_added;	// already added
+  idl_bool                      pd_imported;    // Imported?
+  idl_bool                      pd_in_main_file; // Defined in main file?
+  UTL_Scope                     *pd_defined_in; // Scope
+  NodeType                      pd_node_type;   // What kind of node
+  long                          pd_line;        // Line defined in
+  String                        *pd_file_name;  // What file defined in
+  UTL_ScopedName                *pd_name;       // As given
+  Identifier                    *pd_local_name; // Name in scope
+  UTL_StrList                   *pd_pragmas;    // Pragmas
+  idl_bool                      pd_added;       // already added
 
   // Operations
 
   // Compute the full name of an AST node
-  void				compute_full_name(UTL_ScopedName *n);
+  void                          compute_full_name(UTL_ScopedName *n);
 };
 
 #endif           // _AST_DECL_AST_DECL_HH
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
index 40189295737..550146537b7 100644
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ b/TAO/TAO_IDL/include/ast_enum.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -71,12 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_enum_val.hh,
-**		 utl_scoped_name.hh, utl_strlist.hh, ast_expression.hh,
+**               utl_scoped_name.hh, utl_strlist.hh, ast_expression.hh,
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_Enum : public virtual AST_ConcreteType, public virtual UTL_Scope
+class   AST_Enum : public virtual AST_ConcreteType, public virtual UTL_Scope
 {
 public:
   // Operations
@@ -92,23 +92,23 @@ public:
   DEF_NARROW_FROM_SCOPE(AST_Enum);
 
   // AST Dumping
-  virtual void			dump(ostream &);
+  virtual void                  dump(ostream &);
 
   // Other operations
 
   // Look up an AST_EnumVal by value
-  virtual AST_EnumVal		*lookup_by_value(const AST_Expression *v);
+  virtual AST_EnumVal           *lookup_by_value(const AST_Expression *v);
 
   // Get value to be assigned to next enumerator
-  virtual unsigned long		next_enum_val();
+  virtual unsigned long         next_enum_val();
 
 private:
   // Data
-  unsigned long			pd_enum_counter;	// Value for next
-							// enumerator
+  unsigned long                 pd_enum_counter;        // Value for next
+                                                        // enumerator
   // Scope management
   friend int tao_yyparse();
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
+  virtual AST_EnumVal           *fe_add_enum_val(AST_EnumVal    *v);
 
 };
 
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 6851474b641..83b5033fcf6 100644
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ b/TAO/TAO_IDL/include/ast_enum_val.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_constant.hh, utl_scoped_name.hh, utl_strlist.hh,
-**		 ast_decl.hh
+**               ast_decl.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_EnumVal : public virtual AST_Constant
+class   AST_EnumVal : public virtual AST_Constant
 {
 public:
   // Operations
@@ -93,7 +93,7 @@ public:
   DEF_NARROW_FROM_DECL(AST_EnumVal);
 
   // AST Dumping
-  virtual void			dump(ostream &);
+  virtual void                  dump(ostream &);
 };
 
 #endif           // _AST_ENUM_VAL_AST_ENUM_VAL_HH
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
index f3a667bd8b7..e7821e6d405 100644
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ b/TAO/TAO_IDL/include/ast_exception.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -85,7 +85,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-class	AST_Exception : public virtual AST_Structure
+class   AST_Exception : public virtual AST_Structure
 {
 public:
   // Operations
@@ -101,17 +101,17 @@ public:
   DEF_NARROW_FROM_SCOPE(AST_Exception);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   friend int tao_yyparse();
   // Scope Management Protocol
 
-  virtual AST_Field		*fe_add_field(AST_Field		*f);
-  virtual AST_Union		*fe_add_union(AST_Union		*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure	*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
+  virtual AST_Field             *fe_add_field(AST_Field         *f);
+  virtual AST_Union             *fe_add_union(AST_Union         *u);
+  virtual AST_Structure         *fe_add_structure(AST_Structure *s);
+  virtual AST_Enum              *fe_add_enum(AST_Enum           *e);
+  virtual AST_EnumVal           *fe_add_enum_val(AST_EnumVal    *v);
 
 };
 
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index db3bd7abc41..5ac661d52df 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -76,70 +76,70 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 */
 
 // An expression (and maybe its value, if computed)
-class	AST_Expression {
+class   AST_Expression {
 public:
   // Enum to define all the different operators to combine expressions
   enum ExprComb {
-      EC_add		// '+'
-    , EC_minus		// '-'
-    , EC_mul		// '*'
-    , EC_div		// '/'
-    , EC_mod		// '%'
-    , EC_or		// '|'
-    , EC_xor		// '^'
-    , EC_and		// '&'
-    , EC_left		// '<<'
-    , EC_right		// '>>'
-    , EC_u_plus		// unary '+'
-    , EC_u_minus	// unary '-'
-    , EC_bit_neg	// '~'
-    , EC_none		// No operator (missing)
-    , EC_symbol		// a symbol (function or constant name)
+      EC_add            // '+'
+    , EC_minus          // '-'
+    , EC_mul            // '*'
+    , EC_div            // '/'
+    , EC_mod            // '%'
+    , EC_or             // '|'
+    , EC_xor            // '^'
+    , EC_and            // '&'
+    , EC_left           // '<<'
+    , EC_right          // '>>'
+    , EC_u_plus         // unary '+'
+    , EC_u_minus        // unary '-'
+    , EC_bit_neg        // '~'
+    , EC_none           // No operator (missing)
+    , EC_symbol         // a symbol (function or constant name)
   };
-  
+
   // Enum to define the different kinds of evaluation possible
   // Extend this for more kinds of evaluation as required
   enum EvalKind {
-      EK_const			// Must evaluate to constant
-    , EK_positive_int		// Must evaluate to positive integer
+      EK_const                  // Must evaluate to constant
+    , EK_positive_int           // Must evaluate to positive integer
   };
 
   // Enum to define expression type
   enum ExprType {
-      EV_short			// Expression value is short
-    , EV_ushort			// Expression value is unsigned short
-    , EV_long			// Expression value is long
-    , EV_ulong			// Expression value is unsigned long
-    , EV_longlong		// Expression value is long long
-    , EV_ulonglong		// Expression value is unsigned long long
-    , EV_float			// Expression value is 32-bit float
-    , EV_double			// Expression value is 64-bit float
-    , EV_longdouble		// Expression value is 128-bit float
-    , EV_char			// Expression value is char
-    , EV_wchar			// Expression value is wide char	
-    , EV_octet			// Expression value is unsigned char
-    , EV_bool			// Expression value is boolean
-    , EV_string			// Expression value is char *
-    , EV_wstring		// Expression value is wchar_t *
-    , EV_any			// Expression value is any of above
-    , EV_void			// Expression value is void (absent)
-    , EV_none			// Expression value is missing
+      EV_short                  // Expression value is short
+    , EV_ushort                 // Expression value is unsigned short
+    , EV_long                   // Expression value is long
+    , EV_ulong                  // Expression value is unsigned long
+    , EV_longlong               // Expression value is long long
+    , EV_ulonglong              // Expression value is unsigned long long
+    , EV_float                  // Expression value is 32-bit float
+    , EV_double                 // Expression value is 64-bit float
+    , EV_longdouble             // Expression value is 128-bit float
+    , EV_char                   // Expression value is char
+    , EV_wchar                  // Expression value is wide char
+    , EV_octet                  // Expression value is unsigned char
+    , EV_bool                   // Expression value is boolean
+    , EV_string                 // Expression value is char *
+    , EV_wstring                // Expression value is wchar_t *
+    , EV_any                    // Expression value is any of above
+    , EV_void                   // Expression value is void (absent)
+    , EV_none                   // Expression value is missing
   };
 
   // Structure to descrive value of constant expression and its type
   struct AST_ExprValue {
     union {
-      short		sval;	// Contains short expression value
-      unsigned short	usval;	// Contains unsigned short expr value
-      long		lval;	// Contains long expression value
-      unsigned long	ulval;	// Contains unsigned long expr value
-      unsigned long	bval;	// Contains boolean expression value
-      float		fval;	// Contains 32-bit float expr value
-      double		dval;	// Contains 64-bit float expr value
-      char		cval;	// Contains char expression value
-      unsigned char	oval;	// Contains unsigned char expr value
-      String	        *strval; // Contains String * expr value
-      unsigned long	eval;	// Contains enumeration value
+      short             sval;   // Contains short expression value
+      unsigned short    usval;  // Contains unsigned short expr value
+      long              lval;   // Contains long expression value
+      unsigned long     ulval;  // Contains unsigned long expr value
+      unsigned long     bval;   // Contains boolean expression value
+      float             fval;   // Contains 32-bit float expr value
+      double            dval;   // Contains 64-bit float expr value
+      char              cval;   // Contains char expression value
+      unsigned char     oval;   // Contains unsigned char expr value
+      String            *strval; // Contains String * expr value
+      unsigned long     eval;   // Contains enumeration value
     } u;
     ExprType et;
   };
@@ -151,17 +151,17 @@ public:
 
   AST_Expression(ExprComb c, AST_Expression *v1, AST_Expression *v2);
 
-  AST_Expression(short		s);
-  AST_Expression(unsigned short	us);
-  AST_Expression(long		l);
-  AST_Expression(long		l, ExprType t);
-  AST_Expression(unsigned long	ul);
-  AST_Expression(float		f);
-  AST_Expression(double		d);
-  AST_Expression(char		c);
-  AST_Expression(unsigned char	uc);
-  AST_Expression(String		*s);
-  AST_Expression(UTL_ScopedName	*n);
+  AST_Expression(short          s);
+  AST_Expression(unsigned short us);
+  AST_Expression(long           l);
+  AST_Expression(long           l, ExprType t);
+  AST_Expression(unsigned long  ul);
+  AST_Expression(float          f);
+  AST_Expression(double         d);
+  AST_Expression(char           c);
+  AST_Expression(unsigned char  uc);
+  AST_Expression(String         *s);
+  AST_Expression(UTL_ScopedName *n);
   virtual ~AST_Expression () {}
 
   // Data Accessors
@@ -173,7 +173,7 @@ public:
   void set_file_name(String *f);
   ExprComb ec();
   void set_ec(ExprComb new_ec);
-  AST_ExprValue	*ev();
+  AST_ExprValue *ev();
   void set_ev(AST_ExprValue *new_ev);
   AST_Expression *v1();
   void set_v1(AST_Expression *e);
@@ -183,44 +183,44 @@ public:
   void set_n(UTL_ScopedName *new_n);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
   // Other operations
 
   // Evaluation and value coercion
-  virtual AST_ExprValue		*eval(EvalKind ek);
-  virtual AST_ExprValue		*coerce(ExprType t);
+  virtual AST_ExprValue         *eval(EvalKind ek);
+  virtual AST_ExprValue         *coerce(ExprType t);
 
   // Evaluate then store value inside this AST_Expression
-  virtual void			evaluate(EvalKind ek);
+  virtual void                  evaluate(EvalKind ek);
 
   // Compare to AST_Expressions
-  virtual long			operator==(AST_Expression *vc);
-  virtual long			compare(AST_Expression *vc);
+  virtual long                  operator==(AST_Expression *vc);
+  virtual long                  compare(AST_Expression *vc);
 
 protected:
   // Evaluate different sets of operators
-  virtual AST_ExprValue	*eval_bin_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_bit_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_un_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_symbol(EvalKind ek);
+  virtual AST_ExprValue *eval_bin_op(EvalKind ek);
+  virtual AST_ExprValue *eval_bit_op(EvalKind ek);
+  virtual AST_ExprValue *eval_un_op(EvalKind ek);
+  virtual AST_ExprValue *eval_symbol(EvalKind ek);
 
 private:
   // Data
-  UTL_Scope			*pd_defined_in;	// Scope
-  long				pd_line;	// Line defined in
-  String			*pd_file_name;	// What file defined in
+  UTL_Scope                     *pd_defined_in; // Scope
+  long                          pd_line;        // Line defined in
+  String                        *pd_file_name;  // What file defined in
 
-  ExprComb			pd_ec;		// What combinator
-  AST_ExprValue			*pd_ev;		// computed value
-  AST_Expression		*pd_v1;		// 1st sub-expression
-  AST_Expression		*pd_v2;		// 2nd sub-expression
-  UTL_ScopedName		*pd_n;		// symbolic name (if any)
+  ExprComb                      pd_ec;          // What combinator
+  AST_ExprValue                 *pd_ev;         // computed value
+  AST_Expression                *pd_v1;         // 1st sub-expression
+  AST_Expression                *pd_v2;         // 2nd sub-expression
+  UTL_ScopedName                *pd_n;          // symbolic name (if any)
 
   // Operations
 
   // Fill out the lineno, filename and definition scope details
-  void				fill_definition_details();
+  void                          fill_definition_details();
 
   // Internal evaluation
   virtual AST_ExprValue *eval_internal(EvalKind ek);
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
index f344e371b83..493a12eaa0b 100644
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ b/TAO/TAO_IDL/include/ast_extern.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -84,10 +84,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // the entire AST. The check ensures that for each fwd declared interface
 // the full definition was also seen.
 
-extern void	AST_record_fwd_interface(AST_InterfaceFwd *i);
-extern void	AST_check_fwd_interface();
+extern void     AST_record_fwd_interface(AST_InterfaceFwd *i);
+extern void     AST_check_fwd_interface();
 
-extern idl_bool	AST_illegal_recursive_type(AST_Decl *t);
+extern idl_bool AST_illegal_recursive_type(AST_Decl *t);
 
 #endif           // _AST_EXTERN_AST_EXTERN_HH
 
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index b3c6f04cd8c..20df9f68fe3 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -82,12 +82,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
+#include        "idl_fwd.h"
+#include        "idl_narrow.h"
+#include        "ast_decl.h"
 
 
-class	AST_Field : public virtual AST_Decl
+class   AST_Field : public virtual AST_Decl
 {
 public:
   // Operations
@@ -95,9 +95,9 @@ public:
   // Constructor(s)
   AST_Field();
   AST_Field(AST_Type *field_type,
-	    UTL_ScopedName *n, UTL_StrList *p);
+            UTL_ScopedName *n, UTL_StrList *p);
   AST_Field(AST_Decl::NodeType nt, AST_Type *field_type,
-	    UTL_ScopedName *n, UTL_StrList *p);
+            UTL_ScopedName *n, UTL_StrList *p);
   virtual ~AST_Field() {}
 
   // Data Accessors
@@ -108,11 +108,11 @@ public:
   DEF_NARROW_FROM_DECL(AST_Field);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  AST_Type			*pd_field_type;	// Base type for field
+  AST_Type                      *pd_field_type; // Base type for field
 
 };
 
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 6733bbad3e8..b6a6686ffb8 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -73,18 +73,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_predefined_type.hh utl_scoped_name.hh utl_strlist.hh
-**		 ast_module.hh ast_root.hh ast_interface.hh
-**		 ast_interface_fwd.hh ast_exception.hh ast_structure.hh
-**		 ast_enum.hh ast_operation.hh ast_type.hh ast_field.hh
-**		 ast_argument.hh ast_attribute.hh ast_union.hh
-**		 ast_concrete_type.hh ast_union_branch.hh ast_union_label.hh
-**		 ast_expression.hh ast_enum_val.hh ast_array.hh
-**		 ast_sequence.hh ast_string.hh ast_typedef.hh
+**               ast_module.hh ast_root.hh ast_interface.hh
+**               ast_interface_fwd.hh ast_exception.hh ast_structure.hh
+**               ast_enum.hh ast_operation.hh ast_type.hh ast_field.hh
+**               ast_argument.hh ast_attribute.hh ast_union.hh
+**               ast_concrete_type.hh ast_union_branch.hh ast_union_label.hh
+**               ast_expression.hh ast_enum_val.hh ast_array.hh
+**               ast_sequence.hh ast_string.hh ast_typedef.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_Generator
+class   AST_Generator
 {
 public:
   // Operations
@@ -92,126 +92,126 @@ public:
   // Create a node representing a predefined type
   virtual AST_PredefinedType
     *create_predefined_type(AST_PredefinedType::PredefinedType t,
-			    UTL_ScopedName *n,
-			    UTL_StrList *p);
+                            UTL_ScopedName *n,
+                            UTL_StrList *p);
 
   // Create a node representing a module
-  virtual AST_Module	*create_module(UTL_ScopedName *n,
-				       UTL_StrList *p);
+  virtual AST_Module    *create_module(UTL_ScopedName *n,
+                                       UTL_StrList *p);
 
   // Create a node representing a module which is the root of an AST
-  virtual AST_Root	*create_root(UTL_ScopedName *n,
-				     UTL_StrList *p);
+  virtual AST_Root      *create_root(UTL_ScopedName *n,
+                                     UTL_StrList *p);
 
   // Create a node representing an interface
-  virtual AST_Interface	*create_interface(UTL_ScopedName *n,
-					  AST_Interface **ih,
-					  long nih,
-					  UTL_StrList *p);
+  virtual AST_Interface *create_interface(UTL_ScopedName *n,
+                                          AST_Interface **ih,
+                                          long nih,
+                                          UTL_StrList *p);
 
   // Create a node representing a forward declaration of an interface
   virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
-						 UTL_StrList *p);
+                                                 UTL_StrList *p);
 
   // Create a node representing an exception
-  virtual AST_Exception	*create_exception(UTL_ScopedName *n,
-					  UTL_StrList *p);
+  virtual AST_Exception *create_exception(UTL_ScopedName *n,
+                                          UTL_StrList *p);
 
   // Create a node representing a structure
-  virtual AST_Structure	*create_structure(UTL_ScopedName *n,
-					  UTL_StrList *p);
+  virtual AST_Structure *create_structure(UTL_ScopedName *n,
+                                          UTL_StrList *p);
 
   // Create a node representing an enum
-  virtual AST_Enum	*create_enum(UTL_ScopedName *n,
-				     UTL_StrList *p);
+  virtual AST_Enum      *create_enum(UTL_ScopedName *n,
+                                     UTL_StrList *p);
 
   // Create a node representing an operation on an interface
-  virtual AST_Operation	*create_operation(AST_Type *rt,
-					  AST_Operation::Flags fl,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
+  virtual AST_Operation *create_operation(AST_Type *rt,
+                                          AST_Operation::Flags fl,
+                                          UTL_ScopedName *n,
+                                          UTL_StrList *p);
 
   // Create a node representing a field in a structure, exception or
   // union
-  virtual AST_Field	*create_field(AST_Type *ft,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
+  virtual AST_Field     *create_field(AST_Type *ft,
+                                      UTL_ScopedName *n,
+                                      UTL_StrList *p);
 
   // Create a node representing an argument to an operation
-  virtual AST_Argument	*create_argument(AST_Argument::Direction d,
-					 AST_Type *ft,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
+  virtual AST_Argument  *create_argument(AST_Argument::Direction d,
+                                         AST_Type *ft,
+                                         UTL_ScopedName *n,
+                                         UTL_StrList *p);
 
   // Create a node representing an attribute
-  virtual AST_Attribute	*create_attribute(idl_bool ro,
-					  AST_Type *ft,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
+  virtual AST_Attribute *create_attribute(idl_bool ro,
+                                          AST_Type *ft,
+                                          UTL_ScopedName *n,
+                                          UTL_StrList *p);
 
   // Create a node representing a union
-  virtual AST_Union	*create_union(AST_ConcreteType *dt,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
+  virtual AST_Union     *create_union(AST_ConcreteType *dt,
+                                      UTL_ScopedName *n,
+                                      UTL_StrList *p);
 
   // Create a node representing one branch in a union
   virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab,
-					       AST_Type *ft,
-					       UTL_ScopedName *n,
-					       UTL_StrList *p);
+                                               AST_Type *ft,
+                                               UTL_ScopedName *n,
+                                               UTL_StrList *p);
 
   // Create a node representing a label on a union branch
   virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul,
-					     AST_Expression *lv);
+                                             AST_Expression *lv);
 
   // Create a node representing a constant
-  virtual AST_Constant	*create_constant(AST_Expression::ExprType et,
-					 AST_Expression *ev,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
+  virtual AST_Constant  *create_constant(AST_Expression::ExprType et,
+                                         AST_Expression *ev,
+                                         UTL_ScopedName *n,
+                                         UTL_StrList *p);
 
   // Create various kinds of nodes representing expressions
-  virtual AST_Expression	*create_expr(UTL_ScopedName *n);
-  virtual AST_Expression	*create_expr(AST_Expression *v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(AST_Expression::ExprComb c,
-					     AST_Expression *v1,
-					     AST_Expression *v2);
-  virtual AST_Expression	*create_expr(long v);
-  virtual AST_Expression	*create_expr(long v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(unsigned long v);
-  virtual AST_Expression	*create_expr(String *s);
-  virtual AST_Expression	*create_expr(char c);
-  virtual AST_Expression	*create_expr(double d);
+  virtual AST_Expression        *create_expr(UTL_ScopedName *n);
+  virtual AST_Expression        *create_expr(AST_Expression *v,
+                                             AST_Expression::ExprType t);
+  virtual AST_Expression        *create_expr(AST_Expression::ExprComb c,
+                                             AST_Expression *v1,
+                                             AST_Expression *v2);
+  virtual AST_Expression        *create_expr(long v);
+  virtual AST_Expression        *create_expr(long v,
+                                             AST_Expression::ExprType t);
+  virtual AST_Expression        *create_expr(unsigned long v);
+  virtual AST_Expression        *create_expr(String *s);
+  virtual AST_Expression        *create_expr(char c);
+  virtual AST_Expression        *create_expr(double d);
 
   // Create a node representing an enumerator
-  virtual AST_EnumVal	*create_enum_val(unsigned long v,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
+  virtual AST_EnumVal   *create_enum_val(unsigned long v,
+                                         UTL_ScopedName *n,
+                                         UTL_StrList *p);
 
   // Create a node representing an array type
-  virtual AST_Array	*create_array(UTL_ScopedName *n,
-				      unsigned long ndims,
-				      UTL_ExprList *dims);
+  virtual AST_Array     *create_array(UTL_ScopedName *n,
+                                      unsigned long ndims,
+                                      UTL_ExprList *dims);
 
   // Create a node representing a sequence type
-  virtual AST_Sequence	*create_sequence(AST_Expression *v,
-					 AST_Type *bt);
+  virtual AST_Sequence  *create_sequence(AST_Expression *v,
+                                         AST_Type *bt);
 
   // Create a node representing a string type
-  virtual AST_String	*create_string(AST_Expression *v);
+  virtual AST_String    *create_string(AST_Expression *v);
 
   // Create a node representing a wide string type
-  virtual AST_String	*create_wstring(AST_Expression *v);
+  virtual AST_String    *create_wstring(AST_Expression *v);
 
   // Create a node representing a type renaming (typedef)
-  virtual AST_Typedef	*create_typedef(AST_Type *bt,
-					UTL_ScopedName *n,
-					UTL_StrList *p);
+  virtual AST_Typedef   *create_typedef(AST_Type *bt,
+                                        UTL_ScopedName *n,
+                                        UTL_StrList *p);
 
   // Create a node representing a native
-  virtual AST_Native	*create_native (UTL_ScopedName *n,
+  virtual AST_Native    *create_native (UTL_ScopedName *n,
                                         UTL_StrList *p);
 
 };
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index c41eaf858fd..317a181dcd0 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -79,14 +79,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_type.h"
-#include	"utl_scope.h"
-#include	"ast_decl.h"
+#include        "idl_fwd.h"
+#include        "idl_narrow.h"
+#include        "ast_type.h"
+#include        "utl_scope.h"
+#include        "ast_decl.h"
 
 
-class	AST_Interface : public virtual AST_Type, public virtual UTL_Scope
+class   AST_Interface : public virtual AST_Type, public virtual UTL_Scope
 {
 public:
   // Operations
@@ -94,13 +94,13 @@ public:
   // Constructor(s)
   AST_Interface();
   AST_Interface(UTL_ScopedName *n,
-		AST_Interface **ih,
-		long nih,
-		UTL_StrList *p);
+                AST_Interface **ih,
+                long nih,
+                UTL_StrList *p);
   virtual ~AST_Interface() {}
 
   // Data Accessors
-  AST_Interface	**inherits();
+  AST_Interface **inherits();
   void set_inherits(AST_Interface **i);
   long n_inherits();
   void set_n_inherits(long i);
@@ -119,27 +119,27 @@ public:
   DEF_NARROW_FROM_SCOPE(AST_Interface);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  AST_Interface			**pd_inherits;	// Inherited interfaces
-						// This is an array of pointers
-						// to the inherited interfaces
-  long				pd_n_inherits;	// How many of them?
+  AST_Interface                 **pd_inherits;  // Inherited interfaces
+                                                // This is an array of pointers
+                                                // to the inherited interfaces
+  long                          pd_n_inherits;  // How many of them?
 
   // Scope Management Protocol
   friend int tao_yyparse();
 
-  virtual AST_Constant		*fe_add_constant(AST_Constant	*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception	*e);
-  virtual AST_Attribute		*fe_add_attribute(AST_Attribute	*a);
-  virtual AST_Operation		*fe_add_operation(AST_Operation	*o);
-  virtual AST_Union		*fe_add_union(AST_Union		*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure	*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef	*t);
+  virtual AST_Constant          *fe_add_constant(AST_Constant   *c);
+  virtual AST_Exception         *fe_add_exception(AST_Exception *e);
+  virtual AST_Attribute         *fe_add_attribute(AST_Attribute *a);
+  virtual AST_Operation         *fe_add_operation(AST_Operation *o);
+  virtual AST_Union             *fe_add_union(AST_Union         *u);
+  virtual AST_Structure         *fe_add_structure(AST_Structure *s);
+  virtual AST_Enum              *fe_add_enum(AST_Enum           *e);
+  virtual AST_EnumVal           *fe_add_enum_val(AST_EnumVal    *v);
+  virtual AST_Typedef           *fe_add_typedef(AST_Typedef     *t);
   virtual AST_Native            *fe_add_native (AST_Native      *n);
 
 };
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 72a8f8842aa..49153b9da59 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -71,12 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_decl.hh, ast_interface.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
+**               utl_strlist.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_InterfaceFwd : public virtual AST_Type
+class   AST_InterfaceFwd : public virtual AST_Type
 {
 public:
   // Operations
@@ -87,7 +87,7 @@ public:
   virtual ~AST_InterfaceFwd() {}
 
   // Data Accessors
-  AST_Interface	*full_definition();
+  AST_Interface *full_definition();
   void set_full_definition(AST_Interface *nfd);
 
   // Narrowing
@@ -95,12 +95,12 @@ public:
   DEF_NARROW_FROM_DECL(AST_InterfaceFwd);
 
   // AST Dumping
-  virtual void		dump(ostream &);
+  virtual void          dump(ostream &);
 
 private:
   // Data
-  AST_Interface		*pd_full_definition;	// The interface this is a
-						// forward declaration of
+  AST_Interface         *pd_full_definition;    // The interface this is a
+                                                // forward declaration of
 };
 
 #endif           // _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 073eb5baa2c..cae2cb03b3c 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -79,7 +79,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-class	AST_Module : public virtual AST_Decl, public virtual UTL_Scope
+class   AST_Module : public virtual AST_Decl, public virtual UTL_Scope
 {
 public:
   // Operations
@@ -95,7 +95,7 @@ public:
   DEF_NARROW_FROM_SCOPE(AST_Module);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   friend void fe_populate(AST_Module *m);
@@ -103,17 +103,17 @@ private:
 
   // Scope Management Protocol
 
-  virtual AST_PredefinedType	*fe_add_predefined_type(AST_PredefinedType *t);
-  virtual AST_Module		*fe_add_module(AST_Module		*m);
-  virtual AST_Interface		*fe_add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*fe_add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*fe_add_constant(AST_Constant		*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception		*e);
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef		*t);
+  virtual AST_PredefinedType    *fe_add_predefined_type(AST_PredefinedType *t);
+  virtual AST_Module            *fe_add_module(AST_Module               *m);
+  virtual AST_Interface         *fe_add_interface(AST_Interface         *i);
+  virtual AST_InterfaceFwd      *fe_add_interface_fwd(AST_InterfaceFwd  *i);
+  virtual AST_Constant          *fe_add_constant(AST_Constant           *c);
+  virtual AST_Exception         *fe_add_exception(AST_Exception         *e);
+  virtual AST_Union             *fe_add_union(AST_Union                 *u);
+  virtual AST_Structure         *fe_add_structure(AST_Structure         *s);
+  virtual AST_Enum              *fe_add_enum(AST_Enum                   *e);
+  virtual AST_EnumVal           *fe_add_enum_val(AST_EnumVal            *v);
+  virtual AST_Typedef           *fe_add_typedef(AST_Typedef             *t);
   virtual AST_Native            *fe_add_native (AST_Native      *n);
 
 };
diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h
index d170da542a9..4b3f40fa6b9 100644
--- a/TAO/TAO_IDL/include/ast_native.h
+++ b/TAO/TAO_IDL/include/ast_native.h
@@ -1,7 +1,7 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#if !defined (_AST_NATIVE_H_)
+#ifndef _AST_NATIVE_H_
 #define _AST_NATIVE_H_
 
 // Representation of "native" IDL type added by the POA spec
@@ -32,7 +32,7 @@ public:
   DEF_NARROW_FROM_DECL(AST_Native);
 
   // AST Dumping
-  virtual void		dump(ostream &o);
+  virtual void          dump(ostream &o);
 };
 
 #endif /* AST_NATIVE_H */
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index 3dcf8a252ef..50ef6b40796 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -71,27 +71,27 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_decl.hh, utl_scope.hh, ast_type.hh, utl_strlist.hh,
-**		 utl_exceptlist.hh, utl_scoped_name.hh
+**               utl_exceptlist.hh, utl_scoped_name.hh
 **
 ** USE: included from ast.hh
 */
 
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"utl_list.h"
-#include	"ast_decl.h"
-#include	"utl_scope.h"
-#include	"utl_scoped_name.h"
+#include        "idl_fwd.h"
+#include        "idl_narrow.h"
+#include        "utl_list.h"
+#include        "ast_decl.h"
+#include        "utl_scope.h"
+#include        "utl_scoped_name.h"
 
 
-class	AST_Operation : public virtual AST_Decl, public virtual UTL_Scope
+class   AST_Operation : public virtual AST_Decl, public virtual UTL_Scope
 {
 public:
   // Define enum with flags for operation attributes
   enum Flags {
-       OP_noflags		// No flags present
-     , OP_oneway		// Operation is oneway
-     , OP_idempotent		// Operation is idempotent
+       OP_noflags               // No flags present
+     , OP_oneway                // Operation is oneway
+     , OP_idempotent            // Operation is idempotent
   };
 
   // Operations
@@ -99,9 +99,9 @@ public:
   // Constructor(s)
   AST_Operation();
   AST_Operation(AST_Type *return_type,
-		Flags flags,
-		UTL_ScopedName *n,
-		UTL_StrList *p);
+                Flags flags,
+                UTL_ScopedName *n,
+                UTL_StrList *p);
   virtual ~AST_Operation() {}
 
   // Data Accessors
@@ -109,30 +109,30 @@ public:
   Flags flags();
   UTL_StrList *context();
   UTL_ExceptList *exceptions();
-  
+
   // Narrowing
   DEF_NARROW_METHODS2(AST_Operation, AST_Decl, UTL_Scope);
   DEF_NARROW_FROM_DECL(AST_Operation);
   DEF_NARROW_FROM_SCOPE(AST_Operation);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  AST_Type			*pd_return_type;	// Return type
-  Flags				pd_flags;		// Operation flags
-  UTL_StrList			*pd_context;		// Context
-  UTL_ExceptList		*pd_exceptions;		// Exceptions raised
+  AST_Type                      *pd_return_type;        // Return type
+  Flags                         pd_flags;               // Operation flags
+  UTL_StrList                   *pd_context;            // Context
+  UTL_ExceptList                *pd_exceptions;         // Exceptions raised
 
   // Scope Management Protocol
   friend int tao_yyparse();
 
-  virtual AST_Argument		*fe_add_argument(AST_Argument	*a);
-  virtual UTL_StrList		*fe_add_context(UTL_StrList 	*c);	
-							// Add context
-  virtual UTL_NameList		*fe_add_exceptions(UTL_NameList *e);
-							// exceptions
+  virtual AST_Argument          *fe_add_argument(AST_Argument   *a);
+  virtual UTL_StrList           *fe_add_context(UTL_StrList     *c);
+                                                        // Add context
+  virtual UTL_NameList          *fe_add_exceptions(UTL_NameList *e);
+                                                        // exceptions
 
 };
 
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index 7c7ebd953f4..ae4460ac8af 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -74,32 +74,32 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_concrete_type.hh, utl_scoped_name.hh, utl_strlist.hh,
-**		 ast_decl.hh
+**               ast_decl.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_PredefinedType : public virtual AST_ConcreteType
+class   AST_PredefinedType : public virtual AST_ConcreteType
 {
 public:
   // Enum for all the different predefined types
   enum PredefinedType {
-        PT_long		// Predefined type "long"
-      , PT_ulong	// Predefined type "unsigned long"
-      , PT_longlong	// Predefined type "long long"
-      , PT_ulonglong	// Predefined type "unsigned long long"
-      , PT_short	// Predefined type "short"
-      , PT_ushort	// Predefined type "unsigned short"
-      , PT_float	// Predefined type "float"
-      , PT_double	// Predefined type "double"
-      , PT_longdouble	// Predefined type "long double"
-      , PT_char		// Predefined type "char"
-      , PT_wchar	// Predefined type "wchar_t"
-      , PT_boolean	// Predefined type "boolean"
-      , PT_octet	// Predefined type "octet"
-      , PT_any		// Predefined type "any"
-      , PT_void		// Predefined type "void"
-      , PT_pseudo	// Predefined type for pseudo objects
+        PT_long         // Predefined type "long"
+      , PT_ulong        // Predefined type "unsigned long"
+      , PT_longlong     // Predefined type "long long"
+      , PT_ulonglong    // Predefined type "unsigned long long"
+      , PT_short        // Predefined type "short"
+      , PT_ushort       // Predefined type "unsigned short"
+      , PT_float        // Predefined type "float"
+      , PT_double       // Predefined type "double"
+      , PT_longdouble   // Predefined type "long double"
+      , PT_char         // Predefined type "char"
+      , PT_wchar        // Predefined type "wchar_t"
+      , PT_boolean      // Predefined type "boolean"
+      , PT_octet        // Predefined type "octet"
+      , PT_any          // Predefined type "any"
+      , PT_void         // Predefined type "void"
+      , PT_pseudo       // Predefined type for pseudo objects
   };
 
   // Operations
@@ -110,18 +110,18 @@ public:
   virtual ~AST_PredefinedType() {}
 
   // Data Accessors
-  PredefinedType	pt();
+  PredefinedType        pt();
 
   // Narrowing
   DEF_NARROW_METHODS1(AST_PredefinedType, AST_ConcreteType);
   DEF_NARROW_FROM_DECL(AST_PredefinedType);
 
   // AST Dumping
-  virtual void		dump(ostream &o);
+  virtual void          dump(ostream &o);
 
 private:
   // Data
-  const PredefinedType	pd_pt;		// The specific predefined type
-};  
+  const PredefinedType  pd_pt;          // The specific predefined type
+};
 
 #endif           // _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
index e81c87f1fda..f85e5f9cbb3 100644
--- a/TAO/TAO_IDL/include/ast_root.h
+++ b/TAO/TAO_IDL/include/ast_root.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -75,7 +75,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-class	AST_Root : public virtual AST_Module
+class   AST_Root : public virtual AST_Module
 {
 public:
   // Operations
@@ -91,16 +91,16 @@ public:
   DEF_NARROW_FROM_SCOPE(AST_Root);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   friend class FE_Declarator;
   friend int tao_yyparse();
   // Add protocol
 
-  virtual AST_Sequence		*fe_add_sequence(AST_Sequence		*s);
-  virtual AST_String		*fe_add_string(AST_String		*s);
-  virtual AST_Array		*fe_add_array(AST_Array			*a);
+  virtual AST_Sequence          *fe_add_sequence(AST_Sequence           *s);
+  virtual AST_String            *fe_add_string(AST_String               *s);
+  virtual AST_Array             *fe_add_array(AST_Array                 *a);
 
 };
 
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
index 73849d0f02b..38c869792af 100644
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ b/TAO/TAO_IDL/include/ast_sequence.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_concrete_type.hh, ast_type.hh, ast_decl.hh,
-**		 ast_expression.hh
+**               ast_expression.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_Sequence : public virtual AST_ConcreteType
+class   AST_Sequence : public virtual AST_ConcreteType
 {
 public:
   // Operations
@@ -97,12 +97,12 @@ public:
   DEF_NARROW_FROM_DECL(AST_Sequence);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  AST_Expression		*pd_max_size;	// Maximum sequence size
-  AST_Type			*pd_base_type;	// Sequence base type
+  AST_Expression                *pd_max_size;   // Maximum sequence size
+  AST_Type                      *pd_base_type;  // Sequence base type
 };
 
 #endif           // _AST_SEQUENCE_AST_SEQUENCE_HH
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
index 9e5874c304c..b44577b975d 100644
--- a/TAO/TAO_IDL/include/ast_string.h
+++ b/TAO/TAO_IDL/include/ast_string.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -77,7 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-class	AST_String : public virtual AST_ConcreteType
+class   AST_String : public virtual AST_ConcreteType
 {
 public:
   // Operations
@@ -90,19 +90,19 @@ public:
 
   // Data Accessors
   AST_Expression *max_size();
-  long		 width();
+  long           width();
 
   // Narrowing
   DEF_NARROW_METHODS1(AST_String, AST_ConcreteType);
   DEF_NARROW_FROM_DECL(AST_String);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  AST_Expression		*pd_max_size;	// String maximum size
-  long				pd_width;	// Width of string
+  AST_Expression                *pd_max_size;   // String maximum size
+  long                          pd_width;       // Width of string
 };
 
 #endif           // _AST_STRING_AST_STRING_HH
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
index baa1944bbe6..b0f14cc45fe 100644
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ b/TAO/TAO_IDL/include/ast_structure.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -79,13 +79,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
+**               utl_strlist.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_Structure : public virtual AST_ConcreteType,
-			public virtual UTL_Scope
+class   AST_Structure : public virtual AST_ConcreteType,
+                        public virtual UTL_Scope
 {
 public:
   // Operations
@@ -102,17 +102,17 @@ public:
   DEF_NARROW_FROM_SCOPE(AST_Structure);
 
   // AST Dumping
-  virtual void		dump(ostream &o);
+  virtual void          dump(ostream &o);
 
 private:
   friend int tao_yyparse();
   // Scope Management Protocol
 
-  virtual AST_Union	*fe_add_union(AST_Union		*u);
-  virtual AST_Structure	*fe_add_structure(AST_Structure	*s);
-  virtual AST_Field	*fe_add_field(AST_Field		*f);
-  virtual AST_Enum	*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal	*fe_add_enum_val(AST_EnumVal	*v);
+  virtual AST_Union     *fe_add_union(AST_Union         *u);
+  virtual AST_Structure *fe_add_structure(AST_Structure *s);
+  virtual AST_Field     *fe_add_field(AST_Field         *f);
+  virtual AST_Enum      *fe_add_enum(AST_Enum           *e);
+  virtual AST_EnumVal   *fe_add_enum_val(AST_EnumVal    *v);
 };
 
 #endif           // _AST_STRUCTURE_AST_STRUCTURE_HH
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index 04a36d8235d..1b22dc98da5 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -78,12 +78,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
+#include        "idl_fwd.h"
+#include        "idl_narrow.h"
+#include        "ast_decl.h"
 
 
-class	AST_Type : public virtual AST_Decl
+class   AST_Type : public virtual AST_Decl
 {
 public:
   // Operations
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index c2e13051b54..623c023b84a 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -77,7 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-class	AST_Typedef : public virtual AST_Type
+class   AST_Typedef : public virtual AST_Type
 {
 public:
   // Operations
@@ -95,11 +95,11 @@ public:
   DEF_NARROW_FROM_DECL(AST_Typedef);
 
   // AST Dumping
-  virtual void		dump(ostream &o);
+  virtual void          dump(ostream &o);
 
 private:
   // Data
-  AST_Type		*pd_base_type;	// typedef base type
+  AST_Type              *pd_base_type;  // typedef base type
 };
 
 #endif           // _AST_TYPEDEF_AST_TYPEDEF_HH
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index 062e540e9a8..84f73d481d5 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -79,12 +79,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_union_branch.hh,
-**		 ast_union_label.hh, utl_scoped_name.hh, utl_strlist.hh
+**               ast_union_label.hh, utl_scoped_name.hh, utl_strlist.hh
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_Union : public virtual AST_Structure
+class   AST_Union : public virtual AST_Structure
 {
 public:
   // Operations
@@ -104,39 +104,39 @@ public:
   DEF_NARROW_FROM_SCOPE(AST_Union);
 
   // AST Dumping
-  virtual void			dump(ostream &);
+  virtual void                  dump(ostream &);
 
 private:
   // Data
-  AST_ConcreteType		*pd_disc_type;	// Discriminator type
-  AST_Expression::ExprType	pd_udisc_type;	// Its expression type
+  AST_ConcreteType              *pd_disc_type;  // Discriminator type
+  AST_Expression::ExprType      pd_udisc_type;  // Its expression type
   /* Convention: udisc_type == EV_any denotes an enum value */
 
   // Operations
 
   // Look up a branch by node pointer
-  AST_UnionBranch		*lookup_branch(AST_UnionBranch *branch);
+  AST_UnionBranch               *lookup_branch(AST_UnionBranch *branch);
 
   // Look up the branch with the "default" label
-  AST_UnionBranch		*lookup_default();
+  AST_UnionBranch               *lookup_default();
 
   // Look up a branch given a branch with a label. This is used to
   // check for duplicate labels
-  AST_UnionBranch		*lookup_label(AST_UnionBranch *b);
+  AST_UnionBranch               *lookup_label(AST_UnionBranch *b);
 
   // Look up a union branch given an enumerator. This is used to
   // check for duplicate enum labels
-  AST_UnionBranch		*lookup_enum(AST_UnionBranch *b);
+  AST_UnionBranch               *lookup_enum(AST_UnionBranch *b);
 
 private:
   friend int tao_yyparse();
   // Scope Management Protocol
 
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*fe_add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
+  virtual AST_Union             *fe_add_union(AST_Union                 *u);
+  virtual AST_UnionBranch       *fe_add_union_branch(AST_UnionBranch    *b);
+  virtual AST_Structure         *fe_add_structure(AST_Structure         *s);
+  virtual AST_Enum              *fe_add_enum(AST_Enum                   *e);
+  virtual AST_EnumVal           *fe_add_enum_val(AST_EnumVal            *v);
 
 };
 
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index 2bfe414452e..e756a23e383 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPEndencies: ast_field.hh, ast_union_label.hh, ast_type.hh,
-**		 utl_scoped_name.hh, utl_strlist.h, ast_decl.h
+**               utl_scoped_name.hh, utl_strlist.h, ast_decl.h
 **
 ** USE: Included from ast.hh
 */
 
-class	AST_UnionBranch : public virtual AST_Field
+class   AST_UnionBranch : public virtual AST_Field
 {
 public:
   // Operations
@@ -86,9 +86,9 @@ public:
   // Constructor(s)
   AST_UnionBranch();
   AST_UnionBranch(AST_UnionLabel *label,
-		  AST_Type *ft,
-		  UTL_ScopedName *n,
-		  UTL_StrList *p);
+                  AST_Type *ft,
+                  UTL_ScopedName *n,
+                  UTL_StrList *p);
   virtual ~AST_UnionBranch() {}
 
   // Data Accessors
@@ -99,11 +99,11 @@ public:
   DEF_NARROW_FROM_DECL(AST_UnionBranch);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  AST_UnionLabel		*pd_label;	// Label of this branch
+  AST_UnionLabel                *pd_label;      // Label of this branch
 };
 
 #endif           // _AST_UNION_BRANCH_AST_UNION_BRAN_HH
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
index 7dd124784a4..2a50603fcbf 100644
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ b/TAO/TAO_IDL/include/ast_union_label.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -77,13 +77,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: included from ast.hh
 */
 
-class	AST_UnionLabel
+class   AST_UnionLabel
 {
 public:
   // Define kind of label
   enum UnionLabel {
-        UL_default		// Label is "default"
-      , UL_label		// Regular label
+        UL_default              // Label is "default"
+      , UL_label                // Regular label
   };
 
   // Operations
@@ -98,12 +98,12 @@ public:
   AST_Expression *label_val();
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
 private:
   // Data
-  UnionLabel			pd_label_kind;	// Label kind
-  AST_Expression		*pd_label_val;	// Label expression
+  UnionLabel                    pd_label_kind;  // Label kind
+  AST_Expression                *pd_label_val;  // Label expression
 
 };
 
diff --git a/TAO/TAO_IDL/include/be_extern.h b/TAO/TAO_IDL/include/be_extern.h
index 253599b76f1..ad43829cf88 100644
--- a/TAO/TAO_IDL/include/be_extern.h
+++ b/TAO/TAO_IDL/include/be_extern.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -71,12 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Functions:
 
-extern "C" AST_Generator	*BE_init();
+extern "C" AST_Generator        *BE_init();
 
-extern "C" void			BE_produce();
-extern "C" void			BE_abort();
-extern "C" void			BE_prep_arg(char *, idl_bool);
+extern "C" void                 BE_produce();
+extern "C" void                 BE_abort();
+extern "C" void                 BE_prep_arg(char *, idl_bool);
 
-extern "C" void			BE_version();
+extern "C" void                 BE_version();
 
 #endif           // _BE_EXTERN_BE_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h
index b5c3bb163d5..75e69a69546 100644
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ b/TAO/TAO_IDL/include/drv_extern.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -71,17 +71,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Functions
 
-extern void		DRV_init ();
-extern void		DRV_parse_args (long, char **);
-extern void		DRV_usage ();
+extern void             DRV_init ();
+extern void             DRV_parse_args (long, char **);
+extern void             DRV_usage ();
 
-extern void	        DRV_pre_proc (char *myfile);
+extern void             DRV_pre_proc (char *myfile);
 
-extern void		DRV_cpp_init ();
-extern void		DRV_cpp_putarg (char *str);
-extern void		DRV_cpp_new_location (char *new_loc);
+extern void             DRV_cpp_init ();
+extern void             DRV_cpp_putarg (char *str);
+extern void             DRV_cpp_new_location (char *new_loc);
 
-extern void		DRV_fork();
+extern void             DRV_fork();
 extern int              DRV_check_gperf ();
 extern void             DRV_check_for_include (const char* buf);
 #endif           // _DRV_EXTERN_DRV_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/drv_link.h b/TAO/TAO_IDL/include/drv_link.h
index fa154436c25..0eaec30233c 100644
--- a/TAO/TAO_IDL/include/drv_link.h
+++ b/TAO/TAO_IDL/include/drv_link.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -67,8 +67,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _DRV_LINK_DRV_LINK_HH
 #define _DRV_LINK_DRV_LINK_HH
 
-// drv_link.hh - Define data and functions which are used to 
-//		 link in the back end functions
+// drv_link.hh - Define data and functions which are used to
+//               link in the back end functions
 
 /*
  * Front end interface
@@ -87,16 +87,16 @@ typedef UTL_Error * (* DRV_PF_FE_new_UTL_Error)();
 typedef UTL_Indenter * (* DRV_PF_FE_new_UTL_Indenter)();
 typedef UTL_String * (* DRV_PF_FE_new_UTL_String)(char *);
 
-extern DRV_PF_FE_init_stage1	DRV_FE_init_stage1;
-extern DRV_PF_FE_init_stage2	DRV_FE_init_stage2;
-extern DRV_PF_FE_yyparse	DRV_FE_yyparse;
-extern DRV_PF_FE_set_yyin	DRV_FE_set_yyin;
+extern DRV_PF_FE_init_stage1    DRV_FE_init_stage1;
+extern DRV_PF_FE_init_stage2    DRV_FE_init_stage2;
+extern DRV_PF_FE_yyparse        DRV_FE_yyparse;
+extern DRV_PF_FE_set_yyin       DRV_FE_set_yyin;
 
-extern DRV_PF_FE_new_UTL_Error	DRV_FE_new_UTL_Error;
+extern DRV_PF_FE_new_UTL_Error  DRV_FE_new_UTL_Error;
 extern DRV_PF_FE_new_UTL_Indenter DRV_FE_new_UTL_Indenter;
-extern DRV_PF_FE_new_UTL_String	DRV_FE_new_UTL_String;
+extern DRV_PF_FE_new_UTL_String DRV_FE_new_UTL_String;
 
-/* 
+/*
  * Back end interface
  */
 
@@ -107,11 +107,11 @@ typedef void (* DRV_PF_BE_abort)();
 typedef void (* DRV_PF_BE_prep_arg)(char *, idl_bool);
 typedef void (* DRV_PF_BE_version)();
 
-extern DRV_PF_BE_init		DRV_BE_init;
-extern DRV_PF_BE_produce 	DRV_BE_produce;
-extern DRV_PF_BE_abort   	DRV_BE_abort;
-extern DRV_PF_BE_prep_arg	DRV_BE_prep_arg;
-extern DRV_PF_BE_version	DRV_BE_version;
+extern DRV_PF_BE_init           DRV_BE_init;
+extern DRV_PF_BE_produce        DRV_BE_produce;
+extern DRV_PF_BE_abort          DRV_BE_abort;
+extern DRV_PF_BE_prep_arg       DRV_BE_prep_arg;
+extern DRV_PF_BE_version        DRV_BE_version;
 
 // Functions
 
@@ -121,4 +121,4 @@ extern void DRV_FE_close();
 extern void DRV_BE_open();
 extern void DRV_BE_close();
 
-#endif	// _DRV_LINK_DRV_LINK_HH
+#endif  // _DRV_LINK_DRV_LINK_HH
diff --git a/TAO/TAO_IDL/include/drv_private.h b/TAO/TAO_IDL/include/drv_private.h
index 6b18ea8df74..04ea84024d3 100644
--- a/TAO/TAO_IDL/include/drv_private.h
+++ b/TAO/TAO_IDL/include/drv_private.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -68,16 +68,16 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _DRV_PRIVATE_DRV_PRIVATE_HH
 
 // drv_private.hh - Define data and functions which are private to
-//		    the DRV but which must be accessible througout the DRV
+//                  the DRV but which must be accessible througout the DRV
 
 // Data
 
-extern char		*DRV_files[];	// All files to be processed
-extern long		DRV_nfiles;	// How many are there?
-extern long		DRV_file_index;	// What's the file I am responsible
-					// for?
+extern char             *DRV_files[];   // All files to be processed
+extern long             DRV_nfiles;     // How many are there?
+extern long             DRV_file_index; // What's the file I am responsible
+                                        // for?
 
 // Functions
-extern	void		DRV_drive(char *);// Compiler driver for single file
+extern  void            DRV_drive(char *);// Compiler driver for single file
 
-#endif	// _DRV_PRIVATE_DRV_PRIVATE_HH
+#endif  // _DRV_PRIVATE_DRV_PRIVATE_HH
diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h
index 00840836a90..39ea7e7e985 100644
--- a/TAO/TAO_IDL/include/fe_declarator.h
+++ b/TAO/TAO_IDL/include/fe_declarator.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -77,13 +77,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from fe.hh
 */
 
-class	FE_Declarator
+class   FE_Declarator
 {
 public:
   // Enum to denote types of declarators
   enum DeclaratorType {
-        FD_simple		// Simple declarator
-      , FD_complex		// Complex declarator (complex_part field used)
+        FD_simple               // Simple declarator
+      , FD_complex              // Complex declarator (complex_part field used)
   };
 
   // Operations
@@ -101,13 +101,13 @@ public:
 
   // Compose an FE_Declarator into an AST_Type once all the needed information
   // is available
-  AST_Type		*compose(AST_Decl* tc);
+  AST_Type              *compose(AST_Decl* tc);
 
 private:
   // Data
-  AST_Decl		*pd_complex_part;	// If a complex declarator
-  UTL_ScopedName	*pd_name;		// The name if complex
-  DeclaratorType	pd_decl_type;		// Whether complex or simple
+  AST_Decl              *pd_complex_part;       // If a complex declarator
+  UTL_ScopedName        *pd_name;               // The name if complex
+  DeclaratorType        pd_decl_type;           // Whether complex or simple
 };
 
 #endif           // _FE_DECLARATOR_FE_DECLARATOR_HH
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
index 87ec38c5b55..d7a7bf6dd03 100644
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ b/TAO/TAO_IDL/include/fe_extern.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -87,14 +87,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // which is then used in the second stage to create the global scope
 // and to populate it with nodes for the predefined types
 
-extern "C" void			FE_init_stage1();	// Initialize stage 1
-extern "C" void			FE_init_stage2();	// Initialize stage 2
+extern "C" void                 FE_init_stage1();       // Initialize stage 1
+extern "C" void                 FE_init_stage2();       // Initialize stage 2
 
 // Interface to Yacc parser
 
 class File;
-extern "C" int			FE_yyparse();		// Invode yyparse
-extern "C" void			FE_set_yyin(File *);	// Set yyin
+extern "C" int                  FE_yyparse();           // Invode yyparse
+extern "C" void                 FE_set_yyin(File *);    // Set yyin
 
 // Interface to constructors for objects need by the driver
 
@@ -102,8 +102,8 @@ class UTL_Error;
 class UTL_Indenter;
 class UTL_String;
 
-extern "C" UTL_Error *		FE_new_UTL_Error();
-extern "C" UTL_Indenter *	FE_new_UTL_Indenter();
-extern "C" UTL_String *  	FE_new_UTL_String(char *);
+extern "C" UTL_Error *          FE_new_UTL_Error();
+extern "C" UTL_Indenter *       FE_new_UTL_Indenter();
+extern "C" UTL_String *         FE_new_UTL_String(char *);
 
 #endif           // _FE_EXTERN_FE_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index f9b9d5bbf45..0fe78e3e227 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
 ** DEPENDENCIES: utl_scoped_name.hh, ast_interface.hh, utl_scope.hh,
-**		 ast_decl.hh
+**               ast_decl.hh
 **
 ** USE: Included from fe.hh
 */
 
-class	FE_InterfaceHeader
+class   FE_InterfaceHeader
 {
 public:
   // Operations
@@ -94,16 +94,16 @@ public:
 
 private:
   // Data
-  UTL_ScopedName	*pd_interface_name;	// Interface name
-  AST_Interface		**pd_inherits;		// Inherited interfaces
-  long			pd_n_inherits;		// How many
+  UTL_ScopedName        *pd_interface_name;     // Interface name
+  AST_Interface         **pd_inherits;          // Inherited interfaces
+  long                  pd_n_inherits;          // How many
 
   // Operations
 
   // Compile the flattened unique list of interfaces which this
   // interface inherits from
-  void			compile_one_inheritance(AST_Interface *i);
-  void			compile_inheritance(UTL_NameList *l);
+  void                  compile_one_inheritance(AST_Interface *i);
+  void                  compile_inheritance(UTL_NameList *l);
 };
 
 #endif           // _FE_INTERFACE_HEADER_FE_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h
index 1c496ce9843..1d1b28b2371 100644
--- a/TAO/TAO_IDL/include/fe_private.h
+++ b/TAO/TAO_IDL/include/fe_private.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _FE_FE_HH
 
 // fe_private.hh - Defines data which is private to the FE but
-//		   which must be accessible throughout the FE
+//                 which must be accessible throughout the FE
 
 /*
 ** DEPENDENCIES: NONE
@@ -80,8 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * FE includes
  */
 
-#include	"fe_interface_header.h"// class FE_InterfaceHeader
-#include	"fe_declarator.h"	// class FE_Declarator
+#include        "fe_interface_header.h"// class FE_InterfaceHeader
+#include        "fe_declarator.h"       // class FE_Declarator
 
 /*
  * FE Operations
diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h
index c28a733f785..d67cd4be4e0 100644
--- a/TAO/TAO_IDL/include/global_extern.h
+++ b/TAO/TAO_IDL/include/global_extern.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -69,12 +69,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // global_extern.hh - Global data for the IDL compiler
 
-extern	IDL_GlobalData	*idl_global;	// Contains all "global" data
+extern  IDL_GlobalData  *idl_global;    // Contains all "global" data
 
 // Global functions for the IDL compiler
 
 // Return TRUE when the name of this AST_Decl can be reused in
 // a definition in this scope
-extern	idl_bool	can_be_redefined(AST_Decl *);
+extern  idl_bool        can_be_redefined(AST_Decl *);
 
 #endif           // _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h
index 5989365150e..0b9161c511b 100644
--- a/TAO/TAO_IDL/include/idl.h
+++ b/TAO/TAO_IDL/include/idl.h
@@ -75,23 +75,27 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include        "ace/ACE.h"             // Most important ACE include file
 #include        "ace/streams.h"         // iostreams
 
-#include	"intlmacros.h"		// Define macros for intl'ion
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include	<stdlib.h>		// POSIX standard defns
-#include	<ctype.h>		// External functions
+#include        "intlmacros.h"          // Define macros for intl'ion
 
-#include	<sys/types.h>		// POSIX standard types
+#include        <stdlib.h>              // POSIX standard defns
+#include        <ctype.h>               // External functions
 
-#include	"idl_narrow.h"		// IDL Narrowing mechanism
+#include        <sys/types.h>           // POSIX standard types
 
-#include	"idl_defines.h"	// Constants for IDL compiler
-#include	"idl_fwd.h"		// Forward decls of classes
+#include        "idl_narrow.h"          // IDL Narrowing mechanism
 
-#include	"idl_bool.h"		// Defines boolean for IDL
+#include        "idl_defines.h" // Constants for IDL compiler
+#include        "idl_fwd.h"             // Forward decls of classes
 
-#include	"utl_string.h"		// Defines utility string class
-#include	"utl_identifier.h"	// Defines utility identifier class
-#include	"ast.h"		// AST classes
-#include	"util.h"		// Utility classes
+#include        "idl_bool.h"            // Defines boolean for IDL
+
+#include        "utl_string.h"          // Defines utility string class
+#include        "utl_identifier.h"      // Defines utility identifier class
+#include        "ast.h"         // AST classes
+#include        "util.h"                // Utility classes
 
 #endif           // _IDL_IDL_HH
diff --git a/TAO/TAO_IDL/include/idl_bool.h b/TAO/TAO_IDL/include/idl_bool.h
index c0741684896..838e7dbfcb8 100644
--- a/TAO/TAO_IDL/include/idl_bool.h
+++ b/TAO/TAO_IDL/include/idl_bool.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -81,14 +81,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from idl.hh
 */
 
-#ifndef	I_TRUE
-#define I_TRUE	1
+#ifndef I_TRUE
+#define I_TRUE  1
 #endif
 
-#ifndef	I_FALSE
-#define I_FALSE	0
+#ifndef I_FALSE
+#define I_FALSE 0
 #endif
 
-typedef		long		idl_bool;
+typedef         long            idl_bool;
 
 #endif           // _IDL_BOOL_IDL_BOOL_HH
diff --git a/TAO/TAO_IDL/include/idl_defines.h b/TAO/TAO_IDL/include/idl_defines.h
index 6cf062ee212..db7a7c6154d 100644
--- a/TAO/TAO_IDL/include/idl_defines.h
+++ b/TAO/TAO_IDL/include/idl_defines.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // This cannot be an enum since more than one value may be active at
 // a given time, hence bitflags are #define'd instead
-     
-#define	IDL_CF_VERSION		(1 << 0)
-#define	IDL_CF_DUMP_AST		(1 << 1)
-#define	IDL_CF_ONLY_PREPROC	(1 << 2)
-#define	IDL_CF_ONLY_USAGE	(1 << 3)
-#define	IDL_CF_INFORMATIVE	(1 << 4)
-#define	IDL_CF_NOWARNINGS	(1 << 5)
-
-#endif	// _IDL_DEFINES_IDL_DEFINES_HH
+
+#define IDL_CF_VERSION          (1 << 0)
+#define IDL_CF_DUMP_AST         (1 << 1)
+#define IDL_CF_ONLY_PREPROC     (1 << 2)
+#define IDL_CF_ONLY_USAGE       (1 << 3)
+#define IDL_CF_INFORMATIVE      (1 << 4)
+#define IDL_CF_NOWARNINGS       (1 << 5)
+
+#endif  // _IDL_DEFINES_IDL_DEFINES_HH
diff --git a/TAO/TAO_IDL/include/idl_extern.h b/TAO/TAO_IDL/include/idl_extern.h
index efbe0ccdeb5..7cf1fb14e02 100644
--- a/TAO/TAO_IDL/include/idl_extern.h
+++ b/TAO/TAO_IDL/include/idl_extern.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -71,11 +71,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 //
 // Global variables and functions for IDL compiler
 
-#include	"fe_extern.h"		// External API of FE
-#include	"be_extern.h"		// External API of BE
-#include	"drv_extern.h"		// External API of DRV
-#include	"ast_extern.h"		// External API of AST
-#include	"nr_extern.h"		// External API of NR
-#include	"global_extern.h"	// Global data
+#include        "fe_extern.h"           // External API of FE
+#include        "be_extern.h"           // External API of BE
+#include        "drv_extern.h"          // External API of DRV
+#include        "ast_extern.h"          // External API of AST
+#include        "nr_extern.h"           // External API of NR
+#include        "global_extern.h"       // Global data
 
 #endif           // _IDL_EXTERN_IDL_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl_fwd.h b/TAO/TAO_IDL/include/idl_fwd.h
index 7b9761418b4..5198f1bcae8 100644
--- a/TAO/TAO_IDL/include/idl_fwd.h
+++ b/TAO/TAO_IDL/include/idl_fwd.h
@@ -79,70 +79,70 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Class for global data representation:
 
-class	IDL_GlobalData;			// Global data is stored in an
-					// instance of this
+class   IDL_GlobalData;                 // Global data is stored in an
+                                        // instance of this
 
 // Classes for utility of the IDL compiler:
 
-class	UTL_ScopeStack;			// Stack of scopes
-class	UTL_Scope;			// A definition scope (mixin)
-
-class	UTL_LongList;			// List of longs
-class	UTL_StrList;			// List of strings
-class	UTL_StrlistActiveIterator;	// Active iterator for list of strings
-class	UTL_IdList;			// List of identifiers
-class	UTL_IdListActiveIterator;	// Active iterator for list of id's
-class	UTL_ExceptList;			// List of exceptions
-class	UTL_NameList;			// List of scoped names
-class	UTL_ExprList;			// List of expressions
-class	UTL_InterfList;			// List of interfaces
-class	UTL_LabelList;			// List of union branch labels
-class	UTL_DeclList;			// List of declarators
-class	UTL_String;			// String class
-class	UTL_Identifier;			// Identifier class
-
-class	UTL_Error;			// Error class
-class	UTL_Indenter;			// Indenter class
+class   UTL_ScopeStack;                 // Stack of scopes
+class   UTL_Scope;                      // A definition scope (mixin)
+
+class   UTL_LongList;                   // List of longs
+class   UTL_StrList;                    // List of strings
+class   UTL_StrlistActiveIterator;      // Active iterator for list of strings
+class   UTL_IdList;                     // List of identifiers
+class   UTL_IdListActiveIterator;       // Active iterator for list of id's
+class   UTL_ExceptList;                 // List of exceptions
+class   UTL_NameList;                   // List of scoped names
+class   UTL_ExprList;                   // List of expressions
+class   UTL_InterfList;                 // List of interfaces
+class   UTL_LabelList;                  // List of union branch labels
+class   UTL_DeclList;                   // List of declarators
+class   UTL_String;                     // String class
+class   UTL_Identifier;                 // Identifier class
+
+class   UTL_Error;                      // Error class
+class   UTL_Indenter;                   // Indenter class
 
 // Classes for utility of the FE. These classes are used only
 // by the FE but their forward declaration is needed because lists
 // of them are constructed by classes in UTL
 
-class	FE_InterfaceHeader;		// Interface header
-class	FE_Declarator;			// Declarator
+class   FE_InterfaceHeader;             // Interface header
+class   FE_Declarator;                  // Declarator
 
 // Generator class for the AST
 
-class	AST_Generator;			// Generate nodes of various types
+class   AST_Generator;                  // Generate nodes of various types
 
 // Classes for AST:
 
-class	AST_Decl;			// The rock bottom base class
-
-class	AST_PredefinedType;		// A predefined type
-class	AST_Type;			// An IDL type
-class	AST_ConcreteType;		// An IDL concrete type
-class	AST_Module;			// A module
-class	AST_Root;			// The root of an AST (a module)
-class	AST_Interface;			// An interface
-class	AST_InterfaceFwd;		// A forward interface decl
-class	AST_Constant;			// A constant declaration
-class	AST_Expression;			// Value of an expression
-class	AST_Exception;			// An exception declaration
-class	AST_Attribute;			// An attribute declaration
-class	AST_Operation;			// An operation declaration
-class	AST_Argument;			// An argument to an operation
-class	AST_Union;			// A union declaration
-class	AST_UnionBranch;		// A branch in a union
-class	AST_UnionLabel;			// A union branch label
-class	AST_Structure;			// A structure declaration
-class	AST_Field;			// A field in a structure or union
-class	AST_Enum;			// An enum declaration
-class	AST_EnumVal;			// An enumerator in an enum
-class	AST_Sequence;			// A sequence declaration
-class	AST_String;			// A string declaration
-class	AST_Array;			// An array declaration
-class	AST_Typedef;			// A typedef declaration
+class   AST_Decl;                       // The rock bottom base class
+
+class   AST_PredefinedType;             // A predefined type
+class   AST_Type;                       // An IDL type
+class   AST_ConcreteType;               // An IDL concrete type
+class   AST_Module;                     // A module
+class   AST_Root;                       // The root of an AST (a module)
+class   AST_Interface;                  // An interface
+class   AST_InterfaceFwd;               // A forward interface decl
+class   AST_Constant;                   // A constant declaration
+class   AST_Expression;                 // Value of an expression
+class   AST_Exception;                  // An exception declaration
+class   AST_Attribute;                  // An attribute declaration
+class   AST_Operation;                  // An operation declaration
+class   AST_Argument;                   // An argument to an operation
+class   AST_Union;                      // A union declaration
+class   AST_UnionBranch;                // A branch in a union
+class   AST_UnionLabel;                 // A union branch label
+class   AST_Structure;                  // A structure declaration
+class   AST_Field;                      // A field in a structure or union
+class   AST_Enum;                       // An enum declaration
+class   AST_EnumVal;                    // An enumerator in an enum
+class   AST_Sequence;                   // A sequence declaration
+class   AST_String;                     // A string declaration
+class   AST_Array;                      // An array declaration
+class   AST_Typedef;                    // A typedef declaration
 class   AST_Native;                     // A native declaration
 
 #endif           // _IDL_FWD_IDL_FWD_HH
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 0f66796cb3e..8fe0d6e80b5 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -81,119 +81,119 @@ public:
   // better error messages can be produced, and for use by BEs in situations
   // where context sensitive behavior is required
   enum ParseState {
-      PS_NoState		// No state
-    , PS_TypeDeclSeen		// Seen complete typedef declaration
-    , PS_ConstDeclSeen		// Seen complete const declaration
-    , PS_ExceptDeclSeen		// Seen complete exception declaration
-    , PS_InterfaceDeclSeen	// Seen complete interface declaration
-    , PS_ModuleDeclSeen		// Seen complete module declaration
-    , PS_AttrDeclSeen		// Seen complete attribute declaration
-    , PS_OpDeclSeen		// Seen complete operation declaration
-    , PS_ModuleSeen		// Seen a MODULE keyword
-    , PS_ModuleIDSeen		// Seen the module ID
-    , PS_ModuleSqSeen		// '{' seen for module
-    , PS_ModuleQsSeen		// '}' seen for module
-    , PS_ModuleBodySeen		// Seen complete module body
-    , PS_InterfaceSeen		// Seen an INTERFACE keyword
-    , PS_InterfaceIDSeen	// Seen the interface ID
-    , PS_InheritSpecSeen	// Seen a complete inheritance spec
-    , PS_ForwardDeclSeen	// Forward interface decl seen
-    , PS_InterfaceSqSeen	// '{' seen for interface
-    , PS_InterfaceQsSeen	// '}' seen for interface
-    , PS_InterfaceBodySeen	// Seen an interface body
-    , PS_InheritColonSeen	// Seen ':' in inheritance list
-    , PS_SNListCommaSeen	// Seen ',' in list of scoped names
-    , PS_ScopedNameSeen		// Seen a complete scoped name
-    , PS_SN_IDSeen		// Seen an identifier as part of a scoped name
-    , PS_ScopeDelimSeen		// Seen a scope delim as party of a scoped name
-    , PS_ConstSeen		// Seen a CONST keyword
-    , PS_ConstTypeSeen		// Parsed the type of a constant
-    , PS_ConstIDSeen		// Seen the constant ID
-    , PS_ConstAssignSeen	// Seen the '='
-    , PS_ConstExprSeen		// Seen the constant value expression
-    , PS_TypedefSeen		// Seen a TYPEDEF keyword
-    , PS_TypeSpecSeen		// Seen a complete type specification
-    , PS_DeclaratorsSeen	// Seen a complete list of declarators
-    , PS_StructSeen		// Seen a STRUCT keyword
-    , PS_StructIDSeen		// Seen the struct ID
-    , PS_StructSqSeen		// '{' seen for struct
-    , PS_StructQsSeen		// '}' seen for struct
-    , PS_StructBodySeen		// Seen complete body of struct decl
-    , PS_MemberTypeSeen		// Seen type of struct or except member
-    , PS_MemberDeclsSeen	// Seen decls of struct or except members
-    , PS_MemberDeclsCompleted	// Completed one struct or except member to ';'
-    , PS_UnionSeen		// Seen a UNION keyword
-    , PS_UnionIDSeen		// Seen the union ID
-    , PS_SwitchSeen		// Seen the SWITCH keyword
-    , PS_SwitchOpenParSeen	// Seen the switch open par.
-    , PS_SwitchTypeSeen		// Seen the switch type spec
-    , PS_SwitchCloseParSeen	// Seen the switch close par.
-    , PS_UnionSqSeen		// '{' seen for union
-    , PS_UnionQsSeen		// '}' seen for union
-    , PS_DefaultSeen		// Seen DEFAULT keyword
-    , PS_UnionLabelSeen		// Seen label of union element
-    , PS_LabelColonSeen		// Seen ':' of union branch label
-    , PS_LabelExprSeen		// Seen expression of union branch label
-    , PS_UnionElemSeen		// Seen a union element
-    , PS_UnionElemCompleted	// Completed one union member up to ';'
-    , PS_CaseSeen		// Seen a CASE keyword
-    , PS_UnionElemTypeSeen	// Seen type spec for union element
-    , PS_UnionElemDeclSeen	// Seen declarator for union element
-    , PS_UnionBodySeen		// Seen completed union body
-    , PS_EnumSeen		// Seen an ENUM keyword
-    , PS_EnumIDSeen		// Seen the enum ID
-    , PS_EnumSqSeen		// Seen '{' for enum
-    , PS_EnumQsSeen		// Seen '}' for enum
-    , PS_EnumBodySeen		// Seen complete enum body
-    , PS_EnumCommaSeen		// Seen ',' in list of enumerators
-    , PS_SequenceSeen		// Seen a SEQUENCE keyword
-    , PS_SequenceSqSeen		// Seen '<' for sequence
-    , PS_SequenceQsSeen		// Seen '>' for sequence
-    , PS_SequenceTypeSeen	// Seen type decl for sequence
-    , PS_SequenceCommaSeen	// Seen comma for sequence
-    , PS_SequenceExprSeen	// Seen size expression for sequence
-    , PS_StringSeen		// Seen a STRING keyword
-    , PS_StringSqSeen		// Seen '<' for string
-    , PS_StringQsSeen		// Seen '>' for string
-    , PS_StringExprSeen		// Seen size expression for string
-    , PS_StringCompleted	// Seen a string decl without size spec
-    , PS_ArrayIDSeen		// Seen array ID
-    , PS_ArrayCompleted		// Seen completed array declaration
-    , PS_DimSqSeen		// Seen '[' for array dimension
-    , PS_DimQsSeen		// Seen ']' for array dimension
-    , PS_DimExprSeen		// Seen size expression for array dimension
-    , PS_AttrROSeen		// Seen READONLY keyword
-    , PS_AttrSeen		// Seen ATTRIBUTE keyword
-    , PS_AttrTypeSeen		// Seen type decl for attribute
-    , PS_AttrDeclsSeen		// Seen declarators for attribute
-    , PS_AttrCompleted		// Seen complete attribute declaration
-    , PS_ExceptSeen		// Seen EXCEPTION keyword
-    , PS_ExceptIDSeen		// Seen exception identifier
-    , PS_ExceptSqSeen		// Seen '{' for exception
-    , PS_ExceptQsSeen		// Seen '}' for exception
-    , PS_ExceptBodySeen		// Seen complete exception body
-    , PS_OpAttrSeen		// Seen operation attribute
-    , PS_OpTypeSeen		// Seen operation return type
-    , PS_OpIDSeen		// Seen operation ID
-    , PS_OpParsCompleted	// Completed operation param list
-    , PS_OpRaiseCompleted	// Completed operation except list
-    , PS_OpContextCompleted	// Completed operation context spec
-    , PS_OpCompleted		// Completed operation statement
-    , PS_OpSqSeen		// Seen '(' for operation
-    , PS_OpQsSeen		// Seen ')' for operation
-    , PS_OpParCommaSeen		// Seen ',' in list of op params
-    , PS_OpParDirSeen		// Seen parameter direction
-    , PS_OpParTypeSeen		// Seen parameter type
-    , PS_OpParDeclSeen		// Seen parameter declaration
-    , PS_OpRaiseSeen		// Seen RAISES keyword
-    , PS_OpRaiseSqSeen		// Seen '(' for RAISES
-    , PS_OpRaiseQsSeen		// Seen ')' for RAISES
-    , PS_OpContextSeen		// Seen CONTEXT keyword
-    , PS_OpContextSqSeen	// Seen '(' for CONTEXT
-    , PS_OpContextQsSeen	// Seen ')' for CONTEXT
-    , PS_OpContextCommaSeen	// Seen ',' for CONTEXT
-    , PS_DeclsCommaSeen		// Seen ',' in declarators list
-    , PS_DeclsDeclSeen		// Seen complete decl in decls list
+      PS_NoState                // No state
+    , PS_TypeDeclSeen           // Seen complete typedef declaration
+    , PS_ConstDeclSeen          // Seen complete const declaration
+    , PS_ExceptDeclSeen         // Seen complete exception declaration
+    , PS_InterfaceDeclSeen      // Seen complete interface declaration
+    , PS_ModuleDeclSeen         // Seen complete module declaration
+    , PS_AttrDeclSeen           // Seen complete attribute declaration
+    , PS_OpDeclSeen             // Seen complete operation declaration
+    , PS_ModuleSeen             // Seen a MODULE keyword
+    , PS_ModuleIDSeen           // Seen the module ID
+    , PS_ModuleSqSeen           // '{' seen for module
+    , PS_ModuleQsSeen           // '}' seen for module
+    , PS_ModuleBodySeen         // Seen complete module body
+    , PS_InterfaceSeen          // Seen an INTERFACE keyword
+    , PS_InterfaceIDSeen        // Seen the interface ID
+    , PS_InheritSpecSeen        // Seen a complete inheritance spec
+    , PS_ForwardDeclSeen        // Forward interface decl seen
+    , PS_InterfaceSqSeen        // '{' seen for interface
+    , PS_InterfaceQsSeen        // '}' seen for interface
+    , PS_InterfaceBodySeen      // Seen an interface body
+    , PS_InheritColonSeen       // Seen ':' in inheritance list
+    , PS_SNListCommaSeen        // Seen ',' in list of scoped names
+    , PS_ScopedNameSeen         // Seen a complete scoped name
+    , PS_SN_IDSeen              // Seen an identifier as part of a scoped name
+    , PS_ScopeDelimSeen         // Seen a scope delim as party of a scoped name
+    , PS_ConstSeen              // Seen a CONST keyword
+    , PS_ConstTypeSeen          // Parsed the type of a constant
+    , PS_ConstIDSeen            // Seen the constant ID
+    , PS_ConstAssignSeen        // Seen the '='
+    , PS_ConstExprSeen          // Seen the constant value expression
+    , PS_TypedefSeen            // Seen a TYPEDEF keyword
+    , PS_TypeSpecSeen           // Seen a complete type specification
+    , PS_DeclaratorsSeen        // Seen a complete list of declarators
+    , PS_StructSeen             // Seen a STRUCT keyword
+    , PS_StructIDSeen           // Seen the struct ID
+    , PS_StructSqSeen           // '{' seen for struct
+    , PS_StructQsSeen           // '}' seen for struct
+    , PS_StructBodySeen         // Seen complete body of struct decl
+    , PS_MemberTypeSeen         // Seen type of struct or except member
+    , PS_MemberDeclsSeen        // Seen decls of struct or except members
+    , PS_MemberDeclsCompleted   // Completed one struct or except member to ';'
+    , PS_UnionSeen              // Seen a UNION keyword
+    , PS_UnionIDSeen            // Seen the union ID
+    , PS_SwitchSeen             // Seen the SWITCH keyword
+    , PS_SwitchOpenParSeen      // Seen the switch open par.
+    , PS_SwitchTypeSeen         // Seen the switch type spec
+    , PS_SwitchCloseParSeen     // Seen the switch close par.
+    , PS_UnionSqSeen            // '{' seen for union
+    , PS_UnionQsSeen            // '}' seen for union
+    , PS_DefaultSeen            // Seen DEFAULT keyword
+    , PS_UnionLabelSeen         // Seen label of union element
+    , PS_LabelColonSeen         // Seen ':' of union branch label
+    , PS_LabelExprSeen          // Seen expression of union branch label
+    , PS_UnionElemSeen          // Seen a union element
+    , PS_UnionElemCompleted     // Completed one union member up to ';'
+    , PS_CaseSeen               // Seen a CASE keyword
+    , PS_UnionElemTypeSeen      // Seen type spec for union element
+    , PS_UnionElemDeclSeen      // Seen declarator for union element
+    , PS_UnionBodySeen          // Seen completed union body
+    , PS_EnumSeen               // Seen an ENUM keyword
+    , PS_EnumIDSeen             // Seen the enum ID
+    , PS_EnumSqSeen             // Seen '{' for enum
+    , PS_EnumQsSeen             // Seen '}' for enum
+    , PS_EnumBodySeen           // Seen complete enum body
+    , PS_EnumCommaSeen          // Seen ',' in list of enumerators
+    , PS_SequenceSeen           // Seen a SEQUENCE keyword
+    , PS_SequenceSqSeen         // Seen '<' for sequence
+    , PS_SequenceQsSeen         // Seen '>' for sequence
+    , PS_SequenceTypeSeen       // Seen type decl for sequence
+    , PS_SequenceCommaSeen      // Seen comma for sequence
+    , PS_SequenceExprSeen       // Seen size expression for sequence
+    , PS_StringSeen             // Seen a STRING keyword
+    , PS_StringSqSeen           // Seen '<' for string
+    , PS_StringQsSeen           // Seen '>' for string
+    , PS_StringExprSeen         // Seen size expression for string
+    , PS_StringCompleted        // Seen a string decl without size spec
+    , PS_ArrayIDSeen            // Seen array ID
+    , PS_ArrayCompleted         // Seen completed array declaration
+    , PS_DimSqSeen              // Seen '[' for array dimension
+    , PS_DimQsSeen              // Seen ']' for array dimension
+    , PS_DimExprSeen            // Seen size expression for array dimension
+    , PS_AttrROSeen             // Seen READONLY keyword
+    , PS_AttrSeen               // Seen ATTRIBUTE keyword
+    , PS_AttrTypeSeen           // Seen type decl for attribute
+    , PS_AttrDeclsSeen          // Seen declarators for attribute
+    , PS_AttrCompleted          // Seen complete attribute declaration
+    , PS_ExceptSeen             // Seen EXCEPTION keyword
+    , PS_ExceptIDSeen           // Seen exception identifier
+    , PS_ExceptSqSeen           // Seen '{' for exception
+    , PS_ExceptQsSeen           // Seen '}' for exception
+    , PS_ExceptBodySeen         // Seen complete exception body
+    , PS_OpAttrSeen             // Seen operation attribute
+    , PS_OpTypeSeen             // Seen operation return type
+    , PS_OpIDSeen               // Seen operation ID
+    , PS_OpParsCompleted        // Completed operation param list
+    , PS_OpRaiseCompleted       // Completed operation except list
+    , PS_OpContextCompleted     // Completed operation context spec
+    , PS_OpCompleted            // Completed operation statement
+    , PS_OpSqSeen               // Seen '(' for operation
+    , PS_OpQsSeen               // Seen ')' for operation
+    , PS_OpParCommaSeen         // Seen ',' in list of op params
+    , PS_OpParDirSeen           // Seen parameter direction
+    , PS_OpParTypeSeen          // Seen parameter type
+    , PS_OpParDeclSeen          // Seen parameter declaration
+    , PS_OpRaiseSeen            // Seen RAISES keyword
+    , PS_OpRaiseSqSeen          // Seen '(' for RAISES
+    , PS_OpRaiseQsSeen          // Seen ')' for RAISES
+    , PS_OpContextSeen          // Seen CONTEXT keyword
+    , PS_OpContextSqSeen        // Seen '(' for CONTEXT
+    , PS_OpContextQsSeen        // Seen ')' for CONTEXT
+    , PS_OpContextCommaSeen     // Seen ',' for CONTEXT
+    , PS_DeclsCommaSeen         // Seen ',' in declarators list
+    , PS_DeclsDeclSeen          // Seen complete decl in decls list
     , PS_NativeSeen             // Seen a native declaration
     , PS_PragmaPrefixSyntax     // Could not parse the #pragma prefix
   };
@@ -203,97 +203,97 @@ public:
   virtual ~IDL_GlobalData() {}
 
   // Operations
-  virtual UTL_ScopeStack	*scopes();		// Scopes stack
-  virtual void			set_scopes(UTL_ScopeStack *);
-							// Set it
+  virtual UTL_ScopeStack        *scopes();              // Scopes stack
+  virtual void                  set_scopes(UTL_ScopeStack *);
+                                                        // Set it
 
-  virtual AST_Root		*root();		// Root of AST
-  virtual void			set_root(AST_Root *);	// Set it
+  virtual AST_Root              *root();                // Root of AST
+  virtual void                  set_root(AST_Root *);   // Set it
 
-  virtual AST_Generator		*gen();			// Generator
-  virtual void			set_gen(AST_Generator *);// Set it
+  virtual AST_Generator         *gen();                 // Generator
+  virtual void                  set_gen(AST_Generator *);// Set it
 
-  virtual UTL_Error		*err();			// Error reporter
-  virtual void			set_err(UTL_Error *);	// Set it
+  virtual UTL_Error             *err();                 // Error reporter
+  virtual void                  set_err(UTL_Error *);   // Set it
 
-  virtual long			err_count();		// How many errors?
-  virtual void			set_err_count(long);	// Set it
+  virtual long                  err_count();            // How many errors?
+  virtual void                  set_err_count(long);    // Set it
 
-  virtual long			lineno();		// Where in file?
-  virtual void			set_lineno(long);	// Set it
+  virtual long                  lineno();               // Where in file?
+  virtual void                  set_lineno(long);       // Set it
 
-  virtual String		*filename();		// What file?
-  virtual void			set_filename(String *);	// Set it
+  virtual String                *filename();            // What file?
+  virtual void                  set_filename(String *); // Set it
 
-  virtual String		*main_filename();	// What's the main
-							// file name?
-  virtual void			set_main_filename(String *);
-							// Set it
+  virtual String                *main_filename();       // What's the main
+                                                        // file name?
+  virtual void                  set_main_filename(String *);
+                                                        // Set it
 
-  virtual String		*real_filename();	// What's the real
-							// file name?
-  virtual void			set_real_filename(String *);
-			                                // Set it
+  virtual String                *real_filename();       // What's the real
+                                                        // file name?
+  virtual void                  set_real_filename(String *);
+                                                        // Set it
 
-  virtual String		*stripped_filename();	// Stripped filename
-  virtual void			set_stripped_filename(String *);  // Set it
+  virtual String                *stripped_filename();   // Stripped filename
+  virtual void                  set_stripped_filename(String *);  // Set it
 
-  virtual idl_bool		imported();		// Are we imported?
-  virtual idl_bool		import();		// Is import on?
-  virtual void			set_import(idl_bool);	// Set it
+  virtual idl_bool              imported();             // Are we imported?
+  virtual idl_bool              import();               // Is import on?
+  virtual void                  set_import(idl_bool);   // Set it
 
-  virtual idl_bool		in_main_file();		// Are we?
-  virtual void			set_in_main_file(idl_bool);	// Set it
+  virtual idl_bool              in_main_file();         // Are we?
+  virtual void                  set_in_main_file(idl_bool);     // Set it
 
-  virtual char			*prog_name();		// Invoked as..
-  virtual void			set_prog_name(char *);	// Set it
+  virtual char                  *prog_name();           // Invoked as..
+  virtual void                  set_prog_name(char *);  // Set it
 
-  virtual char			*cpp_location();	// Where's CPP?
-  virtual void			set_cpp_location(char *);// Set it
+  virtual char                  *cpp_location();        // Where's CPP?
+  virtual void                  set_cpp_location(char *);// Set it
 
-  virtual long			compile_flags();	// What flags are on?
-  virtual void			set_compile_flags(long);// Turn some on or off
+  virtual long                  compile_flags();        // What flags are on?
+  virtual void                  set_compile_flags(long);// Turn some on or off
 
-  virtual char			*be();			// Get BE to use
-  virtual void			set_be(char *);		// Set it
+  virtual char                  *be();                  // Get BE to use
+  virtual void                  set_be(char *);         // Set it
 
-  virtual char			*local_escapes();	// Get local escapes
-  virtual void			set_local_escapes(char *);// Set it
+  virtual char                  *local_escapes();       // Get local escapes
+  virtual void                  set_local_escapes(char *);// Set it
 
-  virtual UTL_Indenter		*indent();		// Get indenter
-  virtual void			set_indent(UTL_Indenter *);
-							// Set it
+  virtual UTL_Indenter          *indent();              // Get indenter
+  virtual void                  set_indent(UTL_Indenter *);
+                                                        // Set it
 
-  virtual UTL_StrList		*pragmas();		// Get pragmas
-  virtual void			set_pragmas(UTL_StrList *);// Set it
+  virtual UTL_StrList           *pragmas();             // Get pragmas
+  virtual void                  set_pragmas(UTL_StrList *);// Set it
 
-  virtual idl_bool		read_from_stdin();	// Reading from stdin?
-  virtual void			set_read_from_stdin(idl_bool); // Set it
+  virtual idl_bool              read_from_stdin();      // Reading from stdin?
+  virtual void                  set_read_from_stdin(idl_bool); // Set it
 
-  virtual void			store_include_file_name(String *);
+  virtual void                  store_include_file_name(String *);
 
-  virtual String	      **include_file_names();	// Array of file names
-  virtual void			set_include_file_names(String **); // Set it
+  virtual String              **include_file_names();   // Array of file names
+  virtual void                  set_include_file_names(String **); // Set it
 
-  virtual unsigned long		n_include_file_names();	// How many
-  virtual void			set_n_include_file_names(unsigned long n);
+  virtual unsigned long         n_include_file_names(); // How many
+  virtual void                  set_n_include_file_names(unsigned long n);
 
   // = Access methods to deal with other IDL files included in the main
   //   IDL file. These IDL files are exactly the same strings that are
   // "#include"d in the main IDL file, not the ones after CC
   // preprocessor parsed the file.
-  
+
   // Just storing the pointer. No memory will be allocated.
   virtual void add_to_included_idl_files (char* file_name);
-  
-  // Get all the files. 
+
+  // Get all the files.
   virtual char** included_idl_files (void);
-  
+
   // The number of currently availabe include files.
   virtual size_t n_included_idl_files (void);
-  
-  virtual ParseState		parse_state();		// What state we're in
-  virtual void			set_parse_state(ParseState s); // Set it
+
+  virtual ParseState            parse_state();          // What state we're in
+  virtual void                  set_parse_state(ParseState s); // Set it
 
   // Convert from a predefined type to an expression type
   virtual AST_Expression::ExprType
@@ -358,76 +358,76 @@ public:
   // macro definition.
 
   // = Set and get methods for different file name endings.
-  
+
   virtual void client_hdr_ending (const char* s);
-  // Set the client_hdr_ending. 
-  
+  // Set the client_hdr_ending.
+
   virtual const char* client_hdr_ending (void) const;
   // Get the client_hdr_ending.
-  
+
   virtual void client_inline_ending (const char* s);
   // Set the client_inline_ending.
-  
+
   virtual const char* client_inline_ending (void) const;
-  // Get the client_inline_ending. 
-  
+  // Get the client_inline_ending.
+
   virtual void  client_stub_ending (const char* s);
   // Set the client_stub_ending.
-  
+
   virtual const char* client_stub_ending (void) const;
   // Get the client_stub_ending.
-  
+
   virtual void server_hdr_ending (const char* s);
   // Set the server_hdr_ending.
-  
+
   virtual const char* server_hdr_ending (void) const;
   // Get the server_hdr_ending.
-  
+
   virtual void server_template_hdr_ending (const char* s);
   // Set the server_template_hdr_ending.
-  
-  virtual const char* server_template_hdr_ending (void) const; 
+
+  virtual const char* server_template_hdr_ending (void) const;
   // Get the server_template_hdr_ending.
-  
+
   virtual void server_skeleton_ending (const char* s);
   // Set the server_skeleton_ending.
-  
+
   virtual const char* server_skeleton_ending (void) const;
   // Get the server_skeleton_ending.
-  
+
   virtual void server_template_skeleton_ending (const char* s);
   // Set the server_template_skeleton_ending.
-  
+
   virtual const char* server_template_skeleton_ending (void) const;
   // Get the server_template_skeleton_ending.
-  
+
   virtual void server_inline_ending (const char* s);
   // Set the server_inline_ending.
 
   virtual const char* server_inline_ending (void) const;
   // Get the server_inline_ending.
-  
+
   virtual void server_template_inline_ending (const char* s);
   //  Set the server_template_inline_ending.
-  
+
   virtual const char* server_template_inline_ending (void) const;
   // Get the server_template_inline_ending.
 
   virtual void output_dir (const char* s);
   // Set the directory where all the IDL-Compiler-Generated files are
   // to be kept. Default  is current directory from which the
-  // <tao_idl> is called. 
+  // <tao_idl> is called.
 
   virtual const char* output_dir (void) const;
   // Get the directory where all the IDL-Compiler-Generated files are
   // to be kept. Default  is current directory from which the
-  // <tao_idl> is called. 
+  // <tao_idl> is called.
 
   virtual void gperf_path (const char* s);
   // Set the path for the perfect hashing program (GPERF).
 
   virtual const char* gperf_path (void) const;
-  // Get the path for the perfect hashing program (GPERF). 
+  // Get the path for the perfect hashing program (GPERF).
 
   virtual void any_support (idl_bool);
   // enable suppressing any support
@@ -445,100 +445,100 @@ public:
   // enable compiled marshaling support
 
   virtual idl_bool compiled_marshaling (void);
-  // check if we use compiled marshaling 
+  // check if we use compiled marshaling
 
   virtual void exception_support (idl_bool);
   // enable real C++ exceptions
 
   virtual idl_bool exception_support (void);
-  // check if real C++ exception support is to be enabled 
+  // check if real C++ exception support is to be enabled
 
   virtual void opt_tc (idl_bool);
   // enable optimized typecodes
 
   virtual idl_bool opt_tc (void);
   // check if TypeCodes need be optimized
-  
+
 private:
   // Data
-  UTL_ScopeStack		*pd_scopes;		// Store scopes stack
-  AST_Root			*pd_root;		// Store AST root
-  AST_Generator			*pd_gen;		// Store generator
-  UTL_Error			*pd_err;		// Error object
-  long				pd_err_count;		// Count of errors
-  long				pd_lineno;		// What line #
-  String			*pd_filename;		// What file
-  String			*pd_main_filename;	// What main filename
-  String			*pd_real_filename;	// What real filename
-  String			*pd_stripped_filename;	// Stripped filename
-  idl_bool			pd_import;		// Is import on?
-  idl_bool			pd_in_main_file;	// Are we in it?
-  char				*pd_prog_name;		// Argv[0]
-  char				*pd_cpp_location;	// Where to find CPP
-  long				pd_compile_flags;	// Compile flags
-  char				*pd_be;			// BE name to use
-  char				*pd_local_escapes;	// Trapdoor argument
-  UTL_Indenter			*pd_indent;		// Indent object
-  UTL_StrList			*pd_pragmas;		// List of pragmas
-							// as its being built
-  idl_bool			pd_read_from_stdin;	// Reading from stdin?
-  String			**pd_include_file_names;// Array of file names.
-  unsigned long			pd_n_include_file_names;// How many.
-  unsigned long			pd_n_alloced_file_names;// How many alloced.
+  UTL_ScopeStack                *pd_scopes;             // Store scopes stack
+  AST_Root                      *pd_root;               // Store AST root
+  AST_Generator                 *pd_gen;                // Store generator
+  UTL_Error                     *pd_err;                // Error object
+  long                          pd_err_count;           // Count of errors
+  long                          pd_lineno;              // What line #
+  String                        *pd_filename;           // What file
+  String                        *pd_main_filename;      // What main filename
+  String                        *pd_real_filename;      // What real filename
+  String                        *pd_stripped_filename;  // Stripped filename
+  idl_bool                      pd_import;              // Is import on?
+  idl_bool                      pd_in_main_file;        // Are we in it?
+  char                          *pd_prog_name;          // Argv[0]
+  char                          *pd_cpp_location;       // Where to find CPP
+  long                          pd_compile_flags;       // Compile flags
+  char                          *pd_be;                 // BE name to use
+  char                          *pd_local_escapes;      // Trapdoor argument
+  UTL_Indenter                  *pd_indent;             // Indent object
+  UTL_StrList                   *pd_pragmas;            // List of pragmas
+                                                        // as its being built
+  idl_bool                      pd_read_from_stdin;     // Reading from stdin?
+  String                        **pd_include_file_names;// Array of file names.
+  unsigned long                 pd_n_include_file_names;// How many.
+  unsigned long                 pd_n_alloced_file_names;// How many alloced.
 
   char** included_idl_files_;
   // IDL files that are "#include'd.
-  
+
   size_t n_included_idl_files_;
   // The number of such idl files that are currently stored.
-  
+
   size_t n_allocated_idl_files_;
   // For char*'s have been allocated for this.
-  
-  ParseState			pd_parse_state;		// Parse state we're in.
+
+  ParseState                    pd_parse_state;         // Parse state we're in.
 
   // Operations
-  long				seen_include_file_before(String *);
-							// Seen this include
-							// before?
+  long                          seen_include_file_before(String *);
+                                                        // Seen this include
+                                                        // before?
 
   String                        *pd_idl_src_file;       // IDL source file.
 
   char* export_macro_;
   char* export_include_;
-  
+
   // Client's header file name ending. Default is "C.h".
-  char*  client_hdr_ending_; 
-  
+  char*  client_hdr_ending_;
+
   // Client's stub's file name ending. Default is "C.cpp".
   char* client_stub_ending_;
-  
+
   // Client's inline file name ending. Default is "C.i".
-  char* client_inline_ending_; 
-  
+  char* client_inline_ending_;
+
   // Server's hdr file name ending. Default is "S.h".
   char* server_hdr_ending_;
-  
+
   // Server's template hdr file name ending. Default is "S_T.h".
   char* server_template_hdr_ending_;
-  
+
   // Server's skeleton file name ending. Default is "S.cpp".
   char* server_skeleton_ending_;
-  
+
   // Server's template skeleton file name ending. Default is
-  // "S_T.cpp". 
+  // "S_T.cpp".
   char* server_template_skeleton_ending_;
-  
+
   // Server's inline file name ending. Default is "S.i".
   char* server_inline_ending_;
-  
+
   // Server's template inline file name ending. Default is "S_T.i".
   char* server_template_inline_ending_;
 
   // Path for the perfect hash generator(gperf) program. Default
   // is $ACE_ROOT/bin/gperf.
   char* gperf_path_;
-  
+
   // Directory where all the IDL-Compiler-Generated files are to be
   // kept. Default value is 0 for this string which means the current
   // directory from which the <tao_idl> is called.
@@ -560,7 +560,7 @@ private:
   // do we generate optimized typecodes?
 };
 
-#endif	//_IDL_IDL_GLOBAL_HH
+#endif  //_IDL_IDL_GLOBAL_HH
 
 
 
diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h
index 7b770612682..f861a851277 100644
--- a/TAO/TAO_IDL/include/idl_narrow.h
+++ b/TAO/TAO_IDL/include/idl_narrow.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -64,8 +64,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#ifndef	_IDL_NARROW_IDL_NARROW_HH
-#define	_IDL_NARROW_IDL_NARROW_HH
+#ifndef _IDL_NARROW_IDL_NARROW_HH
+#define _IDL_NARROW_IDL_NARROW_HH
 
 // idl_narrow.hh
 //
@@ -95,11 +95,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // IMPL_NARROW_METHODSn where n is 0,1,2 and 3 are provided.
 // DEF_NARROW_METHODSn where n is 0,1,2 and 3 are provided.
 
-extern	char	*type_id_to_string(long);
+extern  char    *type_id_to_string(long);
 
 #define DEF_NARROW_METHODS0(TYPE)\
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
+static  int     type_id(); \
+virtual void    *narrow(long type_const)
 
 
 #define IMPL_NARROW_METHODS0(TYPE)\
@@ -108,17 +108,17 @@ TYPE::type_id()\
 {\
   return 0;\
 }\
-void	* \
+void    * \
 TYPE::narrow(long type_const) {\
-  void	*rval = NULL; \
+  void  *rval = NULL; \
   if (type_const == (long)&TYPE::type_id) \
     rval = this; \
   return rval; \
 }
 
 #define DEF_NARROW_METHODS1(TYPE,PARENT) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
+static  int     type_id(); \
+virtual void    *narrow(long type_const)
 
 
 #define IMPL_NARROW_METHODS1(TYPE,PARENT) \
@@ -127,9 +127,9 @@ TYPE::type_id() \
 {\
    return 0;\
 }\
-void	* \
+void    * \
 TYPE::narrow(long type_const) {\
-  void	*rval = NULL; \
+  void  *rval = NULL; \
   if (type_const == (long)&TYPE::type_id) \
     rval = this; \
   if (rval == NULL) \
@@ -138,8 +138,8 @@ TYPE::narrow(long type_const) {\
 }
 
 #define DEF_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
+static  int     type_id(); \
+virtual void    *narrow(long type_const)
 
 
 #define IMPL_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
@@ -148,7 +148,7 @@ TYPE::type_id() \
 {\
    return 0;\
 }\
-void	* \
+void    * \
 TYPE::narrow(long type_const) { \
   void *rval = NULL; \
   if (type_const == (long)&TYPE::type_id) \
@@ -161,8 +161,8 @@ TYPE::narrow(long type_const) { \
 }
 
 #define DEF_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
+static  int     type_id(); \
+virtual void    *narrow(long type_const)
 
 
 #define IMPL_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
@@ -171,7 +171,7 @@ TYPE::type_id() \
 {\
    return 0;\
 }\
-void	* \
+void    * \
 TYPE::narrow(long type_const) {\
   void *rval = NULL; \
   if (type_const == (long)&TYPE::type_id) \
@@ -186,8 +186,8 @@ TYPE::narrow(long type_const) {\
 }
 
 #define DEF_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
+static  int     type_id(); \
+virtual void    *narrow(long type_const)
 
 
 #define IMPL_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
@@ -196,7 +196,7 @@ TYPE::type_id() \
 {\
    return 0;\
 }\
-void	* \
+void    * \
 TYPE::narrow(long type_const) {\
   void *rval = NULL; \
   if (type_const == (long)&TYPE::type_id) \
@@ -213,8 +213,8 @@ TYPE::narrow(long type_const) {\
 }
 
 #define DEF_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
+static  int     type_id(); \
+virtual void    *narrow(long type_const)
 
 
 #define IMPL_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
@@ -223,7 +223,7 @@ TYPE::type_id() \
 {\
    return 0;\
 }\
-void	* \
+void    * \
 TYPE::narrow(long type_const) {\
   void *rval = NULL; \
   if (type_const == (long)&TYPE::type_id) \
@@ -242,7 +242,7 @@ TYPE::narrow(long type_const) {\
 }
 
 #define DEF_NARROW_FROM_DECL(TYPE)\
-static	TYPE *narrow_from_decl(AST_Decl *t)
+static  TYPE *narrow_from_decl(AST_Decl *t)
 
 
 #define IMPL_NARROW_FROM_DECL(TYPE)\
@@ -252,7 +252,7 @@ TYPE::narrow_from_decl(AST_Decl *t) { \
 }
 
 #define DEF_NARROW_FROM_SCOPE(TYPE)\
-static	TYPE *narrow_from_scope(UTL_Scope *t)
+static  TYPE *narrow_from_scope(UTL_Scope *t)
 
 
 #define IMPL_NARROW_FROM_SCOPE(TYPE)\
@@ -261,4 +261,4 @@ TYPE::narrow_from_scope(UTL_Scope *t) { \
     return (TYPE *)t->narrow((long)&TYPE::type_id);\
 }
 
-#endif	// _IDL_NARROW_IDL_NARROW_HH
+#endif  // _IDL_NARROW_IDL_NARROW_HH
diff --git a/TAO/TAO_IDL/include/intlmacros.h b/TAO/TAO_IDL/include/intlmacros.h
index a3a8c8c5cf0..5b5fddd8723 100644
--- a/TAO/TAO_IDL/include/intlmacros.h
+++ b/TAO/TAO_IDL/include/intlmacros.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -64,18 +64,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#ifndef	_IDL_INTLMACROS_HH
+#ifndef _IDL_INTLMACROS_HH
 #define _IDL_INTLMACROS_HH
 
 // intlmacros.hh
 //
 // Define macros which conditionalize string internationalization
 
-#ifndef	DOMF_TEXT_DEVEL_DOMAIN
-#define	DOMF_TEXT_DEVEL_DOMAIN	"SUNW_DOE_DOMF_DEVEL"
-#endif	// DOMF_TEXT_DEVEL_DOMAIN
+#ifndef DOMF_TEXT_DEVEL_DOMAIN
+#define DOMF_TEXT_DEVEL_DOMAIN  "SUNW_DOE_DOMF_DEVEL"
+#endif  // DOMF_TEXT_DEVEL_DOMAIN
 
-#define	GTDEVEL(s)		s
+#define GTDEVEL(s)              s
 
 #if defined(__STDC__)
 #define CONV(p) #p
@@ -84,4 +84,4 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define MKSTR(p) "p"
 #endif
 
-#endif	// _IDL_INTLMACROS_HH
+#endif  // _IDL_INTLMACROS_HH
diff --git a/TAO/TAO_IDL/include/nr_extern.h b/TAO/TAO_IDL/include/nr_extern.h
index efa8be05209..27e01d58edb 100644
--- a/TAO/TAO_IDL/include/nr_extern.h
+++ b/TAO/TAO_IDL/include/nr_extern.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -70,7 +70,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // nr_extern.hh - Defines entry points provided by narrowing
 
 // Convert between an UTL_Scope and an AST_Decl
-extern	AST_Decl	*ScopeAsDecl(UTL_Scope *s);
-extern	UTL_Scope	*DeclAsScope(AST_Decl *d);
+extern  AST_Decl        *ScopeAsDecl(UTL_Scope *s);
+extern  UTL_Scope       *DeclAsScope(AST_Decl *d);
 
-#endif	// _NR_EXTERN_NR_EXTERN_HH
+#endif  // _NR_EXTERN_NR_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/util.h b/TAO/TAO_IDL/include/util.h
index fa8d871e721..b16d2e14bff 100644
--- a/TAO/TAO_IDL/include/util.h
+++ b/TAO/TAO_IDL/include/util.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -69,19 +69,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // util.hh - Includes commonly used things defined in the util directory
 
-#include	"utl_stack.h"		// class fe_stack
-#include	"utl_exprlist.h"	// class UTL_ExprList
-#include	"utl_strlist.h"	// class UTL_StrList
-#include	"utl_idlist.h"		// class UTL_IdList
-#include	"utl_exceptlist.h"	// class UTL_ExceptList
-#include	"utl_namelist.h"	// class UTL_NameList
-#include	"utl_labellist.h"	// class UTL_LabelList
-#include	"utl_decllist.h"	// class UTL_DeclList
+#include        "utl_stack.h"           // class fe_stack
+#include        "utl_exprlist.h"        // class UTL_ExprList
+#include        "utl_strlist.h" // class UTL_StrList
+#include        "utl_idlist.h"          // class UTL_IdList
+#include        "utl_exceptlist.h"      // class UTL_ExceptList
+#include        "utl_namelist.h"        // class UTL_NameList
+#include        "utl_labellist.h"       // class UTL_LabelList
+#include        "utl_decllist.h"        // class UTL_DeclList
 
-#include	"idl_global.h"		// Class IDL_GlobalData
+#include        "idl_global.h"          // Class IDL_GlobalData
 
-#include	"utl_error.h"		// class UTL_Error
+#include        "utl_error.h"           // class UTL_Error
 
-#include	"utl_indenter.h"	// class UTL_Indenter
+#include        "utl_indenter.h"        // class UTL_Indenter
 
 #endif           // _UTIL_UTIL_HH
diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h
index 4a33e154ac2..030cef94568 100644
--- a/TAO/TAO_IDL/include/utl_decllist.h
+++ b/TAO/TAO_IDL/include/utl_decllist.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 /*
 ** DEPENDENCIES: utl_list.hh, fe_declarator.hh
@@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_DeclList : public UTL_List
+class   UTL_DeclList : public UTL_List
 {
 public:
   // Operations
@@ -98,15 +98,15 @@ public:
   UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr);
 
   // Get element
-  FE_Declarator		*head();
+  FE_Declarator         *head();
 
 private:
   // Data
-  FE_Declarator		*pd_car_data;	// The element this list stores
+  FE_Declarator         *pd_car_data;   // The element this list stores
 };
 
 // Active iterator fooor UTL_DeclList
-class	UTL_DecllistActiveIterator : public UTL_ListActiveIterator
+class   UTL_DecllistActiveIterator : public UTL_ListActiveIterator
 {
 public:
   // Operations
@@ -115,7 +115,7 @@ public:
   UTL_DecllistActiveIterator(UTL_DeclList *s);
 
   // Get current item
-  FE_Declarator		*item();
+  FE_Declarator         *item();
 };
 
 #endif           // _UTL_DECLLIST_UTL_DECLLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index 199e20d927f..f0d4bb86d2e 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -78,103 +78,103 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_Error
+class   UTL_Error
 {
 public:
   enum ErrorCode {
-    EIDL_SYNTAX_ERROR,		// Syntax error in IDL input
-				// More details will be gleaned from examining
-				// idl_global->parse_state()
-    EIDL_REDEF,			// Redefinition
-    EIDL_REDEF_SCOPE,		// Redefinition inside defining scope
-    EIDL_DEF_USE,		// Definition after use
-    EIDL_MULTIPLE_BRANCH,	// More than one union branch with this
-				// label
-    EIDL_COERCION_FAILURE,	// Coercion failure
-    EIDL_SCOPE_CONFLICT,	// Between fwd declare and full declare
-    EIDL_ONEWAY_CONFLICT,	// Between op decl and argument direction
-    EIDL_DISC_TYPE,		// Illegal discriminator type in union
-    EIDL_LABEL_TYPE,		// Mismatch with discriminator type in union
-    EIDL_ILLEGAL_ADD,		// Illegal add action
-    EIDL_ILLEGAL_USE,		// Illegal type used in expression
-    EIDL_ILLEGAL_RAISES,	// Error in "raises" clause
-    EIDL_ILLEGAL_CONTEXT,	// Error in "context" clause
-    EIDL_CANT_INHERIT,		// Cannot inherit from non-interface
-    EIDL_LOOKUP_ERROR,		// Identifier not found
-    EIDL_INHERIT_FWD_ERROR,	// Cannot inherit from fwd decl interface
-    EIDL_CONSTANT_EXPECTED,	// We got something else..
-    EIDL_NAME_CASE_ERROR,	// Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED,	// Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,	// Didnt find an enumerator with that name
-    EIDL_EVAL_ERROR,		// Error in evaluating expression
-    EIDL_AMBIGUOUS,		// Ambiguous name definition
-    EIDL_DECL_NOT_DEFINED,	// Forward declared but never defined
-    EIDL_FWD_DECL_LOOKUP,	// Tried to lookup in fwd declared intf
-    EIDL_RECURSIVE_TYPE,	// Illegal recursive use of type
-    EIDL_NONVOID_ONEWAY,	// Non-void return type in oneway operation
-    EIDL_NOT_A_TYPE,		// Not a type
-    EIDL_BACK_END,		// Back end error
-    EIDL_OK			// No error
+    EIDL_SYNTAX_ERROR,          // Syntax error in IDL input
+                                // More details will be gleaned from examining
+                                // idl_global->parse_state()
+    EIDL_REDEF,                 // Redefinition
+    EIDL_REDEF_SCOPE,           // Redefinition inside defining scope
+    EIDL_DEF_USE,               // Definition after use
+    EIDL_MULTIPLE_BRANCH,       // More than one union branch with this
+                                // label
+    EIDL_COERCION_FAILURE,      // Coercion failure
+    EIDL_SCOPE_CONFLICT,        // Between fwd declare and full declare
+    EIDL_ONEWAY_CONFLICT,       // Between op decl and argument direction
+    EIDL_DISC_TYPE,             // Illegal discriminator type in union
+    EIDL_LABEL_TYPE,            // Mismatch with discriminator type in union
+    EIDL_ILLEGAL_ADD,           // Illegal add action
+    EIDL_ILLEGAL_USE,           // Illegal type used in expression
+    EIDL_ILLEGAL_RAISES,        // Error in "raises" clause
+    EIDL_ILLEGAL_CONTEXT,       // Error in "context" clause
+    EIDL_CANT_INHERIT,          // Cannot inherit from non-interface
+    EIDL_LOOKUP_ERROR,          // Identifier not found
+    EIDL_INHERIT_FWD_ERROR,     // Cannot inherit from fwd decl interface
+    EIDL_CONSTANT_EXPECTED,     // We got something else..
+    EIDL_NAME_CASE_ERROR,       // Spelling differences found
+    EIDL_ENUM_VAL_EXPECTED,     // Expected an enumerator
+    EIDL_ENUM_VAL_NOT_FOUND,    // Didnt find an enumerator with that name
+    EIDL_EVAL_ERROR,            // Error in evaluating expression
+    EIDL_AMBIGUOUS,             // Ambiguous name definition
+    EIDL_DECL_NOT_DEFINED,      // Forward declared but never defined
+    EIDL_FWD_DECL_LOOKUP,       // Tried to lookup in fwd declared intf
+    EIDL_RECURSIVE_TYPE,        // Illegal recursive use of type
+    EIDL_NONVOID_ONEWAY,        // Non-void return type in oneway operation
+    EIDL_NOT_A_TYPE,            // Not a type
+    EIDL_BACK_END,              // Back end error
+    EIDL_OK                     // No error
   };
 
   // Operations
 
   // Report errors with varying numbers of arguments
-  void	error0(ErrorCode e);
-  void	error1(ErrorCode e, AST_Decl *t);
-  void	error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
-  void	error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
+  void  error0(ErrorCode e);
+  void  error1(ErrorCode e, AST_Decl *t);
+  void  error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
+  void  error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
 
   // Report a syntax error in IDL input
-  void	syntax_error(IDL_GlobalData::ParseState ps);
+  void  syntax_error(IDL_GlobalData::ParseState ps);
 
   // Report a name being used with different spellings
-  void	name_case_error(char *n, char *t);
+  void  name_case_error(char *n, char *t);
 
   // Report an unsuccesful coercion attempt
-  void	coercion_error(AST_Expression *v, AST_Expression::ExprType t);
+  void  coercion_error(AST_Expression *v, AST_Expression::ExprType t);
 
   // Report a failed name lookup attempt
-  void	lookup_error(UTL_ScopedName *n);
+  void  lookup_error(UTL_ScopedName *n);
 
   // Report an attempt to use a forward declared interface which
   // hasn't been defined yet in an inheritance spec
-  void	inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
+  void  inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
 
   // Report an attempt to inherit from something other than an interface
-  void	inheritance_error(UTL_ScopedName *n, AST_Decl *d);
+  void  inheritance_error(UTL_ScopedName *n, AST_Decl *d);
 
   // Report an error while evaluating an expression (division by zero, etc.)
-  void	eval_error(AST_Expression *d);
+  void  eval_error(AST_Expression *d);
 
   // Report a situation where a constant was expected but we got
   // something else instead. This most likely is a case where a union
   // label did not evaluate to a constant
-  void	constant_expected(UTL_ScopedName *n, AST_Decl *d);
+  void  constant_expected(UTL_ScopedName *n, AST_Decl *d);
 
   // Report a situation where an enumerator was expected but we got
   // something else instead. This occurs when a union with an enum
   // discriminator is being parsed and one of the branch labels is
   // not an enumerator in that enum
-  void	enum_val_expected(AST_Union *t, AST_UnionLabel *l);
+  void  enum_val_expected(AST_Union *t, AST_UnionLabel *l);
 
   // Report a failed enumerator lookup in an enum
-  void	enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
+  void  enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
 
   // Report an ambiguous name definition
-  void	ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
+  void  ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
 
   // Report a forward declared interface which was never defined
-  void	fwd_decl_not_defined(AST_Interface *d);
+  void  fwd_decl_not_defined(AST_Interface *d);
 
   // Report attempt to lookup in forward declared interface
-  void	fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
+  void  fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
 
   // Report a redefinition in scope
-  void	redefinition_in_scope(AST_Decl *t, AST_Decl *s);
+  void  redefinition_in_scope(AST_Decl *t, AST_Decl *s);
 
   // Report not a type error
-  void	not_a_type(AST_Decl *d);
+  void  not_a_type(AST_Decl *d);
 
   // Report back-end error
   void  back_end(long lineno, String *s);
diff --git a/TAO/TAO_IDL/include/utl_error.h b/TAO/TAO_IDL/include/utl_error.h
index 199e20d927f..f0d4bb86d2e 100644
--- a/TAO/TAO_IDL/include/utl_error.h
+++ b/TAO/TAO_IDL/include/utl_error.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -78,103 +78,103 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_Error
+class   UTL_Error
 {
 public:
   enum ErrorCode {
-    EIDL_SYNTAX_ERROR,		// Syntax error in IDL input
-				// More details will be gleaned from examining
-				// idl_global->parse_state()
-    EIDL_REDEF,			// Redefinition
-    EIDL_REDEF_SCOPE,		// Redefinition inside defining scope
-    EIDL_DEF_USE,		// Definition after use
-    EIDL_MULTIPLE_BRANCH,	// More than one union branch with this
-				// label
-    EIDL_COERCION_FAILURE,	// Coercion failure
-    EIDL_SCOPE_CONFLICT,	// Between fwd declare and full declare
-    EIDL_ONEWAY_CONFLICT,	// Between op decl and argument direction
-    EIDL_DISC_TYPE,		// Illegal discriminator type in union
-    EIDL_LABEL_TYPE,		// Mismatch with discriminator type in union
-    EIDL_ILLEGAL_ADD,		// Illegal add action
-    EIDL_ILLEGAL_USE,		// Illegal type used in expression
-    EIDL_ILLEGAL_RAISES,	// Error in "raises" clause
-    EIDL_ILLEGAL_CONTEXT,	// Error in "context" clause
-    EIDL_CANT_INHERIT,		// Cannot inherit from non-interface
-    EIDL_LOOKUP_ERROR,		// Identifier not found
-    EIDL_INHERIT_FWD_ERROR,	// Cannot inherit from fwd decl interface
-    EIDL_CONSTANT_EXPECTED,	// We got something else..
-    EIDL_NAME_CASE_ERROR,	// Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED,	// Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,	// Didnt find an enumerator with that name
-    EIDL_EVAL_ERROR,		// Error in evaluating expression
-    EIDL_AMBIGUOUS,		// Ambiguous name definition
-    EIDL_DECL_NOT_DEFINED,	// Forward declared but never defined
-    EIDL_FWD_DECL_LOOKUP,	// Tried to lookup in fwd declared intf
-    EIDL_RECURSIVE_TYPE,	// Illegal recursive use of type
-    EIDL_NONVOID_ONEWAY,	// Non-void return type in oneway operation
-    EIDL_NOT_A_TYPE,		// Not a type
-    EIDL_BACK_END,		// Back end error
-    EIDL_OK			// No error
+    EIDL_SYNTAX_ERROR,          // Syntax error in IDL input
+                                // More details will be gleaned from examining
+                                // idl_global->parse_state()
+    EIDL_REDEF,                 // Redefinition
+    EIDL_REDEF_SCOPE,           // Redefinition inside defining scope
+    EIDL_DEF_USE,               // Definition after use
+    EIDL_MULTIPLE_BRANCH,       // More than one union branch with this
+                                // label
+    EIDL_COERCION_FAILURE,      // Coercion failure
+    EIDL_SCOPE_CONFLICT,        // Between fwd declare and full declare
+    EIDL_ONEWAY_CONFLICT,       // Between op decl and argument direction
+    EIDL_DISC_TYPE,             // Illegal discriminator type in union
+    EIDL_LABEL_TYPE,            // Mismatch with discriminator type in union
+    EIDL_ILLEGAL_ADD,           // Illegal add action
+    EIDL_ILLEGAL_USE,           // Illegal type used in expression
+    EIDL_ILLEGAL_RAISES,        // Error in "raises" clause
+    EIDL_ILLEGAL_CONTEXT,       // Error in "context" clause
+    EIDL_CANT_INHERIT,          // Cannot inherit from non-interface
+    EIDL_LOOKUP_ERROR,          // Identifier not found
+    EIDL_INHERIT_FWD_ERROR,     // Cannot inherit from fwd decl interface
+    EIDL_CONSTANT_EXPECTED,     // We got something else..
+    EIDL_NAME_CASE_ERROR,       // Spelling differences found
+    EIDL_ENUM_VAL_EXPECTED,     // Expected an enumerator
+    EIDL_ENUM_VAL_NOT_FOUND,    // Didnt find an enumerator with that name
+    EIDL_EVAL_ERROR,            // Error in evaluating expression
+    EIDL_AMBIGUOUS,             // Ambiguous name definition
+    EIDL_DECL_NOT_DEFINED,      // Forward declared but never defined
+    EIDL_FWD_DECL_LOOKUP,       // Tried to lookup in fwd declared intf
+    EIDL_RECURSIVE_TYPE,        // Illegal recursive use of type
+    EIDL_NONVOID_ONEWAY,        // Non-void return type in oneway operation
+    EIDL_NOT_A_TYPE,            // Not a type
+    EIDL_BACK_END,              // Back end error
+    EIDL_OK                     // No error
   };
 
   // Operations
 
   // Report errors with varying numbers of arguments
-  void	error0(ErrorCode e);
-  void	error1(ErrorCode e, AST_Decl *t);
-  void	error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
-  void	error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
+  void  error0(ErrorCode e);
+  void  error1(ErrorCode e, AST_Decl *t);
+  void  error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
+  void  error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
 
   // Report a syntax error in IDL input
-  void	syntax_error(IDL_GlobalData::ParseState ps);
+  void  syntax_error(IDL_GlobalData::ParseState ps);
 
   // Report a name being used with different spellings
-  void	name_case_error(char *n, char *t);
+  void  name_case_error(char *n, char *t);
 
   // Report an unsuccesful coercion attempt
-  void	coercion_error(AST_Expression *v, AST_Expression::ExprType t);
+  void  coercion_error(AST_Expression *v, AST_Expression::ExprType t);
 
   // Report a failed name lookup attempt
-  void	lookup_error(UTL_ScopedName *n);
+  void  lookup_error(UTL_ScopedName *n);
 
   // Report an attempt to use a forward declared interface which
   // hasn't been defined yet in an inheritance spec
-  void	inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
+  void  inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
 
   // Report an attempt to inherit from something other than an interface
-  void	inheritance_error(UTL_ScopedName *n, AST_Decl *d);
+  void  inheritance_error(UTL_ScopedName *n, AST_Decl *d);
 
   // Report an error while evaluating an expression (division by zero, etc.)
-  void	eval_error(AST_Expression *d);
+  void  eval_error(AST_Expression *d);
 
   // Report a situation where a constant was expected but we got
   // something else instead. This most likely is a case where a union
   // label did not evaluate to a constant
-  void	constant_expected(UTL_ScopedName *n, AST_Decl *d);
+  void  constant_expected(UTL_ScopedName *n, AST_Decl *d);
 
   // Report a situation where an enumerator was expected but we got
   // something else instead. This occurs when a union with an enum
   // discriminator is being parsed and one of the branch labels is
   // not an enumerator in that enum
-  void	enum_val_expected(AST_Union *t, AST_UnionLabel *l);
+  void  enum_val_expected(AST_Union *t, AST_UnionLabel *l);
 
   // Report a failed enumerator lookup in an enum
-  void	enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
+  void  enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
 
   // Report an ambiguous name definition
-  void	ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
+  void  ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
 
   // Report a forward declared interface which was never defined
-  void	fwd_decl_not_defined(AST_Interface *d);
+  void  fwd_decl_not_defined(AST_Interface *d);
 
   // Report attempt to lookup in forward declared interface
-  void	fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
+  void  fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
 
   // Report a redefinition in scope
-  void	redefinition_in_scope(AST_Decl *t, AST_Decl *s);
+  void  redefinition_in_scope(AST_Decl *t, AST_Decl *s);
 
   // Report not a type error
-  void	not_a_type(AST_Decl *d);
+  void  not_a_type(AST_Decl *d);
 
   // Report back-end error
   void  back_end(long lineno, String *s);
diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h
index 821efe648d2..7d726039fb0 100644
--- a/TAO/TAO_IDL/include/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_exceptlist.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 /*
 ** DEPENDENCIES: utl_list.hh, ast_exception.hh
@@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_ExceptList : public UTL_List
+class   UTL_ExceptList : public UTL_List
 {
 public:
   // Operations
@@ -98,15 +98,15 @@ public:
   UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr);
 
   // Get list item
-  AST_Exception		*head();
+  AST_Exception         *head();
 
 private:
   // Data
-  AST_Exception		*pd_car_data;	// Item of this list
+  AST_Exception         *pd_car_data;   // Item of this list
 };
 
 // Active iterator for UTL_ExceptList
-class	UTL_ExceptlistActiveIterator : public UTL_ListActiveIterator
+class   UTL_ExceptlistActiveIterator : public UTL_ListActiveIterator
 {
 public:
   // Operations
@@ -115,7 +115,7 @@ public:
   UTL_ExceptlistActiveIterator(UTL_ExceptList *s);
 
   // Get current item
-  AST_Exception		*item();
+  AST_Exception         *item();
 };
 
 #endif           // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h
index d113b23109e..934bdca15e1 100644
--- a/TAO/TAO_IDL/include/utl_exprlist.h
+++ b/TAO/TAO_IDL/include/utl_exprlist.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 /*
 ** DEPENDENCIES: ast_expression.hh, utl_list.hh
@@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_ExprList : public UTL_List
+class   UTL_ExprList : public UTL_List
 {
 public:
   // Operations
@@ -98,15 +98,15 @@ public:
   UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr);
 
   // Get list item
-  AST_Expression		*head();
+  AST_Expression                *head();
 
 private:
   // Data
-  AST_Expression		*pd_car_data;	// List item
+  AST_Expression                *pd_car_data;   // List item
 };
 
 // Active iterator for UTL_ExprList
-class	UTL_ExprlistActiveIterator : public UTL_ListActiveIterator
+class   UTL_ExprlistActiveIterator : public UTL_ListActiveIterator
 {
 public:
   // Operations
@@ -115,7 +115,7 @@ public:
   UTL_ExprlistActiveIterator(UTL_ExprList *s);
 
   // Get current item
-  AST_Expression		*item();
+  AST_Expression                *item();
 };
 
 #endif           // _UTL_EXPRLIST_UTL_EXPRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h
index 392ee7e58e5..bf9739732f0 100644
--- a/TAO/TAO_IDL/include/utl_identifier.h
+++ b/TAO/TAO_IDL/include/utl_identifier.h
@@ -64,8 +64,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#ifndef	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
-#define	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
+#ifndef _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
+#define _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
 
 // utl_identifier.hh
 //
@@ -77,8 +77,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-#include	"idl_fwd.h"
-#include	"utl_string.h"
+#include        "idl_fwd.h"
+#include        "utl_string.h"
 
 class Identifier
 {
@@ -94,20 +94,20 @@ public:
 
   // =Operations
 
-  char	*get_string ();
+  char  *get_string ();
   // get the underlying string
 
-  long	compare (Identifier *other);
+  long  compare (Identifier *other);
   // compare with other Identifier
 
   // =Dumping
 
-  virtual void	dump (ostream &o);
+  virtual void  dump (ostream &o);
   // dump to an ostream
 
   private:
     // Storage for data
-    char	*pv_string;
+    char        *pv_string;
 };
 
-#endif		// _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
+#endif          // _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h
index 211836af42e..dc0ed8c0c04 100644
--- a/TAO/TAO_IDL/include/utl_idlist.h
+++ b/TAO/TAO_IDL/include/utl_idlist.h
@@ -64,8 +64,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#ifndef	_UTL_IDLIST_UTL_IDLIST_HH
-#define	_UTL_IDLIST_UTL_IDLIST_HH
+#ifndef _UTL_IDLIST_UTL_IDLIST_HH
+#define _UTL_IDLIST_UTL_IDLIST_HH
 
 // utl_idlist.hh
 //
@@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 /*
 ** DEPENDENCIES: utl_list.hh, utl_identifier.hh
@@ -89,10 +89,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "utl_identifier.h"
+#include        "utl_string.h"
 
 class UTL_IdList : public UTL_List
 {
@@ -129,8 +129,8 @@ private:
 
 // Active iterator for UTL_IdList
 
-class	UTL_IdListActiveIterator :
-	public UTL_ListActiveIterator
+class   UTL_IdListActiveIterator :
+        public UTL_ListActiveIterator
 {
   // =TITLE
   //  UTL_IdListActiveIterator
@@ -144,4 +144,4 @@ public:
   // retrieves the next item
 };
 
-#endif		// _UTL_IDLIST_UTL_IDLIST_HH
+#endif          // _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h
index 29c8c587f00..c72291eaf92 100644
--- a/TAO/TAO_IDL/include/utl_indenter.h
+++ b/TAO/TAO_IDL/include/utl_indenter.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -88,22 +88,22 @@ class UTL_Indenter
 public:
   // Operations
 
-  UTL_Indenter();		// constructor
+  UTL_Indenter();               // constructor
   // Constructor(s)
 
   virtual ~UTL_Indenter() {}
   // destructor
 
-  void reset();			
+  void reset();
   // Reset indentation level to 0
 
-  void increase();		
+  void increase();
   // Increase indentation level
 
-  void decrease();		
+  void decrease();
   // Decrease indentation level
 
-  void skip_to (ostream &o);	
+  void skip_to (ostream &o);
   // Skip to indentation level stop
 
   void skip_to (FILE *fp);
@@ -111,7 +111,7 @@ public:
 
 private:
   // Data
-  long				pd_indent_level;	// How far to indent
+  long                          pd_indent_level;        // How far to indent
 };
 
 #endif           // _UTL_INDENTER_UTL_INDENTER_HH
diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h
index e3410e34623..0ad12eef9d6 100644
--- a/TAO/TAO_IDL/include/utl_labellist.h
+++ b/TAO/TAO_IDL/include/utl_labellist.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 /*
 ** DEPENDENCIES: utl_list.hh, ast_union_label.hh
@@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_LabelList : public UTL_List
+class   UTL_LabelList : public UTL_List
 {
 public:
   // Operations
@@ -98,15 +98,15 @@ public:
   UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr);
 
   // Get list item
-  AST_UnionLabel	*head();
+  AST_UnionLabel        *head();
 
 private:
   // Data
-  AST_UnionLabel	*pd_car_data;	// List item
+  AST_UnionLabel        *pd_car_data;   // List item
 };
 
 // Active iterator for UTL_LabelList
-class	UTL_LabellistActiveIterator : public UTL_ListActiveIterator
+class   UTL_LabellistActiveIterator : public UTL_ListActiveIterator
 {
 public:
   // Operations
@@ -115,7 +115,7 @@ public:
   UTL_LabellistActiveIterator(UTL_LabelList *source);
 
   // Get current item
-  AST_UnionLabel	*item();
+  AST_UnionLabel        *item();
 };
 
 #endif           // _UTL_LABELLIST_UTL_LABELLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
index 0c113ab9fbc..fa657f70e77 100644
--- a/TAO/TAO_IDL/include/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_list.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -79,20 +79,20 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 // Forward declare active iterator for UTL_List
-class	UTL_ListActiveIterator;
+class   UTL_ListActiveIterator;
 
-class	UTL_List
+class   UTL_List
 {
 public:
   // Operations
@@ -101,50 +101,50 @@ public:
   UTL_List(UTL_List *c);
 
   // Smash last cdr pointer in "this" with l
-  void			nconc(UTL_List *l);
+  void                  nconc(UTL_List *l);
 
   // Copy the list starting at "this"
-  virtual UTL_List	*copy();
+  virtual UTL_List      *copy();
 
   // Get next list
-  UTL_List		*tail();
+  UTL_List              *tail();
 
   // Set next list
-  void			set_tail(UTL_List *l);
+  void                  set_tail(UTL_List *l);
 
   // How long is this list?
-  long			length();
+  long                  length();
 
 private:
   // Data
-  UTL_List		*pd_cdr_data;	// The next list
+  UTL_List              *pd_cdr_data;   // The next list
 
   // Operations
-  long			list_length(long n); // How long is it?
+  long                  list_length(long n); // How long is it?
 
   // Friend class
-  friend class		UTL_ListActiveIterator; // Friend class
+  friend class          UTL_ListActiveIterator; // Friend class
 
 };
 
 // Active iterator for lists
-class	UTL_ListActiveIterator
+class   UTL_ListActiveIterator
 {
 public:
   // Operations
 
   // Constructor(s)
-  UTL_ListActiveIterator(UTL_List *s);	
+  UTL_ListActiveIterator(UTL_List *s);
 
   // Get next list
-  virtual void		next();
+  virtual void          next();
 
   // Are we at the end of this list?
-  virtual long		is_done();
+  virtual long          is_done();
 
 protected:
   // Data
-  UTL_List		*source;		// On what to iterate?
+  UTL_List              *source;                // On what to iterate?
 };
 
 #endif           // _UTL_LIST_UTL_LIST_HH
diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h
index 3b9be0bc45a..f962882425f 100644
--- a/TAO/TAO_IDL/include/utl_namelist.h
+++ b/TAO/TAO_IDL/include/utl_namelist.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 /*
 ** DEPENDENCIES: utl_list.hh, utl_scoped_name.hh
@@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_NameList : public UTL_List
+class   UTL_NameList : public UTL_List
 {
 public:
   // Operations
@@ -98,15 +98,15 @@ public:
   UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr);
 
   // Get list item
-  UTL_ScopedName	*head();
+  UTL_ScopedName        *head();
 
 private:
   // Data
-  UTL_ScopedName	*pd_car_data;	// List item
+  UTL_ScopedName        *pd_car_data;   // List item
 };
 
 // Active iterator for UTL_NameList
-class	UTL_NamelistActiveIterator : public UTL_ListActiveIterator
+class   UTL_NamelistActiveIterator : public UTL_ListActiveIterator
 {
 public:
   // Operations
@@ -115,7 +115,7 @@ public:
   UTL_NamelistActiveIterator(UTL_NameList *source);
 
   // Get current item
-  UTL_ScopedName	*item();
+  UTL_ScopedName        *item();
 };
 
 #endif           // _UTL_NAMELIST_UTL_NAMELIST_HH
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index ce94d12574f..e4102d5bb06 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -89,23 +89,23 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
-#include	"ast_expression.h"
-#include	"utl_scoped_name.h"
+#include        "idl_fwd.h"
+#include        "idl_narrow.h"
+#include        "ast_decl.h"
+#include        "ast_expression.h"
+#include        "utl_scoped_name.h"
 
 // Forward declaration of active iterator for UTL_Scope
 class UTL_ScopeActiveIterator;
 
-class	UTL_Scope : public virtual COMMON_Base
+class   UTL_Scope : public virtual COMMON_Base
 {
 public:
   // Enum to denote the kind of iteration desired
   enum ScopeIterationKind {
-      IK_both		// Iterate through both decls and local types
-    , IK_decls		// Iterate only through decls
-    , IK_localtypes	// Iterate only through local types
+      IK_both           // Iterate through both decls and local types
+    , IK_decls          // Iterate only through decls
+    , IK_localtypes     // Iterate only through local types
   };
 
   // Operations
@@ -116,31 +116,31 @@ public:
   virtual ~UTL_Scope() {}
 
   // Scope Management Protocol
-  virtual AST_PredefinedType	*add_predefined_type(AST_PredefinedType	*t);
-  virtual AST_Module		*add_module(AST_Module			*m);
-  virtual AST_Interface		*add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*add_constant(AST_Constant		*c);
-  virtual AST_Exception		*add_exception(AST_Exception		*e);
-  virtual AST_Attribute		*add_attribute(AST_Attribute		*a);
-  virtual AST_Operation		*add_operation(AST_Operation		*o);
-  virtual AST_Argument		*add_argument(AST_Argument		*a);
-  virtual AST_Union		*add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*add_structure(AST_Structure		*s);
-  virtual AST_Field		*add_field(AST_Field			*f);
-  virtual AST_Enum		*add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*add_typedef(AST_Typedef		*t);
-  virtual UTL_StrList		*add_context(UTL_StrList		*c);
-  virtual UTL_NameList		*add_exceptions(UTL_NameList		*e);
-  virtual AST_Sequence		*add_sequence(AST_Sequence		*s);
-  virtual AST_String		*add_string(AST_String			*s);
-  virtual AST_Array		*add_array(AST_Array			*a);
+  virtual AST_PredefinedType    *add_predefined_type(AST_PredefinedType *t);
+  virtual AST_Module            *add_module(AST_Module                  *m);
+  virtual AST_Interface         *add_interface(AST_Interface            *i);
+  virtual AST_InterfaceFwd      *add_interface_fwd(AST_InterfaceFwd     *i);
+  virtual AST_Constant          *add_constant(AST_Constant              *c);
+  virtual AST_Exception         *add_exception(AST_Exception            *e);
+  virtual AST_Attribute         *add_attribute(AST_Attribute            *a);
+  virtual AST_Operation         *add_operation(AST_Operation            *o);
+  virtual AST_Argument          *add_argument(AST_Argument              *a);
+  virtual AST_Union             *add_union(AST_Union                    *u);
+  virtual AST_UnionBranch       *add_union_branch(AST_UnionBranch       *b);
+  virtual AST_Structure         *add_structure(AST_Structure            *s);
+  virtual AST_Field             *add_field(AST_Field                    *f);
+  virtual AST_Enum              *add_enum(AST_Enum                      *e);
+  virtual AST_EnumVal           *add_enum_val(AST_EnumVal               *v);
+  virtual AST_Typedef           *add_typedef(AST_Typedef                *t);
+  virtual UTL_StrList           *add_context(UTL_StrList                *c);
+  virtual UTL_NameList          *add_exceptions(UTL_NameList            *e);
+  virtual AST_Sequence          *add_sequence(AST_Sequence              *s);
+  virtual AST_String            *add_string(AST_String                  *s);
+  virtual AST_Array             *add_array(AST_Array                    *a);
   virtual AST_Native            *add_native (AST_Native                 *n);
 
   // Call back end add_XXX functions for this scope
-  virtual AST_Decl 		*call_add();
+  virtual AST_Decl              *call_add();
 
   // Data Accessors
   AST_Decl::NodeType scope_node_type()
@@ -153,24 +153,24 @@ public:
   DEF_NARROW_FROM_SCOPE(UTL_Scope);
 
   // AST Dumping
-  virtual void			dump(ostream &o);
+  virtual void                  dump(ostream &o);
 
   // Other Operations
 
   // Name Lookup Mechanism
-  virtual AST_Decl		*lookup_by_name(UTL_ScopedName *,
-						idl_bool treat_as_ref);
+  virtual AST_Decl              *lookup_by_name(UTL_ScopedName *,
+                                                idl_bool treat_as_ref);
 
   // Look up the Identifier * specified only in the local scope
-  virtual AST_Decl		*lookup_by_name_local(Identifier *,
-						      idl_bool treat_as_ref);
+  virtual AST_Decl              *lookup_by_name_local(Identifier *,
+                                                      idl_bool treat_as_ref);
 
   // Look up a predefined type by its ExprType
   virtual AST_Decl
     *lookup_primitive_type(AST_Expression::ExprType);
 
   // How many entries are used?
-  virtual unsigned long		nmembers();
+  virtual unsigned long         nmembers();
 
 protected:
   // UTL_Scope protected addition protocol. This protocol is
@@ -180,81 +180,81 @@ protected:
   // defined elsewhere were referenced in this scope
 
   // Add to decls. Node represents a local declaration
-  void				add_to_scope(AST_Decl *e);
+  void                          add_to_scope(AST_Decl *e);
 
   // Add to local types. Node represents a local manifest type
-  void				add_to_local_types(AST_Decl *e);
+  void                          add_to_local_types(AST_Decl *e);
 
   // Add to referenced nodes set.
-  void				add_to_referenced(AST_Decl *e,
-						  idl_bool recursive);
+  void                          add_to_referenced(AST_Decl *e,
+                                                  idl_bool recursive);
 
   // Has this node been referenced here already?
-  idl_bool			referenced(AST_Decl *e);
+  idl_bool                      referenced(AST_Decl *e);
 
   // Look up a scoped name in the inherited interfaces of an
   // interface
-  virtual AST_Decl		*look_in_inherited(UTL_ScopedName *,
-						   idl_bool treat_as_ref);
+  virtual AST_Decl              *look_in_inherited(UTL_ScopedName *,
+                                                   idl_bool treat_as_ref);
 protected:
   // Operations
 
   // Lookup based on the local name
-  virtual AST_Decl		*lookup_for_add(AST_Decl *d,
-						idl_bool treat_as_ref);
+  virtual AST_Decl              *lookup_for_add(AST_Decl *d,
+                                                idl_bool treat_as_ref);
 
 private:
   // Data
 
   // What type is this node? This is a cache of the information
   // in AST_Decl
-  const	AST_Decl::NodeType	pd_scope_node_type;
+  const AST_Decl::NodeType      pd_scope_node_type;
 
   // Storage for declarations in this scope:
-  AST_Decl			**pd_decls;		// Store declarations
-  long				pd_decls_allocated;	// How many allocated?
-  long				pd_decls_used;		// How many used?
+  AST_Decl                      **pd_decls;             // Store declarations
+  long                          pd_decls_allocated;     // How many allocated?
+  long                          pd_decls_used;          // How many used?
 
   // Storage for local manifest types in this scope:
-  AST_Decl			**pd_local_types;	// Store types
-  long				pd_locals_allocated;	// How many allocated?
-  long				pd_locals_used;		// How many used?
+  AST_Decl                      **pd_local_types;       // Store types
+  long                          pd_locals_allocated;    // How many allocated?
+  long                          pd_locals_used;         // How many used?
 
   // Storage for referenced nodes in this scope:
-  AST_Decl			**pd_referenced;	// Store references
-  long				pd_referenced_allocated;// How many allocated?
-  long				pd_referenced_used;	// How many used?
+  AST_Decl                      **pd_referenced;        // Store references
+  long                          pd_referenced_allocated;// How many allocated?
+  long                          pd_referenced_used;     // How many used?
 
   // Friend class UTL_ScopeActiveIterator defines active iterator for
   // UTL_Scope. Definition follows below.
-  friend class			UTL_ScopeActiveIterator;
+  friend class                  UTL_ScopeActiveIterator;
 
 private:
   friend int tao_yyparse();
   friend class AST_Enum;
 
   // Scope Management Protocol
-  virtual AST_PredefinedType	*fe_add_predefined_type(AST_PredefinedType *t);
-  virtual AST_Module		*fe_add_module(AST_Module		*m);
-  virtual AST_Interface		*fe_add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*fe_add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*fe_add_constant(AST_Constant		*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception		*e);
-  virtual AST_Attribute		*fe_add_attribute(AST_Attribute		*a);
-  virtual AST_Operation		*fe_add_operation(AST_Operation		*o);
-  virtual AST_Argument		*fe_add_argument(AST_Argument		*a);
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*fe_add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Field		*fe_add_field(AST_Field			*f);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef		*t);
-  virtual UTL_StrList		*fe_add_context(UTL_StrList		*c);
-  virtual UTL_NameList		*fe_add_exceptions(UTL_NameList		*e);
-  virtual AST_Sequence		*fe_add_sequence(AST_Sequence		*s);
-  virtual AST_String		*fe_add_string(AST_String		*s);
-  virtual AST_Array		*fe_add_array(AST_Array			*a);
+  virtual AST_PredefinedType    *fe_add_predefined_type(AST_PredefinedType *t);
+  virtual AST_Module            *fe_add_module(AST_Module               *m);
+  virtual AST_Interface         *fe_add_interface(AST_Interface         *i);
+  virtual AST_InterfaceFwd      *fe_add_interface_fwd(AST_InterfaceFwd  *i);
+  virtual AST_Constant          *fe_add_constant(AST_Constant           *c);
+  virtual AST_Exception         *fe_add_exception(AST_Exception         *e);
+  virtual AST_Attribute         *fe_add_attribute(AST_Attribute         *a);
+  virtual AST_Operation         *fe_add_operation(AST_Operation         *o);
+  virtual AST_Argument          *fe_add_argument(AST_Argument           *a);
+  virtual AST_Union             *fe_add_union(AST_Union                 *u);
+  virtual AST_UnionBranch       *fe_add_union_branch(AST_UnionBranch    *b);
+  virtual AST_Structure         *fe_add_structure(AST_Structure         *s);
+  virtual AST_Field             *fe_add_field(AST_Field                 *f);
+  virtual AST_Enum              *fe_add_enum(AST_Enum                   *e);
+  virtual AST_EnumVal           *fe_add_enum_val(AST_EnumVal            *v);
+  virtual AST_Typedef           *fe_add_typedef(AST_Typedef             *t);
+  virtual UTL_StrList           *fe_add_context(UTL_StrList             *c);
+  virtual UTL_NameList          *fe_add_exceptions(UTL_NameList         *e);
+  virtual AST_Sequence          *fe_add_sequence(AST_Sequence           *s);
+  virtual AST_String            *fe_add_string(AST_String               *s);
+  virtual AST_Array             *fe_add_array(AST_Array                 *a);
   virtual AST_Native            *fe_add_native (AST_Native              *n);
 };
 
@@ -267,26 +267,26 @@ public:
   UTL_ScopeActiveIterator(UTL_Scope *s, UTL_Scope::ScopeIterationKind ik);
 
   // Advance to next item
-  virtual void			next();
+  virtual void                  next();
 
   // Get current item
-  virtual AST_Decl		*item();
+  virtual AST_Decl              *item();
 
   // Have we iterated over entire scope?
-  virtual idl_bool		is_done();
+  virtual idl_bool              is_done();
 
   // What kind of iterator is this?
-  virtual UTL_Scope::ScopeIterationKind	iteration_kind();
+  virtual UTL_Scope::ScopeIterationKind iteration_kind();
 
   // What stage are we in with this iterator?
-  virtual UTL_Scope::ScopeIterationKind	iteration_stage();
+  virtual UTL_Scope::ScopeIterationKind iteration_stage();
 
 private:
   // Data
-  UTL_Scope			*iter_source;	// Scope to iterate over
-  UTL_Scope::ScopeIterationKind	ik;		// What kind of iteration
-  UTL_Scope::ScopeIterationKind	stage;		// What stage
-  long				il;		// What location in stage
+  UTL_Scope                     *iter_source;   // Scope to iterate over
+  UTL_Scope::ScopeIterationKind ik;             // What kind of iteration
+  UTL_Scope::ScopeIterationKind stage;          // What stage
+  long                          il;             // What location in stage
 };
 
 #endif           // _UTL_SCOPE_UTL_SCOPE_HH
diff --git a/TAO/TAO_IDL/include/utl_scoped_name.h b/TAO/TAO_IDL/include/utl_scoped_name.h
index 5a3145e669b..2cdc381bf2f 100644
--- a/TAO/TAO_IDL/include/utl_scoped_name.h
+++ b/TAO/TAO_IDL/include/utl_scoped_name.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -75,8 +75,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from ast.hh
 */
 
-typedef UTL_IdList			UTL_ScopedName;
+typedef UTL_IdList                      UTL_ScopedName;
 
-typedef UTL_IdListActiveIterator	UTL_ScopedNameActiveIterator;
+typedef UTL_IdListActiveIterator        UTL_ScopedNameActiveIterator;
 
 #endif           // _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h
index 9d4224cde4c..eb8b2cf8b46 100644
--- a/TAO/TAO_IDL/include/utl_stack.h
+++ b/TAO/TAO_IDL/include/utl_stack.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -78,9 +78,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 */
 
 // Forward declaration of active iterator for UTL_ScopeStack
-class	UTL_ScopeStackActiveIterator;
+class   UTL_ScopeStackActiveIterator;
 
-class	UTL_ScopeStack
+class   UTL_ScopeStack
 {
 public:
   // Operations
@@ -90,41 +90,41 @@ public:
   virtual ~UTL_ScopeStack();
 
   // Return top element
-  virtual UTL_Scope		*top();
+  virtual UTL_Scope             *top();
 
   // Pop top element
-  virtual void			pop();
+  virtual void                  pop();
 
   // Clear entire stack
-  virtual void			clear();
+  virtual void                  clear();
 
   // Push an element on the stack and return stack
-  virtual UTL_ScopeStack	*push(UTL_Scope *el);
+  virtual UTL_ScopeStack        *push(UTL_Scope *el);
 
   // How deep is the stack now?
-  virtual unsigned long		depth();
+  virtual unsigned long         depth();
 
   // Return bottom element
-  virtual UTL_Scope		*bottom();
+  virtual UTL_Scope             *bottom();
 
   // Return (top - 1) element
-  virtual UTL_Scope		*next_to_top();
+  virtual UTL_Scope             *next_to_top();
 
   // return topmost non-NULL element
-  virtual UTL_Scope		*top_non_null();
+  virtual UTL_Scope             *top_non_null();
 
 private:
   // Data
-  UTL_Scope			**pd_stack_data;	// Store scopes stack
-  unsigned long			pd_stack_data_nalloced;	// How many allocated?
-  unsigned long			pd_stack_top;		// How many used?
+  UTL_Scope                     **pd_stack_data;        // Store scopes stack
+  unsigned long                 pd_stack_data_nalloced; // How many allocated?
+  unsigned long                 pd_stack_top;           // How many used?
 
   // Friend active iterator class for UTL_ScopeStack
-  friend class			UTL_ScopeStackActiveIterator;
+  friend class                  UTL_ScopeStackActiveIterator;
 };
 
 // Active iterator for UTL_ScopeStack
-class	UTL_ScopeStackActiveIterator
+class   UTL_ScopeStackActiveIterator
 {
 public:
   // Operations
@@ -133,18 +133,18 @@ public:
   UTL_ScopeStackActiveIterator(UTL_ScopeStack *s);
 
   // Advance to next element
-  virtual void			next();
+  virtual void                  next();
 
   // Get current item
-  virtual UTL_Scope		*item();
+  virtual UTL_Scope             *item();
 
   // Is the iteration finished?
-  virtual long			is_done();
+  virtual long                  is_done();
 
 private:
   // Data
-  UTL_ScopeStack		*source;	// On what to iterate?
-  long				il;		// Where are we in iteration?
+  UTL_ScopeStack                *source;        // On what to iterate?
+  long                          il;             // Where are we in iteration?
 };
 
 #endif           // _UTL_STACK_UTL_STACK_HH
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index 0db31bd2bf6..de6516b7849 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -76,10 +76,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 */
 
 #ifndef String
-#define String	UTL_String
-#endif	// String
+#define String  UTL_String
+#endif  // String
 
-class	UTL_String
+class   UTL_String
 {
   // =TITLE
   //  UTL_String
@@ -101,7 +101,7 @@ public:
   // construct using a pointer to UTL_String
 
   virtual ~UTL_String (void) {}
-  // destructor 
+  // destructor
 
   // =AST Dumping
 
@@ -122,21 +122,21 @@ public:
 
 private:
   // Data
-  char		*p_str;		
+  char          *p_str;
   // Storage for characters
 
-  char		*c_str;		
+  char          *c_str;
   // Canonicalized string
 
-  unsigned long	len;		
+  unsigned long len;
   // How long is string
 
-  unsigned long alloced;	
+  unsigned long alloced;
   // How much allocated
 
   // =Private helper operations
 
-  void canonicalize (void);	
+  void canonicalize (void);
   // Compute canonical representation
 };
 
diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h
index 5806cb57785..99213ed50e3 100644
--- a/TAO/TAO_IDL/include/utl_strlist.h
+++ b/TAO/TAO_IDL/include/utl_strlist.h
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//       It relies on a type-unsafe cast from UTL_List to subclasses, which
+//       will cease to operate correctly if you use either multiple or
+//       public virtual inheritance.
 //
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
+//       For portability reasons we have decided to provide both this and
+//       an implementation of the list classes in terms of templates. If
+//       your compiler supports templates, please use the files in the
+//       include/utl_tmpl and util/utl_tmpl directories instead of the
+//       files by the same names in the include and util directories.
 
 /*
 ** DEPENDENCIES: utl_list.hh, utl_string.hh
@@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** USE: Included from util.hh
 */
 
-class	UTL_StrList : public UTL_List
+class   UTL_StrList : public UTL_List
 {
 public:
   // Operations
@@ -98,29 +98,29 @@ public:
   UTL_StrList(String *s, UTL_StrList *cdr);
 
   // AST Dumping
-  virtual void		dump(ostream &o);
+  virtual void          dump(ostream &o);
 
   // Other Operations
 
   // Copy a list of strings
-  virtual UTL_List	*copy();
+  virtual UTL_List      *copy();
 
   // Get list element
-  String		*head();
+  String                *head();
 
   // Set the list element
-  void			set_head(String *);
+  void                  set_head(String *);
 
   // Get last element in this list
-  String		*last_component();
+  String                *last_component();
 
 private:
   // Data
-  String		*pd_car_data;	// The list item
+  String                *pd_car_data;   // The list item
 };
 
 // Active iterator for  UTL_StrList
-class	UTL_StrlistActiveIterator : public UTL_ListActiveIterator
+class   UTL_StrlistActiveIterator : public UTL_ListActiveIterator
 {
 public:
   // Operations
@@ -129,7 +129,7 @@ public:
   UTL_StrlistActiveIterator(UTL_StrList *s);
 
   // Get current item
-  String		*item();
+  String                *item();
 };
 
 #endif           // _UTL_STRLIST_UTL_STRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
index 63247a10df2..8de08c85725 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -65,17 +65,22 @@
 ** USE: Included from util.hh
 */
 
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"fe_declarator.h"
+#include        "ace/stdcpp.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class	UTL_DeclList : public UTL_List<UTL_DeclList, FE_Declarator>
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "utl_idlist.h"
+#include        "utl_scoped_name.h"
+#include        "utl_identifier.h"
+#include        "utl_string.h"
+#include        "fe_declarator.h"
+
+
+class   UTL_DeclList : public UTL_List<UTL_DeclList, FE_Declarator>
 {
 public:
   // Operations
@@ -86,7 +91,7 @@ public:
 };
 
 // Active iterator for UTL_DeclList
-class	UTL_DecllistActiveIterator :
+class   UTL_DecllistActiveIterator :
     public UTL_ListActiveIterator<UTL_DeclList, FE_Declarator>
 {
 public:
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
index a709776a875..8fee4504360 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -65,25 +65,30 @@
 ** USE: Included from util.hh
 */
 
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_strlist.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"ast_expression.h"
-#include	"idl_bool.h"
-#include	"utl_scope.h"
-#include	"ast_decl.h"
-#include	"ast_type.h"
-#include	"ast_concrete_type.h"
-#include	"ast_structure.h"
-#include	"ast_exception.h"
+#include        "ace/stdcpp.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class	UTL_ExceptList : public UTL_List<UTL_ExceptList, AST_Exception>
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "utl_strlist.h"
+#include        "utl_idlist.h"
+#include        "utl_scoped_name.h"
+#include        "utl_identifier.h"
+#include        "utl_string.h"
+#include        "ast_expression.h"
+#include        "idl_bool.h"
+#include        "utl_scope.h"
+#include        "ast_decl.h"
+#include        "ast_type.h"
+#include        "ast_concrete_type.h"
+#include        "ast_structure.h"
+#include        "ast_exception.h"
+
+
+class   UTL_ExceptList : public UTL_List<UTL_ExceptList, AST_Exception>
 {
 public:
   // Operations
@@ -94,7 +99,7 @@ public:
 };
 
 // Active iterator for UTL_ExceptList
-class	UTL_ExceptlistActiveIterator :
+class   UTL_ExceptlistActiveIterator :
     public UTL_ListActiveIterator<UTL_ExceptList, AST_Exception>
 {
 public:
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
index 5215ae18362..84fbcd3957c 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -65,18 +65,23 @@
 ** USE: Included from util.hh
 */
 
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_strlist.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"ast_expression.h"
+#include        "ace/stdcpp.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class	UTL_ExprList : public UTL_List<UTL_ExprList, AST_Expression>
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "utl_strlist.h"
+#include        "utl_idlist.h"
+#include        "utl_scoped_name.h"
+#include        "utl_identifier.h"
+#include        "utl_string.h"
+#include        "ast_expression.h"
+
+
+class   UTL_ExprList : public UTL_List<UTL_ExprList, AST_Expression>
 {
 public:
   // Operations
@@ -87,7 +92,7 @@ public:
 };
 
 // Active iterator for UTL_ExprList
-class	UTL_ExprlistActiveIterator :
+class   UTL_ExprlistActiveIterator :
     public UTL_ListActiveIterator<UTL_ExprList, AST_Expression>
 {
 public:
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
index a08bac915b6..a9a1b77c26d 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -52,8 +52,8 @@
  *======================================================================
  */
 
-#ifndef	_UTL_IDLIST_UTL_IDLIST_HH
-#define	_UTL_IDLIST_UTL_IDLIST_HH
+#ifndef _UTL_IDLIST_UTL_IDLIST_HH
+#define _UTL_IDLIST_UTL_IDLIST_HH
 
 // utl_idlist.hh
 //
@@ -65,13 +65,18 @@
 ** USE: Included from util.hh
 */
 
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
+#include        "ace/stdcpp.h"
 
-class	UTL_IdList : public UTL_List<UTL_IdList, Identifier>
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "utl_identifier.h"
+#include        "utl_string.h"
+
+class   UTL_IdList : public UTL_List<UTL_IdList, Identifier>
 {
   public:
     // Constructor(s)
@@ -79,22 +84,22 @@ class	UTL_IdList : public UTL_List<UTL_IdList, Identifier>
     virtual ~UTL_IdList() {}
 
     // AST Dumping
-    virtual void	dump(ostream &o);
+    virtual void        dump(ostream &o);
 
     // Other operations
 
     // Get last element in this list
-    Identifier		*last_component();
+    Identifier          *last_component();
 };
 
 // Active iterator for UTL_IdList
 
-class	UTL_IdListActiveIterator :
-	public UTL_ListActiveIterator<UTL_IdList, Identifier>
+class   UTL_IdListActiveIterator :
+        public UTL_ListActiveIterator<UTL_IdList, Identifier>
 {
   public:
     // Constructor(s)
     UTL_IdListActiveIterator(UTL_IdList *s);
 };
 
-#endif		// _UTL_IDLIST_UTL_IDLIST_HH
+#endif          // _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
index e9c38823e31..b7ca1d38e43 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -65,13 +65,18 @@
 ** USE: Included from util.hh
 */
 
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"ast_union_label.h"
+#include        "ace/stdcpp.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class	UTL_LabelList : public UTL_List<UTL_LabelList, AST_UnionLabel>
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "ast_union_label.h"
+
+
+class   UTL_LabelList : public UTL_List<UTL_LabelList, AST_UnionLabel>
 {
 public:
   // Operations
@@ -82,7 +87,7 @@ public:
 };
 
 // Active iterator for UTL_LabelList
-class	UTL_LabellistActiveIterator :
+class   UTL_LabellistActiveIterator :
     public UTL_ListActiveIterator<UTL_LabelList, AST_UnionLabel>
 {
 public:
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
index 8bc8c4035a6..b300298b93d 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -69,7 +69,7 @@
 template<class L, class T> class UTL_ListActiveIterator;
 
 template<class L, class T>
-class	UTL_List
+class   UTL_List
 {
 public:
   // Operations
@@ -79,62 +79,62 @@ public:
   virtual ~UTL_List() {}
 
   // Smash last cdr pointer in "this" with l
-  void			nconc(L *l);
+  void                  nconc(L *l);
 
   // Copy the list starting at "this"
-  L			*copy();
+  L                     *copy();
 
   // Get list element
-  T			*head();
+  T                     *head();
 
   // Get next list
-  L			*tail();
+  L                     *tail();
 
   // Set the list element
-  void			set_head(T *t);
+  void                  set_head(T *t);
 
   // Set next list
-  void			set_tail(L *l);
+  void                  set_tail(L *l);
 
   // How long is this list?
-  long			length();
+  long                  length();
 
 private:
   // Data
-  T			*pd_car_data;	// The next list
-  L			*pd_cdr_data;	// The next list
+  T                     *pd_car_data;   // The next list
+  L                     *pd_cdr_data;   // The next list
 
   // Operations
-  long			list_length(long n); // How long is it?
+  long                  list_length(long n); // How long is it?
 
   // Friend class
-  friend class		UTL_ListActiveIterator<L, T>; // Friend class
+  friend class          UTL_ListActiveIterator<L, T>; // Friend class
 
 };
 
 // Active iterator for lists
 template<class L, class T>
-class	UTL_ListActiveIterator
+class   UTL_ListActiveIterator
 {
 public:
   // Operations
 
   // Constructor(s)
-  UTL_ListActiveIterator(UTL_List<L, T> *s);	
+  UTL_ListActiveIterator(UTL_List<L, T> *s);
   virtual ~UTL_ListActiveIterator() {}
 
   // Get current item
-  T			*item();
+  T                     *item();
 
   // Get next list
-  virtual void		next();
+  virtual void          next();
 
   // Are we at the end of this list?
-  virtual long		is_done();
+  virtual long          is_done();
 
 protected:
   // Data
-  UTL_List<L, T>		*source;		// On what to iterate?
+  UTL_List<L, T>                *source;                // On what to iterate?
 };
 
 #endif           // _UTL_LIST_UTL_LIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
index ff8f23ff45c..bd79687f222 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -65,15 +65,20 @@
 ** USE: Included from util.hh
 */
 
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
+#include        "ace/stdcpp.h"
 
-class	UTL_NameList : public UTL_List<UTL_NameList, UTL_ScopedName>
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "utl_idlist.h"
+#include        "utl_scoped_name.h"
+#include        "utl_identifier.h"
+#include        "utl_string.h"
+
+class   UTL_NameList : public UTL_List<UTL_NameList, UTL_ScopedName>
 {
 public:
   // Operations
@@ -84,7 +89,7 @@ public:
 };
 
 // Active iterator for UTL_NameList
-class	UTL_NamelistActiveIterator :
+class   UTL_NamelistActiveIterator :
     public UTL_ListActiveIterator<UTL_NameList, UTL_ScopedName>
 {
 public:
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
index 2b6966d0b01..2bdfe06b847 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
@@ -42,8 +42,8 @@
  *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
  *POSSIBILITY OF SUCH DAMAGES.
  *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
+ *SunSoft, Inc.
+ *2550 Garcia Avenue
  *Mountain View, California  94043
  *
  *
@@ -65,13 +65,18 @@
 ** USE: Included from util.hh
 */
 
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_string.h"
+#include        "ace/stdcpp.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class	UTL_StrList : public UTL_List<UTL_StrList, String>
+#include        "idl_fwd.h"
+#include        "utl_list.h"
+#include        "utl_string.h"
+
+
+class   UTL_StrList : public UTL_List<UTL_StrList, String>
 {
 public:
   // Operations
@@ -81,16 +86,16 @@ public:
   virtual ~UTL_StrList() {}
 
   // AST Dumping
-  virtual void		dump(ostream &o);
+  virtual void          dump(ostream &o);
 
   // Other Operations
 
   // Get last element in this list
-  String		*last_component();
+  String                *last_component();
 };
 
 // Active iterator for  UTL_StrList
-class	UTL_StrlistActiveIterator :
+class   UTL_StrlistActiveIterator :
     public UTL_ListActiveIterator<UTL_StrList, String>
 {
 public:
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h
index bc45d738917..3d74636b0e9 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h
@@ -18,13 +18,18 @@
 //
 // ===========================================================
 
-#if !defined (CONSUMER_INPUT_HANDLER_H)
+#ifndef CONSUMER_INPUT_HANDLER_H
 #define CONSUMER_INPUT_HANDLER_H
 
 #include "ConsumerC.h"
 #include "NotifierC.h"
 #include "Consumer_i.h"
 #include "ace/Read_Buffer.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/TAO.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h
index c1c6f9adef4..dc00f6e919a 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.h
+++ b/TAO/examples/Callback_Quoter/Consumer_i.h
@@ -17,7 +17,7 @@
 //
 // ===========================================================
 
-#if !defined (CONSUMER_I_H)
+#ifndef CONSUMER_I_H
 #define CONSUMER_I_H
 #include "ConsumerS.h"
 #include "ConsumerC.h"
@@ -40,7 +40,7 @@ public:
   // Destructor.
 
   void push (const Callback_Quoter::Info & data,
-	     CORBA_Environment& TAO_TRY_ENV);
+             CORBA_Environment& TAO_TRY_ENV);
   // Gets the stock information from the Notifier.
 
   virtual void shutdown (CORBA::Environment &TAO_TRY_ENV);
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index 9af7ea3e201..62e171ba3fe 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -16,7 +16,7 @@
 //
 // ===========================================================
 
-#if !defined (SUPPLIER_INPUT_HANDLER_H)
+#ifndef SUPPLIER_INPUT_HANDLER_H
 #define SUPPLIER_INPUT_HANDLER_H
 
 #include "Notifier_i.h"
@@ -40,8 +40,8 @@ public:
   // Destructor.
 
   int init (int argc,
-	    char *argv[],
-	    CORBA::Environment &env);
+            char *argv[],
+            CORBA::Environment &env);
   // Initialize the Notifier who plays the role of the server here.
 
   int run (CORBA::Environment &env);
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index e93431ceef1..72b772421f3 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -17,13 +17,18 @@
 //
 // ===========================================================
 
-#if !defined (NOTIFIER_I_H)
+#ifndef NOTIFIER_I_H
 #define NOTIFIER_I_H
 
 #include "NotifierS.h"
 #include "ConsumerC.h"
 #include "tao/TAO.h"
 #include "ace/Containers.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SString.h"
 
 class Notifier_i : public POA_Notifier
@@ -40,19 +45,19 @@ public:
   // Destructor.
 
   virtual void register_callback (const char *stock_name,
-			          CORBA::Long threshold_value,
-			          Callback_Quoter::Consumer_ptr consumer_handler,
-				  CORBA::Environment &TAO_TRY_ENV);
+                                  CORBA::Long threshold_value,
+                                  Callback_Quoter::Consumer_ptr consumer_handler,
+                                  CORBA::Environment &TAO_TRY_ENV);
   // Register a distributed callback handler that is invoked when the
   // given stock reaches the desired threshold value.
 
   virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler,
-				    CORBA::Environment &TAO_TRY_ENV);
+                                    CORBA::Environment &TAO_TRY_ENV);
   // Remove the consumer object.
 
   virtual void market_status (const char *stock_name,
-			      CORBA::Long stock_value,
-			      CORBA::Environment &TAO_TRY_ENV);
+                              CORBA::Long stock_value,
+                              CORBA::Environment &TAO_TRY_ENV);
   // Get the market status.
 
   void orb (CORBA::ORB_ptr orb);
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h
index bf614646cbf..f60eb0fa2bb 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.h
+++ b/TAO/examples/Callback_Quoter/Supplier_i.h
@@ -56,7 +56,7 @@ private:
   // object with the POA.
 
   int send_market_status (const char *stock_name,
-			  long value);
+                          long value);
   // Sends the stock name and its value.
 
   int argc_;
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h
index 021da94cd51..56af579da2d 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Handler.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_CONSUMER_HANDLER_H)
+#ifndef _CONSUMER_HANDLER_H
 #define _CONSUMER_HANDLER_H
 
 //#include "ace/CORBA_Handler.h"
@@ -59,7 +59,7 @@ public:
   ACE_Reactor *reactor (void);
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
   // Close down the handler.
 
 private:
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.h b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
index 1872f2aedec..1e427156ea8 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
@@ -14,11 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (CONSUMER_INPUT_HANDLER_H)
+#ifndef CONSUMER_INPUT_HANDLER_H
 #define CONSUMER_INPUT_HANDLER_
 
 #include "ace/Service_Config.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Forward declaration.
 class Consumer_Handler;
 
@@ -38,13 +42,13 @@ public:
   ~Consumer_Input_Handler (void);
 
   int initialize (Consumer_Handler *,
-			  ACE_HANDLE h = 0);
+                          ACE_HANDLE h = 0);
 
   virtual int handle_input (ACE_HANDLE);
   // Dispatch the callback when events occur.
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
   // Close down the handler.
 
   int consumer_initiated_shutdown (void);
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index f5f37f15dfb..9c35c908de2 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_EVENT_COMM_I_H)
+#ifndef _EVENT_COMM_I_H
 #define _EVENT_COMM_I_H
 
 #include "ace/Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "ace/SString.h"
 #include "Event_CommS.h"
@@ -39,11 +44,11 @@ public:
   // Destructor.
 
   virtual void push (const Event_Comm::Event & event,
-		     CORBA::Environment &TAO_TRY_ENV);
+                     CORBA::Environment &TAO_TRY_ENV);
   // Pass the <event> to the <Consumer>.
 
   virtual void disconnect (const char * reason,
-			   CORBA::Environment &TAO_TRY_ENV);
+                           CORBA::Environment &TAO_TRY_ENV);
   // Disconnect the <Consumer> from the <Notifier>, giving it the
   // <reason>.
 };
@@ -66,23 +71,23 @@ public:
   // Initialize a Notifier_i object with the specified size hint.
 
   virtual void disconnect (const char *reason,
-			   CORBA::Environment &TAO_TRY_ENV);
+                           CORBA::Environment &TAO_TRY_ENV);
   // Disconnect all the receivers, giving them the <reason>.
 
   virtual void push (const Event_Comm::Event &event,
-		     CORBA::Environment &TAO_TRY_ENV);
+                     CORBA::Environment &TAO_TRY_ENV);
   // Send the <event> to all the consumers who have subscribed and who
   // match the filtering criteria.
 
    virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
-			   const char * filtering_criteria,
-			   CORBA::Environment &TAO_TRY_ENV);
+                           const char * filtering_criteria,
+                           CORBA::Environment &TAO_TRY_ENV);
   // Subscribe the <Consumer> to receive events that match
   // <filtering_criteria> applied by the <Notifier>.
 
  void unsubscribe (Event_Comm::Consumer *consumer,
-		    const char *filtering_criteria,
-		    CORBA::Environment &TAO_TRY_ENV);
+                    const char *filtering_criteria,
+                    CORBA::Environment &TAO_TRY_ENV);
   // Unsubscribe the <Consumer>.
 
 private:
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h
index 7e2c7ad7952..a54d1b7cdc0 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.h
+++ b/TAO/examples/Event_Comm/Notifier_Handler.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (_NOTIFIER_HANDLER_H)
+#ifndef _NOTIFIER_HANDLER_H
 #define _NOTIFIER_HANDLER_H
 
 #include "ace/CORBA_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Event_Comm_i.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index 8f96c6565c3..ed9d75fbb92 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_NOTIFIER_SERVER_H)
+#ifndef _NOTIFIER_SERVER_H
 #define _NOTIFIER_SERVER_H
 
 #include "Event_Comm_i.h"
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.h b/TAO/examples/Event_Comm/Supplier_Input_Handler.h
index 041e3797a68..e9b034180c7 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.h
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.h
@@ -17,11 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (SUPPLIER_INPUT_HANDLER_H)
+#ifndef SUPPLIER_INPUT_HANDLER_H
 #define SUPPLIER_INPUT_HANDLER_H
 
 #include "ace/Service_Config.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Forward declaration.
 class Notifier_Handler;
 
@@ -49,7 +53,7 @@ public:
   // Frame input events and notify <Consumers>.
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
   // Close down the handler.
 
 protected:
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index c87bf9980ea..527ce752000 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -3,7 +3,11 @@
 #include "DatabaseS.h"
 #include "ace/Malloc.h"
 
-class DatabaseImpl 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class DatabaseImpl
 {
 public:
 
@@ -64,7 +68,7 @@ public:
                                               const char *entry_type,
                                               const Database::NVPairSequence &initial_attributes,
                                               CORBA::Environment &env);
-    
+
     virtual Database::Entry_ptr find_entry (const char *key,
                                             const char *entry_type,
                                             CORBA::Environment &env);
@@ -91,24 +95,24 @@ public:
   class Employee
   {
   public:
-    Employee (const char* name, 
+    Employee (const char* name,
               CORBA::Long id);
 
     ~Employee (void);
-    
+
     const char *name (void) const;
     void name (const char* name);
-    
+
     CORBA::Long id (void) const;
     void id (CORBA::Long id);
-    
+
     void *operator new (size_t);
     void operator delete (void *pointer);
-    
+
   private:
     char *name_;
     // Employee name.
-    
+
     CORBA::Long id_;
     // Employee ID.
   };
diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h
index 4ebbccea87b..736789654cf 100644
--- a/TAO/examples/POA/Default_Servant/File_i.h
+++ b/TAO/examples/POA/Default_Servant/File_i.h
@@ -36,25 +36,25 @@ public:
     PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
     // write buffer to File corresponding to this Descriptor
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer, 
+    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer,
                                CORBA::Environment &env);
 
     // Reads num_bytes from the file and returns it
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes, 
+    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes,
                                                 CORBA::Environment &env);
     // seek to the offset in file from whence
-    virtual CORBA::ULong lseek (CORBA::ULong offset, 
-                                CORBA::Long whence,  
+    virtual CORBA::ULong lseek (CORBA::ULong offset,
+                                CORBA::Long whence,
                                 CORBA::Environment &env);
 
     // closes the file corresponding to the requested ObjectID
     virtual void destroy (CORBA::Environment &env);
 
   private:
-    
+
     // Extracts the ACE_HANDLE from the objectID
     ACE_HANDLE fd (CORBA::Environment &env);
-   
+
     PortableServer::POA_var poa_;
   };
 
@@ -62,7 +62,7 @@ public:
     // File System implementation class
   {
   public:
-    // Constructor, Creates a single File Descriptor Servant and 
+    // Constructor, Creates a single File Descriptor Servant and
     // registers it with the POA as the Default Servant
     System (PortableServer::POA_ptr poa);
 
@@ -73,14 +73,14 @@ public:
     PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
     //Opens a file ,creates a Descriptor reference with the ACE_HANDLE
-    // and returns that reference	
-    File::Descriptor_ptr open (const char *file_name, 
+    // and returns that reference
+    File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags,
                                CORBA::Environment &env);
-    
+
   private:
     PortableServer::POA_var poa_;
-    
+
     // The single File Descriptor servant which serves requests for any
     // Descriptor object under poa_.
     Descriptor fd_servant_;
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
index 3cc3721c274..f0a316eee8e 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
@@ -4,11 +4,15 @@
 // This file is generated automatically by
 // ${ACE_ROOT}/GenExportH.BAT
 // ------------------------------
-#if !defined (Alt_Resource_Factory_EXPORT_H)
+#ifndef Alt_Resource_Factory_EXPORT_H
 #define Alt_Resource_Factory_EXPORT_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (Alt_Resource_Factory_HAS_DLL)
 #  if (Alt_Resource_Factory_HAS_DLL == 1)
 #    if defined (Alt_Resource_Factory_BUILD_DLL)
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
index 2b20061d4db..b8ecc8ebf7f 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
@@ -3,7 +3,7 @@
 #include "tao/corba.h"
 #include "Alt_Resource_Factory.h"
 
-class Alt_Resource_Factory_Export My_Resource_Factory :  public TAO_Resource_Factory 
+class Alt_Resource_Factory_Export My_Resource_Factory :  public TAO_Resource_Factory
 {
 public:
   virtual ACE_Reactor *get_reactor (void);
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.h b/TAO/examples/POA/Forwarding/MyFooServant.h
index 49bde57fe28..7534f403a33 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.h
+++ b/TAO/examples/POA/Forwarding/MyFooServant.h
@@ -13,7 +13,7 @@
 //
 //=============================================================================
 
-#if !defined (MYFOOSERVANT_H)
+#ifndef MYFOOSERVANT_H
 #define MYFOOSERVANT_H
 
 #include "FooS.h"
@@ -29,16 +29,16 @@ public:
                      PortableServer::POA_ptr poa_ptr,
                      CORBA::Long value,
                      CORBA::Object_ptr forward_to_ptr);
-  
+
   // Destructor
   virtual ~MyFirstFooServant (void);
-  
+
   //Returns the Default POA of this Servant object
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
   // Simple doit method
   virtual CORBA::Long doit (CORBA::Environment &env);
-  
+
   // Setup forwarding
   virtual void forward (CORBA::Environment &env);
 
@@ -61,13 +61,13 @@ public:
   MySecondFooServant (CORBA::ORB_ptr orb_ptr,
                       MyFooServantLocator *locator,
                       CORBA::Long value);
-  
+
   // Destructor
   virtual ~MySecondFooServant (void);
-  
+
   // Simple doit method
   virtual CORBA::Long doit (CORBA::Environment &env);
-  
+
   // Setup forwarding
   virtual void forward (CORBA::Environment &env);
 
diff --git a/TAO/examples/POA/Forwarding/Servant_Locator.h b/TAO/examples/POA/Forwarding/Servant_Locator.h
index 256e4176b84..888b6805d33 100644
--- a/TAO/examples/POA/Forwarding/Servant_Locator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Locator.h
@@ -17,7 +17,7 @@
 //
 //==================================================================================
 
-#if !defined (MYFOOSERVANTLOCATOR_H)
+#ifndef MYFOOSERVANTLOCATOR_H
 #define MYFOOSERVANTLOCATOR_H
 
 #include "tao/corba.h"
@@ -41,7 +41,7 @@ public:
                                              CORBA::Environment &env);
   // This method is invoked by a POA whenever it receives a request
   // for MyFoo object that is not currently active.
-  
+
   virtual void postinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr adapter,
                            const char *operation,
@@ -52,17 +52,17 @@ public:
   // request.
 
   void forward (CORBA::Environment &env);
-  
+
 private:
   CORBA::ORB_var orb_var_;
 
   int counter_;
   // Counter for number of invocations of this.
-  
+
   PortableServer::Servant servant_ptr_;
   // There really exists only one servant, which is returned all the
   // time.
-  
+
   CORBA::Object_var forward_to_var_;
   // location to forward to
 
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h
index 6ab5e0b5ddf..af9afb37c43 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.h
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h
@@ -13,7 +13,7 @@
 //
 //=============================================================================
 
-#if !defined (MYFOOSERVANT_H)
+#ifndef MYFOOSERVANT_H
 #define MYFOOSERVANT_H
 
 #include "FooS.h"
@@ -23,7 +23,7 @@ class GENERIC_SERVANT_Export MyFooServant : public POA_Foo
 public:
   // constructor - takes a POA and a value parameter
   MyFooServant (CORBA::ORB_ptr orb,
-		PortableServer::POA_ptr poa,
+                PortableServer::POA_ptr poa,
                 CORBA::Long value);
 
   // Destructor
diff --git a/TAO/examples/POA/Generic_Servant/generic_servant_export.h b/TAO/examples/POA/Generic_Servant/generic_servant_export.h
index 6c7059c79a2..cabb41f48f7 100644
--- a/TAO/examples/POA/Generic_Servant/generic_servant_export.h
+++ b/TAO/examples/POA/Generic_Servant/generic_servant_export.h
@@ -4,11 +4,15 @@
 // This file is generated automatically by
 // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
 // ------------------------------
-#if !defined (GENERIC_SERVANT_EXPORT_H)
+#ifndef GENERIC_SERVANT_EXPORT_H
 #define GENERIC_SERVANT_EXPORT_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (GENERIC_SERVANT_HAS_DLL)
 #  if (GENERIC_SERVANT_HAS_DLL == 1)
 #    if defined (GENERIC_SERVANT_BUILD_DLL)
diff --git a/TAO/examples/POA/TIE/Foo_i.h b/TAO/examples/POA/TIE/Foo_i.h
index 75f4731e1f2..116e5384ca6 100644
--- a/TAO/examples/POA/TIE/Foo_i.h
+++ b/TAO/examples/POA/TIE/Foo_i.h
@@ -13,7 +13,7 @@
 //
 //=============================================================================
 
-#if !defined (FOO_I_H)
+#ifndef FOO_I_H
 #define FOO_I_H
 
 #include "FooS.h"
@@ -77,7 +77,7 @@ public:
     PortableServer::POA_var poa_;
     // Default poa associated with this servant
   };
-  
+
   class Inner_i
   {
   public:
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 09cff9259f8..b2ec79f92f9 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -6,7 +6,7 @@
 //    FactoryFinder.h
 //
 // = DESCRIPTION
-//    Server for the Quoter Factory Finder 
+//    Server for the Quoter Factory Finder
 //
 // = AUTHOR
 //    Michael Kircher (mk1@cs.wustl.edu)
@@ -14,10 +14,15 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/TAO.h"
 #include "Factory_Finder_i.h"
 
-#if !defined (QUOTER_FACTORY_FINDER_H)
+#ifndef QUOTER_FACTORY_FINDER_H
 #define QUOTER_FACTORY_FINDER_H
 
 class Quoter_Factory_Finder_Server
@@ -36,7 +41,7 @@ public:
   // Initialize the Quoter_Server state - parsing arguments and ...
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
   u_int parse_args (void);
   // parse the passed parameters
@@ -47,7 +52,7 @@ private:
 
   Quoter_Factory_Finder_i *quoter_Factory_Finder_i_ptr_;
   // instance of the Quoter Factory Finder
-  
+
   CosNaming::NamingContext_var quoterNamingContext_var_;
   // reference to the Quoter naming context
 
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index 4ce73d28a98..c85c7d226b1 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -15,10 +15,10 @@
 
 #include "QuoterS.h"
 
-#if !defined (QUOTER_FACTORY_FINDER_IMPL_H)
+#ifndef QUOTER_FACTORY_FINDER_IMPL_H
 #define QUOTER_FACTORY_FINDER_IMPL_H
 
-class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder 
+class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder
 {
   // = TILE
   //   A CosLifeCycle conforming Factory Finder for the Quoter
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index bee301b10b9..0d614088019 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -14,10 +14,15 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/TAO.h"
 #include "Generic_Factory_i.h"
 
-#if !defined (GENERIC_FACTORY_H)
+#ifndef GENERIC_FACTORY_H
 #define GENERIC_FACTORY_H
 
 class Quoter_Generic_Factory_Server
@@ -49,7 +54,7 @@ private:
 
   Quoter_Generic_Factory_i *quoter_Generic_Factory_i_ptr_;
   // Instance of the Quoter Generic Factory.
-  
+
   CosNaming::NamingContext_var quoterNamingContext_var_;
   // Reference to the Quoter naming context.
 
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index 100b1a6c22e..21265bda13c 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -16,7 +16,7 @@
 #include "QuoterS.h"
 
 
-#if !defined (QUOTER_GENERIC_FACTORY_IMPL_H)
+#ifndef QUOTER_GENERIC_FACTORY_IMPL_H
 #define QUOTER_GENERIC_FACTORY_IMPL_H
 
 class Quoter_Generic_Factory_i : public POA_Stock::Quoter_Generic_Factory
@@ -34,7 +34,7 @@ public:
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
-  CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, 
+  CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
                                    const CosLifeCycle::Criteria &the_criteria,
                                    CORBA::Environment &_env_there);
   // Returns an object reference to a newly created object, though the
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index aa835cad233..23573a1a648 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -4,17 +4,17 @@
 //
 // = LIBRARY
 //    TAO/tests/Quoter
-// 
+//
 // = FILENAME
 //    Quoter_i.h
 //
 // = AUTHOR
-//    Darrell Brunsch 
-// 
+//    Darrell Brunsch
+//
 // ============================================================================
 
-#if !defined (QUOTER_IMPL_H)
-#define	QUOTER_IMPL_H
+#ifndef QUOTER_IMPL_H
+#define QUOTER_IMPL_H
 
 #include "QuoterS.h"
 
@@ -34,10 +34,10 @@ class Quoter_i: public POA_Stock::Quoter
   //   Actual Quoter Implementation class.  Returns a quoter for a given stock
   //   and provides an example for the lifecycle functionality.
 public:
-  Quoter_i (const char *obj_name = "",  
-	       const unsigned char use_LifeCycle_Service = 0,
-	       PortableServer::POA_ptr poa_ptr = 0);
-  // Constructor (use_LifeCycle_Service is 1 if the LifeCycle_Service should be used 
+  Quoter_i (const char *obj_name = "",
+               const unsigned char use_LifeCycle_Service = 0,
+               PortableServer::POA_ptr poa_ptr = 0);
+  // Constructor (use_LifeCycle_Service is 1 if the LifeCycle_Service should be used
   // instead of the Quoter Generic_Factory
 
   ~Quoter_i (void);
@@ -46,7 +46,7 @@ public:
   virtual CORBA::Long get_quote (const char *stock_name,
                                  CORBA::Environment &env);
   // Returns the current quote for the stock <stock_name>
-  
+
   // = Lifecycle methods
 
   virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there,
@@ -62,9 +62,9 @@ public:
   virtual void remove (CORBA::Environment &_tao_environment);
   // Removes the object.
 
-private:  
+private:
   unsigned char use_LifeCycle_Service_;
-  // This flag defines if a Generic Factory is used (0 by default) or 
+  // This flag defines if a Generic Factory is used (0 by default) or
   // the more sophisticated LifeCycle Service (1)
 
   PortableServer::POA_var poa_var_;
@@ -90,7 +90,7 @@ public:
   ~Quoter_Factory_i (void);
   // Destructor.
 
-  virtual Stock::Quoter_ptr create_quoter (const char *name,  
+  virtual Stock::Quoter_ptr create_quoter (const char *name,
                                            CORBA::Environment &env);
   // Return the quoter by the id <name>.
 
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index 1e37d188b79..a0bee1d9a05 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (QUOTER_CLIENT_H)
+#ifndef QUOTER_CLIENT_H
 #define QUOTER_CLIENT_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "tao/corba.h"
@@ -68,7 +73,7 @@ private:
   // Flag to tell server to shutdown.
 
   Stock::Quoter_Factory_Finder_var factory_Finder_var_;
-  // Pointer to a factory finder 
+  // Pointer to a factory finder
 
   Stock::Quoter_Factory_var factory_var_;
   // Pointer to a factory
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index 51af5cfa68a..522f775ed1d 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (QUOTER_SERVER_H)
+#ifndef QUOTER_SERVER_H
 #define QUOTER_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
@@ -29,7 +34,7 @@
 #include "Quoter_i.h"
 #include "QuoterC.h"
 
-class Quoter_Server 
+class Quoter_Server
 {
   // =TITLE
   //   Defines a Quoter Server class that implements the functionality
@@ -51,7 +56,7 @@ public:
   // Initialize the Quoter_Server state - parsing arguments and ...
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
 private:
   int parse_args (void);
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index 93e23917cb0..c7333b19c5b 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (ACCOUNTMANAGER_I_H)
-#define	ACCOUNTMANAGER_I_H
+#ifndef ACCOUNTMANAGER_I_H
+#define ACCOUNTMANAGER_I_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/OS.h"
 #include "tao/TAO.h"
 #include "BankS.h"
@@ -44,13 +49,13 @@ public:
   // Destructor.
 
   virtual Bank::Account_ptr open (const char *name,
-				  CORBA::Float initial_balance,
-				  CORBA::Environment &_env);
+                                  CORBA::Float initial_balance,
+                                  CORBA::Environment &_env);
   // Return the Account interface with the given name from the server.
   // Put the initial balance specified in the new account.
 
   virtual void close (Bank::Account_ptr,
-		      CORBA::Environment &env);
+                      CORBA::Environment &env);
   // Close the given account.
 
   virtual void shutdown (CORBA::Environment &env);
diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h
index e6b6049c6a7..969d3cad1e2 100644
--- a/TAO/examples/Simple/bank/Account_i.h
+++ b/TAO/examples/Simple/bank/Account_i.h
@@ -17,8 +17,8 @@
 //
 // ============================================================================
 
-#if !defined (ACCOUNT_I_H)
-#define	ACCOUNT_I_H
+#ifndef ACCOUNT_I_H
+#define ACCOUNT_I_H
 
 #include "BankS.h"
 
@@ -49,15 +49,15 @@ public:
   // Get the name of the <Account> holder.
 
   virtual void name (const char *name,
-		     CORBA::Environment &env);
+                     CORBA::Environment &env);
   // Set the name of the <Account> holder.
 
   virtual void deposit (CORBA::Float,
-			CORBA::Environment &env);
+                        CORBA::Environment &env);
   // Deposit money in the account.
 
   virtual void withdraw (CORBA::Float,
-			 CORBA::Environment &env);
+                         CORBA::Environment &env);
   // Withdraw money in the account.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/bank/Client_i.h b/TAO/examples/Simple/bank/Client_i.h
index e06369f955f..eb9bf8ce1ab 100644
--- a/TAO/examples/Simple/bank/Client_i.h
+++ b/TAO/examples/Simple/bank/Client_i.h
@@ -55,22 +55,22 @@ private:
   // Checks the various operations of the account.
 
   void deposit (Bank::Account_ptr server,
-		CORBA::Float deposit_amount,
-		CORBA::Environment &env);
+                CORBA::Float deposit_amount,
+                CORBA::Environment &env);
   // Deposit in the account.
 
   void withdraw (Bank::Account_ptr server,
-		 CORBA::Float withdrawl_amount);
+                 CORBA::Float withdrawl_amount);
   // Withdraw from the account.
 
   Bank::Account_ptr open (const char *name,
-			  CORBA::Float initial_balance,
-			  CORBA::Environment &env);
+                          CORBA::Float initial_balance,
+                          CORBA::Environment &env);
   // Open a new account with the given name and initial balance.
 
 
   void close (Bank::Account_ptr account,
-	      CORBA::Environment &env);
+              CORBA::Environment &env);
   // Close a given Account.
 
   void test_for_different_name (CORBA::Environment &env);
diff --git a/TAO/examples/Simple/bank/Server_i.h b/TAO/examples/Simple/bank/Server_i.h
index 3a86681c27b..e195f184c2c 100644
--- a/TAO/examples/Simple/bank/Server_i.h
+++ b/TAO/examples/Simple/bank/Server_i.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (SERVER_I_H)
+#ifndef SERVER_I_H
 #define SERVER_I_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "orbsvcs/CosNamingC.h"
@@ -42,8 +47,8 @@ public:
   // Destructor.
 
   int init (int argc,
-	    char *argv[],
-	    CORBA::Environment &env);
+            char *argv[],
+            CORBA::Environment &env);
   // Initialize the Server state - parsing arguments and waiting.
 
   int run (CORBA::Environment &env);
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index 87e54162477..2b4958ef096 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -17,13 +17,18 @@
 //
 // ===========================================================
 
-#if !defined (BROADCASTER_I_H)
+#ifndef BROADCASTER_I_H
 #define BROADCASTER_I_H
 
 #include "BroadcasterS.h"
 #include "ReceiverC.h"
 #include "tao/TAO.h"
 #include "ace/Containers.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SString.h"
 
 class Broadcaster_i : public POA_Broadcaster
@@ -40,17 +45,17 @@ public:
   // Destructor.
 
   virtual void add (Receiver_ptr receiver,
-		    const char *nickname,
-		    CORBA::Environment &TAO_TRY_ENV);
+                    const char *nickname,
+                    CORBA::Environment &TAO_TRY_ENV);
   // Saves receiver references in a list.
 
   virtual void remove (Receiver_ptr receiver,
-		       CORBA::Environment &TAO_TRY_ENV);
+                       CORBA::Environment &TAO_TRY_ENV);
   // Removes receiver references from the list.
 
   virtual void say (Receiver_ptr receiver,
-		    const char *text,
-		    CORBA::Environment &TAO_TRY_ENV);
+                    const char *text,
+                    CORBA::Environment &TAO_TRY_ENV);
   // Called by Broadcaster clients to send messages.
 
 public:
@@ -58,7 +63,7 @@ public:
   // The ORB manager.
 
   void broadcast (const char* text,
-		  CORBA::Environment &TAO_TRY_ENV);
+                  CORBA::Environment &TAO_TRY_ENV);
   // Broadcasts the text to all registered clients.
 
   class Receiver_Data
@@ -82,7 +87,7 @@ public:
   typedef ACE_Unbounded_Set<Receiver_Data>
           RECEIVER_SET;
   typedef ACE_Unbounded_Set_Iterator<Receiver_Data>
-	  RECEIVER_SET_ITERATOR;
+          RECEIVER_SET_ITERATOR;
 
   RECEIVER_SET receiver_set_;
   // Set of registered clients.
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index f62bf9a769e..bbbd82d289e 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -18,12 +18,17 @@
 //
 // ===========================================================
 
-#if !defined (CLIENT_I_H)
+#ifndef CLIENT_I_H
 #define CLIENT_I_H
 
 #include "Receiver_i.h"
 #include "BroadcasterC.h"
 #include "ace/Read_Buffer.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/TAO.h"
 
 class Client_i : public ACE_Event_Handler
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index b0db0d1618e..c0ec2f98fc2 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -17,7 +17,7 @@
 //
 // ===========================================================
 
-#if !defined (RECEIVER_I_H)
+#ifndef RECEIVER_I_H
 #define RECEIVER_I_H
 
 #include "ReceiverS.h"
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 2622ee027c9..dca164d5ba6 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -18,7 +18,7 @@
 //
 // ===========================================================
 
-#if !defined (SERVER_I_H)
+#ifndef SERVER_I_H
 #define SERVER_I_H
 
 #include "Broadcaster_i.h"
@@ -39,8 +39,8 @@ public:
  // Destructor.
 
  int init (int argc,
-	    char *argv[],
-	    CORBA::Environment &env);
+            char *argv[],
+            CORBA::Environment &env);
  // Initialize the server.
 
  int run (CORBA::Environment &env);
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index c8214fefde9..d54b811fef8 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (ECHO_I_H)
+#ifndef ECHO_I_H
 #define ECHO_I_H
 
 #include "EchoS.h"
@@ -41,7 +41,7 @@ public:
   // Destructor.
 
   virtual char *echo (const char *mesg,
-		      CORBA::Environment &env);
+                      CORBA::Environment &env);
   // Return the mesg string back from the server.
 
  virtual void shutdown (CORBA::Environment &env);
diff --git a/TAO/examples/Simple/echo/Server_i.h b/TAO/examples/Simple/echo/Server_i.h
index 381acdf1cdd..43529e5b0a2 100644
--- a/TAO/examples/Simple/echo/Server_i.h
+++ b/TAO/examples/Simple/echo/Server_i.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (SERVER_I_H)
+#ifndef SERVER_I_H
 #define SERVER_I_H
 
 #include "Echo_i.h"
diff --git a/TAO/examples/Simple/grid/Client_i.h b/TAO/examples/Simple/grid/Client_i.h
index 4455c6c73b1..105dda085ae 100644
--- a/TAO/examples/Simple/grid/Client_i.h
+++ b/TAO/examples/Simple/grid/Client_i.h
@@ -18,7 +18,7 @@
 
 # include "GridC.h"
 
-class Client_i 
+class Client_i
 {
   // = TITLE
   //    Simple Client implementation.
@@ -41,9 +41,9 @@ public:
 
   int init (int argc, char *argv[]);
   // Initialize the client communication endpoint with server.
- 
+
   void test_grid (void);
-  // Make the grid. 
+  // Make the grid.
 
 private:
   int read_ior (char *filename);
@@ -81,7 +81,7 @@ private:
 
   CORBA::Short setx_;
   // Cell identifier in which a value meeds to be stored.
- 
+
   CORBA::Short sety_;
   // Cell identifier in which a value meeds to be stored.
 
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index cd0c34c26a5..516a10f6072 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/tests/Simple/grid
-// 
+//
 // = FILENAME
 //    Grid_i.h
 //
@@ -13,11 +13,11 @@
 //    This class implements the Grid IDL interface.
 //
 // = AUTHOR
-// 
+//
 // ============================================================================
 
-#if !defined (GRID_I_H)
-#define	GRID_I_H
+#ifndef GRID_I_H
+#define GRID_I_H
 
 #include "GridS.h"
 
@@ -49,22 +49,22 @@ public:
   // Returns the height of the grid
 
   virtual void width (CORBA::Short,
-	              CORBA_Environment &);
+                      CORBA_Environment &);
   // Sets the width of the grid.
 
   virtual void height (CORBA::Short,
                        CORBA_Environment &);
   // Sets the height of the grid.
 
-  virtual void set (CORBA::Short, 
-		    CORBA::Short,
-		    CORBA::Long,
-		    CORBA::Environment &);
+  virtual void set (CORBA::Short,
+                    CORBA::Short,
+                    CORBA::Long,
+                    CORBA::Environment &);
   // Sets the grid value.
 
-  virtual CORBA::Long get (CORBA::Short, 
-	                   CORBA::Short,
-		           CORBA::Environment &);
+  virtual CORBA::Long get (CORBA::Short,
+                           CORBA::Short,
+                           CORBA::Environment &);
   // Gets the grid value.
 
   virtual void destroy (CORBA::Environment &);
@@ -78,14 +78,14 @@ private:
   // Height of the grid.
 
   CORBA::Long **array_;
-  // Pointer to the matrix.  This is organized as an "array of arrays."  
+  // Pointer to the matrix.  This is organized as an "array of arrays."
 };
 
 class Grid_Factory_i : public POA_Grid_Factory
 {
   // =TITLE
   //   Create a <Grid>.
-public: 
+public:
   // = Initialization and termination methods.
   Grid_Factory_i (void);
   // Constructor.
@@ -94,13 +94,13 @@ public:
   // Destructor.
 
   virtual Grid_ptr make_grid (CORBA::Short,
-			      CORBA::Short,
-			      CORBA::Environment &_env);
+                              CORBA::Short,
+                              CORBA::Environment &_env);
   // This function creates and returns a <Grid>.
 
   virtual void shutdown (CORBA::Environment &env);
   // Shutdown the server.
-  
+
   void orb (CORBA::ORB_ptr o);
   // Set the ORB pointer.
 
diff --git a/TAO/examples/Simple/grid/Server_i.h b/TAO/examples/Simple/grid/Server_i.h
index 1cb5f88a2be..dbfd942a2f8 100644
--- a/TAO/examples/Simple/grid/Server_i.h
+++ b/TAO/examples/Simple/grid/Server_i.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (SERVER_I_H)
+#ifndef SERVER_I_H
 #define SERVER_I_H
 
 #include "Grid_i.h"
diff --git a/TAO/examples/Simple/time/Client_i.h b/TAO/examples/Simple/time/Client_i.h
index ab4a3d5893d..84ff238619b 100644
--- a/TAO/examples/Simple/time/Client_i.h
+++ b/TAO/examples/Simple/time/Client_i.h
@@ -11,7 +11,7 @@
 //
 // = DESCRIPTION
 //    This class implements a simple CORBA client that access a Time
-//    server. 
+//    server.
 //
 // = AUTHORS
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
diff --git a/TAO/examples/Simple/time/Server_i.h b/TAO/examples/Simple/time/Server_i.h
index 3f3a1814c3a..3ebb7c72b53 100644
--- a/TAO/examples/Simple/time/Server_i.h
+++ b/TAO/examples/Simple/time/Server_i.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (SERVER_I_H)
+#ifndef SERVER_I_H
 #define SERVER_I_H
 
 #include "Time_i.h"
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index a4d17a315dd..ec7d011aff3 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/tests/Simple/time
-// 
+//
 // = FILENAME
 //    Time_i.h
 //
@@ -14,11 +14,11 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (TIME_I_H)
-#define	TIME_I_H
+#ifndef TIME_I_H
+#define TIME_I_H
 
 #include "TimeS.h"
 
@@ -28,9 +28,9 @@ class Time_i: public POA_Time
   //    Time Object Implementation
   //
   // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that 
+  //    Implementation of a simple object that has two methods, one that
   //    return the current time/date on the server and the other that
-  //    shuts down the server.  
+  //    shuts down the server.
 public:
   // = Initialization and termination methods.
   Time_i (void);
diff --git a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h
index e5840bb289e..d3a9bb3ccf4 100644
--- a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h
+++ b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h
@@ -7,7 +7,7 @@
 //    AnyAnalyser.h
 //
 // = AUTHOR
-//    Michael Kircher 
+//    Michael Kircher
 //
 // = DESCRIPTION
 //   Accepts an CORBA::Any, traverses it, copies it into a tree structure
@@ -19,7 +19,7 @@
 #include "PrintVisitor.h"
 #include "tao/corba.h"
 
-#if !defined (ANYANALYSER_H)
+#ifndef ANYANALYSER_H
 #define ANYANALYSER_H
 
 typedef enum {PARENT_IS_STRUCT, PARENT_IS_NO_STRUCT} KIND;
@@ -36,24 +36,24 @@ class AnyAnalyser {
 
 public:
   AnyAnalyser (const char *filename);
-  
+
   ~AnyAnalyser ();
 
   // cause the PrintViewer to be deleted to close the file
   void close ();
-  
+
   // main starting point includes analysing and printing
   void printAny (CORBA::TypeCode_ptr any_type, const void *any_value);
 
   void printTimeStamp (ACE_hrtime_t creation,
                        ACE_hrtime_t ec_recv,
                        ACE_hrtime_t ec_send);
-  // Print the time stamp, which means forward this 
+  // Print the time stamp, which means forward this
   // call to the PrintVisitor
 
 private:
-  Node *analyse (CORBA::TypeCode_ptr tc_ptr, 
-		             const unsigned char *&value_ptr,
+  Node *analyse (CORBA::TypeCode_ptr tc_ptr,
+                             const unsigned char *&value_ptr,
                  RecurseInfo recurseInfo);
 
   PrintVisitor *printVisitor_ptr_;
diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
index 8730e2d56d0..90c6a1db6db 100644
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
+++ b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
@@ -1,6 +1,6 @@
 // $Id$
 // ============================================================================
-// 
+//
 // = FILENAME
 //    DOVEMIB.h
 //
@@ -9,7 +9,7 @@
 //
 // ============================================================================
 
-#if !defined (DOVE_MIB_H)
+#ifndef DOVE_MIB_H
 #define DOVE_MIB_H
 
 //#include "ace/SString.h"
@@ -29,7 +29,7 @@ public:
   MIB_Consumer (void);
 
   int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     const char *my_name);
+                     const char *my_name);
   // Uses the name server to obtain a reference to the <supplier_name>
   // and registers with channel to receive notifications from the
   // supplier.  Also registers to receive shutdown messages from the
@@ -41,7 +41,7 @@ public:
 
   // = (not protected to allow short-circuiting) protected:
   virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
   // disconnects from the channel.
diff --git a/TAO/examples/Simulator/DOVEMIB/Node.h b/TAO/examples/Simulator/DOVEMIB/Node.h
index d8029a4fa5e..90823bb26cc 100644
--- a/TAO/examples/Simulator/DOVEMIB/Node.h
+++ b/TAO/examples/Simulator/DOVEMIB/Node.h
@@ -7,10 +7,10 @@
 //    Node.h
 //
 // = AUTHOR
-//    Michael Kircher 
+//    Michael Kircher
 //
 // = DESCRIPTION
-//    This file descibes the various node types for analysing 
+//    This file descibes the various node types for analysing
 //    an CORBA::Any. It is no memory allocated, that means
 //    The values are not really contained by the nodes, but the
 //    nodes refer to the values via pointers.
@@ -19,15 +19,20 @@
 
 #include "tao/corba.h"
 #include "ace/Containers.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "NodeVisitor.h"
 
-#if !defined (NODE_H)
+#ifndef NODE_H
 #define NODE_H
 
 
 // base class for nodes
 class Node {
-public: 
+public:
   virtual ~Node () {}
   virtual void Accept (NodeVisitor *NodeVisitor) = 0;
   virtual unsigned int getRecursionLevel () = 0;
@@ -41,8 +46,8 @@ protected:
 // Node to store information about a Struct
 class StructNode : public Node {
 public:
-  StructNode (const char *Name_ptr, 
-	      unsigned int recursion_level);
+  StructNode (const char *Name_ptr,
+              unsigned int recursion_level);
   ~StructNode ();
 
   // accpet a visitor
@@ -56,15 +61,15 @@ public:
 
   // get the number of children
   unsigned int getChildNumber ();
-  
+
   // get the name of the struct
-  const char *getName ();  
+  const char *getName ();
 
   // get recursion level
   unsigned int getRecursionLevel ();
-    
 
-private: 
+
+private:
   ACE_Unbounded_Queue<Node *> *queue_ptr_;
   ACE_Unbounded_Queue_Iterator<Node *> *queue_iterator_ptr_;
   unsigned int queue_position_;
@@ -76,9 +81,9 @@ private:
 // Node to store information about a Double
 class DoubleNode : public Node {
 public:
-  DoubleNode (CORBA::Double *Double_ptr, 
-	      const char *Name_ptr,
-	      unsigned int recursion_level);
+  DoubleNode (CORBA::Double *Double_ptr,
+              const char *Name_ptr,
+              unsigned int recursion_level);
   ~DoubleNode () {}
 
   // accpet a visitor
@@ -92,9 +97,9 @@ public:
 
   // get recursion level
   unsigned int getRecursionLevel ();
-  
+
 private:
-  CORBA::Double *Double_ptr_; 
+  CORBA::Double *Double_ptr_;
   const char *Name_ptr_;
   unsigned int recursion_level_;
 };
@@ -103,9 +108,9 @@ private:
 // Node to store information about a Long
 class LongNode : public Node {
 public:
-  LongNode (CORBA::Long *Long_ptr, 
-	    const char *Name_ptr,
-	    unsigned int recursion_level);
+  LongNode (CORBA::Long *Long_ptr,
+            const char *Name_ptr,
+            unsigned int recursion_level);
   ~LongNode () {}
 
   // accpet a visitor
@@ -121,7 +126,7 @@ public:
   unsigned int getRecursionLevel ();
 
 private:
-  CORBA::Long *Long_ptr_; 
+  CORBA::Long *Long_ptr_;
   const char *Name_ptr_;
   unsigned int recursion_level_;
 };
@@ -130,11 +135,11 @@ private:
 // Node to store information about a ULong
 class ULongNode : public Node {
 public:
-  ULongNode (CORBA::ULong *Long_ptr, 
-	     const char *Name_ptr,
-	     unsigned int recursion_level);
-  ~ULongNode () {} 
-  
+  ULongNode (CORBA::ULong *Long_ptr,
+             const char *Name_ptr,
+             unsigned int recursion_level);
+  ~ULongNode () {}
+
   // accpet a visitor
   void Accept (NodeVisitor *nodeVisitor);
 
@@ -157,11 +162,11 @@ private:
 // Node to store information about a String
 class StringNode : public Node {
 public:
-  StringNode (CORBA::String_var String_var, 
-	      const char *Name_ptr,
-	      unsigned int recursion_level);
+  StringNode (CORBA::String_var String_var,
+              const char *Name_ptr,
+              unsigned int recursion_level);
   ~StringNode () {}
-  
+
   // accpet a visitor
   void Accept (NodeVisitor *nodeVisitor);
 
diff --git a/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h b/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h
index d19e065ae2c..f1a0d5d4050 100644
--- a/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h
+++ b/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h
@@ -7,14 +7,14 @@
 //    NodeVisitor.h
 //
 // = AUTHOR
-//    Michael Kircher 
+//    Michael Kircher
 //
 // = DESCRIPTION
 //    This file descibes the Visitor used by the any evaluator.
 //
 // ============================================================================
 
-#if !defined (NODE_VISITOR_H)
+#ifndef NODE_VISITOR_H
 #define NODE_VISITOR_H
 
 class StructNode;
@@ -30,7 +30,7 @@ public:
   virtual void visitStructNode (StructNode *structNode) = 0;
   virtual void visitDoubleNode (DoubleNode *doubleNode) = 0;
   virtual void visitLongNode (LongNode *longNode) = 0;
-  virtual void visitULongNode (ULongNode *uLongNode) = 0;  
+  virtual void visitULongNode (ULongNode *uLongNode) = 0;
   virtual void visitStringNode (StringNode *stringNode) = 0;
 protected:
   NodeVisitor () {}
diff --git a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h
index 6c0f16a5f3d..b2b2a6f28a0 100644
--- a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h
+++ b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h
@@ -18,7 +18,7 @@
 #include "NodeVisitor.h"
 #include "Node.h"
 
-#if !defined (PRINT_VISITOR_H)
+#ifndef PRINT_VISITOR_H
 #define PRINT_VISITOR_H
 
 
diff --git a/TAO/examples/Simulator/DOVEMIB/any_test_i.h b/TAO/examples/Simulator/DOVEMIB/any_test_i.h
index eb877ef23c5..673b892fb19 100644
--- a/TAO/examples/Simulator/DOVEMIB/any_test_i.h
+++ b/TAO/examples/Simulator/DOVEMIB/any_test_i.h
@@ -3,17 +3,17 @@
 // ============================================================================
 //
 // = LIBRARY
-// 
+//
 // = FILENAME
 //    any_test_i.h
 //
 // = AUTHOR
 //   Michael Kircher
-// 
+//
 // ============================================================================
 
-#if !defined (_ANY_TEST_I_HH)
-#define	_ANY_TEST_I_HH
+#ifndef _ANY_TEST_I_HH
+#define _ANY_TEST_I_HH
 
 #include "any_testS.h"
 
diff --git a/TAO/examples/Simulator/DOVEMIB/clnt.h b/TAO/examples/Simulator/DOVEMIB/clnt.h
index 67ed5c84d57..bec38868e21 100644
--- a/TAO/examples/Simulator/DOVEMIB/clnt.h
+++ b/TAO/examples/Simulator/DOVEMIB/clnt.h
@@ -16,6 +16,11 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "any_testC.h"
 #include "NavWeapC.h"
@@ -42,7 +47,7 @@ private:
 
   Any_Test_ptr any_test_ptr_;
  //  Reverse_ptr reverse_ptr_;
-  
+
   int argc_;
   // # of arguments on the command line.
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index 2f7ac32beff..e3c0e1cd996 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -14,6 +14,11 @@
 // ============================================================================
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
@@ -22,12 +27,12 @@
 #include "orbsvcs/Scheduler_Factory.h"
 
 
-#if !defined (DOVE_SUPPLIER_H)
+#ifndef DOVE_SUPPLIER_H
 #define DOVE_SUPPLIER_H
 
 #define SOURCE_ID 123
 
-class DOVE_Supplier 
+class DOVE_Supplier
 {
 public:
   DOVE_Supplier ();
@@ -44,11 +49,11 @@ public:
   // inherited from PushSupplier.
 
 private:
-  class Internal_DOVE_Supplier : public POA_RtecEventComm::PushSupplier 
+  class Internal_DOVE_Supplier : public POA_RtecEventComm::PushSupplier
   {
     friend class DOVE_Supplier;
   public:
-    virtual void disconnect_push_supplier (CORBA::Environment &) 
+    virtual void disconnect_push_supplier (CORBA::Environment &)
     {
     }
 
@@ -61,7 +66,7 @@ private:
 private:
   int get_EventChannel ();
   // get a reference to the event channel
-  
+
   int connect_Supplier ();
   // connect the the supplier with the event channel
 
@@ -69,7 +74,7 @@ private:
   RtecEventChannelAdmin::EventChannel_var eventChannel_var_;
   RtecEventChannelAdmin::SupplierAdmin_var supplierAdmin_var_;
   RtecEventChannelAdmin::ProxyPushConsumer_var proxyPushConsumer_var_;
-  RtecScheduler::Scheduler_var scheduler_var_; 
+  RtecScheduler::Scheduler_var scheduler_var_;
 
   Internal_DOVE_Supplier* internal_DOVE_Supplier_ptr_;
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
index c95efa7f473..e82cc75fd76 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
@@ -1,7 +1,7 @@
 // $Id$
 
 // ============================================================================
-// 
+//
 // = FILENAME
 //    Event_Con.h
 //
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (EVENT_CON_H)
+#ifndef EVENT_CON_H
 #define EVENT_CON_H
 
 #include "ace/SString.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
 
@@ -33,7 +38,7 @@ public:
   Demo_Consumer (void);
 
   int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     const char *my_name);
+                     const char *my_name);
   // Uses the name server to obtain a reference to the <supplier_name>
   // and registers with channel to receive notifications from the
   // supplier.  Also registers to receive shutdown messages from the
@@ -45,7 +50,7 @@ public:
 
   // = (not protected to allow short-circuiting) protected:
   virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
   // disconnects from the channel.
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
index b3a9928da03..1b56d50d96a 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#if !defined (EVENT_SUP_H)
+#ifndef EVENT_SUP_H
 #define EVENT_SUP_H
 
 //#include <ctype.h>
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
index 1f58fc223a4..80ec077b833 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (LOGGING_SUP_H)
+#ifndef LOGGING_SUP_H
 #define LOGGING_SUP_H
 
 //#include <ctype.h>
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index 4154e64e5a7..a67b77541b7 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -10,17 +10,22 @@
 //
 // = DESCRIPTION
 //      This class implements a subset of the functionality of the
-//      CORBA Concurrency Service. 
+//      CORBA Concurrency Service.
 //
 // = AUTHORS
 //    Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
-#if !defined (_CONCURRENCY_SERVICE_H)
+#ifndef _CONCURRENCY_SERVICE_H
 #define _CONCURRENCY_SERVICE_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
@@ -41,13 +46,13 @@ public:
   // Default Constructor.
 
   Concurrency_Service (int argc,
-		       char **argv,
+                       char **argv,
                        CORBA::Environment &env);
   // Constructor taking the command-line arguments.
 
   ~Concurrency_Service (void);
   // Destructor.
-	
+
   int init (int argc,
             char **argv,
             CORBA::Environment &env);
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index e66ac7b848d..5289711965d 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -17,35 +17,35 @@
 #include "orbsvcs/CosLifeCycleC.h"
 #include "orbsvcs/LifeCycleServiceC.h"
 
-#if !defined (CRITERIA_EVALUATOR_H_H)
+#ifndef CRITERIA_EVALUATOR_H_H
 #define CRITERIA_EVALUATOR_H_H
 
 class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator
 {
   // = TITLE
-  //  
+  //
 
 public:
   Criteria_Evaluator (const CosLifeCycle::Criteria & criteria);
   ~Criteria_Evaluator ();
-  
+
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (CORBA::Environment &_tao_environment);
 
   char * getFilter (CORBA::Environment &_tao_environment);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (CORBA::Environment &_tao_environment) 
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (CORBA::Environment &_tao_environment)
     {
       return 0;
     }
 
-  char * getPreferences (CORBA::Environment &_tao_environment) 
+  char * getPreferences (CORBA::Environment &_tao_environment)
     {
       return 0;
     }
 
 private:
   CORBA::Any *getCriteriaMember (const CORBA::String member_name);
-    
+
   const CosLifeCycle::Criteria &criteria_;
 };
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
index 287f58d2e1e..6730e707e99 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (FACTORY_TRADER_H)
+#ifndef FACTORY_TRADER_H
 #define FACTORY_TRADER_H
 
 #include "tao/corba.h"
@@ -23,7 +23,7 @@
 #include "orbsvcs/CosLifeCycleC.h"
 
 
-class Factory_Trader 
+class Factory_Trader
 {
 public:
   Factory_Trader ();
@@ -31,11 +31,11 @@ public:
 
   void add_type ();
   // Add a the Factory type to the repository
-  
+
   void export (const char * name,
-	       const char * location, 
-	       const char * description,
-	       const CORBA::Object_ptr object_ptr);
+               const char * location,
+               const char * description,
+               const CORBA::Object_ptr object_ptr);
   // export a specific factory
 
   CORBA::Object_ptr query (const CORBA::String constraint);
diff --git a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h
index 065b10fcd24..ab24a98dc6f 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h
@@ -14,10 +14,15 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/TAO.h"
 #include "Life_Cycle_Service_i.h"
 
-#if !defined (LIFE_CYCLE_SERVICE_H)
+#ifndef LIFE_CYCLE_SERVICE_H
 #define IFE_CYCLE_SERVICE_H
 
 class Life_Cycle_Service_Server
@@ -48,7 +53,7 @@ private:
   // instance of the ORB Manager
 
   Life_Cycle_Service_i *life_Cycle_Service_i_ptr_;
-  // Instance of the creation service 
+  // Instance of the creation service
 
   CosNaming::NamingContext_var namingContext_var_;
   // reference to the naming service
diff --git a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h
index 93730aa7887..7b4aa4d18ba 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h
@@ -17,7 +17,7 @@
 #include "Factory_Trader.h"
 #include "Criteria_Evaluator.h"
 
-#if !defined (LIFE_CYCLE_SERVICE_IMPL_H)
+#ifndef LIFE_CYCLE_SERVICE_IMPL_H
 #define LIFE_CYCLE_SERVICE_IMPL_H
 
 class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service
@@ -34,7 +34,7 @@ public:
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
-  CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, 
+  CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
                                    const CosLifeCycle::Criteria &the_criteria,
                                    CORBA::Environment &_env_there);
   // Returns an object reference to a newly created object, though the
@@ -42,14 +42,14 @@ public:
   // request to a more concrete Factory.
 
   void register_factory (const char * name,
-			 const char * location,
-			 const char * description,
-			 CORBA::Object_ptr object,
-			 CORBA::Environment &_env_there);
+                         const char * location,
+                         const char * description,
+                         CORBA::Object_ptr object,
+                         CORBA::Environment &_env_there);
   // Registers a factory with specified properties
 
 private:
-  Factory_Trader *factory_trader_ptr_;  
+  Factory_Trader *factory_trader_ptr_;
 };
 
 #endif /* LIFE_CYCLE_SERVICE_IMPL_H */
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service_i.h b/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
index 653483fe6a9..e240453fcab 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
@@ -20,10 +20,15 @@
 //
 // ============================================================================
 
-#if !defined (_LOG_SERVER_H)
+#ifndef _LOG_SERVER_H
 #define _LOG_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "orbsvcs/CosNamingC.h"
@@ -51,17 +56,17 @@ public:
 
   int init (int argc,
             char **argv,
-	    CORBA::Environment& env);
+            CORBA::Environment& env);
   // Initialize the Logger_Server state - parsing arguments and ...
 
   int run (CORBA::Environment& env);
-  // Run the ORB. 
+  // Run the ORB.
 
   Logger_ptr make_logger (const char *name,
-			  CORBA::Environment &_env);
+                          CORBA::Environment &_env);
   // This function creates and returns a logger with the given <name>.
   // Currently, <name> is unused.
-  
+
 private:
   int parse_args (void);
   // Parses the commandline arguments.
@@ -79,7 +84,7 @@ private:
 
   Logger_Factory_i factory_impl_;
   // Implementation object of the Logger_Factory.
-       
+
   Logger_Factory_var factory_;
   // Factory_var to register with NamingService.
 
@@ -91,7 +96,7 @@ private:
 
   char* service_name_;
   // The id to give the Logger_Factory instance (defaults to
-  // "LoggingService") 
+  // "LoggingService")
 };
 
 #endif /* _LOG_SERVER_H */
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index ae7fe95ce48..819f496802f 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_NAMING_SERVICE_H)
+#ifndef TAO_NAMING_SERVICE_H
 #define TAO_NAMING_SERVICE_H
 
 #include "tao/TAO.h"
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 55210166821..aefadda286c 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -4,20 +4,25 @@
 //
 // = BINARY
 //    trader
-//  
-// = FILENAME 
+//
+// = FILENAME
 //    Trading_Service.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ======================================================================= 
+//
+// = AUTHOR
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// =======================================================================
 
-#if !defined (_TRADING_SERVICE_H)
+#ifndef _TRADING_SERVICE_H
 #define _TRADING_SERVICE_H
 
 #include "tao/TAO.h"
 #include "ace/Auto_Ptr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/IOR_Multicast.h"
 #include "orbsvcs/Trader/Trader.h"
 #include "orbsvcs/Trader/Service_Type_Repository.h"
@@ -47,26 +52,26 @@ public:
 
   Trading_Service (void);
   // Default constructor.
-  
+
   ~Trading_Service (void);
   // Destructor
 
   int init (int argc, char* argv[]);
   // Initialize the Trading Service with arguments.
-  
+
   int run (void);
   // Run the Trading Service.
 
   int shutdown (void);
-  
+
 private:
 
   int init_multicast_server (void);
-  // Enable the Trading Service to answer multicast requests for its IOR. 
+  // Enable the Trading Service to answer multicast requests for its IOR.
 
   int bootstrap_to_federation (void);
   // Bootstrap to another trader, and attach to its trader network.
-  
+
   int parse_args (int& argc, char *argv[]);
   // parses the arguments.
 
@@ -81,16 +86,16 @@ private:
 
   CORBA::String_var name_;
   // Name of this trading service: "hostname:pid".
-  
+
   CORBA::String_var ior_;
-  // IOR of the trader kept around for handiness purposes. 
-  
+  // IOR of the trader kept around for handiness purposes.
+
   CORBA::Boolean federate_;
   // Flag indicating whether this trader should join the federation.
 
   CORBA::Boolean bootstrapper_;
-  // Flag inidicating whether we're the trader others are bootstrapping to. 
-  
+  // Flag inidicating whether we're the trader others are bootstrapping to.
+
   TAO_IOR_Multicast ior_multicast_;
   // Event handler that responds to resolve_initial_references requests.
 };
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 082b96ddbb6..5882da9dc92 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -6,24 +6,29 @@
 //
 // = LIBRARY
 //    cos
-// 
+//
 // = FILENAME
 //   AVStreams_i.h
 //
 // = AUTHOR
 //    Sumedh Mungee <sumedh@cs.wustl.edu>
-//    
-// 
+//
+//
 // ============================================================================
 
-#if !defined (AVSTREAMS_I_H)
-#define	AVSTREAMS_I_H
+#ifndef AVSTREAMS_I_H
+#define AVSTREAMS_I_H
 
 #include "orbsvcs/orbsvcs_export.h"
 #include "orbsvcs/CosPropertyServiceS.h"
 #include "orbsvcs/AVStreamsS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "ace/Process.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/Null_MediaCtrlS.h"
@@ -35,76 +40,76 @@ public:
   AV_Null_MediaCtrl (void);
 };
 
-class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl 
+class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl
   : public virtual POA_AVStreams::Basic_StreamCtrl
 // = DESCRIPTION
 //    Base class for StreamCtrl, implements basic stream start
-//    and stop functionality 
+//    and stop functionality
 {
  public:
   TAO_Basic_StreamCtrl (void);
   // Default Constructor
 
-  virtual void stop (const AVStreams::flowSpec &the_spec,  
+  virtual void stop (const AVStreams::flowSpec &the_spec,
                      CORBA::Environment &env);
   // Stop the transfer of data of the stream
   // Empty the_spec means apply operation to all flows
 
-  virtual void start (const AVStreams::flowSpec &the_spec,  
+  virtual void start (const AVStreams::flowSpec &the_spec,
                       CORBA::Environment &env);
-  // Start the transfer of data in the stream. 
-  // Empty the_spec means apply operation to all flows   
+  // Start the transfer of data in the stream.
+  // Empty the_spec means apply operation to all flows
 
-  virtual void destroy (const AVStreams::flowSpec &the_spec,  
+  virtual void destroy (const AVStreams::flowSpec &the_spec,
                         CORBA::Environment &env);
-  // Tears down the stream. This will close the connection, and delete 
+  // Tears down the stream. This will close the connection, and delete
   // the streamendpoint and vdev associated with this stream
   // Empty the_spec means apply operation to all flows
 
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, 
-                                     const AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
+                                     const AVStreams::flowSpec &the_spec,
                                      CORBA::Environment &env);
   // Changes the QoS associated with the stream
   // Empty the_spec means apply operation to all flows
 
-  virtual void push_event (const char *the_event,  
+  virtual void push_event (const char *the_event,
                            CORBA::Environment &env);
   // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   // E.g., loss of flow, reestablishment of flow, etc..
-   
-  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, 
-                             const char *fp_name, 
-                             const CORBA::Any &fp_settings,  
+
+  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
+                             const char *fp_name,
+                             const CORBA::Any &fp_settings,
                              CORBA::Environment &env);
   // Used to control the flow protocol parameters.
 
-  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name,  
+  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name,
                                                  CORBA::Environment &env);
-  // Not implemented in the light profile, will raise the notsupported 
-  // exception 
-   
-  virtual void set_flow_connection (const char *flow_name, 
-                                    CORBA::Object_ptr flow_connection,  
+  // Not implemented in the light profile, will raise the notsupported
+  // exception
+
+  virtual void set_flow_connection (const char *flow_name,
+                                    CORBA::Object_ptr flow_connection,
                                     CORBA::Environment &env);
   // Not implemented in the light profile, will raise the notsupported
   // exception
-   
+
   virtual ~TAO_Basic_StreamCtrl (void);
   // Destructor
 
  protected:
-  
+
   AVStreams::VDev_var vdev_a_;
   AVStreams::VDev_var vdev_b_;
   // The Virtual Devices for this stream
-   
+
   AVStreams::StreamEndPoint_A_var stream_endpoint_a_;
   AVStreams::StreamEndPoint_B_var stream_endpoint_b_;
   // The Endpoints for this stream
 };
 
-class TAO_ORBSVCS_Export TAO_StreamCtrl 
-  : public virtual POA_AVStreams::StreamCtrl, 
+class TAO_ORBSVCS_Export TAO_StreamCtrl
+  : public virtual POA_AVStreams::StreamCtrl,
     public virtual TAO_Basic_StreamCtrl
 // = DESCRIPTION
 //    Implementation the A/V StreamCtrl class. this class
@@ -114,11 +119,11 @@ class TAO_ORBSVCS_Export TAO_StreamCtrl
 public:
   TAO_StreamCtrl (void);
   // Default Constructor
-   
-  virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party, 
-                                    AVStreams::MMDevice_ptr b_party, 
-                                    AVStreams::streamQoS &the_qos, 
-                                    const AVStreams::flowSpec &the_flows,  
+
+  virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party,
+                                    AVStreams::MMDevice_ptr b_party,
+                                    AVStreams::streamQoS &the_qos,
+                                    const AVStreams::flowSpec &the_flows,
                                     CORBA::Environment &env);
   // Establish a stream between a_party and b_party,
   // with qos the_qos, and for the flows in the_flows
@@ -126,27 +131,27 @@ public:
   // Causes a connection to be established between the StreamEndpoints.
   // Returns success/failure
 
-  virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party, 
-                               AVStreams::StreamEndPoint_B_ptr b_party, 
-                               AVStreams::streamQoS &the_qos, 
-                               const AVStreams::flowSpec &the_flows,  
+  virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party,
+                               AVStreams::StreamEndPoint_B_ptr b_party,
+                               AVStreams::streamQoS &the_qos,
+                               const AVStreams::flowSpec &the_flows,
                                CORBA::Environment &env);
   // Establish a connection between two streamendpoints. This can
   // be used if the streamendpoints have been created independent of
   // a MMDevice
-   
-  virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, 
-                             const AVStreams::flowSpec &the_spec,  
+
+  virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
+                             const AVStreams::flowSpec &the_spec,
                              CORBA::Environment &env);
-  // Unbind the_ep from the stream. Empty the_spec means apply to all flows. 
-   
+  // Unbind the_ep from the stream. Empty the_spec means apply to all flows.
+
   virtual void unbind (CORBA::Environment &env);
   // unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-   
+
   virtual ~TAO_StreamCtrl (void);
   // Destructor
 
-};  
+};
 
 
 class TAO_ORBSVCS_Export TAO_Base_StreamEndPoint
@@ -167,13 +172,13 @@ public:
   virtual int handle_stop (const AVStreams::flowSpec &the_spec,
                             CORBA::Environment &env) = 0;
   // Application needs to define this
-  
-  virtual int handle_start (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_start (const AVStreams::flowSpec &the_spec,
                              CORBA::Environment &env) = 0;
   // Application needs to define this
 
-  
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,
                                CORBA::Environment &env) = 0;
   // Application needs to define this
 };
@@ -193,12 +198,12 @@ class TAO_ORBSVCS_Export TAO_Server_Base_StreamEndPoint
   : public virtual TAO_Base_StreamEndPoint
 {
 public:
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,
                                                       CORBA::Environment &env) = 0;
   // Application needs to define this
 };
 
-class TAO_ORBSVCS_Export TAO_StreamEndPoint 
+class TAO_ORBSVCS_Export TAO_StreamEndPoint
   : public virtual POA_AVStreams::StreamEndPoint, // The POA class
     public virtual TAO_Base_StreamEndPoint
 {
@@ -209,84 +214,84 @@ public:
   TAO_StreamEndPoint (void);
   // Constructor
 
-  virtual void stop (const AVStreams::flowSpec &the_spec,  
+  virtual void stop (const AVStreams::flowSpec &the_spec,
                      CORBA::Environment &env);
    // Stop the stream. Empty the_spec means, for all the flows
-  
-  virtual void start (const AVStreams::flowSpec &the_spec,  
+
+  virtual void start (const AVStreams::flowSpec &the_spec,
                       CORBA::Environment &env);
   // Start the stream, Empty the_spec means, for all the flows
 
-  virtual void destroy (const AVStreams::flowSpec &the_spec,  
+  virtual void destroy (const AVStreams::flowSpec &the_spec,
                         CORBA::Environment &env);
   // Destroy the stream, Empty the_spec means, for all the flows
 
 
-  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, 
-                                  AVStreams::streamQoS &qos_spec, 
-                                  const AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
+                                  AVStreams::streamQoS &qos_spec,
+                                  const AVStreams::flowSpec &the_spec,
                                   CORBA::Environment &env) = 0;
   // Called by StreamCtrl. responder is the peer to connect to
 
-  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, 
-                                             CORBA::Boolean is_mcast, 
-                                             AVStreams::streamQoS &qos, 
-                                             AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
+                                             CORBA::Boolean is_mcast,
+                                             AVStreams::streamQoS &qos,
+                                             AVStreams::flowSpec &the_spec,
                                              CORBA::Environment &env);
   // Called by the peer StreamEndPoint. The flow_spec indicates the
   // flows (which contain transport addresses etc.)
 
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, 
-                                     const AVStreams::flowSpec &the_flows,  
+  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
+                                     const AVStreams::flowSpec &the_flows,
                                      CORBA::Environment &env);
   // Change the transport qos on a stream
-   
-  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,  
+
+  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,
                                                    CORBA::Environment &env);
   // Used to restrict the set of protocols
-   
-  virtual void disconnect (const AVStreams::flowSpec &the_spec,  
+
+  virtual void disconnect (const AVStreams::flowSpec &the_spec,
                            CORBA::Environment &env);
   // disconnect the flows
-   
-  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, 
-                             const char *fp_name, 
-                             const CORBA::Any &fp_settings,  
+
+  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
+                             const char *fp_name,
+                             const CORBA::Any &fp_settings,
                              CORBA::Environment &env);
   // Used to control the flow
-   
-  virtual CORBA::Object_ptr get_fep (const char *flow_name,  
+
+  virtual CORBA::Object_ptr get_fep (const char *flow_name,
                                      CORBA::Environment &env);
   // Not implemented in the light profile, throws notsupported
 
-  virtual char * add_fep (CORBA::Object_ptr the_fep,  
+  virtual char * add_fep (CORBA::Object_ptr the_fep,
                           CORBA::Environment &env);
   // Not implemented in the light profile, throws notsupported
-   
-  virtual void remove_fep (const char *fep_name,  
+
+  virtual void remove_fep (const char *fep_name,
                            CORBA::Environment &env);
   // Not implemented in the light profile, throws notsupported
-   
-  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator,  
+
+  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
                                CORBA::Environment &env);
   // Used to "attach" a negotiator to the endpoint
-   
-  virtual void set_key (const char *flow_name, 
+
+  virtual void set_key (const char *flow_name,
                         const AVStreams::encryption_key & the_key,
                         CORBA::Environment &env);
-  // Used for public key encryption. 
-    
-  virtual void set_source_id (CORBA::Long source_id,  
+  // Used for public key encryption.
+
+  virtual void set_source_id (CORBA::Long source_id,
                               CORBA::Environment &env);
   // Used to set a unique id for packets sent by this streamendpoint
 
   virtual ~TAO_StreamEndPoint (void);
   // Destructor
-   
+
 };
 
-class TAO_ORBSVCS_Export TAO_Client_StreamEndPoint : 
-  public virtual POA_AVStreams::StreamEndPoint_A, 
+class TAO_ORBSVCS_Export TAO_Client_StreamEndPoint :
+  public virtual POA_AVStreams::StreamEndPoint_A,
   public virtual TAO_StreamEndPoint,
   public virtual TAO_Client_Base_StreamEndPoint
 {
@@ -296,25 +301,25 @@ public:
   TAO_Client_StreamEndPoint (void);
   // Constructor
 
-  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, 
-                                  AVStreams::streamQoS &qos_spec, 
-                                  const AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
+                                  AVStreams::streamQoS &qos_spec,
+                                  const AVStreams::flowSpec &the_spec,
                                   CORBA::Environment &env);
   // Called by StreamCtrl. responder is the peer to connect to
 
-  virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, 
-                                       AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
+                                       AVStreams::flowSpec &the_spec,
                                        CORBA::Environment &env);
   // Used for ATM-style multicast
-  
-  virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, 
-                                       AVStreams::streamQoS &the_qos, 
-                                       const AVStreams::flowSpec &the_flows,  
+
+  virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
+                                       AVStreams::streamQoS &the_qos,
+                                       const AVStreams::flowSpec &the_flows,
                                        CORBA::Environment &env);
   // Used for ATM-style multicast
 
-  virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, 
-                                const AVStreams::flowSpec &theSpec,  
+  virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
+                                const AVStreams::flowSpec &theSpec,
                                 CORBA::Environment &env);
   // Used to remove a multicast leaf
 
@@ -323,8 +328,8 @@ public:
 
 };
 
-class TAO_ORBSVCS_Export TAO_Server_StreamEndPoint : 
-  public virtual POA_AVStreams::StreamEndPoint_B, 
+class TAO_ORBSVCS_Export TAO_Server_StreamEndPoint :
+  public virtual POA_AVStreams::StreamEndPoint_B,
   public virtual TAO_StreamEndPoint,
   public virtual TAO_Server_Base_StreamEndPoint // Abstract interface
 {
@@ -334,21 +339,21 @@ public:
   TAO_Server_StreamEndPoint (void);
   // Constructor
 
-  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, 
-                                  AVStreams::streamQoS &qos_spec, 
-                                  const AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
+                                  AVStreams::streamQoS &qos_spec,
+                                  const AVStreams::flowSpec &the_spec,
                                   CORBA::Environment &env);
 
-  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, 
-                                             CORBA::Boolean is_mcast, 
-                                             AVStreams::streamQoS &qos, 
-                                             AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
+                                             CORBA::Boolean is_mcast,
+                                             AVStreams::streamQoS &qos,
+                                             AVStreams::flowSpec &the_spec,
                                              CORBA::Environment &env);
   // Called by the peer StreamEndPoint. The flow_spec indicates the
   // flows (which contain transport addresses etc.)
 
-  virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, 
-                                       AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
+                                       AVStreams::flowSpec &the_spec,
                                        CORBA::Environment &env);
   // Used for internet-style multicast
 
@@ -356,8 +361,8 @@ public:
   // Destructor
 };
 
-class TAO_ORBSVCS_Export TAO_VDev 
-  :public virtual TAO_PropertySet, 
+class TAO_ORBSVCS_Export TAO_VDev
+  :public virtual TAO_PropertySet,
    public virtual POA_AVStreams::VDev
 // = DESCRIPTION
 //    Implements the VDev interface. One of these is created per connection,
@@ -367,36 +372,36 @@ class TAO_ORBSVCS_Export TAO_VDev
   TAO_VDev (void);
   // Default Constructor
 
-  virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, 
-                                   AVStreams::VDev_ptr the_peer_dev, 
-                                   AVStreams::streamQoS &the_qos, 
-                                   const AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
+                                   AVStreams::VDev_ptr the_peer_dev,
+                                   AVStreams::streamQoS &the_qos,
+                                   const AVStreams::flowSpec &the_spec,
                                    CORBA::Environment &env);
   // Called to tell the vdev who the streamctrl, peer vdev is
 
-  virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, 
-                                         AVStreams::MCastConfigIf_ptr a_mcastconfigif, 
-                                         AVStreams::streamQoS &the_qos, 
-                                         const AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
+                                         AVStreams::MCastConfigIf_ptr a_mcastconfigif,
+                                         AVStreams::streamQoS &the_qos,
+                                         const AVStreams::flowSpec &the_spec,
                                          CORBA::Environment &env);
   // Used to set the streamctrl and multicast device
-   
-  virtual void configure (const CosPropertyService::Property &the_config_mesg,  
+
+  virtual void configure (const CosPropertyService::Property &the_config_mesg,
                           CORBA::Environment &env);
   // Called by the peer VDev to configure the device (catch all)
-  
-  virtual void set_format (const char *flowName, 
-                           const char *format_name,  
+
+  virtual void set_format (const char *flowName,
+                           const char *format_name,
                            CORBA::Environment &env);
   // Used to set a format on a flowname
-   
-  virtual void set_dev_params (const char *flowName, 
-                               const CosPropertyService::Properties &new_params,  
+
+  virtual void set_dev_params (const char *flowName,
+                               const CosPropertyService::Properties &new_params,
                                CORBA::Environment &env);
   // Used to set device parameters
-  
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, 
-                                     const AVStreams::flowSpec &the_spec,  
+
+  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
+                                     const AVStreams::flowSpec &the_spec,
                                      CORBA::Environment &env);
   // Called to change QoS of the device
 
@@ -410,21 +415,21 @@ class TAO_ORBSVCS_Export TAO_VDev
  private:
   AVStreams::StreamCtrl_var streamctrl_;
   // My stream controller
-   
+
   AVStreams::VDev_var peer_;
   // My peer
 };
 
 class TAO_AV_Endpoint_Strategy;
 
-class TAO_ORBSVCS_Export TAO_MMDevice 
-  : public virtual TAO_PropertySet, 
+class TAO_ORBSVCS_Export TAO_MMDevice
+  : public virtual TAO_PropertySet,
     public virtual POA_AVStreams::MMDevice
 // = DESCRIPTION
 //     Implements a factory to create Endpoints and VDevs
 {
  protected:
-  
+
   TAO_AV_Endpoint_Strategy *endpoint_strategy_;
 
  public:
@@ -447,21 +452,21 @@ class TAO_ORBSVCS_Export TAO_MMDevice
                                                  CORBA::Environment &env);
   // Multicast bind
 
-  virtual AVStreams::StreamEndPoint_A_ptr  create_A (AVStreams::StreamCtrl_ptr the_requester, 
-                                                     AVStreams::VDev_out the_vdev, 
-                                                     AVStreams::streamQoS &the_qos, 
-                                                     CORBA::Boolean_out met_qos, 
-                                                     char *&named_vdev, 
-                                                     const AVStreams::flowSpec &the_spec,  
+  virtual AVStreams::StreamEndPoint_A_ptr  create_A (AVStreams::StreamCtrl_ptr the_requester,
+                                                     AVStreams::VDev_out the_vdev,
+                                                     AVStreams::streamQoS &the_qos,
+                                                     CORBA::Boolean_out met_qos,
+                                                     char *&named_vdev,
+                                                     const AVStreams::flowSpec &the_spec,
                                                      CORBA::Environment &env);
   // Called by StreamCtrl to create a "A" type streamandpoint and vdev
-  
-  virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester, 
-                                                     AVStreams::VDev_out the_vdev, 
-                                                     AVStreams::streamQoS &the_qos, 
-                                                     CORBA::Boolean_out met_qos, 
-                                                     char *&named_vdev, 
-                                                     const AVStreams::flowSpec &the_spec,  
+
+  virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester,
+                                                     AVStreams::VDev_out the_vdev,
+                                                     AVStreams::streamQoS &the_qos,
+                                                     CORBA::Boolean_out met_qos,
+                                                     char *&named_vdev,
+                                                     const AVStreams::flowSpec &the_spec,
                                                      CORBA::Environment &env);
   // Called by StreamCtrl to create a "B" type streamandpoint and vdev
 
@@ -474,14 +479,14 @@ class TAO_ORBSVCS_Export TAO_MMDevice
                            CORBA::Environment &env);
   // Not supported in the light profile, raises notsupported
 
-  virtual CORBA::Object_ptr get_fdev (const char *flow_name,  
+  virtual CORBA::Object_ptr get_fdev (const char *flow_name,
                                       CORBA::Environment &env);
   // Not supported in the light profile, raises notsupported
 
-  virtual void remove_fdev (const char *flow_name,  
+  virtual void remove_fdev (const char *flow_name,
                             CORBA::Environment &env);
   // Not supported in the light profile, raises notsupported
-  
+
   virtual ~TAO_MMDevice (void);
   // Destructor
 };
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 22b68d9a8ac..d964036148a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -6,18 +6,18 @@
 //
 // = LIBRARY
 //    cos
-// 
+//
 // = FILENAME
 //   Endpoint_Strategy.h
 //
 // = AUTHOR
 //    Sumedh Mungee <sumedh@cs.wustl.edu>
-//    
-// 
+//
+//
 // ============================================================================
 
-#if !defined (TAO_AV_ENDPOINT_STRATEGY_H)
-#define	TAO_AV_ENDPOINT_STRATEGY_H
+#ifndef TAO_AV_ENDPOINT_STRATEGY_H
+#define TAO_AV_ENDPOINT_STRATEGY_H
 
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "tao/TAO.h"
@@ -87,7 +87,7 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy
 
   virtual int get_vdev (CORBA::Environment &env);
   // Get the Vdev object reference for the newly created
-  // endpoint 
+  // endpoint
 
   CosNaming::NamingContext_var naming_context_;
   // Naming context
@@ -97,10 +97,10 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy
 
   char host_[MAXHOSTNAMELEN];
   // name of this host used for resolving unique names.
-  
+
   pid_t pid_;
   // My child's process id.
-};  
+};
 
 
 // ----------------------------------------------------------------------
@@ -117,7 +117,7 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy_A
   virtual ~TAO_AV_Endpoint_Process_Strategy_A (void);
   // Destructor.
 
- protected:  
+ protected:
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev,
                         CORBA::Environment &env);
@@ -125,8 +125,8 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy_A
 
   virtual int get_stream_endpoint (CORBA::Environment &env);
   // Gets the "A" type stream endpoint from the child process
-  
-};  
+
+};
 
 // ----------------------------------------------------------------------
 
@@ -147,12 +147,12 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy_B
                         AVStreams::VDev_ptr &vdev,
                         CORBA::Environment &env);
   // Creates a "B" type stream endpoint, and a vdev
-  
-  
+
+
   virtual int get_stream_endpoint (CORBA::Environment &env);
   // Gets the object reference of the "B" type streamendpoint.
-  
-};  
+
+};
 
 // Include the templates here.
 #include "Endpoint_Strategy_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index da3ffcad393..8483ce20a34 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (TAO_AV_ENDPOINT_STRATEGY_T_H)
+#ifndef TAO_AV_ENDPOINT_STRATEGY_T_H
 #define TAO_AV_ENDPOINT_STRATEGY_T_H
 
 #include "Endpoint_Strategy.h"
@@ -20,10 +20,10 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Reactive_Strategy
 
   virtual int activate (void);
   // creates and activates the streamendpoint, vdev, and mediacontrol
-  
+
   virtual int activate_stream_endpoint (CORBA::Environment &env) = 0;
   // activates the stream_endpoint with the POA
-  
+
   virtual int activate_vdev (CORBA::Environment &env);
   // activates the vdev with the POA
 
@@ -70,7 +70,7 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Reactive_Strategy_A
                         CORBA::Environment &env);
   // Called by the MMDevice, when it needs to create an A type endpoint
 
-  
+
 };
 
 // ----------------------------------------------------------------------
@@ -114,22 +114,22 @@ public:
   int init (int argc, char **argv);
   // Initializes the ORB, creates and activates the
   // T_StreamEndpoint, T_VDev, T_MediaCtrl in the POA
-  
+
   int run (ACE_Time_Value *tv = 0);
   // runs the ORB event loop
 
  protected:
-  int activate_objects (int argc, 
+  int activate_objects (int argc,
                         char **argv,
                         CORBA::Environment &env);
   // Creates the objects and inserts them into the Naming
   // Service, so the parent can pick the IOR's and
   // return them to the client
-  
+
 
   int bind_to_naming_service (CORBA::Environment &env);
   // Binds to the naming service
-  
+
   int register_vdev (CORBA::Environment &env);
   // Registers vdev with the naming service
 
@@ -171,9 +171,9 @@ public:
 
   T_MediaCtrl *media_ctrl_;
   // Media controller
-  
+
   pid_t pid_;
-  // pid of this process 
+  // pid of this process
 
   char host_[MAXHOSTNAMELEN];
   // Name of the host.
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
index 487e688eb2c..ce4252418cb 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Channel_Clients
 //
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index e384b935053..129022f97ae 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_CC_LOCK_H)
+#ifndef _CC_LOCK_H
 #define _CC_LOCK_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/CosConcurrencyControlC.h"
 
 #define NUMBER_OF_LOCK_MODES 5
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index f316ecfc6e1..5b6087189c5 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -32,10 +32,15 @@
 //
 // ============================================================================
 
-#if !defined (_CC_LOCKSET_H)
+#ifndef _CC_LOCKSET_H
 #define _CC_LOCKSET_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Token.h"
 #include "orbsvcs/CosConcurrencyControlS.h"
 
@@ -76,21 +81,21 @@ public:
 
   // = CosConcurrencyControl methods
   virtual void lock (CosConcurrencyControl::lock_mode mode,
-		     CORBA::Environment &env);
+                     CORBA::Environment &env);
   // Acquires this lock. Blocks until lock is obtained
 
   virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode,
-				   CORBA::Environment &env);
+                                   CORBA::Environment &env);
   // Tries to acquire this lock. If it is not possible to acquire the
   // lock, false is returned
 
   virtual void unlock (CosConcurrencyControl::lock_mode mode,
-		       CORBA::Environment &env);
+                       CORBA::Environment &env);
   // Releases this lock.
 
   virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
-			    CosConcurrencyControl::lock_mode new_mode,
-			    CORBA::Environment &env);
+                            CosConcurrencyControl::lock_mode new_mode,
+                            CORBA::Environment &env);
   // Changes the mode of this lock.
 
   // = Debugging methods
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index 5802cf81c3b..f0f12c6d214 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (_CC_LOCKSETFACTORY_H)
+#ifndef _CC_LOCKSETFACTORY_H
 #define _CC_LOCKSETFACTORY_H
 
 // #include "tao/corba.h"
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index 0958472b535..112b433a9c3 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (_CONCURRENCY_SERVER_H)
+#ifndef _CONCURRENCY_SERVER_H
 #define _CONCURRENCY_SERVER_H
 
 #include "tao/corba.h"
@@ -42,7 +42,7 @@ public:
   //Default constructor.
 
   TAO_Concurrency_Server (CORBA::ORB_var &orb,
-			  PortableServer::POA_var &poa);
+                          PortableServer::POA_var &poa);
   // Takes the POA under which to register the Concurrency Service
   // implementation object.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.h b/TAO/orbsvcs/orbsvcs/Event/BCU.h
index 07d64c46271..6e81c989e15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/BCU.h
+++ b/TAO/orbsvcs/orbsvcs/Event/BCU.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace ORB
-// 
+//
 // = FILENAME
 //    Benchmark Computation Units
 //
@@ -18,10 +18,15 @@
 //    numbers.
 // ============================================================================
 
-#if !defined (ACE_BCU_H)
+#ifndef ACE_BCU_H
 #define ACE_BCU_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/orbsvcs_export.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index a3c398030c8..ddf74892afb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    Dispatching_Module
 //
@@ -58,15 +58,15 @@ public:
   // Default construction.
 
   virtual void open (ACE_ES_Consumer_Module *up,
-		     ACE_ES_Correlation_Module *down);
+                     ACE_ES_Correlation_Module *down);
   // Link to adjacent modules.
 
   virtual void connected (ACE_Push_Consumer_Proxy *consumer,
-			  CORBA::Environment &);
+                          CORBA::Environment &);
   // Forward down_.
 
   virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-			      CORBA::Environment &);
+                              CORBA::Environment &);
   // Forward down_.
 
   virtual void disconnected (ACE_Push_Consumer_Proxy *consumer);
@@ -77,11 +77,11 @@ public:
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &) = 0;
+                     CORBA::Environment &) = 0;
   // Forward up_.
 
   virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
+                              u_long &command_action);
   // Called by ACE_ES_Dispatch_Requests when dequeued by RT_Tasks.
 
   virtual void dispatch_queue_closed (ACE_ES_Dispatch_Queue *q);
@@ -132,32 +132,32 @@ class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request : public ACE_RT_Task_Command
 public:
   ACE_ES_Dispatch_Request (void);
   // Default construction.
-  
+
   virtual ~ACE_ES_Dispatch_Request (void);
   // Default destruction.
-  
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   RtecScheduler::handle_t rt_info);
+
+  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
+                           RtecScheduler::handle_t rt_info);
   // All the events must be added after construction to the
   // event_set.
 
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   const TAO_EC_Event_Array &event_set,
-			   RtecScheduler::handle_t rt_info);
+  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
+                           const TAO_EC_Event_Array &event_set,
+                           RtecScheduler::handle_t rt_info);
   // Set consumer_ to <consumer> and copy <event_set> to event_set_.
   // <rt_info> describes the method receiving this dispatch.
 
   ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   const RtecEventComm::Time &time,
-			   RtecScheduler::handle_t rt_info);
+                           const RtecEventComm::Time &time,
+                           RtecScheduler::handle_t rt_info);
   // Set consumer_ to <consumer> and sets
   // single_event_.header.creation_time to <time>.  Sets
   // use_single_event_ to 1.  <rt_info> describes the method
   // receiving this dispatch.
 
   ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   const TAO_EC_Event &event,
-			   RtecScheduler::handle_t rt_info);
+                           const TAO_EC_Event &event,
+                           RtecScheduler::handle_t rt_info);
   // Sets consumer_ and the first slot of event_set_.  We use the
   // event_set_ instead of the single_event_ so that we can just carry
   // around the pointer to <event>.  <rt_info> describes the method
@@ -167,8 +167,8 @@ public:
   // Description of the method receiving this request.
 
   void set (ACE_ES_Dispatching_Base *dispatching_module,
-	    RtecScheduler::OS_Priority priority,
-	    RtecScheduler::Preemption_Subpriority sub_priority);
+            RtecScheduler::OS_Priority priority,
+            RtecScheduler::Preemption_Subpriority sub_priority);
   // For multi-threaded implementations, <dispatching_module> is
   // called back when a request is dequeued.  <priority> is the
   // dispatch priority of the event.  <sub_priority> is the enqueue
@@ -240,7 +240,7 @@ protected:
 
 #if defined (ACE_WIN32)
 class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy
-// = TITLE 
+// = TITLE
 //     Event Service ReactorEx Notification Strategy
 //
 // = DESCRIPTION
@@ -252,7 +252,7 @@ class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy
 {
 public:
   ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh,
-		       TAO_EC_Timer_Module *tm);
+                       TAO_EC_Timer_Module *tm);
   // Stores away <eh> for when this->open is called.
 
   int open (void);
@@ -266,7 +266,7 @@ public:
   // point to a dispatching module.
   virtual int notify (void);
   virtual int notify (ACE_Event_Handler *,
-		      ACE_Reactor_Mask mask);
+                      ACE_Reactor_Mask mask);
 
   //  ACE_HANDLE get_handle (void);
   // Returns event_.handle ().
@@ -284,7 +284,7 @@ typedef ACE_ES_ReactorEx_NS ACE_ES_Notification_Strategy;
 #else // *******************************************************
 
 class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Strategy
-// = TITLE 
+// = TITLE
 //     Event Service Reactor Notification Strategy
 //
 // = DESCRIPTION
@@ -293,7 +293,7 @@ class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Str
 {
 public:
   ACE_ES_Reactor_NS (ACE_Event_Handler *eh,
-		     TAO_EC_Timer_Module *tm);
+                     TAO_EC_Timer_Module *tm);
   // Calls ACE_Reactor_Notification_Strategy with the ORB's reactor
   // and signal mask.
 
@@ -330,18 +330,18 @@ class TAO_ORBSVCS_Export ACE_ES_Dispatch_Queue : public ACE_RT_Task
 {
 public:
   ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatching_module,
-			 ACE_ES_Notification_Strategy *notification_strategy);
+                         ACE_ES_Notification_Strategy *notification_strategy);
   // Stores <dispatching_module> for this->threads_closed.  Stores
   // away <notification_strategy> for this->synch_threads.
 
   int open_queue (RtecScheduler::Period &period,
-		  int threads);
+                  int threads);
   // This is a hack to get the channel to work with the new
   // scheduler.
 
 #if 0
   int open_queue (RtecScheduler::OS_Priority priority,
-		  int threads);
+                  int threads);
   // Creates a name from the <priority> and tries to find a scheduling
   // qos structure.  If one is not found, but created, qos_ is set
   // with default values.  Either way, if qos_->thread_ > 0, it calls
@@ -383,7 +383,7 @@ public:
   // Delete queues.
 
   void connected (ACE_Push_Consumer_Proxy *consumer,
-		  CORBA::Environment &);
+                  CORBA::Environment &);
   // Allocate any needed dispatching resources for this consumers
   // priority.
 
@@ -395,7 +395,7 @@ public:
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // Enqueues the request on the appropriate Dispatch Queue.
 
   virtual void activate (int threads_per_queue);
@@ -465,7 +465,7 @@ public:
   // the dispatching base constructor.
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // Forward up_.
 };
 
@@ -480,16 +480,16 @@ class TAO_ORBSVCS_Export ACE_ES_RTU_Dispatching : public ACE_ES_Priority_Dispatc
 {
 public:
   ACE_ES_RTU_Dispatching (ACE_EventChannel *channel);
-  // Store <channel>.  
+  // Store <channel>.
 
   virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
+                              u_long &command_action);
   // Called by ACE_Dispatch_Queues and handle_signal when an event
   // needs to be dequeued.  Implements an RTU-like delayed preemption
   // policy.
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // Calls ACE_ES_Priority_Dispatching::push and then checks if
   // preemption is necessary.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 46a1ca2233e..e5ba8e67229 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -159,10 +159,10 @@ private:
   ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP> supplier_;
   // Our supplier personality....
 
-  // We use a different Consumer_Proxy 
+  // We use a different Consumer_Proxy
   typedef ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map;
   typedef ACE_Map_Iterator<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map_Iterator;
-  
+
   Consumer_Map consumer_proxy_map_;
   RtecEventChannelAdmin::ProxyPushConsumer_var default_consumer_proxy_;
   // We talk to the EC (as a supplier) using either an per-supplier
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index e5bfe24a4e8..b00aca0c11f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -54,6 +54,11 @@
 #define TAO_EC_GATEWAY_UDP_H
 
 #include "ace/SOCK_CODgram.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecUDPAdminS.h"
@@ -83,8 +88,8 @@ public:
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
-	     RtecUDPAdmin::AddrServer_ptr addr_server,
-	     ACE_SOCK_Dgram* dgram,
+             RtecUDPAdmin::AddrServer_ptr addr_server,
+             ACE_SOCK_Dgram* dgram,
              CORBA::Environment &_env);
   // To do its job this class requires to know the local EC it will
   // connect to; it also requires to build an RT_Info for the local
@@ -149,7 +154,7 @@ public:
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
              const ACE_INET_Addr& ignore_from,
-	     RtecUDPAdmin::AddrServer_ptr addr_server,
+             RtecUDPAdmin::AddrServer_ptr addr_server,
              CORBA::Environment &_env);
   // To do its job this class requires to know the local EC it will
   // connect to; it also requires to build an RT_Info for the local
@@ -175,10 +180,10 @@ public:
   // The PushSupplier method.
   virtual void disconnect_push_supplier (CORBA::Environment &);
 
-  
+
   void get_addr (const RtecEventComm::EventHeader& header,
-		 RtecUDPAdmin::UDP_Addr_out addr,
-		 CORBA::Environment& env);
+                 RtecUDPAdmin::UDP_Addr_out addr,
+                 CORBA::Environment& env);
   // Call the RtecUDPAdmin::AddrServer
 
 private:
@@ -243,7 +248,7 @@ public:
   TAO_ECG_Mcast_EH (TAO_ECG_UDP_Receiver *recv);
 
   int open (RtecEventChannelAdmin::EventChannel_ptr ec,
-	    CORBA::Environment& _env);
+            CORBA::Environment& _env);
   // Register for changes in the EC subscription list.
   // When the subscription list becomes non-empty we join the proper
   // multicast groups (using the receiver to translate between event
@@ -260,9 +265,9 @@ public:
   // Reactor callbacks
 
   void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-			CORBA::Environment& _env);
+                        CORBA::Environment& _env);
   void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-			CORBA::Environment& _env);
+                        CORBA::Environment& _env);
   // The Observer methods
 
   class Observer : public POA_RtecEventChannelAdmin::Observer
@@ -282,9 +287,9 @@ public:
 
     // The Observer methods
     virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-				  CORBA::Environment& _env);
+                                  CORBA::Environment& _env);
     virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-				  CORBA::Environment& _env);
+                                  CORBA::Environment& _env);
 
   private:
     TAO_ECG_Mcast_EH* eh_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index ef2220d1714..8d7c41842b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -14,7 +14,7 @@
 //
 // = DESCRIPTION
 //   Simple implementations of the UDP Administration service.
-//   
+//
 //   connects to a "remote" EC as a consumer, it also connects to the
 //   <local> EC as a supplier of events, this later EC is usually
 //   collocated.
@@ -60,8 +60,8 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-			 RtecUDPAdmin::UDP_Addr_out addr,
-			 CORBA::Environment& env);
+                         RtecUDPAdmin::UDP_Addr_out addr,
+                         CORBA::Environment& env);
 
 private:
   CORBA::UShort port_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 2203852802e..27ed245a42d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -31,6 +31,11 @@
 #define ACE_EVENT_CHANNEL_H
 
 #include "ace/Containers.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Map_Manager.h"
 
 #include "tao/Timeprobe.h"
@@ -70,7 +75,7 @@ void operator += (TAO_EC_Event_Array &dest,
 // = DESCRIPTION
 //   The Event Channel must compare events (actually event headers)
 //   for equality.
-// 
+//
 ACE_INLINE int operator == (const RtecEventComm::Event &event1,
                             const RtecEventComm::Event &event2);
 
@@ -200,8 +205,8 @@ public:
          SHUTDOWN = CONSUMER | SUPPLIER };
 
   ACE_EventChannel (CORBA::Boolean activate_threads = 1,
-		    u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE,
-		    TAO_Module_Factory* factory = 0);
+                    u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+                    TAO_Module_Factory* factory = 0);
   // Construction of the given <type>.  Check the **_CHANNEL
   // enumerations defined below.
   // By default we activate the threads on construction, but it is
@@ -272,9 +277,9 @@ public:
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-		     CORBA::Environment &env);
+                     CORBA::Environment &env);
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-				CORBA::Environment &env);
+                                CORBA::Environment &env);
   // The observer manipulators
 
   // = Timer managment
@@ -288,7 +293,7 @@ public:
 
   int cancel_timer (RtecScheduler::OS_Priority preemption_priority,
                     int id,
-		    ACE_ES_Timer_ACT *&act);
+                    ACE_ES_Timer_ACT *&act);
   // Cancel the timer associated with the priority of
   // <preemption_priority> and <id>.  <act> is filled in with the
   // Timer_ACT used when scheduling the timer.  Returns 0 on success,
@@ -327,10 +332,10 @@ private:
     //   + When was the last update.
     //   + Does it want to receive all changes?
     //
-    
+
     Observer_Entry (void);
     Observer_Entry (RtecEventChannelAdmin::Observer_Handle h,
-		    RtecEventChannelAdmin::Observer_ptr o);
+                    RtecEventChannelAdmin::Observer_ptr o);
 
     RtecEventChannelAdmin::Observer_Handle handle;
     // The handle
@@ -957,7 +962,7 @@ public:
   // Unregister the consumer from the Event Service.
 
   virtual void push (const ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
 
   RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (CORBA::Environment &);
   // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin.
@@ -971,7 +976,7 @@ public:
 
   void fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos);
   // Fill the QoS with the disjuction off all the subscriptions in
-  // this EC. 
+  // this EC.
   // It leaves the gateways out of the list.
 
 private:
@@ -1159,14 +1164,14 @@ private:
   // = Push helper methods.
 
   int push_source (ACE_Push_Supplier_Proxy *source,
-		   const TAO_EC_Event &event,
-		   CORBA::Environment &_env);
+                   const TAO_EC_Event &event,
+                   CORBA::Environment &_env);
   // Push <event> to all consumers subscribed to all events from
   // <source>.  Returns 0 on success, -1 on failure.
 
   int push_source_type (ACE_Push_Supplier_Proxy *source,
                         const TAO_EC_Event &event,
-			CORBA::Environment &_env);
+                        CORBA::Environment &_env);
   // Push <event> to all consumers subscribed to <event>.type_ from
   // <source>.  Returns 0 on success, -1 on failure.
 
@@ -1217,7 +1222,7 @@ public:
 
   virtual void push (ACE_Push_Supplier_Proxy *proxy,
                      RtecEventComm::EventSet &event,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // The supplier module acts on behalf of the supplier proxy to
   // forward events through the channel.
 
@@ -1238,7 +1243,7 @@ public:
 
   void fill_qos (RtecEventChannelAdmin::SupplierQOS& s_qos);
   // Fill the QoS with the disjuction off all the publications in
-  // this EC. 
+  // this EC.
   // It leaves the gateways out of the list.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
index c740d70303e..66a281e7c22 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_EC_EVENT_MANIP_H)
+#ifndef TAO_EC_EVENT_MANIP_H
 #define TAO_EC_EVENT_MANIP_H
 
 #include "orbsvcs/RtecEventCommC.h"
@@ -44,7 +44,7 @@ public:
 
   ~TAO_EC_Event_Set (void);
   // destructor
-  
+
   CORBA::ULong length (void) const;
   // The length.
 
@@ -71,7 +71,7 @@ private:
 private:
   CORBA::ULong length_;
   // The length of the buffer.
-  
+
   RtecEventComm::Event* buffer_;
   // The buffer.
 
@@ -79,7 +79,7 @@ private:
   // Synchronize access to the class internals.
 
   CORBA::ULong refcnt_;
-  // The reference count.  
+  // The reference count.
 };
 
 class TAO_ORBSVCS_Export TAO_EC_Event
@@ -104,7 +104,7 @@ public:
                 CORBA::ULong index);
   // Constructor, we assume ownership (i.e. duplicate and release the
   // set)
-  
+
   ~TAO_EC_Event (void);
   // Destructor
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
index 5ff831379c2..ced85087e93 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
@@ -1,24 +1,29 @@
 //
 // $Id$
 //
-#if !defined (FAST_REACTOR_H)
+#ifndef FAST_REACTOR_H
 #define FAST_REACTOR_H
 
 #if defined (ACE_OLD_STYLE_REACTOR)
 # if defined (ACE_WIN32)
 #   include "ace/ReactorEx.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx 
-# else 
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#   define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx
+# else
 #   include "ace/Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Reactor 
+#   define ACE_ES_FAST_REACTOR_BASE ACE_Reactor
 # endif /* ACE_WIN32 */
 #else
 # if defined (ACE_WIN32)
 #   include "ace/WFMO_Reactor.h"
 #   define ACE_ES_FAST_REACTOR_BASE ACE_WFMO_Reactor
-# else 
+# else
 #   include "ace/Select_Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor 
+#   define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor
 # endif /* ACE_WIN32 */
 #endif /* ACE_OLD_STYLE_REACTOR */
 //## end module.includes
@@ -34,14 +39,14 @@ public:
     ACE_Time_Value *this_timeout = &timer_buf ;
 
     if (this->timer_queue_->calculate_timeout (max_wait_time,
-					       this_timeout) == 0) 
+                                               this_timeout) == 0)
       {
-	ACE_Time_Value t (0, 500000);
-	ACE_OS::select (0, 0, 0, 0, &t);
+        ACE_Time_Value t (0, 500000);
+        ACE_OS::select (0, 0, 0, 0, &t);
       }
     else
       {
-	ACE_OS::select (0, 0, 0, 0, this_timeout);
+        ACE_OS::select (0, 0, 0, 0, this_timeout);
       }
 
     return this->timer_queue_->expire () == -1 ? -1 : 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
index 8ce6e79488b..c2c6f093f30 100644
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
+++ b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
@@ -10,10 +10,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_GPlot_File_H)
+#ifndef ACE_GPlot_File_H
 #define ACE_GPlot_File_H
 
 #include "ace/Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 
 class TAO_ORBSVCS_Export ACE_GPlot_File
@@ -25,7 +30,7 @@ class TAO_ORBSVCS_Export ACE_GPlot_File
 //      entry   value
 //      entry   value
 //      entry   value
-//	  ...
+//        ...
 //    They represent x,y pairs to be graphed by GPlot.  entry's are
 //    type long.  value's are type long or float.
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index cc37eb01d12..4ba8dbb44c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ORB Services
-// 
+//
 // = FILENAME
 //    Local_ESTypes.h
 //
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
index 4ec2467f90b..b246930b37a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ORB Services
-// 
+//
 // = FILENAME
 //    Memory_Pools
 //
@@ -18,6 +18,11 @@
 #define ACE_MEMORY_POOLS_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Event_Channel.h"
 #include "Dispatching_Modules.h"
 
@@ -31,10 +36,10 @@
   typedef ACE_Thread_Mutex ACE_MEMORY_POOL_MUTEX;
 #endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION || !ACE_HAS_THREADS */
 
-typedef char 
+typedef char
         ACE_ES_Dispatch_Request_Chunk[sizeof (ACE_ES_Dispatch_Request)];
 
-typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX> 
+typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX>
         _ACE_Dispatch_Request_Allocator;
 
 class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request_Allocator : public _ACE_Dispatch_Request_Allocator
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
index dd8198bc255..8233726cdea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
@@ -50,7 +50,7 @@ class TAO_ORBSVCS_Export TAO_Module_Factory
   //   achieved by constructing modules with different dynamic
   //   types.  This class encapsulates all the strategies creation in
   //   a single point.
-  // 
+  //
 public:
   virtual ~TAO_Module_Factory (void);
 
@@ -93,7 +93,7 @@ class TAO_ORBSVCS_Export TAO_Default_Module_Factory : public TAO_Module_Factory
   //   achieved by constructing modules with different dynamic
   //   types.  This class encapsulates all the strategies creation in
   //   a single point.
-  // 
+  //
 public:
   TAO_Default_Module_Factory (void);
   virtual ~TAO_Default_Module_Factory (void);
@@ -137,7 +137,7 @@ class TAO_ORBSVCS_Export TAO_Reactive_Module_Factory : public TAO_Module_Factory
   //   An Event Channel configured with this factory can exhibit high
   //   priority inversion, but it should provide high-performance due
   //   to the elimination of context switching.
-  // 
+  //
 public:
   TAO_Reactive_Module_Factory (void);
   virtual ~TAO_Reactive_Module_Factory (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index d506aa3393f..be8fc01ff9e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_RT_TASK_H)
+#ifndef ACE_RT_TASK_H
 #define ACE_RT_TASK_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/RtecSchedulerC.h"
 
 class TAO_ORBSVCS_Export ACE_RT_Thread_Manager : public ACE_Thread_Manager
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
index 3bd0a1c25c1..8ae5982544d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
@@ -13,6 +13,11 @@
 
 // Added these.
 #include "ace/Timer_Heap.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Timer_List.h"
 
 #include "Local_ESTypes.h"
@@ -61,7 +66,7 @@ private:
   ACE_Timer_List timer_queue_;
   // The timer storage mechanism used by reactor_.
 
-#if !defined (ACE_OLD_STYLE_REACTOR)
+#ifndef ACE_OLD_STYLE_REACTOR
   ACE_ES_Fast_Reactor fast_reactor_;
   // The timer dispatch mechanism.
 #endif /* ! ACE_OLD_STYLE_REACTOR */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index 6e0c39fc0e2..2d988fac177 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -3,10 +3,15 @@
 // $Id$
 //
 
-#if !defined(TAO_EC_TIMER_MODULE_H)
+#ifndef TAO_EC_TIMER_MODULE_H
 #define TAO_EC_TIMER_MODULE_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/orbsvcs/Event/RT_Task.h"
 
@@ -53,8 +58,8 @@ public:
   // Add a timer at the given priority.
 
   virtual int register_handler (RtecScheduler::Preemption_Priority priority,
-				ACE_Event_Handler* eh,
-				ACE_HANDLE handle) = 0;
+                                ACE_Event_Handler* eh,
+                                ACE_HANDLE handle) = 0;
   // Register a handler?????
 
   virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority) = 0;
@@ -95,8 +100,8 @@ public:
                             int id,
                             const void*& act);
   virtual int register_handler (RtecScheduler::Preemption_Priority priority,
-				ACE_Event_Handler* eh,
-				ACE_HANDLE handle);
+                                ACE_Event_Handler* eh,
+                                ACE_HANDLE handle);
   virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
 
 private:
@@ -149,14 +154,14 @@ public:
                             int id,
                             const void*& act);
   virtual int register_handler (RtecScheduler::Preemption_Priority priority,
-				ACE_Event_Handler* eh,
-				ACE_HANDLE handle);
+                                ACE_Event_Handler* eh,
+                                ACE_HANDLE handle);
   virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
-  
+
 private:
   int shutdown_;
   // The reactors are shutdown, do not attempt to restart them.
-  
+
   ReactorTask *reactorTasks[ACE_Scheduler_MAX_PRIORITIES];
   // The set of ReactorTasks
 
diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
index 2cbc7cc9fc4..dd91d88c36e 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
@@ -5,10 +5,15 @@
 //    the Scheduling Service implementation.
 //
 
-#if !defined (ACE_ES_CONSTANTS_H)
+#ifndef ACE_ES_CONSTANTS_H
 #define ACE_ES_CONSTANTS_H
 
 #include "ace/Message_Block.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "orbsvcs/Time_Utilities.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index 5e9dfb36354..d5d1a8ee2ad 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -9,21 +9,26 @@
 // = FILENAME
 //    svr.h
 //
-// = DESCRIPTION 
-//    Defines a class that listens to a multicast address for client requests 
+// = DESCRIPTION
+//    Defines a class that listens to a multicast address for client requests
 //    for ior of a bootstrappable service.
-//    
+//
 // = AUTHORS
 //      Sergio Flores-Gaitan
 //
 // ============================================================================
 
-#if !defined (TAO_IOR_MULTICAST_H)
+#ifndef TAO_IOR_MULTICAST_H
 #define TAO_IOR_MULTICAST_H
 
 #include "tao/corba.h"
 #include "orbsvcs/orbsvcs_export.h"
 #include "ace/INET_Addr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/Reactor.h"
 
@@ -35,7 +40,7 @@ class TAO_ORBSVCS_Export TAO_IOR_Multicast : public ACE_Event_Handler
 public:
 
   TAO_IOR_Multicast (void);
-  // Default constructor  
+  // Default constructor
 
   TAO_IOR_Multicast (const char *ior,
                      u_short port,
@@ -46,16 +51,16 @@ public:
             u_short port,
             const char *mcast_addr,
             TAO_Service_ID service_id);
-  
+
   // destructor
   ~TAO_IOR_Multicast (void);
 
   // call back when input is received on the handle.
   virtual int handle_input (ACE_HANDLE fd);
-  
+
   // callback when a timeout has occurred.
   virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
+                              const void *arg);
 
   // returns the internal handle used to receive multicast
   virtual ACE_HANDLE get_handle (void) const;
@@ -65,8 +70,8 @@ private:
   // temporary buffer
 
   TAO_Service_ID service_id_;
-  // Service id that we're waiting for. 
-  
+  // Service id that we're waiting for.
+
   ACE_SOCK_Dgram_Mcast mcast_dgram_;
   // multicast endpoint of communication
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
index 1b7756f7d92..722aa9bbf85 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_ORBSVCS_LOGGER_I_H)
+#ifndef TAO_ORBSVCS_LOGGER_I_H
 #define TAO_ORBSVCS_LOGGER_I_H
 
 #include "orbsvcs/LoggerS.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h
index ce7bdca0f0f..ca51363c127 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_NAMING_I_H)
+#ifndef TAO_NAMING_I_H
 #define TAO_NAMING_I_H
 
 #include "orbsvcs/CosNamingS.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index 8aec6d8914d..e00e504723b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -5,42 +5,47 @@
 //
 // = LIBRARY
 //    cos
-// 
+//
 // = FILENAME
 //   Entries.h
 //
 // = AUTHOR
 //    Marina Spivak <marina@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (TAO_ENTRIES_H)
+#ifndef TAO_ENTRIES_H
 #define TAO_ENTRIES_H
 
 #include "ace/Hash_Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "ace/SString.h"
 
 #include "tao/corba.h"
 #include "orbsvcs/CosNamingC.h"
 
-class TAO_ORBSVCS_Export TAO_IntId 
+class TAO_ORBSVCS_Export TAO_IntId
 {
   // = TITLE
   //     Stores information a context keeps for each bound name.
-  // 
+  //
   // = DESCRIPTION
   //     Each bound name is associated with an object reference and
-  //     the type of binding. 
+  //     the type of binding.
 public:
   // = Initialization and termination methods.
   TAO_IntId (void);
   // Constructor.
 
   TAO_IntId (CORBA::Object_ptr obj,
-	    CosNaming::BindingType type /* = CosNaming::nobject */);
+            CosNaming::BindingType type /* = CosNaming::nobject */);
   // Constructor.
-  
+
   TAO_IntId (const TAO_IntId & rhs);
   // Copy constructor.
 
@@ -50,37 +55,37 @@ public:
   void operator= (const TAO_IntId & rhs);
   // Assignment operator (does copy memory).
 
-  CORBA::Object_ptr ref_;   
+  CORBA::Object_ptr ref_;
   // CORBA object reference of the bound object.
 
-  CosNaming::BindingType type_;  
+  CosNaming::BindingType type_;
   // Indicator of whether the object is a NamingContext that should
   // participate in name resolution when compound names are used.
 };
 
-class TAO_ORBSVCS_Export TAO_ExtId 
+class TAO_ORBSVCS_Export TAO_ExtId
 {
   // = TITLE
   //    Stores the name to which an object is bound.
   //
   // = DESCRIPTION
   //    This class is used as the External ID for the
-  //    <ACE_Hash_Map_Manager>.  
+  //    <ACE_Hash_Map_Manager>.
 public:
   // = Initialization and termination methods.
 
   TAO_ExtId (void);
   // Constructor.
 
-  TAO_ExtId (const char *id, 
-	    const char *kind);
+  TAO_ExtId (const char *id,
+            const char *kind);
   // Constructor.
-  
+
   TAO_ExtId (const TAO_ExtId & rhs);
   // Copy constructor.
 
   ~TAO_ExtId (void);
-  // Destructor. 
+  // Destructor.
 
   void operator= (const TAO_ExtId & rhs);
   // Assignment operator (does copy memory).
@@ -94,10 +99,10 @@ public:
   u_long hash (void) const;
   // This class has to have a hash for use with ACE_Hash_Map_Manager.
 
-  ACE_CString kind_;  
+  ACE_CString kind_;
   // Any information user wants to store (not used by Naming Service).
 
-  ACE_CString id_;  
+  ACE_CString id_;
   // Any information user wants to store (not used by Naming Service).
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index ca950c1d7f2..91f356d8989 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_NAMING_UTILS_H)
+#ifndef TAO_NAMING_UTILS_H
 #define TAO_NAMING_UTILS_H
 
 #include "tao/corba.h"
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index ecce5aebc1b..560a5b08231 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (COSPROPERTYSERVICE_I_H)
-#define	COSPROPERTYSERVICE_I_H
+#ifndef COSPROPERTYSERVICE_I_H
+#define COSPROPERTYSERVICE_I_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/orbsvcs_export.h"
 #include "orbsvcs/CosPropertyServiceS.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index fd73102608d..81fcc5773eb 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -19,8 +19,8 @@ class TAO_ORBSVCS_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Sched
   //
 public:
   ACE_Runtime_Scheduler (int config_count,
-			 ACE_Scheduler_Factory::POD_Config_Info config_info[],
-			 int entry_count,
+                         ACE_Scheduler_Factory::POD_Config_Info config_info[],
+                         int entry_count,
                          ACE_Scheduler_Factory::POD_RT_Info rt_info[]);
 
   // Initialize the data from the POD_RT_Info array.
@@ -41,7 +41,7 @@ public:
   virtual void set (RtecScheduler::handle_t handle,
                     RtecScheduler::Criticality criticality,
                     RtecScheduler::Time time,
-		    RtecScheduler::Time typical_time,
+                    RtecScheduler::Time typical_time,
                     RtecScheduler::Time cached_time,
                     RtecScheduler::Period period,
                     RtecScheduler::Importance importance,
@@ -80,7 +80,7 @@ public:
   virtual void compute_scheduling (CORBA::Long minimum_priority,
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
-				   RtecScheduler::Config_Info_Set_out configs,
+                                   RtecScheduler::Config_Info_Set_out configs,
                                    CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
@@ -89,8 +89,8 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority p_priority,
                                        RtecScheduler::OS_Priority& priority,
-				       RtecScheduler::Dispatching_Type & d_type,
-				       CORBA::Environment &_env)
+                                       RtecScheduler::Dispatching_Type & d_type,
+                                       CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 7b7f7fc9415..866b373dd72 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -5,6 +5,10 @@
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/RtecSchedulerS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
@@ -44,9 +48,9 @@ public:
 
   virtual void set (RtecScheduler::handle_t handle,
                     RtecScheduler::Criticality criticality,
-		    RtecScheduler::Time time,
-		    RtecScheduler::Time typical_time,
-		    RtecScheduler::Time cached_time,
+                    RtecScheduler::Time time,
+                    RtecScheduler::Time typical_time,
+                    RtecScheduler::Time cached_time,
                     RtecScheduler::Period period,
                     RtecScheduler::Importance importance,
                     RtecScheduler::Quantum quantum,
@@ -84,7 +88,7 @@ public:
   virtual void compute_scheduling (CORBA::Long minimum_priority,
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
-				   RtecScheduler::Config_Info_Set_out configs,
+                                   RtecScheduler::Config_Info_Set_out configs,
                                    CORBA::Environment &_env)
     TAO_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
@@ -93,8 +97,8 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority p_priority,
                                        RtecScheduler::OS_Priority& priority,
-				       RtecScheduler::Dispatching_Type & d_type,
-				       CORBA::Environment &_env)
+                                       RtecScheduler::Dispatching_Type & d_type,
+                                       CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
@@ -115,7 +119,7 @@ private:
   // trait for the scheduler implementation base class
   typedef ACE_DynScheduler BaseSchedImplType;
 
-  // traits for the scheduler strategy 
+  // traits for the scheduler strategy
 #if defined (TAO_USES_MUF_SCHEDULING)
 
   typedef ACE_MUF_Scheduler_Strategy Scheduler_Strategy;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index 3d44e52ca59..a4f7a67cd48 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if ! defined (DYNSCHED_H)
+#ifndef DYNSCHED_H
 #define DYNSCHED_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Map_Manager.h"
 #include "ace/Message_Block.h"
 #include "ace/Synch.h"
@@ -96,7 +101,7 @@ public:
   };
 
 
-
+
   /////////////////////////////
   // public member functions //
   /////////////////////////////
@@ -169,7 +174,7 @@ public:
   // Obtains an RT_Info based on its "handle".
 
   status_t lookup_config_info (Preemption_Priority priority,
-				               Config_Info* &config_info);
+                                               Config_Info* &config_info);
   // Obtains a Config_Info based on its priority.
 
   status_t schedule (void);
@@ -189,7 +194,7 @@ public:
   // subpriorities of the Task that was assigned handle.  "preemption_prio"
   // is a platform-independent priority queue number, ranging from a
   // highest priority value of 0 to the lowest priority value, which is
-  // returned by "minimum_priority_queue ()".  Returns 0 on success, 
+  // returned by "minimum_priority_queue ()".  Returns 0 on success,
   // or -1 if an invalid handle was supplied.
 
   // = Access the platform-independent priority value of the lowest-priority
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 496c242fd08..9c6141e14d6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if ! defined (SCHEDENTRY_H)
+#ifndef SCHEDENTRY_H
 #define SCHEDENTRY_H
 
 #include "orbsvcs/RtecSchedulerC.h"
@@ -243,13 +243,13 @@ private:
   // The set of arrivals in the entry's effective period.
   ACE_Ordered_MultiSet<Dispatch_Entry_Link> dispatches_;
 
-  // Depth-first-search status of the entry. 
+  // Depth-first-search status of the entry.
   DFS_Status dfs_status_;
 
-  // Depth-first-search discovery order of the entry. 
+  // Depth-first-search discovery order of the entry.
   long discovered_;
 
-  // Depth-first-search completion order of the entry. 
+  // Depth-first-search completion order of the entry.
   long finished_;
 
   // Flag identifying threads in the call graph.
@@ -268,7 +268,7 @@ private:
 };
 
 
-// Wrapper for dependencies between RT_Infos 
+// Wrapper for dependencies between RT_Infos
 class TAO_ORBSVCS_Export Task_Entry_Link
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index 90106022157..257329bb4e7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if ! defined (SCHEDULER_H)
+#ifndef SCHEDULER_H
 #define SCHEDULER_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Map_Manager.h"
 #include "ace/Message_Block.h"
 #include "ace/Synch.h"
@@ -142,7 +147,7 @@ public:
   // In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
   // (rtinfo, 0, handle) is called.  Returns FAILED if an error
   // occurs.
-  // 
+  //
   // One motivation for allocating RT_Info's from within the Scheduler
   // is to allow RT_Infos to persist after the tasks that use them.
   // For instance, we may want to call this->schedule right before the
@@ -151,11 +156,11 @@ public:
   // fail.
 
   virtual status_t lookup_rt_info (handle_t handle,
-				   RT_Info* &rtinfo) = 0;
+                                   RT_Info* &rtinfo) = 0;
   // Obtains an RT_Info based on its "handle".
 
   virtual status_t lookup_config_info (Preemption_Priority priority,
-				       Config_Info* &config_info) = 0;
+                                       Config_Info* &config_info) = 0;
   // Obtains a Config_Info based on its priority.
 
 
@@ -178,7 +183,7 @@ public:
   // a highest priority value of 0 to the lowest priority value, which is
   // returned by "minimum_priority_queue ()". The current and deadline times
   // are part of the scheduling service implementation interface, but may be
-  // ignored by some implementations and used by others.  
+  // ignored by some implementations and used by others.
 
   // = Access the platform-independent priority value of the lowest-priority
   //   thread.
@@ -215,7 +220,7 @@ public:
   // (debug)
 
   static int add_dependency(RT_Info* rt_info,
-			    const Dependency_Info& d);
+                            const Dependency_Info& d);
 
   static int number_of_dependencies(RT_Info* rt_info);
   static int number_of_dependencies(RT_Info& rt_info);
@@ -225,7 +230,7 @@ public:
 
   virtual int dispatch_configuration (const Preemption_Priority &p_priority,
                                       OS_Thread_Priority& priority,
-				      Dispatching_Type & d_type);
+                                      Dispatching_Type & d_type);
   // provide the thread priority and queue type for the given priority level
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index a8546dfec12..68c33084cc0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if ! defined (SCHEDULER_INTERNAL_H)
+#ifndef SCHEDULER_INTERNAL_H
 #define SCHEDULER_INTERNAL_H
 
 #include "Scheduler.h"
@@ -50,7 +50,7 @@ public:
   // Obtains an RT_Info based on its "handle".
 
   virtual status_t lookup_config_info (Preemption_Priority priority,
-				       Config_Info* &config_info);
+                                       Config_Info* &config_info);
   // Obtains a Config_Info based on its priority.
 
   // = Computes the schedule.
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index 2abce70e8c2..15abbb9760a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if ! defined (STRATEGY_SCHEDULER_H)
+#ifndef STRATEGY_SCHEDULER_H
 #define STRATEGY_SCHEDULER_H
 
 #include "DynSched.h"
@@ -77,7 +77,7 @@ private:
 };
 
 
-
+
 ////////////////////////////////////////
 // Factory for strategized schedulers //
 ////////////////////////////////////////
@@ -150,7 +150,7 @@ public:
     //   and then on the dependency topological sort finishing time (ascending).
 
 
-  virtual ACE_DynScheduler::Dispatching_Type 
+  virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry) = 0;
   // provide the dispatching queue type for the given dispatch entry
 
@@ -172,7 +172,7 @@ protected:
 };
 
 
-
+
 class TAO_ORBSVCS_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strategy
   // = TITLE
   //    ACE_MUF_Scheduler_Strategy
@@ -206,7 +206,7 @@ public:
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
     // = determine the minimum critical priority number
 
-  virtual ACE_DynScheduler::Dispatching_Type 
+  virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
   // provide the dispatching queue type for the given dispatch entry
 
@@ -269,7 +269,7 @@ public:
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
     // = determine the minimum critical priority number
 
-  virtual ACE_DynScheduler::Dispatching_Type 
+  virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
   // provide the dispatching queue type for the given dispatch entry
 
@@ -299,7 +299,7 @@ private:
 
 
 
-
+
 class TAO_ORBSVCS_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strategy
   // = TITLE
   //    ACE_MLF_Scheduler_Strategy
@@ -327,7 +327,7 @@ public:
                      u_int count);
     // = sort the dispatch entry link pointer array in ascending laxity order
 
-  virtual ACE_DynScheduler::Dispatching_Type 
+  virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
   // provide the dispatching queue type for the given dispatch entry
 
@@ -386,7 +386,7 @@ public:
                      u_int count);
     // = sort the dispatch entry link pointer array in ascending deadline (period) order
 
-  virtual ACE_DynScheduler::Dispatching_Type 
+  virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
   // provide the dispatching queue type for the given dispatch entry
 
@@ -418,7 +418,7 @@ private:
 
 };
 
-
+
 class TAO_ORBSVCS_Export ACE_RMS_Dyn_Scheduler_Strategy : public ACE_Scheduler_Strategy
   // = TITLE
   //    ACE_RMS_Dyn_Scheduler_Strategy
@@ -451,7 +451,7 @@ public:
     virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
   // = determine the minimum critical priority number
 
-  virtual ACE_DynScheduler::Dispatching_Type 
+  virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
   // provide the dispatching queue type for the given dispatch entry
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index eb937fe61d1..95707b4370c 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -5,6 +5,10 @@
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/RtecSchedulerC.h"
 
@@ -60,9 +64,9 @@ public:
     // = DESCRIPTION
     //   This class provide us with a plain old data version of
     //   configuration info, which is useful for implementing static arrays
-	//   NOTE: if used in an array, the run-time scheduler requires that the
-	//   array index match the preemption priority stored in the config info
-	//   at that index: this is used to detect uninitialized/corrupted schedules
+        //   NOTE: if used in an array, the run-time scheduler requires that the
+        //   array index match the preemption priority stored in the config info
+        //   at that index: this is used to detect uninitialized/corrupted schedules
   {
     RtecScheduler::Preemption_Priority preemption_priority;
     RtecScheduler::OS_Priority thread_priority;
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index 327b915efb0..becd59c0c64 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -9,6 +9,10 @@
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/orbsvcs_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index f3bcc2b64c0..0b953421d15 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -3,15 +3,15 @@
 // =====================================================================
 // $Id$
 //
-// = LIBRARY 
+// = LIBRARY
 //    orbsvcs
-//  
+//
 // = FILENAME
 //    Constraint_Nodes.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
+//
+// = AUTHOR
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
 // =====================================================================
 
 #ifndef TAO_CONSTRAINT_NODES_H
@@ -46,22 +46,22 @@ public:
   // Implementing the pattern of double dispatching, each subclass of
   // TAO_Constraint will call back on an InterpreterVisitor the
   // method to handle a node of its ExpressionType.
-  
+
   virtual TAO_Expression_Type expr_type (void) const = 0;
   // Return the expression type represented by this node.
-  
-  virtual ~TAO_Constraint (void) {}  
+
+  virtual ~TAO_Constraint (void) {}
 };
 
 class TAO_Noop_Constraint : public TAO_Constraint
 // = TITLE
-//   A node that represents an operation with no operands. 
+//   A node that represents an operation with no operands.
 {
 public:
 
   TAO_Noop_Constraint (TAO_Expression_Type type)
     : type_ (type) {}
-  
+
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
   virtual TAO_Expression_Type expr_type (void) const
@@ -79,10 +79,10 @@ class TAO_Binary_Constraint : public TAO_Constraint
 //      and right operands.
 {
 public:
-  
+
   TAO_Binary_Constraint (TAO_Expression_Type op_type,
-			 TAO_Constraint* left,
-			 TAO_Constraint* right);
+                         TAO_Constraint* left,
+                         TAO_Constraint* right);
 
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
@@ -90,10 +90,10 @@ public:
 
   virtual TAO_Expression_Type expr_type (void) const
     { return this->op_; }
-  
+
   TAO_Constraint* left_operand (void) const;
   // Return the left operand of the binary expression
-  
+
   TAO_Constraint* right_operand (void) const;
   // Return the right operand of the binary expression
 
@@ -114,16 +114,16 @@ public:
   static int visit_mult (TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
   static int visit_div (TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
   static int visit_twiddle (TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_in (TAO_Constraint_Visitor* , TAO_Binary_Constraint*);  
-  
+  static int visit_in (TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
+
 private:
 
   TAO_Binary_Constraint (const TAO_Binary_Constraint&);
   TAO_Binary_Constraint& operator= (const TAO_Binary_Constraint&);
-  
+
   TAO_Expression_Type op_;
   // The operator type
-  
+
   TAO_Constraint* left_;
   TAO_Constraint* right_;
   // The operands of the expression
@@ -136,27 +136,27 @@ class TAO_Unary_Constraint : public TAO_Constraint
 //      one operand.
 {
 public:
-  
+
   TAO_Unary_Constraint (TAO_Expression_Type op_type,
-				 TAO_Constraint* operand);
-  
+                                 TAO_Constraint* operand);
+
   virtual ~TAO_Unary_Constraint (void);
-  
+
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
   virtual TAO_Expression_Type expr_type (void) const
     { return this->op_; }
-  
+
   TAO_Constraint* operand (void);
-  
+
 private:
 
   TAO_Unary_Constraint (const TAO_Unary_Constraint&);
   TAO_Unary_Constraint& operator= (const TAO_Unary_Constraint&);
-  
+
   TAO_Expression_Type op_;
   // The operator type
-  
+
   TAO_Constraint* operand_;
   // The operand of the expression
 };
@@ -168,24 +168,24 @@ class TAO_Property_Constraint : public TAO_Constraint
 //      value is determined by the offer being evaluated.
 {
 public:
-  
+
   TAO_Property_Constraint (const char* name);
 
   virtual ~TAO_Property_Constraint (void);
-  
+
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
   virtual TAO_Expression_Type expr_type (void) const
     { return TAO_IDENT; }
-  
+
   const char* name (void) const;
   // Returns the name of the property.
-  
+
 private:
 
   TAO_Property_Constraint (const TAO_Property_Constraint&);
   TAO_Property_Constraint& operator= (const TAO_Property_Constraint&);
-  
+
   char* name_;
   // The name of the property.
 };
@@ -194,7 +194,7 @@ class TAO_Literal_Constraint : public TAO_Constraint
 //
 // = TITLE
 //     TAO_Literal_Constraint represents a literal occuring in
-//     the constraint expression tree. 
+//     the constraint expression tree.
 {
  public:
 
@@ -202,108 +202,108 @@ class TAO_Literal_Constraint : public TAO_Constraint
     : type_ (TAO_UNKNOWN) {}
 
   // = Constructors for each of the various types of literals.
-  
-  TAO_Literal_Constraint (CORBA::Any* any);  
+
+  TAO_Literal_Constraint (CORBA::Any* any);
   TAO_Literal_Constraint (CORBA::ULong uinteger);
   TAO_Literal_Constraint (CORBA::Long integer);
   TAO_Literal_Constraint (CORBA::Boolean boolean);
-  TAO_Literal_Constraint (CORBA::Double doub);  
+  TAO_Literal_Constraint (CORBA::Double doub);
   TAO_Literal_Constraint (const char* str);
-  
+
   TAO_Literal_Constraint (const TAO_Literal_Constraint& lit);
   // Copy constructor
-  
+
   ~TAO_Literal_Constraint(void);
   // Destructor.
-  
+
   virtual int accept (TAO_Constraint_Visitor* visitor);
   // Visitor accept methods.
-  
+
   virtual TAO_Expression_Type expr_type (void) const
     { return type_; }
 
   void operator= (const TAO_Literal_Constraint& co);
   // Assignment operator.
-  
+
   // Conversion routines.
   operator CORBA::Boolean (void) const;
   operator CORBA::ULong (void) const;
-  operator CORBA::Long (void) const; 
+  operator CORBA::Long (void) const;
   operator CORBA::Double (void) const;
   operator const char* (void) const;
-  operator const CORBA::Any* (void) const; 
-  
+  operator const CORBA::Any* (void) const;
+
   // Return the type represented by this MysteryOperand.
-  
+
   // = Comparison operators.
-  
+
   friend int
     operator< (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
+               const TAO_Literal_Constraint& right);
+
   friend int
     operator<= (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
+                const TAO_Literal_Constraint& right);
+
   friend int
     operator> (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
+               const TAO_Literal_Constraint& right);
+
   friend int
     operator>= (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
+                const TAO_Literal_Constraint& right);
+
   friend int
     operator== (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
+                const TAO_Literal_Constraint& right);
+
   friend int
     operator!= (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
+                const TAO_Literal_Constraint& right);
+
   friend int
     operator== (double left,
-		const TAO_Literal_Constraint& right);
-  
+                const TAO_Literal_Constraint& right);
+
   friend int
     operator== (const TAO_String_Manager& left,
-		const TAO_Literal_Constraint& right);
-  
+                const TAO_Literal_Constraint& right);
+
   // = Arithmetic operators.
-  
+
   friend TAO_Literal_Constraint
     operator+ (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
+               const TAO_Literal_Constraint& right);
+
   friend TAO_Literal_Constraint
     operator- (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
+               const TAO_Literal_Constraint& right);
+
   friend TAO_Literal_Constraint
     operator* (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
+               const TAO_Literal_Constraint& right);
+
   friend TAO_Literal_Constraint
     operator/ (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
+               const TAO_Literal_Constraint& right);
+
   friend TAO_Literal_Constraint
     operator- (const TAO_Literal_Constraint& operand);
-  
+
   static TAO_Expression_Type
     widest_type (const TAO_Literal_Constraint& left,
-		 const TAO_Literal_Constraint& right);
+                 const TAO_Literal_Constraint& right);
   // Ensure both operands are of the same simple numeric type.
-  
+
   static TAO_Expression_Type
     comparable_type (CORBA::TypeCode_ptr type);
   // Determine the comparable Expression Type from the CORBA type
-  
+
  private:
 
   void copy (const TAO_Literal_Constraint& co);
   // Private copy method.
-  
+
   union
   {
     char* str_;
@@ -314,10 +314,10 @@ class TAO_Literal_Constraint : public TAO_Constraint
     CORBA::Double double_;
   } op_;
   // Union of the possible literal types.
-  
+
   TAO_Expression_Type type_;
   // The actual types of the TAO_Literal_Constraint.
-  
+
 };
 
 #endif /* TAO_CONSTRAINT_NODES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index d8653f45cea..a77cab4e473 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -3,15 +3,15 @@
 // ========================================================================
 // $Id$
 //
-// = LIBRARY 
+// = LIBRARY
 //    orbsvcs
-//  
+//
 // = FILENAME
 //    Constraint_Visitor.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
+//
+// = AUTHOR
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
 // ========================================================================
 
 #ifndef TAO_CONSTRAINT_VISITOR_H
@@ -45,12 +45,12 @@ class TAO_Constraint_Visitor
 //     appropriate method on the visitor passed to it, based on its
 //     own type. So, the Constraint_Visitor has a method to deal with
 //     each possible type of node in an expression tree; one for each
-//     operator in the grammar. 
+//     operator in the grammar.
 {
 public:
 
   virtual ~TAO_Constraint_Visitor (void) {}
-  
+
   virtual int visit_constraint (TAO_Unary_Constraint* constraint) = 0;
 
   virtual int visit_with (TAO_Unary_Constraint* unary_with) = 0;
@@ -58,7 +58,7 @@ public:
   virtual int visit_max (TAO_Unary_Constraint* unary_max) = 0;
   virtual int visit_first (TAO_Noop_Constraint* noop_first) = 0;
   virtual int visit_random (TAO_Noop_Constraint* noop_random) = 0;
-  
+
   virtual int visit_and (TAO_Binary_Constraint* boolean_and) = 0;
   virtual int visit_or (TAO_Binary_Constraint* boolean_or) = 0;
   virtual int visit_not (TAO_Unary_Constraint* unary_not) = 0;
@@ -110,13 +110,13 @@ class TAO_Constraint_Validator : public TAO_Constraint_Visitor
   //    property names. The algorithm for type
   //    checking is as follows: ensure that operand expression(s)
   //    return the correct types using expr_returns* methods. If they
-  //    (or it) return the correct types, call accept 
+  //    (or it) return the correct types, call accept
   //    on each operand until all return true or one returns false,
   //    at which point we can back out of the traversal and indicate
-  //    failure. 
+  //    failure.
 {
 public:
-  
+
   TAO_Constraint_Validator
     (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct);
   // The constructor creates a map of property names to their values
@@ -128,12 +128,12 @@ public:
 
   virtual ~TAO_Constraint_Validator (void);
   // Desctructor.
-  
+
   int validate (TAO_Constraint* root);
   // Validate returns 1 if the expression tree whose root is <root>
   // makes semantic sense, in that the operands for each operation
   // comply with each other and the types accepted by the operator.
-  
+
   // = Visitor Methods
 
   virtual int visit_constraint (TAO_Unary_Constraint* constraint);
@@ -143,34 +143,34 @@ public:
   virtual int visit_max (TAO_Unary_Constraint* unary_max);
   virtual int visit_first (TAO_Noop_Constraint* noop_first);
   virtual int visit_random (TAO_Noop_Constraint* noop_random);
-  
+
   virtual int visit_and (TAO_Binary_Constraint* boolean_and);
   virtual int visit_or (TAO_Binary_Constraint* boolean_or);
   // The two operands must return a boolean value.
-  
+
   virtual int visit_not (TAO_Unary_Constraint* unary_not);
   // The operand must return a boolean value.
-  
+
   virtual int visit_exist (TAO_Unary_Constraint* unary_exist);
   // The operand must return a valid  (i.e., present in the service
   // type description) property name.
-  
+
   virtual int visit_unary_minus (TAO_Unary_Constraint* unary_minus);
   // The operand must return a number to be negated.
-  
+
   virtual int visit_add (TAO_Binary_Constraint* boolean_add);
   virtual int visit_sub (TAO_Binary_Constraint* boolean_sub);
   virtual int visit_mult (TAO_Binary_Constraint* boolean_mult);
   virtual int visit_div (TAO_Binary_Constraint* boolean_div);
   // Both operands must return numeric results.
-  
+
   virtual int visit_twiddle (TAO_Binary_Constraint* binary_twiddle);
   // Both operands must return strings.
-  
+
   virtual int visit_in (TAO_Binary_Constraint* binary_in);
   // The right operand must be a sequence of the same simple type as
   // the left operand.
-  
+
   virtual int visit_less_than (TAO_Binary_Constraint* boolean_lt);
   virtual int visit_less_than_equal (TAO_Binary_Constraint* boolean_lte);
   virtual int visit_greater_than (TAO_Binary_Constraint* boolean_gt);
@@ -178,28 +178,28 @@ public:
   virtual int visit_equal (TAO_Binary_Constraint* boolean_eq);
   virtual int visit_not_equal (TAO_Binary_Constraint* boolean_neq);
   // The left and right operands must both be of the same simple type.
-  
+
   virtual int visit_literal (TAO_Literal_Constraint* literal);
   virtual int visit_property (TAO_Property_Constraint* literal);
   // The property must be defined in the service type description.
-  
+
 private:
-  
+
   TAO_Typecode_Table type_map_;
   // A map gleaned from the ServiceTypeStruct, which correlates
   // property names with their types.
 
   CORBA::TypeCode* extract_type (TAO_Constraint* expr_type,
-				TAO_Expression_Type& type);
-  
+                                TAO_Expression_Type& type);
+
   int expr_returns_boolean (TAO_Expression_Type expr_type);
   // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will
-  // return a boolean. 
-  
+  // return a boolean.
+
   int expr_returns_number (TAO_Expression_Type expr_type);
   // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will
-  // return a number. 
-  
+  // return a number.
+
   int expr_returns_string (TAO_Expression_Type expr_type);
   // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will
   // return a string.
@@ -220,7 +220,7 @@ class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
 //     TAO_Constraint_Evaluator traverse a constraint expression tree,
 //     and determines whether an offer fits the constraints
 //     represented by the tree
-// 
+//
 // = DESCRIPTION
 //     Using the Visitor pattern, the TAO_Constraint_Evaluator has each
 //     node of the expression tree call back to it with the method
@@ -235,8 +235,8 @@ class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
 public:
 
   TAO_Constraint_Evaluator (CosTrading::Offer* offer,
-			   CORBA::Boolean supports_dynamic_properties = 1);
-  
+                           CORBA::Boolean supports_dynamic_properties = 1);
+
   CORBA::Boolean evaluate_constraint (TAO_Constraint* root);
   // Evaluate returns 1 if the offer satisfies the constraints
   // represented by the the expression tree rooted at <root>, 0 if it
@@ -244,12 +244,12 @@ public:
   // automatically fails.
 
   int evaluate_preference (TAO_Constraint* root,
-			  TAO_Literal_Constraint& result);
+                          TAO_Literal_Constraint& result);
   // The result of the preference evaluation is stored in result. The
   // method returns 0 upon success, -1 upon failure.
-  
+
   // = Visitor Methods
-  
+
   virtual int visit_constraint (TAO_Unary_Constraint* constraint);
 
   virtual int visit_with (TAO_Unary_Constraint* unary_with);
@@ -257,7 +257,7 @@ public:
   virtual int visit_max (TAO_Unary_Constraint* unary_max);
   virtual int visit_first (TAO_Noop_Constraint* noop_first);
   virtual int visit_random (TAO_Noop_Constraint* noop_random);
-  
+
   virtual int visit_and (TAO_Binary_Constraint* boolean_and);
   // Takes the logical and of the results of both operands. Note that
   // in the case where the left operand returns zero, the result is
@@ -270,20 +270,20 @@ public:
 
   virtual int visit_not (TAO_Unary_Constraint* unary_not);
   // Logically negates the value of the operand.
-  
+
   virtual int visit_exist (TAO_Unary_Constraint* unary_exist);
   // The property exists if its name is bound to a value in the
   // <props_> map.
 
   virtual int visit_unary_minus (TAO_Unary_Constraint* unary_minus);
   // Mathematically negates the return value the operand.
-  
+
   virtual int visit_add (TAO_Binary_Constraint* boolean_add);
   // Add the results of evaluating the left and right operands.
-  
+
   virtual int visit_sub (TAO_Binary_Constraint* boolean_sub);
   // Subtract the results of evaluating the left and right operands.
-  
+
   virtual int visit_mult (TAO_Binary_Constraint* boolean_mult);
   // Multiply the results of evaluating the left and right operands.
 
@@ -310,13 +310,13 @@ public:
 
   virtual int visit_property (TAO_Property_Constraint* literal);
   // Copy the value of the property into the result container.
-  
+
 private:
 
   class Operand_Queue :
   public ACE_Unbounded_Queue <TAO_Literal_Constraint>
     // = TITLE
-    // A queue adapter with methods to setting and getting operands 
+    // A queue adapter with methods to setting and getting operands
     // from the expression evaluation results.
   {
   public:
@@ -335,13 +335,13 @@ private:
     void dequeue_operand (void);
     // Remove an operand from the queue.
   };
-  
+
   void do_the_op (int operation);
   // Method for performing a arithmetic or comparison operation.
-  
+
   int visit_bin_op (TAO_Binary_Constraint* op, int operation);
   // Method for evaluating a binary operation.
-  
+
   CORBA::Boolean sequence_does_contain (CORBA::Any* sequence,
                                         TAO_Literal_Constraint& element);
   // Determine if sequence contains <element>, a literal of the same
@@ -350,13 +350,13 @@ private:
   TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&);
   TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&);
   // Disallow copying.
-  
+
   TAO_Lookup_Table props_;
   // The map of property names to their values for a property.
 
   TAO_Property_Evaluator prop_eval_;
   // Utility with which to evaluate the properties of an offer, be
-  // they dyanmic or static. 
+  // they dyanmic or static.
 
   Operand_Queue queue_;
   // The result of a non_boolean operation.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
index 2476c0aee25..0c79088727e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    Trading
-// 
+//
 // = FILENAME
 //    Locking.h
 //
@@ -13,7 +13,7 @@
 //    Marina Spivak <marina@cs.wustl.edu>
 //    Seth Widoff <sbw1@cs.wustl.edu>
 //    Irfan Pyarali <irfan@cs.wustl.edu>
-//   
+//
 // ==========================================================================
 #ifndef TAO_LOCKING_H
 #define TAO_LOCKING_H
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 7d117940433..b79ecffe98a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    Offer_Database.h
 //
 // = AUTHOR
 //    Seth Widoff <sbw1@cs.wustl.edu>
-// 
+//
 // ========================================================================
 
 #ifndef TAO_OFFER_DATABASE_H
@@ -30,12 +30,12 @@ class TAO_Offer_Database
 //   underlying structure is a map of maps. The first maps maps the
 //   service type name to a map of exported offers. The second map
 //   maps the identifying index for that offer within the service
-//   types. So a service type name and an index uniquely identifies an 
+//   types. So a service type name and an index uniquely identifies an
 //   exported offer. In fact, when the register export interface
 //   returns a CosTrading::OfferId, it's returning no more than a
 //   simple string concatenation of these two values. In addition to
-//   all these wonderful things, the TAO_Offer_Database has built-in 
-//   locking, one reader/writer-style lock for modifying the top-level 
+//   all these wonderful things, the TAO_Offer_Database has built-in
+//   locking, one reader/writer-style lock for modifying the top-level
 //   map and a reader/writer-style for each of the offer
 //   maps. Needless to say the locks are acquired when the
 //   TAO_Offer_Database performs operations on the structures they
@@ -52,34 +52,34 @@ public:
 
   // Traits
   typedef TAO_Service_Offer_Iterator<LOCK_TYPE> offer_iterator;
-    
+
   TAO_Offer_Database (void);
   // No arg constructor.
 
   ~TAO_Offer_Database (void);
-  
+
   CosTrading::OfferId insert_offer (const char* type,
                                     CosTrading::Offer* offer);
   // Add an offer of type <type> and generate a CosTrading::OfferId
   // for it. Returns 0 on failure.
 
   int remove_offer (const CosTrading::OfferId offer_id,
-		    CORBA::Environment& _env)
+                    CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		    CosTrading::UnknownOfferId));
-  
+                    CosTrading::UnknownOfferId));
+
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-				   CORBA::Environment& _env)
+                                   CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		    CosTrading::UnknownOfferId));
+                    CosTrading::UnknownOfferId));
   // Lookup an offer whose offer_id is <offer_id>, and return
   // it. Otherwise, throw the appropriate exception.
 
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-				   char*& type_name,
-				   CORBA::Environment& _env)
+                                   char*& type_name,
+                                   CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		    CosTrading::UnknownOfferId));
+                    CosTrading::UnknownOfferId));
   // Lookup an offer whose OfferId is <offer_id> and return in
   // <type_name> the type name of the object. Type name is just a
   // pointer to a location in offer_id, so DON'T DELETE IT.
@@ -88,14 +88,14 @@ public:
   // Return an iterator that will traverse and return all the offer
   // ids in the service type map.
 
-  struct Offer_Map_Entry 
+  struct Offer_Map_Entry
   {
     TAO_Offer_Map* offer_map_;
     CORBA::ULong counter_;
     LOCK_TYPE lock_;
   };
 
-  typedef ACE_Hash_Map_Manager 
+  typedef ACE_Hash_Map_Manager
     <
     TAO_String_Hash_Key,
     Offer_Map_Entry*,
@@ -104,41 +104,41 @@ public:
     Offer_Database;
 
 private:
-  
+
   // The internal id is a pointer here, not only to avoid copying,
   // since we would only copy on insertion, and we only insert once
   // --- with an empty Offer_Map_Entry --- but also since most locks
   // have unimplemented copy constructors.
-  
+
   CosTrading::Offer* lookup_offer (const char* type,
-				   CORBA::ULong id);
+                                   CORBA::ULong id);
   // Lookup an offer whose type is <type> and id, <id>. Return 0 on
-  // failure. 
+  // failure.
 
   int remove_offer (const char* type, CORBA::ULong id);
-  // Remove an offers whose id is <offer_id>. Returns 0 on success, -1 
-  // on failure, and throws a CosTrading::IllegalOfferId if it can't 
+  // Remove an offers whose id is <offer_id>. Returns 0 on success, -1
+  // on failure, and throws a CosTrading::IllegalOfferId if it can't
   // parse the CosTrading::OfferId.
 
   static CosTrading::OfferId generate_offer_id (const char *type_name,
-						CORBA::ULong id);
+                                                CORBA::ULong id);
   // Take in a service type name for the offer the current value of
   // of the counter and generate an offer id.
-  
+
   static void parse_offer_id (const CosTrading::OfferId offer_id,
-			      char* &service_type,
-			      CORBA::ULong& id,
-			      CORBA::Environment& _env)
+                              char* &service_type,
+                              CORBA::ULong& id,
+                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalOfferId));
   // Take in a previously generated offer id and return the type
-  // and id that were used to generate the offer id.  
+  // and id that were used to generate the offer id.
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Offer_Database<LOCK_TYPE> &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_Offer_Database (const TAO_Offer_Database<LOCK_TYPE> &))    
-    
+  ACE_UNIMPLEMENTED_FUNC (TAO_Offer_Database (const TAO_Offer_Database<LOCK_TYPE> &))
+
   LOCK_TYPE db_lock_;
-  
+
   Offer_Database offer_db_;
   // The protected data structure.
 };
@@ -149,30 +149,30 @@ class TAO_Service_Offer_Iterator
 //   TAO_Service_Offer_Iterator iterates over the set of exported
 //   offers for a given type. Handily, it takes care of all the
 //   necessary locking, acquiring them in the constructor, and
-//   releasing them in the destructor. 
+//   releasing them in the destructor.
 {
  public:
 
   typedef TAO_Offer_Database<LOCK_TYPE> Offer_Database;
-  
+
   TAO_Service_Offer_Iterator (const char* type,
-			      TAO_Offer_Database<LOCK_TYPE>& offer_database);
-  
+                              TAO_Offer_Database<LOCK_TYPE>& offer_database);
+
   ~TAO_Service_Offer_Iterator (void);
   // Release all the locks acquired.
-  
+
   int has_more_offers (void);
   // Returns 1 if there are more offers, 0 otherwise.
-  
+
   CosTrading::OfferId get_id (void);
   // Get the id for the current offer.
-    
+
   CosTrading::Offer* get_offer (void);
   // Returns the next offer in the series.
-  
+
   void next_offer (void);
   // Advances the iterator 1.
-  
+
  private:
   // Protected constructor.
 
@@ -184,7 +184,7 @@ class TAO_Service_Offer_Iterator
 
   TAO_Offer_Map::iterator* offer_iter_;
   // Iterator over the actual offer map.
-  
+
   const char* type_;
   // The name of the type. Used for constructing offer ids.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index ee3f93c1f94..f1513e0835c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -91,9 +91,9 @@ public:
 
   TAO_Offer_Iterator (TAO_Offer_Iterator& iter) {}
   // To satisfy g++'s insane lust for copy constructors...
-  
+
   TAO_Offer_Iterator& operator=(const TAO_Offer_Iterator&);
-  
+
   TAO_Property_Filter pfilter_;
   // The filter through which each returned offer must pass. Used to
   // strip offers of undesirable properties.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index f21c2197e9d..fa74f0acf5e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -5,14 +5,14 @@
 //
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    Offer_Iterators_T.h
 //
 // = AUTHOR
 //    Marina Spivak <marina@cs.wustl.edu>
 //    Seth Widoff <sbw1@cs.wustl.edu>
-// 
+//
 // ========================================================================
 
 #ifndef TAO_REGISTER_OFFER_ITERATOR_H
@@ -31,36 +31,36 @@ class TAO_Register_Offer_Iterator : public TAO_Offer_Iterator
   // = DESCRIPTION
   //     Stores ids of offers to be iterated over.  Before returning
   //     an offer, checks if the offer is still there (since it may
-  //     have been removed by the Register). 
+  //     have been removed by the Register).
 public:
 
   // = Initialization and termination methods.
 
   TAO_Register_Offer_Iterator (TAO_Offer_Database<MAP_LOCK_TYPE> &db,
-			       const TAO_Property_Filter& pfilter);
-  // Takes service type and trader reference in order to 
+                               const TAO_Property_Filter& pfilter);
+  // Takes service type and trader reference in order to
   // later locate offers using their ids.
 
   virtual ~TAO_Register_Offer_Iterator (void);
   // destructor.
 
-  virtual CORBA::Boolean next_n (CORBA::ULong n, 
-				 CosTrading::OfferSeq_out offers,
-				 CORBA::Environment& _env)  
+  virtual CORBA::Boolean next_n (CORBA::ULong n,
+                                 CosTrading::OfferSeq_out offers,
+                                 CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // Deposit at maximum n offers into the return sequence and return 1,
   // or return 0 if the iterator is done and no offers are returned.
-  
-  virtual CORBA::ULong max_left (CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::UnknownMaxLeft));
-  // Throws CosTrading::UnknownMaxLeft since with the presence of 
-  // "Register" functionality, the iterator cannot guarantee that 
+
+  virtual CORBA::ULong max_left (CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    CosTrading::UnknownMaxLeft));
+  // Throws CosTrading::UnknownMaxLeft since with the presence of
+  // "Register" functionality, the iterator cannot guarantee that
   // the trader will have all the offers it has now when the time
   // to return them comes.
 
   void add_offer (CosTrading::OfferId id,
-		  const CosTrading::Offer* offer);
+                  const CosTrading::Offer* offer);
   // Add an offer the iterator should iterate over.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 6e6aabcaee2..1be09f077cc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -2,17 +2,17 @@
 
 // ========================================================================
 // $Id$
-// 
+//
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //   Service_Type_Repository.h
 //
 // = AUTHOR
 //    Marina Spivak <marina@cs.wustl.edu>
 //    Seth Widoff <sbw1@cs.wustl.edu>
-// 
+//
 // ========================================================================
 
 #ifndef TAO_SERVICE_TYPE_REPOSITORY_H
@@ -25,36 +25,36 @@ class TAO_ORBSVCS_Export TAO_Service_Type_Repository :
   //
   // = TITLE
   //     This class implements CosTradingRepos::ServiceTypeRepository
-  //     IDL interface. 
+  //     IDL interface.
 {
 public:
-  
+
   TAO_Service_Type_Repository (ACE_Lock* lock = 0);
   // Parameterize the Service_Type_Repository with a lock to serialize
   // access to the type repository map. A reader/writer lock is
-  // probably best. The Service_Type_Repository assumes control of the 
+  // probably best. The Service_Type_Repository assumes control of the
   // lock.
-  
+
   ~TAO_Service_Type_Repository (void);
-  
-  virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber 
-    incarnation (CORBA::Environment& _env);  
-
-  virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber 
-    add_type (const char * name, 
-	      const char * if_name, 
-	      const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
-	      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
-	      CORBA::Environment& _env)
+
+  virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
+    incarnation (CORBA::Environment& _env);
+
+  virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
+    add_type (const char * name,
+              const char * if_name,
+              const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+              const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType, 
-		    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, 
-		    CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, 
-		    CosTrading::IllegalPropertyName, 
-		    CosTrading::DuplicatePropertyName, 
-		    CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, 
-		    CosTrading::UnknownServiceType, 
-		    CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+                    CosTrading::IllegalServiceType,
+                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
+                    CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
+                    CosTrading::IllegalPropertyName,
+                    CosTrading::DuplicatePropertyName,
+                    CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
+                    CosTrading::UnknownServiceType,
+                    CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
 
   // BEGIN SPEC
   // The add_type operation enables the creation of new service types
@@ -96,16 +96,16 @@ public:
   // ServiceTypeNames in "super_types" does not exist, then the
   // CosTrading::UnknownServiceType exception is raised. ° If the same
   // service type name is included two or more times in this
-  // parameter, the DuplicateServiceTypeName exception is raised. 
+  // parameter, the DuplicateServiceTypeName exception is raised.
   // END SPEC
-  
+
 
   virtual void remove_type (const char * name,
-			    CORBA::Environment& _env)
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    CosTradingRepos::ServiceTypeRepository::HasSubTypes));
+                    CosTrading::IllegalServiceType,
+                    CosTrading::UnknownServiceType,
+                    CosTradingRepos::ServiceTypeRepository::HasSubTypes));
 
   // BEGIN SPEC
   // The remove_type operation removes the named type from the service
@@ -114,12 +114,12 @@ public:
   // does not exist within the repository, then the
   // CosTrading::UnknownServiceType exception is raised. ° If "name"
   // has a service type which has been derived from it, then the
-  // HasSubTypes exception is raised. 
+  // HasSubTypes exception is raised.
   // END SPEC
-  
-  virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq* 
+
+  virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq*
     list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& which_types,
-		CORBA::Environment& _env)
+                CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -130,29 +130,29 @@ public:
   // added/modified since a particular incarnation number The names of
   // the requested types are returned by the operation for subsequent
   // querying via the describe_type or the fully_describe_type
-  // operation. 
-  // END SPEC 
-           
+  // operation.
+  // END SPEC
+
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct*
     describe_type (const char * name,
-		   CORBA::Environment& _env) 
+                   CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType));
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType));
   // BEGIN SPEC
   // The describe_type operation permits a client to obtain the
   // details for a particular service type. ° If "name" is malformed,
   // then the CosTrading::IllegalServiceType exception is raised. ° If
   // "name" does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised. 
+  // CosTrading::UnknownServiceType exception is raised.
   // END SPEC
-  
-  virtual CosTradingRepos::ServiceTypeRepository::TypeStruct* 
+
+  virtual CosTradingRepos::ServiceTypeRepository::TypeStruct*
     fully_describe_type (const char * name,
-			 CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType));
+                         CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType));
   // BEGIN SPEC
   // The fully_describe_type operation permits a client to obtain the
   // details for a particular service type. The property sequence
@@ -162,15 +162,15 @@ public:
   // transitive closure of the super type relation. ° If "name" is
   // malformed, then the CosTrading::IllegalServiceType exception is
   // raised. ° If "name" does not exist within the repository, then
-  // the CosTrading::UnknownServiceType exception is raised. 
-  // END SPEC 
+  // the CosTrading::UnknownServiceType exception is raised.
+  // END SPEC
 
   virtual void mask_type (const char * name,
-			  CORBA::Environment& _env) 
+                          CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::AlreadyMasked));
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTradingRepos::ServiceTypeRepository::AlreadyMasked));
   // BEGIN SPEC
   // The mask_type operation permits the deprecation of a particular
   // type (i.e., after being masked, exporters will no longer be able
@@ -181,15 +181,15 @@ public:
   // does not exist within the repository, then the
   // CosTrading::UnknownServiceType exception is raised. ° If the type
   // is currently in the masked state, then the AlreadyMasked
-  // exception is raised. 
-  // END SPEC 
-       
+  // exception is raised.
+  // END SPEC
+
   virtual void unmask_type (const char * name,
-			    CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    CosTradingRepos::ServiceTypeRepository::NotMasked));
+                            CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    CosTrading::IllegalServiceType,
+                    CosTrading::UnknownServiceType,
+                    CosTradingRepos::ServiceTypeRepository::NotMasked));
   // BEGIN SPEC
   // The unmask_type undeprecates a type (i.e., after being unmasked,
   // exporters will be able to resume advertisement of offers of that
@@ -198,21 +198,21 @@ public:
   // does not exist within the repository, then the
   // CosTrading::UnknownServiceType exception is raised. ° If the type
   // is not currently in the masked state, then the NotMasked
-  // exception is raised. 
+  // exception is raised.
   // END SPEC
 
 private:
-  
+
   struct Type_Info
   {
     // storage structure for information pertinent to the type.
-    CosTradingRepos::ServiceTypeRepository::TypeStruct type_struct_; 
+    CosTradingRepos::ServiceTypeRepository::TypeStruct type_struct_;
     // standard type info.
-    
+
     CORBA::Boolean has_subtypes_;
     // names of subtypes.
   };
-  
+
   typedef ACE_Hash_Map_Manager
     <
     TAO_String_Hash_Key,
@@ -220,7 +220,7 @@ private:
     ACE_Null_Mutex
     >
     Prop_Map;
-  
+
   typedef ACE_Hash_Map_Manager
     <
     TAO_String_Hash_Key,
@@ -230,59 +230,59 @@ private:
     Service_Type_Map;
 
   void fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
-			      CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
-			      CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types);
+                              CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                              CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types);
   // Build a sequence aggregating the property names from all
   // supertypes of the type, and a sequence representing the
   // transitive closure of the super type relation.
 
   void collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
                                       TAO_String_Queue& target);
-  
+
   void validate_properties (Prop_Map& prop_map,
-			    const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
-			    CORBA::Environment& _env)
+                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName));
+                     CosTrading::DuplicatePropertyName));
   // Confirm that the properties in props have valid names, and aren't
   // duplicated. Cram those properties into the prop_map.
-  
+
   void validate_supertypes (Service_Type_Map& super_map,
-			    const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
-			    CORBA::Environment& _env)
+                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalServiceType,
-		    CosTrading::UnknownServiceType,
-		    CosTrading::DuplicatePropertyName));   
-  // Confirm that the each super type exists, and cram them into super_map. 
-  
+                    CosTrading::UnknownServiceType,
+                    CosTrading::DuplicatePropertyName));
+  // Confirm that the each super type exists, and cram them into super_map.
+
   void validate_inheritance (Prop_Map& prop_map,
-			     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
-			     CORBA::Environment& _env)
+                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                             CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
   // Ensure that properties of a super_type aren't having their types
   // or retstrictions redefined.
 
   //  void validate_interface (const char* if_name,
-  //			   Service_Type_Map& super_map,
-  //			   CORBA::Environment& _env)
+  //                       Service_Type_Map& super_map,
+  //                       CORBA::Environment& _env)
   //    TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
   // Ensure that the interface type derives from its superclasses'.
-  
+
   void update_type_map (const char* name,
-			const char * if_name, 
-			const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
-			const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
-			Prop_Map& prop_map,
-			Service_Type_Map& super_map);
+                        const char * if_name,
+                        const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                        const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                        Prop_Map& prop_map,
+                        Service_Type_Map& super_map);
   // Update the type map with the information contained in the
   // TypeStruct, prop_map, and super_map.
 
   TAO_Service_Type_Repository (const TAO_Service_Type_Repository&);
   TAO_Service_Type_Repository& operator= (const TAO_Service_Type_Repository&);
-  
+
   ACE_Lock* lock_;
   // Lock with which to serialize access to the service type map.
-  
+
   Service_Type_Map type_map_;
   // Stores information for each service type in the repository.
   // This is a mapping from service type name to a Type_Info struct
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 050978a3461..03dae79a92c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -30,6 +30,11 @@
 #define TAO_TRADER_BASE_H
 
 #include "ace/Hash_Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Containers.h"
 
 #include "orbsvcs/CosTradingS.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 58ed40d5945..7ee9754254a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    Trader_Interfaces.h
 //
@@ -13,7 +13,7 @@
 //    Marina Spivak <marina@cs.wustl.edu>
 //    Seth Widoff <sbw1@cs.wustl.edu>
 //    Irfan Pyarali <irfan@cs.wustl.edu>
-// 
+//
 // ========================================================================
 
 #ifndef TAO_TRADER_INTERFACES_H
@@ -45,41 +45,41 @@ class TAO_Lookup :
 //
 // = TITLE
 //     This class implements CosTrading::Lookup IDL interface.
-{    
+{
 public:
-  
+
   TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
   ~TAO_Lookup (void);
-  
+
   virtual void
     query (const char *type,
-	   const char *constr,
-	   const char *pref,
-	   const CosTrading::PolicySeq& policies,
-	   const CosTrading::Lookup::SpecifiedProps& desired_props,
-	   CORBA::ULong how_many,
-	   CosTrading::OfferSeq_out offers,
-	   CosTrading::OfferIterator_out offer_itr,
-	   CosTrading::PolicyNameSeq_out limits_applied,
-	   CORBA::Environment& env)
+           const char *constr,
+           const char *pref,
+           const CosTrading::PolicySeq& policies,
+           const CosTrading::Lookup::SpecifiedProps& desired_props,
+           CORBA::ULong how_many,
+           CosTrading::OfferSeq_out offers,
+           CosTrading::OfferIterator_out offer_itr,
+           CosTrading::PolicyNameSeq_out limits_applied,
+           CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType,
-		    CosTrading::UnknownServiceType,
-		    CosTrading::IllegalConstraint,
-		    CosTrading::Lookup::IllegalPreference,
-		    CosTrading::Lookup::IllegalPolicyName,
-		    CosTrading::Lookup::PolicyTypeMismatch,
-		    CosTrading::Lookup::InvalidPolicyValue,
-		    CosTrading::IllegalPropertyName,
-		    CosTrading::DuplicatePropertyName,
-		    CosTrading::DuplicatePolicyName));
+                    CosTrading::IllegalServiceType,
+                    CosTrading::UnknownServiceType,
+                    CosTrading::IllegalConstraint,
+                    CosTrading::Lookup::IllegalPreference,
+                    CosTrading::Lookup::IllegalPolicyName,
+                    CosTrading::Lookup::PolicyTypeMismatch,
+                    CosTrading::Lookup::InvalidPolicyValue,
+                    CosTrading::IllegalPropertyName,
+                    CosTrading::DuplicatePropertyName,
+                    CosTrading::DuplicatePolicyName));
 
   // BEGIN SPEC
   // The query operation is the means by which an object can obtain
   // references to other objects that provide services meeting its
   // requirements.
-  
+
   // The "type" parameter conveys the required service type. It is key
   // to the central purpose of trading: to perform an introduction for
   // future type safe interactions between importer and exporter. By
@@ -94,7 +94,7 @@ public:
   // query for the "type" is also a well-formed query with respect to
   // any subtypes. However, if the importer specifies the policy of
   // exact_type_match = TRUE, then only offers with the exact (no
-  // subtype) service type requested are returned. 
+  // subtype) service type requested are returned.
 
   // The constraint "constr" is the means by which the importer states
   // those requirements of a service that are not captured in the
@@ -122,7 +122,7 @@ public:
   // implementation of the trader. However, some names are
   // standardized where they effect the interpretation of other
   // parameters or where they may impact linking and federation of
-  // traders. 
+  // traders.
 
   // The "desired_props" parameter defines the set of properties
   // describing returned offers that are to be returned with the
@@ -134,7 +134,7 @@ public:
   // The desired_props parameter does not affect whether or not a
   // service offer is returned. To avoid "missing" desired properties,
   // the importer should specify "exists prop_name" in the
-  // constraint. 
+  // constraint.
 
   // The returned offers are passed back in one of two ways (or a
   // combination of both). °The "offers" return result conveys a list
@@ -143,7 +143,7 @@ public:
   // how many offers are to be returned via the "offers" result, any
   // remaining offers are available via the iterator interface. If the
   // "how_many" exceeds the number of offers to be returned, then the
-  // "offer_itr" will be nil. 
+  // "offer_itr" will be nil.
 
   // If any cardinality or other limits were applied by one or more
   // traders in responding to a particular query, then the
@@ -153,31 +153,31 @@ public:
   // concatenated onto the names of limits applied locally and
   // returned.
   // END SPEC
-  
+
 private:
 
   TAO_Offer_Iterator* create_offer_iterator (const TAO_Property_Filter&);
   // Factory method for creating an appropriate Offer Iterator based
-  // on the presence of the Register Interface. 
-  
+  // on the presence of the Register Interface.
+
   void lookup_all_subtypes (const char* type,
-			    CosTradingRepos::ServiceTypeRepository::IncarnationNumber& inc_num,
+                            CosTradingRepos::ServiceTypeRepository::IncarnationNumber& inc_num,
                             TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database,
-			    CosTradingRepos::ServiceTypeRepository_ptr rep,
-			    TAO_Constraint_Interpreter& constr_inter,
-			    TAO_Preference_Interpreter& pref_inter,
-			    TAO_Offer_Filter& offer_filter);
+                            CosTradingRepos::ServiceTypeRepository_ptr rep,
+                            TAO_Constraint_Interpreter& constr_inter,
+                            TAO_Preference_Interpreter& pref_inter,
+                            TAO_Offer_Filter& offer_filter);
   // Traverse the type hierarchy to pull the matching offers from all
   // subtypes of the root type.
-  
+
   void lookup_one_type (const char* type,
-			TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database,
-			TAO_Constraint_Interpreter& constr_inter,
-			TAO_Preference_Interpreter& pref_inter,
-			TAO_Offer_Filter& offer_filter);
+                        TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database,
+                        TAO_Constraint_Interpreter& constr_inter,
+                        TAO_Preference_Interpreter& pref_inter,
+                        TAO_Offer_Filter& offer_filter);
   // Check if offers of a type fit the constraints and order them
   // according to the preferences submitted.
-    
+
   int fill_receptacles (const char* type,
                         CORBA::ULong how_many,
                         const CosTrading::Lookup::SpecifiedProps& desired_props,
@@ -187,7 +187,7 @@ private:
                         CosTrading::OfferIterator_ptr& offer_itr,
                         CORBA::Environment& env)
     TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		    CosTrading::DuplicatePropertyName));
+                    CosTrading::DuplicatePropertyName));
   // This method takes the list of ordered offers and places a number
   // of them in the sequence of returned offers and the rest into thr
   // iterator. In addition, fill_receptacles uses the
@@ -196,67 +196,67 @@ private:
 
   void forward_query (const char* next_hop,
                       const char *type,
-		      const char *constr,
-		      const char *pref,
+                      const char *constr,
+                      const char *pref,
                       const CosTrading::PolicySeq& policy_seq,
-		      const CosTrading::Lookup::SpecifiedProps& desired_props,
-		      CORBA::ULong how_many,
-		      CosTrading::OfferSeq_out offers,
-		      CosTrading::OfferIterator_out offer_itr,
-		      CosTrading::PolicyNameSeq_out limits_applied,
-		      CORBA::Environment& env)
+                      const CosTrading::Lookup::SpecifiedProps& desired_props,
+                      CORBA::ULong how_many,
+                      CosTrading::OfferSeq_out offers,
+                      CosTrading::OfferIterator_out offer_itr,
+                      CosTrading::PolicyNameSeq_out limits_applied,
+                      CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType,
-		     CosTrading::UnknownServiceType,
-		     CosTrading::IllegalConstraint,
-		     CosTrading::Lookup::IllegalPreference,
-		     CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
-		     CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
-  // If a starting_trader policy was specfied, foward the query to the 
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::IllegalConstraint,
+                     CosTrading::Lookup::IllegalPreference,
+                     CosTrading::Lookup::IllegalPolicyName,
+                     CosTrading::Lookup::PolicyTypeMismatch,
+                     CosTrading::Lookup::InvalidPolicyValue,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTrading::DuplicatePolicyName));
+  // If a starting_trader policy was specfied, foward the query to the
   // next link in the sequence.
-		      
+
   CORBA::Boolean retrieve_links (TAO_Policies& policies,
-				 CORBA::ULong offer_returned,
-				 CosTrading::LinkNameSeq_out links,
-				 CORBA::Environment& _env)
+                                 CORBA::ULong offer_returned,
+                                 CosTrading::LinkNameSeq_out links,
+                                 CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::Lookup::PolicyTypeMismatch));
+                     CosTrading::Lookup::PolicyTypeMismatch));
   // Assemble a sequence of links that the federate_query method
-  // should follow. Use the starting_trader policy, if one's provided, 
+  // should follow. Use the starting_trader policy, if one's provided,
   // otherwise use the Link interface to determine which of the
   // registered links should be followed in this query.
-  
+
   void federated_query (const CosTrading::LinkNameSeq& links,
                         const TAO_Policies& policies,
                         const CosTrading::Admin::OctetSeq& request_id,
                         TAO_Preference_Interpreter& pref_inter,
-			const char *type,
-			const char *constr,
-			const char *pref,
-			const CosTrading::Lookup::SpecifiedProps& desired_props,
-			CORBA::ULong how_many,
-			CosTrading::OfferSeq& offers,
-			CosTrading::OfferIterator_ptr& offer_itr,
-			CosTrading::PolicyNameSeq& limits_applied,
-			CORBA::Environment& env)
+                        const char *type,
+                        const char *constr,
+                        const char *pref,
+                        const CosTrading::Lookup::SpecifiedProps& desired_props,
+                        CORBA::ULong how_many,
+                        CosTrading::OfferSeq& offers,
+                        CosTrading::OfferIterator_ptr& offer_itr,
+                        CosTrading::PolicyNameSeq& limits_applied,
+                        CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType,
-		     CosTrading::UnknownServiceType,
-		     CosTrading::IllegalConstraint,
-		     CosTrading::Lookup::IllegalPreference,
-		     CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
-		     CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::IllegalConstraint,
+                     CosTrading::Lookup::IllegalPreference,
+                     CosTrading::Lookup::IllegalPolicyName,
+                     CosTrading::Lookup::PolicyTypeMismatch,
+                     CosTrading::Lookup::InvalidPolicyValue,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTrading::DuplicatePolicyName));
   // Perform and pass on a query over a set of links. Merge the
   // results of the federated queries into a single set of results
-  // suitable for returning to the user.  
+  // suitable for returning to the user.
 
   void order_merged_sequence (TAO_Preference_Interpreter& pref_inter,
                               CosTrading::OfferSeq& offers);
@@ -267,20 +267,20 @@ private:
                                   CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
-  
+
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Lookup (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
 
   const unsigned int IDS_SAVED;
-    
+
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_;
   // A reference to the trader for obtaining offer maps.
-  
+
   typedef ACE_Unbounded_Queue<CosTrading::Admin::OctetSeq*> Request_Ids;
-  
+
   Request_Ids request_ids_;
-  // A list of recent request_id_stems 
+  // A list of recent request_id_stems
 
   TRADER_LOCK_TYPE lock_;
   // Lock to secure the set of request ids.
@@ -305,20 +305,20 @@ public:
 
   virtual ~TAO_Register (void);
 
-  virtual CosTrading::OfferId export (CORBA::Object_ptr reference, 
-				      const char *type, 
-				      const CosTrading::PropertySeq& properties,
-				      CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::Register::InvalidObjectRef, 
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    CosTrading::Register::InterfaceTypeMismatch, 
-		    CosTrading::IllegalPropertyName, 
-		    CosTrading::PropertyTypeMismatch, 
-		    CosTrading::ReadonlyDynamicProperty, 
-		    CosTrading::MissingMandatoryProperty, 
-		    CosTrading::DuplicatePropertyName));
+  virtual CosTrading::OfferId export (CORBA::Object_ptr reference,
+                                      const char *type,
+                                      const CosTrading::PropertySeq& properties,
+                                      CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    CosTrading::Register::InvalidObjectRef,
+                    CosTrading::IllegalServiceType,
+                    CosTrading::UnknownServiceType,
+                    CosTrading::Register::InterfaceTypeMismatch,
+                    CosTrading::IllegalPropertyName,
+                    CosTrading::PropertyTypeMismatch,
+                    CosTrading::ReadonlyDynamicProperty,
+                    CosTrading::MissingMandatoryProperty,
+                    CosTrading::DuplicatePropertyName));
 
   // BEGIN SPEC
   // The export operation is the means by which a service is
@@ -363,7 +363,7 @@ public:
 
   // If the type of any of the property values is not the
   // same as the declared type (declared in the service type), then a
-  // PropertyTypeMismatch exception is raised. 
+  // PropertyTypeMismatch exception is raised.
 
   // ° If an attempt is made to assign a dynamic property value to a
   // readonly property, then the ReadonlyDynamicProperty exception is
@@ -373,12 +373,12 @@ public:
   // properties with the same property name are included in this
   // parameter, the DuplicatePropertyName exception is raised.
   // END SPEC
- 
+
   virtual void withdraw (const char *id, CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalOfferId,
+                     CosTrading::UnknownOfferId,
+                     CosTrading::Register::ProxyOfferId));
 
   // BEGIN SPEC
   // The withdraw operation removes the service offer from the trader
@@ -390,17 +390,17 @@ public:
   // "id" is legal but there is no offer within the trader with that
   // "id," then an UnknownOfferId exception is raised. ° If the "id"
   // identifies a proxy offer rather than an ordinary offer, then a
-  // ProxyOfferId exception is raised. 
+  // ProxyOfferId exception is raised.
   // END SPEC
-  
+
   virtual CosTrading::Register::OfferInfo*
     describe (const char * id,
-	      CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId));
-  
+              CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalOfferId,
+                     CosTrading::UnknownOfferId,
+                     CosTrading::Register::ProxyOfferId));
+
   // BEGIN SPEC
   // The describe operation returns the information about an offered
   // service that is held by the trader. It comprises the "reference"
@@ -412,25 +412,25 @@ public:
   // raised. ° If the "id" is legal but there is no offer within the
   // trader with that "id," then an UnknownOfferId exception is
   // raised. ° If the "id" identifies a proxy offer rather than an
-  // ordinary offer, then a ProxyOfferId exception is raised. 
+  // ordinary offer, then a ProxyOfferId exception is raised.
   // END SPEC
-  
-  virtual void modify (const char * id, 
-		       const CosTrading::PropertyNameSeq& del_list, 
-		       const CosTrading::PropertySeq& modify_list,
-		       CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::NotImplemented, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::Register::UnknownPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::Register::MandatoryProperty, 
-		     CosTrading::Register::ReadonlyProperty, 
-		     CosTrading::DuplicatePropertyName));
+
+  virtual void modify (const char * id,
+                       const CosTrading::PropertyNameSeq& del_list,
+                       const CosTrading::PropertySeq& modify_list,
+                       CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::NotImplemented,
+                     CosTrading::IllegalOfferId,
+                     CosTrading::UnknownOfferId,
+                     CosTrading::Register::ProxyOfferId,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::Register::UnknownPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::Register::MandatoryProperty,
+                     CosTrading::Register::ReadonlyProperty,
+                     CosTrading::DuplicatePropertyName));
 
   // BEGIN SPEC
   // The modify operation is used to change the description of a
@@ -482,18 +482,18 @@ public:
   // DuplicatePropertyName exception is raised.
 
   // The NotImplemented exception shall be raised if and only if the
-  // supports_modifiable_properties attribute yields FALSE. 
+  // supports_modifiable_properties attribute yields FALSE.
   // END SPEC
-  
-  virtual void withdraw_using_constraint (const char *type, 
-					  const char *constr,
-					  CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::IllegalConstraint, 
-		     CosTrading::Register::NoMatchingOffers));
-  
+
+  virtual void withdraw_using_constraint (const char *type,
+                                          const char *constr,
+                                          CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::IllegalConstraint,
+                     CosTrading::Register::NoMatchingOffers));
+
   // BEGIN SPEC
   // The withdraw_using_constraint operation withdraws a set of offers
   // from within a single trader. This set is identified in the same
@@ -507,24 +507,24 @@ public:
   // service types, then an IllegalServiceType exception is raised. °
   // If the "type" is correct syntactically but is not recognized as a
   // service type by the trader, then an UnknownServiceType exception
-  // is raised. 
+  // is raised.
 
   // The constraint "constr" is the means by which the client
   // restricts the set of offers to those that are intended for
   // withdrawal. ° If "constr" does not obey the syntax rules for a
   // constraint then an IllegalConstraint exception is raised. ° If
   // the constraint fails to match with any offer of the specified
-  // service type, then a NoMatchingOffers exception is raised. 
+  // service type, then a NoMatchingOffers exception is raised.
   // END SPEC
-  
+
   virtual CosTrading::Register_ptr
     resolve (const CosTrading::TraderName &name,
-	     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::Register::IllegalTraderName, 
-		     CosTrading::Register::UnknownTraderName, 
-		     CosTrading::Register::RegisterNotSupported));
-  
+             CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::Register::IllegalTraderName,
+                     CosTrading::Register::UnknownTraderName,
+                     CosTrading::Register::RegisterNotSupported));
+
   // BEGIN SPEC
   // This operation is used to resolve a context relative name for
   // another trader. In particular, it is used when exporting to a
@@ -549,21 +549,21 @@ public:
   // END SPEC
 
  protected:
-  
+
   void validate_properties (const char* type,
-			    const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-			    const CosTrading::PropertySeq& properties,
-			    CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::MissingMandatoryProperty, 
-		     CosTrading::DuplicatePropertyName));
+                            const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
+                            const CosTrading::PropertySeq& properties,
+                            CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::MissingMandatoryProperty,
+                     CosTrading::DuplicatePropertyName));
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Register (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
-  
+
  private:
 
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_;
@@ -574,7 +574,7 @@ public:
   // *************************************************************
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-class TAO_Admin : 
+class TAO_Admin :
   public TAO_Trader_Components <POA_CosTrading::Admin>,
   public TAO_Support_Attributes <POA_CosTrading::Admin>,
   public TAO_Import_Attributes <POA_CosTrading::Admin>,
@@ -582,9 +582,9 @@ class TAO_Admin :
 //
 // = TITLE
 //     This class implements CosTrading::Admin IDL interface.
-// 
+//
 // = DESCRIPTION (FROM SPEC)
-// 
+//
 // The admin interface enables the values of the trader attributes to
 // be read and written. All attributes are defined as readonly in
 // either SupportAttributes, ImportAttributes, LinkAttributes, or
@@ -598,7 +598,7 @@ class TAO_Admin :
 // operations in the proxy interface. However, in this case, it does
 // have the effect of making any proxy offers exported via the proxy
 // interface for that trader unavailable to satisfy queries on that
-// trader's lookup interface. 
+// trader's lookup interface.
 {
 public:
 
@@ -609,95 +609,95 @@ public:
   // = Importing Parameters (used by the Lookup Interface)
 
   virtual CORBA::ULong set_def_search_card (CORBA::ULong value,
-					    CORBA::Environment &env)
+                                            CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_search_card (CORBA::ULong value,
-					    CORBA::Environment &env)
+                                            CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // search card is the cardinality of the offers searched for
-  // constraint compliance. 
+  // constraint compliance.
 
 
   virtual CORBA::ULong set_def_match_card (CORBA::ULong value,
-					    CORBA::Environment &env)
+                                            CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_match_card (CORBA::ULong value,
-					    CORBA::Environment &env)
+                                            CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // match card is the cardinality of offers found compliant with the
-  // constraints. 
+  // constraints.
 
   virtual CORBA::ULong set_def_return_card (CORBA::ULong value,
-					    CORBA::Environment &env)
+                                            CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_return_card (CORBA::ULong value,
-					    CORBA::Environment &env)
+                                            CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // return card is the cardinality of the offers returned from
   // Lookup.
 
   virtual CORBA::ULong set_max_list (CORBA::ULong value,
-				     CORBA::Environment &env)
+                                     CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_modifiable_properties (CORBA::Boolean value,
-					CORBA::Environment &env)
+                                        CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_dynamic_properties (CORBA::Boolean value,
-				     CORBA::Environment &env)
+                                     CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_proxy_offers (CORBA::Boolean value,
-			       CORBA::Environment &env)
+                               CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // Types of offers available for consideration. Ween out those
   // offers with modifiable properties
-  
+
   // = Link Interface parameters
 
   virtual CORBA::ULong set_def_hop_count (CORBA::ULong value,
-					  CORBA::Environment &env)
+                                          CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_hop_count (CORBA::ULong value,
-					  CORBA::Environment &env)
+                                          CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption
     set_def_follow_policy (CosTrading::FollowOption policy,
-			   CORBA::Environment &env)
+                           CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
     set_max_follow_policy (CosTrading::FollowOption policy,
-			   CORBA::Environment &env)
+                           CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
     set_max_link_follow_policy (CosTrading::FollowOption policy,
-				CORBA::Environment &env)
+                                CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   // = Set Type Repository
-  
+
   virtual CosTrading::TypeRepository_ptr
     set_type_repos (CosTrading::TypeRepository_ptr repository,
-		    CORBA::Environment& env)
+                    CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
     request_id_stem (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CosTrading::Admin::OctetSeq*
     set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
-			 CORBA::Environment& env)
+                         CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual void list_offers (CORBA::ULong how_many,
-			    CosTrading::OfferIdSeq_out ids,
-			    CosTrading::OfferIdIterator_out id_itr,
-			    CORBA::Environment& env) 
+                            CosTrading::OfferIdSeq_out ids,
+                            CosTrading::OfferIdIterator_out id_itr,
+                            CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::NotImplemented));
+                     CosTrading::NotImplemented));
 
 
   // BEGIN SPEC
@@ -715,27 +715,27 @@ public:
   // identifiers are to be returned via the "ids" result; any
   // remaining are available via the iterator interface. If the
   // "how_many" exceeds the number of offers held in the trader, then
-  // the "id_itr" is nil. 
+  // the "id_itr" is nil.
   // END SPEC
 
   virtual void list_proxies (CORBA::ULong how_many,
-			     CosTrading::OfferIdSeq_out ids,
-			     CosTrading::OfferIdIterator_out id_itr,
-			     CORBA::Environment& env)
+                             CosTrading::OfferIdSeq_out ids,
+                             CosTrading::OfferIdIterator_out id_itr,
+                             CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::NotImplemented));
+                     CosTrading::NotImplemented));
 
 private:
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Admin (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
-    
+
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_;
-  
+
   CosTrading::Admin::OctetSeq stem_id_;
   // Unique prefix to create a sequence number space.
-  
+
   CORBA::ULong sequence_number_;
   // Current sequence number.
 
@@ -747,7 +747,7 @@ private:
   // *************************************************************
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-class TAO_Link : 
+class TAO_Link :
   public TAO_Trader_Components <POA_CosTrading::Link>,
   public TAO_Support_Attributes <POA_CosTrading::Link>,
   public TAO_Link_Attributes <POA_CosTrading::Link>
@@ -757,22 +757,22 @@ public:
   TAO_Link (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
   ~TAO_Link (void);
-		
-  virtual void add_link (const char *name, 
-			 CosTrading::Lookup_ptr target, 
-			 CosTrading::FollowOption def_pass_on_follow_rule, 
-			 CosTrading::FollowOption limiting_follow_rule,
-			 CORBA::Environment& _env) 
+
+  virtual void add_link (const char *name,
+                         CosTrading::Lookup_ptr target,
+                         CosTrading::FollowOption def_pass_on_follow_rule,
+                         CosTrading::FollowOption limiting_follow_rule,
+                         CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::DuplicateLinkName, 
-		    CosTrading::InvalidLookupRef, 
-		    CosTrading::Link::DefaultFollowTooPermissive, 
-		    CosTrading::Link::LimitingFollowTooPermissive));
+                    CosTrading::Link::IllegalLinkName,
+                    CosTrading::Link::DuplicateLinkName,
+                    CosTrading::InvalidLookupRef,
+                    CosTrading::Link::DefaultFollowTooPermissive,
+                    CosTrading::Link::LimitingFollowTooPermissive));
   // BEGIN SPEC
   // The add_link operation allows a trader subsequently to use the
   // service of another trader in the performance of its own trading
-  // service operations. 
+  // service operations.
 
   // The "name" parameter is used in subsequent link management
   // operations to identify the intended link. If the parameter is not
@@ -807,14 +807,14 @@ public:
   // trader's "max_link_follow_policy" later in the life of a link, as
   // it is possible that the trader could set its
   // "max_link_follow_policy" to a more restrictive value after the
-  // creation of the link. 
+  // creation of the link.
   // END SPEC
-  
+
   virtual void remove_link (const char *name,
-			    CORBA::Environment& _env) 
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::UnknownLinkName));
+                    CosTrading::Link::IllegalLinkName,
+                    CosTrading::Link::UnknownLinkName));
 
   // BEGIN SPEC
   // The remove_link operation removes all knowledge of the target
@@ -824,14 +824,14 @@ public:
   // The "name" parameter identifies the link to be removed. The
   // exception IllegalLinkName is raised if the link is formed poorly
   // and the UnknownLinkName exception is raised if the named link is
-  // not in the trader. 
+  // not in the trader.
   // END SPEC
-  
+
   virtual CosTrading::Link::LinkInfo* describe_link (const char *name,
-						     CORBA::Environment&) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::UnknownLinkName));
+                                                     CORBA::Environment&)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    CosTrading::Link::IllegalLinkName,
+                    CosTrading::Link::UnknownLinkName));
 
   // BEGIN SPEC
   // The describe_link operation returns information on a link held in
@@ -853,9 +853,9 @@ public:
   // Operation" on page 16-45, most implementations will opt for
   // determining the Register interface when add_link is called and
   // storing that information statically with the rest of the link
-  // state. 
+  // state.
   // END SPEC
-  
+
   virtual CosTrading::LinkNameSeq* list_links (CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
@@ -863,17 +863,17 @@ public:
   // The list_links operation returns a list of the names of all
   // trading links within the trader. The names can be used
   // subsequently for other management operations, such as
-  // describe_link or remove_link. 
+  // describe_link or remove_link.
   // END SPEC
-  
-  virtual void modify_link (const char *name, 
-			    CosTrading::FollowOption def_pass_on_follow_rule, 
-			    CosTrading::FollowOption limiting_follow_rule,
-			    CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::UnknownLinkName, 
-		    CosTrading::Link::DefaultFollowTooPermissive, 
-		    CosTrading::Link::LimitingFollowTooPermissive));
+
+  virtual void modify_link (const char *name,
+                            CosTrading::FollowOption def_pass_on_follow_rule,
+                            CosTrading::FollowOption limiting_follow_rule,
+                            CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
+                    CosTrading::Link::UnknownLinkName,
+                    CosTrading::Link::DefaultFollowTooPermissive,
+                    CosTrading::Link::LimitingFollowTooPermissive));
 
   // BEGIN SPEC
   // The modify_link operation is used to change the existing link
@@ -895,15 +895,15 @@ public:
   // The "limiting_follow_rule" parameter specifies the new limit for
   // the follow behavior of this link. The exception
   // LimitingFollowTooPermissive is raised if the value exceeds the
-  // current "max_link_follow_policy" of the trader. 
+  // current "max_link_follow_policy" of the trader.
   // END SPEC
-  		
+
 private:
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Link (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
-  
+
   typedef ACE_Hash_Map_Manager
   <
   TAO_String_Hash_Key,
@@ -911,11 +911,11 @@ private:
   MAP_LOCK_TYPE
   >
   Links;
-  
+
   Links links_;
   // The collection of link connecting this trader to others in the
-  // federation. 
-  
+  // federation.
+
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_;
 };
 
@@ -924,7 +924,7 @@ private:
   // *************************************************************
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-class TAO_Proxy : 
+class TAO_Proxy :
   public TAO_Trader_Components <POA_CosTrading::Proxy>,
   public TAO_Support_Attributes <POA_CosTrading::Proxy>
 {
@@ -935,56 +935,56 @@ public:
   ~TAO_Proxy (void);
 
   virtual CosTrading::OfferId
-    export_proxy (CosTrading::Lookup_ptr target, 
-		  const char *type, 
-		  const CosTrading::PropertySeq& properties, 
-		  CORBA::Boolean if_match_all, 
-		  const char * recipe, 
-		  const CosTrading::PolicySeq& policies_to_pass_on,
-		  CORBA::Environment& _env) 
+    export_proxy (CosTrading::Lookup_ptr target,
+                  const char *type,
+                  const CosTrading::PropertySeq& properties,
+                  CORBA::Boolean if_match_all,
+                  const char * recipe,
+                  const CosTrading::PolicySeq& policies_to_pass_on,
+                  CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    CosTrading::InvalidLookupRef, 
-		    CosTrading::IllegalPropertyName, 
-		    CosTrading::PropertyTypeMismatch, 
-		    CosTrading::ReadonlyDynamicProperty, 
-		    CosTrading::MissingMandatoryProperty, 
-		    CosTrading::Proxy::IllegalRecipe, 
-		    CosTrading::DuplicatePropertyName, 
-		    CosTrading::DuplicatePolicyName));
+                    CosTrading::IllegalServiceType,
+                    CosTrading::UnknownServiceType,
+                    CosTrading::InvalidLookupRef,
+                    CosTrading::IllegalPropertyName,
+                    CosTrading::PropertyTypeMismatch,
+                    CosTrading::ReadonlyDynamicProperty,
+                    CosTrading::MissingMandatoryProperty,
+                    CosTrading::Proxy::IllegalRecipe,
+                    CosTrading::DuplicatePropertyName,
+                    CosTrading::DuplicatePolicyName));
 
   virtual void withdraw_proxy (const char *id,
-			       CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::IllegalOfferId, 
-		    CosTrading::UnknownOfferId, 
-		    CosTrading::Proxy::NotProxyOfferId));
+                               CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    CosTrading::IllegalOfferId,
+                    CosTrading::UnknownOfferId,
+                    CosTrading::Proxy::NotProxyOfferId));
 
   virtual CosTrading::Proxy::ProxyInfo *
   describe_proxy (const char *id,
-		  CORBA::Environment& _env) 
+                  CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalOfferId, 
-		    CosTrading::UnknownOfferId, 
-		    CosTrading::Proxy::NotProxyOfferId));
+                    CosTrading::IllegalOfferId,
+                    CosTrading::UnknownOfferId,
+                    CosTrading::Proxy::NotProxyOfferId));
 
-   // = CosTrading::TraderComponents methods. 
+   // = CosTrading::TraderComponents methods.
 
   virtual void list_proxies (CORBA::ULong how_many,
-			     CosTrading::OfferIdSeq*& ids,
-			     CosTrading::OfferIdIterator_ptr& id_itr,
-			     CORBA::Environment& env)
+                             CosTrading::OfferIdSeq*& ids,
+                             CosTrading::OfferIdIterator_ptr& id_itr,
+                             CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::NotImplemented));
-				
+                    CosTrading::NotImplemented));
+
 private:
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Proxy (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
 
-  
+
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index 0e873606bb9..3d640c2ef4d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -2,10 +2,10 @@
 
 // ========================================================================
 // $Id$
-// 
+//
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    Trader.h
 //
@@ -13,7 +13,7 @@
 //    Marina Spivak <marina@cs.wustl.edu>
 //    Seth Widoff <sbw1@cs.wustl.edu>
 //    Irfan Pyarali <irfan@cs.wustl.edu>
-//   
+//
 // ========================================================================
 
 #ifndef TAO_TRADER_H
@@ -35,8 +35,8 @@ class TAO_Trader : public TAO_Trader_Base
   //
   // = DESCRIPTION
   //     TAO_Trader contains all the components that together represent
-  //     a single trader.  Based on its constructor arguments, 
-  //     TAO_Trader creates instances of appropriate interface 
+  //     a single trader.  Based on its constructor arguments,
+  //     TAO_Trader creates instances of appropriate interface
   //     implementations as well as instances of objects common to
   //     more than one interface (offers, attributes, etc.).
   //     TAO_Trader also enforces the proper order on all
@@ -44,46 +44,46 @@ class TAO_Trader : public TAO_Trader_Base
   //     creates appropriate components, holds everything together,
   //     and enforces order. TAO_Trader is parameterized by two types
   //     of locks: one for its service service offers, one for its
-  //     state (configuration). 
-{    
+  //     state (configuration).
+{
 public:
 
-  // The desired combination of interfaces to be passed to the 
+  // The desired combination of interfaces to be passed to the
   // TAO_Trader constructor.
 
   typedef TAO_Offer_Database<MAP_LOCK_TYPE> Offer_Database;
   // Offer Database Trait.
 
   TAO_Trader (Trader_Components components = LOOKUP);
-  // Constructor which based on its arguments will create 
+  // Constructor which based on its arguments will create
   // a particular type of trader (e.g. Query trader, Simple trader, etc.)
   // The argument is a bitwise OR of desired Trader_Components as listed
   // in enumerated type above.
 
   virtual ~TAO_Trader (void);
   // destructor.
-  
+
   Offer_Database& offer_database (void);
   // Accessor for the structure with all the service offers.
 
   ACE_Lock &lock (void);
   // returns the trader
-  
-protected: 
-  
+
+protected:
+
   typedef TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> TRADER_SELF;
-  
-  Offer_Database offer_database_; 
+
+  Offer_Database offer_database_;
 
   ACE_Lock_Adapter<TRADER_LOCK_TYPE> lock_;
   // lock that guards the state of the trader (its configuration).
 
   enum { LOOKUP_IF, REGISTER_IF, ADMIN_IF, PROXY_IF, LINK_IF };
-  
+
   PortableServer::ServantBase* ifs_[5];
-  
+
 private:
-  
+
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> &))
 };
@@ -98,35 +98,35 @@ class TAO_Trader_Components : public virtual IF
 public:
 
   TAO_Trader_Components (const TAO_Trading_Components_i& comps);
-  
-  // = CosTrading::TraderComponents methods. 
+
+  // = CosTrading::TraderComponents methods.
   virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns an object reference to the Lookup interface of the trader.
   // Returns nil if the trader does not support Lookup interface.
-  
+
   virtual CosTrading::Register_ptr register_if (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Register interface of the trader.
   // Returns nil if the trader does not support Register interface.
-  
+
   virtual CosTrading::Link_ptr link_if (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException)); 
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Link interface of the trader.
   // Returns nil if the trader does not support Link interface.
 
   virtual CosTrading::Proxy_ptr proxy_if (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference to the Proxy interface of the trader.
-  // Returns nil if the trader does not support Proxy interface. 
-   
+  // Returns nil if the trader does not support Proxy interface.
+
   virtual CosTrading::Admin_ptr admin_if (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Admin interface of the trader.
   // Returns nil if the trader does not support Admin interface.
 
 private:
-  
+
   const TAO_Trading_Components_i& comps_;
 };
 
@@ -138,19 +138,19 @@ public:
   TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs);
 
   // = CosTrading::SupportAttributes methods.
-  
+
   virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
 
   const TAO_Support_Attributes_i& attrs_;
@@ -164,7 +164,7 @@ public:
   TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs);
 
   // = CosTrading::ImportAttributes methods.
-  
+
   virtual CORBA::ULong def_search_card (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
@@ -172,8 +172,8 @@ public:
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   // Search cardinality determines the maximum number of offers searched
-  // before not considering other offers. 
-  
+  // before not considering other offers.
+
   virtual CORBA::ULong def_match_card (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
@@ -182,17 +182,17 @@ public:
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
-  
+
   virtual CORBA::ULong def_return_card (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong max_return_card (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
-  // Return cardinality determines the maximum number of offers marked 
+  // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
-  
+
   virtual CORBA::ULong max_list (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
@@ -208,7 +208,7 @@ public:
   virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
 
   const TAO_Import_Attributes_i& attrs_;
@@ -224,7 +224,7 @@ public:
   // = CosTrading::LinkAttributes methods
   virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &env)
     TAO_THROW_SPEC ((CORBA::SystemException));
-    
+
 private:
 
   const TAO_Link_Attributes_i& attrs_;
@@ -238,20 +238,20 @@ template <class SEQ_TYPE>
 class TAO_Sequence_Extracter : private TAO_Sequence_Extracter_Base
 // = TITLE
 //  Happy hack to extract sequence data out of user defined sequence
-//  that may have x number of typedef aliases. 
+//  that may have x number of typedef aliases.
 {
  public:
 
   TAO_Sequence_Extracter (CORBA::TypeCode* type_code)
     : typecode_ (CORBA::TypeCode::_duplicate (type_code)) {}
-  
+
   CORBA::Boolean extract (const CORBA::Any&, SEQ_TYPE*&);
   // Extract the underlying sequence value into a newly allocated
   // sequence of type SEQ_TYPE. The any assumes ownership of the
   // sequence, so don't release it.
-  
+
  private:
-  
+
   CORBA::TypeCode_var typecode_;
 };
 
@@ -264,4 +264,4 @@ CORBA::Boolean TAO_find (const SEQ& sequence, const OPERAND_TYPE operand);
 #endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_TRADER_H */
-	
+
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 0d5abf78d88..5df0ea1dca6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    Trader_Utils.h
 //
@@ -25,7 +25,7 @@
 //   TAO_Property_Filter
 //   TAO_Property_Evaluator
 //   TAO_Property_Evaluator_By_Name
-// 
+//
 // ========================================================================
 
 #ifndef TAO_TRADER_UTILS_H
@@ -46,25 +46,25 @@ class TAO_ORBSVCS_Export TAO_Property_Evaluator
 //   for a static property, TAO_Property_Evaluator provides methods
 //   that will unify the two approaches under a single
 //   interface. Since dynamic properties aren't necessarily supported
-//   by a trader, this class accounts for that contingency. The use of 
+//   by a trader, this class accounts for that contingency. The use of
 //   indexed lookups allows them to occur in constant time on the
 //   CORBA sequences, but requires that the client know the layout of
-//   properties ahead of time. 
+//   properties ahead of time.
 {
 public:
-  
+
   TAO_Property_Evaluator(const CosTrading::PropertySeq& properties,
-			 CORBA::Boolean supports_dp = 1);
-  
+                         CORBA::Boolean supports_dp = 1);
+
   TAO_Property_Evaluator(CosTrading::Offer& offer,
-			 CORBA::Boolean supports_dp = 1);
+                         CORBA::Boolean supports_dp = 1);
   // Construct an instance of TAO_Property_Evaluator that operates on
   // an <offer> where the support for dynamic properties is dictated
   // by <supports_dynamic_properties>.
 
   virtual ~TAO_Property_Evaluator (void);
   // Clean up dynamic properties.
-  
+
   int is_dynamic_property(int index);
   // Returns 1 if the property at index <index> is dynamic. Returns a
   // 0 when the index is out of bounds.
@@ -73,28 +73,28 @@ public:
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // Returns value of the property whose index is <index>. If the
-  // property at that index is dynamic and the trader supports dynamic 
+  // property at that index is dynamic and the trader supports dynamic
   // properties, then the property_value method will obtain the value
   // of the dynamic property using the evalDP method on the
   // CosTradingDynamic::DynamicPropEval interface, passing on a
   // CosTradingDynamic::DPEvalFailure exception on failure. If the
   // property index is undefined, the method returns a null pointer.
-  
+
   CORBA::TypeCode_ptr property_type (int index);
   // Returns the type of the property whose index is <index>. If the
   // property is dynamic and the trader supports dynamic properties,
   // then the method returns the <returned_type> field of the
   // CosTradingDynamic::DynamicProp struct associated with the
-  // property name. If the index is out of bounds, the method returns 
+  // property name. If the index is out of bounds, the method returns
   // a null pointer (that is, 0).
-  
- protected:  
-  
+
+ protected:
+
   typedef CosTradingDynamic::DynamicProp DP_Struct;
   typedef CosTradingDynamic::DynamicPropEval DP_Eval;
-  
+
   const CosTrading::PropertySeq& props_;
-  // The offer from which the TAO_Property_Evaluator extracts property 
+  // The offer from which the TAO_Property_Evaluator extracts property
   // information.
 
   int supports_dp_;
@@ -105,7 +105,7 @@ public:
   // retrieved from dynamic properties and free them upon deletion. If
   // we didn't do this, then the property_value method would leak or
   // cause seg faults, since the client wouldn't be able to tell
-  // whether or not the return value should be freed.  
+  // whether or not the return value should be freed.
 
  private:
 
@@ -117,7 +117,7 @@ public:
   // TAO_Property_Evaluator_By_Name
   // *************************************************************
 
-class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name : 
+class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name :
   public TAO_Property_Evaluator
 //
 // = TITLE
@@ -133,13 +133,13 @@ class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name :
 public:
 
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
-				  CORBA::Environment& _env,
-				  CORBA::Boolean supports_dp = 1)
+                                  CORBA::Environment& _env,
+                                  CORBA::Boolean supports_dp = 1)
     TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName,
-		     CosTrading::IllegalPropertyName));
-  
+                     CosTrading::IllegalPropertyName));
+
   TAO_Property_Evaluator_By_Name(CosTrading::Offer& offer,
-				 CORBA::Boolean supports_dp = 1);
+                                 CORBA::Boolean supports_dp = 1);
   // Construct an instance of TAO_Property_Evaluator that operates on
   // an <offer> where the support for dynamic properties is dictated
   // by <supports_dynamic_properties>.
@@ -150,28 +150,28 @@ public:
   // will throw a Property_Undefined exception with impunity.
 
   CORBA::Any* property_value(const char* property_name,
-			     CORBA::Environment& _env)
+                             CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // This method is identical to its counterpart in
-  // TAO_Property_Evaluator, except property_value first discovers the 
+  // TAO_Property_Evaluator, except property_value first discovers the
   // index through a string matching lookup.
-  
+
   CORBA::TypeCode_ptr property_type(const char* property_name);
   // This method is identical to its counterpart in
   // TAO_Property_Evaluator, exception property_type first discovers
   // the index through a string matching lookup.
 
   const CosTrading::Property* get_property (const char* property_name);
-  
+
 private:
 
   TAO_Property_Evaluator_By_Name (const TAO_Property_Evaluator_By_Name&);
   TAO_Property_Evaluator_By_Name& operator= (const TAO_Property_Evaluator_By_Name&);
-  
+
   TAO_Lookup_Table table_;
   // The instance of the above mapping for the offer provided in the
-  // constructor. 
+  // constructor.
 };
 
   // *************************************************************
@@ -187,23 +187,23 @@ class TAO_ORBSVCS_Export TAO_Dynamic_Property :
 public:
 
   TAO_Dynamic_Property (void) {}
-  
+
   TAO_Dynamic_Property (const TAO_Dynamic_Property& dp) {}
-  
+
   virtual ~TAO_Dynamic_Property (void);
-  
+
   virtual CORBA::Any* evalDP(const char* name,
-			     CORBA::TypeCode_ptr returned_type,
-			     const CORBA::Any& extra_info,
-			     CORBA::Environment& _env) 
+                             CORBA::TypeCode_ptr returned_type,
+                             const CORBA::Any& extra_info,
+                             CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTradingDynamic::DPEvalFailure)) = 0;
+                     CosTradingDynamic::DPEvalFailure)) = 0;
   // Dynamic property evaluation call-back method.
-  
+
   CosTradingDynamic::DynamicProp*
-    construct_dynamic_prop (const char* name,			    
-			    CORBA::TypeCode_ptr returned_type,
-			    const CORBA::Any& extra_info);
+    construct_dynamic_prop (const char* name,
+                            CORBA::TypeCode_ptr returned_type,
+                            const CORBA::Any& extra_info);
   // Method to construct a dynamic property structure suitable for
   // exporting in a CosTrading::PropertyStruct to the Trading Service.
 };
@@ -218,11 +218,11 @@ class TAO_Policies
 // = TITLE
 // This class ensures that policies submitted to Lookup make sense,
 // have the correct value types, and don't exceed the maximums set
-// through the Admin Interface. 
+// through the Admin Interface.
 //
 // = DESCRIPTION
 // TAO_Policies does an admirable job of reconciling differences
-// between the default parameter settings of the Trader and the import 
+// between the default parameter settings of the Trader and the import
 // and other policies set by the client. Unbeknownst to its client
 // TAO_Policies hides this arbitration, and records whether the user
 // policy was chosen, or the default. This information gets returned
@@ -249,15 +249,15 @@ public:
   // This enum represents the relative order that properties are
   // passed from one trader to another. Hence, as recommended by the
   // spec, the starting_trader policies will be the first element in
-  // the polcy sequence if it's set for a query. 
-  
+  // the polcy sequence if it's set for a query.
+
   static const char * POLICY_NAMES[];
-  
+
   TAO_Policies (TAO_Trader_Base& trader,
-		const CosTrading::PolicySeq& policies,
-		CORBA::Environment& _env)
+                const CosTrading::PolicySeq& policies,
+                CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::DuplicatePolicyName));
+                     CosTrading::DuplicatePolicyName));
 
   // BEGIN SPEC
   // The "policies" parameter allows the importer to specify how the
@@ -278,11 +278,11 @@ public:
   // starting_trader policy value is malformed), then an
   // InvalidPolicyValue exception is raised. ° If the same policy name
   // is included two or more times in this parameter, then the
-  // DuplicatePolicyName exception is raised. 
+  // DuplicatePolicyName exception is raised.
   // END SPEC
 
   ~TAO_Policies (void);
-  
+
   CORBA::ULong search_card (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -294,7 +294,7 @@ public:
   // trader. If this policy is not specified, then the value of the
   // trader's def_search_card attribute is used.
   // END SPEC
-  
+
   CORBA::ULong match_card (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -306,7 +306,7 @@ public:
   // not specified, then the value of the trader's def_match_card
   // attribute is used.
   // END SPEC
-  
+
   CORBA::ULong return_card (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -316,11 +316,11 @@ public:
   // query. The lesser of this value and the trader's max_return_card
   // attribute is used by the trader. If this policy is not specified,
   // then the value of the trader's def_return_card attribute is
-  // used. 
+  // used.
   // END SPEC
-  
+
   // = Offer consideration policies
-  
+
   CORBA::Boolean use_modifiable_properties (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -333,7 +333,7 @@ public:
   // will not. If this policy is not specified, such offers will be
   // included.
   // END SPEC
-  
+
   CORBA::Boolean use_dynamic_properties (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -346,7 +346,7 @@ public:
   // will not. If this policy is not specified, such offers will be
   // included.
   // END SPEC
-  
+
   CORBA::Boolean use_proxy_offers (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -358,7 +358,7 @@ public:
   // will be included; if FALSE, they will not. If this policy is not
   // specified, such offers will be included.
   // END SPEC
-  
+
   CORBA::Boolean exact_type_match (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -368,12 +368,12 @@ public:
   // type; if not (and by default), then any offer of a type
   // conformant to the importer's service type is considered.
   // END SPEC
-  
+
   // = Federated trader policies (not implemented yet)
-  
+
   CosTrading::TraderName* starting_trader (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-		    CosTrading::Lookup::InvalidPolicyValue));
+                    CosTrading::Lookup::InvalidPolicyValue));
   // BEGIN SPEC
   // The "starting_trader" policy facilitates the distribution of the
   // trading service itself. It allows an importer to scope a search
@@ -397,25 +397,25 @@ public:
   // BEGIN SPEC
   //The "link_follow_rule" policy indicates how the client wishes
   //links to be followed in the resolution of its query. See the
-  //discussion in "Link Follow Behavior" on page 16-16 for details. 
+  //discussion in "Link Follow Behavior" on page 16-16 for details.
   // END SPEC
 
-  
+
   CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
-					     CORBA::Environment& _env) const
+                                             CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
+                     CosTrading::Lookup::InvalidPolicyValue,
                      CosTrading::Link::IllegalLinkName,
                      CosTrading::Link::UnknownLinkName));
   // Determine the link follow policy for a given <link_name>.
-  // This method returns the link_follow_rule for a link whose name is 
+  // This method returns the link_follow_rule for a link whose name is
   // <link_name> using the following formula:
   // if the importer specified a link_follow_rule policy
   //      min(trader.max_follow_policy, link.limiting_follow_rule,
   //          query.link_follow_rule)
   // else min(trader.max_follow_policy, link.limiting_follow_rule,
-  //          trader.def_follow_policy) 
-      
+  //          trader.def_follow_policy)
+
   CORBA::ULong hop_count (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -428,18 +428,18 @@ public:
   // the trader's def_hop_count attribute if it is not. If the
   // resulting value is zero, then no federated queries are
   // permitted. If it is greater than zero, then it must be
-  // decremented before passing on to a federated trader. 
+  // decremented before passing on to a federated trader.
   // END SPEC
 
   CosTrading::Admin::OctetSeq* request_id (CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Return the request_id passed to the query method across a link to
-  // another trader. 
+  // another trader.
 
   void copy_to_pass (CosTrading::PolicySeq& policy_seq,
                      const CosTrading::Admin::OctetSeq& request_id) const;
   // Policies to forward to the next trader in a federated query.
-  
+
   void copy_to_forward (CosTrading::PolicySeq& policy_seq,
                         const CosTrading::TraderName& name) const;
   // Policies to forward to the next trader in a directed query.
@@ -450,29 +450,29 @@ public:
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
   // Determine the link follow policy to pass down the link with <link_name>.
-  // This method returns the link_follow_rule for a link whose name is 
+  // This method returns the link_follow_rule for a link whose name is
   // <link_name> using the following formula:
   // If the importer specified a link_follow_rule, policy
   //      pass on min(query.link_follow_rule, link.limiting_follow_rule,
   //                  trader.max_follow_policy)
   // else pass on min(link.def_pass_on_follow_rule,
   //                  trader.max_follow_policy)
-  
-private:  
-  
+
+private:
+
   CORBA::ULong ulong_prop (POLICY_TYPE pol,
-			   CORBA::Environment& _env) const
+                           CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconclile a ULong property with its default.
-  
+
   CORBA::Boolean boolean_prop (POLICY_TYPE pol,
-			       CORBA::Environment& _env) const
+                               CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconcile a Boolean property with its debault.
 
   TAO_Policies (const TAO_Policies&);
   TAO_Policies& operator= (const TAO_Policies&);
-  
+
   CosTrading::Policy* policies_[TAO_NUM_POLICIES];
   // The policies indexable from the enumerated type.
 
@@ -488,7 +488,7 @@ class TAO_ORBSVCS_Export TAO_Policy_Manager
 // = TITLE
 //
 // This class is a utility for clients using the CosTrading::Lookup
-// interface that helps them build a policy sequence without violating 
+// interface that helps them build a policy sequence without violating
 // syntax rules and having to mess with typecodes.
 {
 public:
@@ -496,25 +496,25 @@ public:
   TAO_Policy_Manager (int num_policies = 0);
 
   // = Routines to set policies.
-  
+
   void search_card (CORBA::ULong scard);
   // Set the maximum number of offers searched for the query.
-  
+
   void match_card (CORBA::ULong mcard);
   // Set the maximum number of offers searched for the query.
-    
+
   void return_card (CORBA::ULong rcard);
-  // Set the maximum number of offers rerturned for the query. 
+  // Set the maximum number of offers rerturned for the query.
 
   // A note about cardinalities: The spec implies that these
   // cardinalities apply to the global office space, that is, all
   // offers on all linked traders. However, there's no mechanism for
   // one trader to return to the calling trader the number of offers
   // searched or matched. Thus, these cardinalities are applied on a
-  // per-trader basis. 
-  
+  // per-trader basis.
+
   void use_modifiable_properties (CORBA::Boolean mod_props);
-  // Consider offers with modifiable properties. 
+  // Consider offers with modifiable properties.
 
   void use_dynamic_properties (CORBA::Boolean dyn_props);
   // Consider offers with dynamic properties.
@@ -525,7 +525,7 @@ public:
   void starting_trader (const CosTrading::TraderName& name); // Copy
   void starting_trader (CosTrading::TraderName* name); // Own
   // Designate a trader at which to begin the query.
-  
+
   void link_follow_rule (CosTrading::FollowOption follow_option);
   // Specify under what conditions a federated query is appropriate.
 
@@ -534,7 +534,7 @@ public:
 
   void request_id (const CosTrading::Admin::OctetSeq& request_id);
   // Set the identifier for this query (clients shouldn't use this).
-  
+
   void exact_type_match (CORBA::Boolean exact_type);
   // Search only the designated type --- not it's subtypes.
 
@@ -544,19 +544,19 @@ public:
   const CosTrading::PolicySeq& policy_seq (void) const;
   // Return a PolicySeq suitable for passing to the query method of
   // the Lookup interface.
-  
+
 private:
 
   TAO_Policy_Manager (const TAO_Policy_Manager&);
   TAO_Policy_Manager& operator= (const TAO_Policy_Manager&);
-  
+
   CosTrading::Policy& fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type);
   // Method to prepare the next slot in the policies_ sequence for
   // policy insertion.
-  
+
   int poltable_[TAO_Policies::REQUEST_ID + 1];
   // Table mapping policy enum value to the index in the policies sequence.
-  
+
   CosTrading::PolicySeq policies_;
   // The sequence being prepared for submittal to the query method.
 
@@ -572,34 +572,34 @@ private:
 class TAO_Offer_Modifier
 // = TITLE
 //   This class deletes, modifies, and adds properties to a given
-//   offer according to the rules of the modify method on the Register 
+//   offer according to the rules of the modify method on the Register
 //   interface.
 {
 public:
 
   TAO_Offer_Modifier (const char* type,
-		      const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
-		      CosTrading::Offer* offer);
+                      const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
+                      CosTrading::Offer* offer);
   // Modify an <offer> of type <type>, whose properties are described
   // by <type_struct>
 
   ~TAO_Offer_Modifier (void);
 
   void delete_properties (const CosTrading::PropertyNameSeq& deletes,
-			  CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, 
-		    CosTrading::Register::MandatoryProperty,
-		    CosTrading::IllegalPropertyName,
-		    CosTrading::DuplicatePropertyName));
+                          CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
+                    CosTrading::Register::MandatoryProperty,
+                    CosTrading::IllegalPropertyName,
+                    CosTrading::DuplicatePropertyName));
   // Delete the properties whose names were given to the
   // constructor. Ensure we don't delete mandatory properties.
 
   void merge_properties (CosTrading::PropertySeq& modifies,
-			 CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,                     
+                         CORBA::Environment& _env)
+    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName,
                      CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty, 
+                     CosTrading::ReadonlyDynamicProperty,
                      CosTrading::Register::ReadonlyProperty));
   // Copy to the destination the union of the source and destination
   // properties. In the case of duplicate properties, update the
@@ -612,7 +612,7 @@ public:
 private:
 
   TAO_Offer_Modifier (const TAO_Offer_Modifier&);
-  TAO_Offer_Modifier& operator= (const TAO_Offer_Modifier&);  
+  TAO_Offer_Modifier& operator= (const TAO_Offer_Modifier&);
 
   typedef ACE_Hash_Map_Manager
     <
@@ -623,21 +623,21 @@ private:
     Property_Table;
 
   const char* type_;
-  // The type of the offer.  
-  
+  // The type of the offer.
+
   Property_Table props_;
   // The map of properties in the offer.
 
   TAO_Typecode_Table prop_types_;
   // Table of property types.
-  
+
   TAO_String_Set readonly_, mandatory_;
   // The set of readonly and mandatory property names in the offer's
   // type.
 
   CosTrading::PropertySeq merge_props_;
   // Sequence of properties to merge with the original.
-  
+
   CosTrading::Offer* offer_;
   // A reference to the offer undergoing change.
 };
@@ -651,7 +651,7 @@ class TAO_Offer_Filter
 //    The purpose of this class is to ensure that offers that
 //    shouldn't be considered by the TAO_Constraint_Interpreter
 //    aren't.
-// 
+//
 // = DESCRIPTION
 //    There two classes of reasons why an offer for a correct
 //    type shouldn't be considered: 1) The default parameters of the
@@ -660,39 +660,39 @@ class TAO_Offer_Filter
 //    readonly) or dynamic properties. 2) We've exceeded the
 //    default or provided cardinality constraints. TAO_Offer_Filter
 //    ensures that violation of policies doesn't occur. It's the
-//    enforcer. 
+//    enforcer.
 {
 public:
-  
+
   TAO_Offer_Filter (TAO_Policies& policies,
-		    CORBA::Environment& _env);
+                    CORBA::Environment& _env);
   // Glean from the TypeStruct and Policy setting the appropriate way
   // to screen unsuitable offers from consideration.
 
   void configure_type (CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct);
   // Set the offer filter to screen for offers containing properties
   // that aren't marked as readonly in this TypeStruct.
-  
+
   CORBA::Boolean ok_to_consider (CosTrading::Offer* offer);
   // Determine whether the poicies contained in the given policy
-  // object allow the Lookup interface to consider the offer. That is, 
+  // object allow the Lookup interface to consider the offer. That is,
   // if use_modifiable_properties is false, and the offer contains
   // modifiable properties as designated in the type struct, return
-  // false. If use_dynamic_properties is false, and the offer contains 
-  // dynamic properties, then return false. If the lookup interface is 
-  // safe in considering this offer, return true and subtract from the 
+  // false. If use_dynamic_properties is false, and the offer contains
+  // dynamic properties, then return false. If the lookup interface is
+  // safe in considering this offer, return true and subtract from the
   // search card value. When the search card value falls to zero,
   // ok_to_consider always returns false.
-  
+
   CORBA::Boolean ok_to_consider_more (void);
   // It's ok to consider more offers when lookup hasn't exceeded the
   // cardinality values for searching and matching offers.
 
   void matched_offer (void);
-  // Signal that the Lookup method has matched an offer; decrement the 
+  // Signal that the Lookup method has matched an offer; decrement the
   // match_card.
 
-  // = Return the limits applied.  
+  // = Return the limits applied.
   CosTrading::PolicyNameSeq* limits_applied (void);
   // BEGIN SPEC
   // If any cardinality or other limits were applied by one or more
@@ -701,27 +701,27 @@ public:
   // which limited the query. The sequence of names returned in
   // "limits_applied" from any federated or proxy queries must be
   // concatenated onto the names of limits applied locally and
-  // returned. 
+  // returned.
   // END SPEC
 
   CORBA::ULong search_card_remaining (void) const;
   CORBA::ULong match_card_remaining (void) const;
   // Accessors to retrieve the adjusted cardinalities.
-  
+
 private:
 
   TAO_Offer_Filter (const TAO_Offer_Filter&);
   TAO_Offer_Filter& operator= (const TAO_Offer_Filter&);
-  
+
   TAO_String_Set not_mod_props_;
   // The set of the name of modifiable properties.
 
   TAO_String_Set limits_;
   // Cardinality and property limitations applied.
-  
+
   CORBA::ULong search_card_, match_card_, return_card_;
   // Keep track of the cardinalities.
-  
+
   CORBA::Boolean dp_;
   CORBA::Boolean mod_;
   // Keep track of property limitations: modifiable or dynamic ones
@@ -737,7 +737,7 @@ class TAO_Property_Filter
 //
 //   The Ace_Property_Filter copies those properties specified in a
 //   CosTrading::Lookup::SpecifiedProps from a source
-//   CosTrading::Offer to a destination CosTrading::Offer. 
+//   CosTrading::Offer to a destination CosTrading::Offer.
 {
 public:
 
@@ -745,25 +745,25 @@ public:
 
   TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {}
   // An accomplice to g++'s insane lust for copy constructors.
-  
+
   TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
-		       CORBA::Environment& env)
+                       CORBA::Environment& env)
     TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName));
+                     CosTrading::DuplicatePropertyName));
   // Verify that the specified properties are correct.
 
   TAO_Property_Filter (const TAO_Property_Filter& prop_filter);
   TAO_Property_Filter& operator= (const TAO_Property_Filter& prop_filter);
-  
+
   void filter_offer (CosTrading::Offer* source,
                      CosTrading::Offer& destination);
   // Copy the desired properties from the source offer to the
   // destination offer.
-  
+
 private:
 
   typedef ACE_Unbounded_Queue< CosTrading::Property* > Prop_Queue;
-  
+
   TAO_String_Set props_;
   CosTrading::Lookup::HowManyProps policy_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
index 2ca6a91c499..fd8548f6f43 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
@@ -4,12 +4,16 @@
 // This file is generated automatically by
 // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
 // ------------------------------
-#if !defined (TAO_ORBSVCS_EXPORT_H)
+#ifndef TAO_ORBSVCS_EXPORT_H
 #define TAO_ORBSVCS_EXPORT_H
 
 #include "ace/OS.h"
 
-#if defined (TAO_ORBSVCS_HAS_DLL) 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (TAO_ORBSVCS_HAS_DLL)
 #  if (TAO_ORBSVCS_HAS_DLL == 1)
 #    if defined (TAO_ORBSVCS_BUILD_DLL)
 #      define TAO_ORBSVCS_Export ACE_Proper_Export_Flag
@@ -18,7 +22,7 @@
 #      define TAO_ORBSVCS_Export ACE_Proper_Import_Flag
 #      define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
 #    endif /* TAO_ORBSVCS_BUILD_DLL */
-#  else 
+#  else
 #    define TAO_ORBSVCS_Export
 #    define TAO_ORBSVCS_SINGLETON_DECLARATION(T)
 #  endif   /* ! TAO_ORBSVCS_HAS_DLL == 1 */
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.h b/TAO/orbsvcs/tests/AVStreams/benchmark/child.h
index 7a69562ebfb..3baf5852d47 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.h
@@ -1,9 +1,14 @@
 // $Id$
 
-#if !defined (TAO_AV_BENCH_CHILD_H)
+#ifndef TAO_AV_BENCH_CHILD_H
 #define TAO_AV_BENCH_CHILD_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
@@ -39,7 +44,7 @@ private:
   ACE_HANDLE control_handle_;
 };
 
-class Bench_Server_StreamEndPoint 
+class Bench_Server_StreamEndPoint
   :public  TAO_Server_StreamEndPoint
 {
 public:
@@ -54,17 +59,17 @@ public:
   virtual int handle_stop (const AVStreams::flowSpec &the_spec,
                             CORBA::Environment &env) ;
   // Application needs to define this
-  
-  virtual int handle_start (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_start (const AVStreams::flowSpec &the_spec,
                              CORBA::Environment &env) ;
   // Application needs to define this
 
-  
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,
                                CORBA::Environment &env) ;
   // Application needs to define this
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,
                                                       CORBA::Environment &env) ;
 private:
   ACE_SOCK_Connector connector_;
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
index 390c2016b27..6d4b8cdbc7a 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
@@ -4,10 +4,15 @@
 // NOTE: If you encounter trouble resolving the Naming Service, try
 // running the Naming Service and the server in the same window. [MJB]
 
-#if !defined (TAO_AV_BENCH_CLIENT_H)
+#ifndef TAO_AV_BENCH_CLIENT_H
 #define TAO_AV_BENCH_CLIENT_H
 
 #include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Event_Handler.h"
 #include "ace/ARGV.h"
 #include "tao/TAO.h"
@@ -43,26 +48,26 @@ public:
 
   virtual CORBA::Boolean handle_postconnect (AVStreams::flowSpec &the_spec);
   // called after connecting
-  
-  virtual int handle_start (const AVStreams::flowSpec &the_spec,  
-			    CORBA::Environment &env) ;
+
+  virtual int handle_start (const AVStreams::flowSpec &the_spec,
+                            CORBA::Environment &env) ;
 
   virtual int handle_stop (const AVStreams::flowSpec &the_spec,
-			   CORBA::Environment &env) ;
-  
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,  
-			      CORBA::Environment &env);
-  
+                           CORBA::Environment &env) ;
+
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,
+                              CORBA::Environment &env);
+
 };
 
 class ttcp_Client_StreamEndPoint;
 
-class ttcp_Acceptor 
+class ttcp_Acceptor
   :public virtual ACE_Acceptor <ttcp_Client_StreamEndPoint,ACE_SOCK_ACCEPTOR>
 {
 public:
   ttcp_Acceptor (ttcp_Client_StreamEndPoint *endpoint);
-  
+
   virtual int make_svc_handler (ttcp_Client_StreamEndPoint *&sh);
 private:
   ttcp_Client_StreamEndPoint *endpoint_;
@@ -88,15 +93,15 @@ public:
 private:
   ttcp_Acceptor acceptor_;
   // The Acceptor.
-  
+
   Client *client_;
 };
-class ttcp_Endpoint_Reactive_Strategy_A 
-  : public TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
+class ttcp_Endpoint_Reactive_Strategy_A
+  : public TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 {
 public:
   ttcp_Endpoint_Reactive_Strategy_A (TAO_ORB_Manager *orb_manager,
-				     Client *client_ptr);
+                                     Client *client_ptr);
   // constructor . The orb manager is needed for the TAO_AV_Endpoint_Reactive_Strategy_A.
 
   virtual int make_stream_endpoint (ttcp_Client_StreamEndPoint *& endpoint);
@@ -127,7 +132,7 @@ private:
   TAO_ORB_Manager orb_manager_;
 
   TAO_Naming_Client my_name_client_;
-  
+
   //  ttcp_Endpoint_Reactive_Strategy_A reactive_strategy_;
 
   TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
@@ -137,7 +142,7 @@ private:
   TAO_MMDevice client_mmdevice_;
 
   TAO_StreamCtrl streamctrl_;
-  // Video stream controller 
+  // Video stream controller
 
   int argc_;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.h b/TAO/orbsvcs/tests/AVStreams/benchmark/server.h
index 5c1f22b581e..d311a84a357 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.h
@@ -6,11 +6,16 @@
 // running the Naming Service and the server in the same window. [MJB]
 
 
-#if !defined (TAO_AV_BENCH_SERVER_H)
+#ifndef TAO_AV_BENCH_SERVER_H
 #define TAO_AV_BENCH_SERVER_H
 
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
@@ -23,7 +28,7 @@
 #include "client.h"
 #include "child.h"
 
-class AV_Server_Sig_Handler 
+class AV_Server_Sig_Handler
   : public virtual ACE_Event_Handler
 {
 public:
@@ -35,7 +40,7 @@ public:
   // this will register this sig_handler
   // with the reactor for SIGCHLD,SIGTERM,SIGINT
 
-  virtual int shutdown (ACE_HANDLE, 
+  virtual int shutdown (ACE_HANDLE,
                         ACE_Reactor_Mask);
 
   virtual int handle_input (ACE_HANDLE);
@@ -60,13 +65,13 @@ class Server
 public:
   Server (void);
   // Default constructor
-  
+
   int init (int argc,
             char **argv,
             CORBA::Environment& env);
-  
+
   int run (CORBA::Environment& env);
-  
+
   ~Server (void);
 private:
   TAO_ORB_Manager orb_manager_;
@@ -74,7 +79,7 @@ private:
 
   TAO_Naming_Client my_name_client_;
   // The TAO Naming server
-  
+
   //CosNaming::NamingContext_var naming_context_;
   // The root naming context of the naming service
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
index 2708154c055..140ba26e82c 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
@@ -1,33 +1,37 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
  *         Department of Computer Science and Engineering
  *         email: scen@cse.ogi.edu
  */
-#if !defined (_MPEG_COMMON_H)
+#ifndef _MPEG_COMMON_H
 #define _MPEG_COMMON_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 extern int gethostname (char*, size_t);
 
 #define VERSION 200   /* version 2.00 */
@@ -45,19 +49,19 @@ extern int gethostname (char*, size_t);
 
 /*
 #define LOG_DIR "/home/shanweic/log/"
-#define DEVELOPER_UID	8640
+#define DEVELOPER_UID   8640
 */
 
 /* %% this is where the logging is done.." */
 #define LOG_DIR "./"
-#define DEVELOPER_UID	1735
+#define DEVELOPER_UID   1735
 
-#define SFprintf	if ((!getuid()) || getuid() == DEVELOPER_UID) fprintf
-#define Fprintf		if (shared->config.verbose) fprintf
+#define SFprintf        if ((!getuid()) || getuid() == DEVELOPER_UID) fprintf
+#define Fprintf         if (shared->config.verbose) fprintf
 
-#define VCR_TCP_PORT 	7101
-#define VCR_UNIX_PORT 	"/tmp/vcr_unix_port01"
-#define VCR_ATM_PORT	"3005"
+#define VCR_TCP_PORT    7101
+#define VCR_UNIX_PORT   "/tmp/vcr_unix_port01"
+#define VCR_ATM_PORT    "3005"
 
 #define SPEEDUP_INV_SCALE 5  /* VS fast starts at 5/(5-1) normal speed */
 
@@ -71,15 +75,15 @@ extern int gethostname (char*, size_t);
 
 #define VD_BUF_SIZE (1024 * 1024)  /* Size of client VD buffer */
 
-#define PATH_SIZE 	256
-#define PATTERN_SIZE 	100
-#define MAX_FRAMES 	54000  /* half hour video at 30FPS */
+#define PATH_SIZE       256
+#define PATTERN_SIZE    100
+#define MAX_FRAMES      54000  /* half hour video at 30FPS */
 #define MAX_VDQUEUE_SIZE 20
-#define MAX_FB_PACKETS	20  /* max number of feedback packet info collected. */
-#define POSITION_RANGE 	100
-#define MSGGAP_MIN 	-10  /* these are used for recording stat of
-				msgs received by VB */
-#define MSGGAP_MAX	50
+#define MAX_FB_PACKETS  20  /* max number of feedback packet info collected. */
+#define POSITION_RANGE  100
+#define MSGGAP_MIN      -10  /* these are used for recording stat of
+                                msgs received by VB */
+#define MSGGAP_MAX      50
 
 #define INET_SOCKET_BUFFER_SIZE 1400
 
@@ -94,14 +98,14 @@ extern int gethostname (char*, size_t);
 
 /* Video and audio compression format */
 
-#define VIDEO_MPEG1	0
-#define VIDEO_MPEG2	1
-#define VIDEO_JPEG	3
-#define VIDEO_SIF	4
+#define VIDEO_MPEG1     0
+#define VIDEO_MPEG2     1
+#define VIDEO_JPEG      3
+#define VIDEO_SIF       4
 
-#define AUDIO_RAW	10
-#define AUDIO_MPEG1	11
-#define AUDIO_MPEG2	12
+#define AUDIO_RAW       10
+#define AUDIO_MPEG1     11
+#define AUDIO_MPEG2     12
 
 
 /* system configuration default values */
@@ -130,10 +134,10 @@ extern int gethostname (char*, size_t);
 
 typedef struct
 {
-  int	encodeType;
-  int	channels;
-  int	samplesPerSecond;
-  int	bytesPerSample;
+  int   encodeType;
+  int   channels;
+  int   samplesPerSecond;
+  int   bytesPerSample;
 } AudioParameter;
 
 /* client processes shared data structure definition */
@@ -145,14 +149,14 @@ typedef struct
   char * VBbufAddr, * VDbufAddr;
   int pixelValid;
   unsigned char pixel[256];  /* for transfering pixel value from VP to VD */
-  
+
   /* command and status   */
   int cmd;
   int cmdsn;
   int cmdBusy;
 
   int loopBack;
-  
+
   int framesPerSecond;   /* Frames per second */
   int usecPerFrame;    /* micro-seconds per frame, actual video speed */
   int samplesPerSecond;   /* Samples per second */
@@ -170,7 +174,7 @@ typedef struct
   int live;  /* non-zero if any of the video/audio streams are live source */
   int videoFormat;
   int audioFormat;
-  
+
   /*  video channel parameters  */
   int totalFrames;
   int totalGroups;
@@ -186,21 +190,21 @@ typedef struct
   char pattern[PATTERN_SIZE];
   int IframeGap;
   int VStimeAdvance;
-  
+
   int lastIframeDecoded;
   int sendPatternGops;
   char sendPattern[PATTERN_SIZE];
   float frameRateLimit;
   int framesDropped;
   int qosRecomputes;
-  
+
   /*  video channel status  */
   int currentGroup;
   int currentFrame;
   int currentDisplay;
   int nextFrame;
   int nextGroup;
-  
+
   /* audio channel parameters  */
   int totalSamples;
   AudioParameter audioPara;
@@ -214,87 +218,87 @@ typedef struct
   int currentUPF;
   int rtplay;           /* realtime tag, -- VD needs to drop frames when needed */
   int collectStat;  /* to indicate if statistics should be collected or not */
-  int VBheadFrame;	/* ID of last frame put to VBbuffer by VB */
+  int VBheadFrame;      /* ID of last frame put to VBbuffer by VB */
   int needHeader;   /* VD requests resending of systerm Header */
   int playRoundTripDelay; /* play round trip time (from issuing play/FF/FB
-			     command to first Decoded frame showup in
-			     VD buffer) estimated by CTR start_timer() */
-  int audioMaxPktSize;	/* 0 -- reliable byte stream,
-			   >0 - non-discard mode packet stream,
-			   <0 - discard mode packet stream */
+                             command to first Decoded frame showup in
+                             VD buffer) estimated by CTR start_timer() */
+  int audioMaxPktSize;  /* 0 -- reliable byte stream,
+                           >0 - non-discard mode packet stream,
+                           <0 - discard mode packet stream */
   int videoMaxPktSize;
 
   /* System configuration parameters */
   struct
   {
-    int rt;		/* play as fast as possible without dropping frames,
-			   and audio turned off when this tag is set to 0 (zero)
-				   */
-    int maxFPS;		/* maximum PLAY frames-per-second, this play speed is used
-			   during playback when speed scale is set to 100 */
+    int rt;             /* play as fast as possible without dropping frames,
+                           and audio turned off when this tag is set to 0 (zero)
+                                   */
+    int maxFPS;         /* maximum PLAY frames-per-second, this play speed is used
+                           during playback when speed scale is set to 100 */
     int maxSPS;         /* similar to maxFPS, used when audio is played without
-			   corresponding video
-			   */
-    int ffFPS;		/* play speed when Fast forward */
-    int fbFPS;		/* play speed when fast rewind */
+                           corresponding video
+                           */
+    int ffFPS;          /* play speed when Fast forward */
+    int fbFPS;          /* play speed when fast rewind */
     int feedBackDelay;  /* msec, delay of feedback when AB, VB received first
-			   packet, 0 (zero) default to adaptive */
+                           packet, 0 (zero) default to adaptive */
     int audioMask; /* mask for audio output device */
     AudioParameter audioPara; /* default audio parameter by system */
     int audioTimerDuration; /* for audio-only case, miliseconds */
     int audioBufferedIntervals; /* for audio-only case,
-				   audioTimerDuration * audioBufferedIntervals
-				   milliseconds of audio samples will be buffered
-				   in AF buffer
-				   */
+                                   audioTimerDuration * audioBufferedIntervals
+                                   milliseconds of audio samples will be buffered
+                                   in AF buffer
+                                   */
     int framesPerAudioPlay;   /* for audio-video case, each time, samples corresponding
-				 to this number of video frames will be played */
+                                 to this number of video frames will be played */
     int audioForward;    /* forward value for audio channel, in AFTime unit
-			    (number of samples), audio channel is played ahead of video
-			    by this number of samples. This is introduce to compensate
-			    the dely to AF in audio channel, and usually should be less
-			    than 1 (one) second, but greater than zero.
-			  */
+                            (number of samples), audio channel is played ahead of video
+                            by this number of samples. This is introduce to compensate
+                            the dely to AF in audio channel, and usually should be less
+                            than 1 (one) second, but greater than zero.
+                          */
     int VStimeAdvance;  /* target VB buffer level to be mentained (micro-seconds). This
-			   is sent in INIT message to VS, to decide how many frames to
-			   be maintained in VB buffer
-			  */
+                           is sent in INIT message to VS, to decide how many frames to
+                           be maintained in VB buffer
+                          */
     float frameRateLimit; /* playback frame rate limit (frames per second) */
     int collectStat;    /* tag to collect statistics to file 'stat.n' when set */
     int collectFrameInfo; /* collect MPEG frame info to file 'stat.n' when set*/
     int syncEffective;  /* tag to make sync mechanism effective when set */
     int qosEffective;   /* tag to make QoS control effective when set */
-    int audioOffset; 	/* offset added to audio channel 'nextSample' when play().
-			   usually audio and video are not recorded strictly
-			   synchronized. This parameter is to compensate it. The
-			   value can be any integer value.
-			 */
+    int audioOffset;    /* offset added to audio channel 'nextSample' when play().
+                           usually audio and video are not recorded strictly
+                           synchronized. This parameter is to compensate it. The
+                           value can be any integer value.
+                         */
     int filterPara;     /* 1/R of Median, nsamples of Mean and Average */
-    int maxSPframes;	/* max number of frame in a sendPattern */
-    int audioConn;	/* tag for connection oriented audio data channel */
-    int videoConn;	/* tag for connection oriented video data channel */
+    int maxSPframes;    /* max number of frame in a sendPattern */
+    int audioConn;      /* tag for connection oriented audio data channel */
+    int videoConn;      /* tag for connection oriented video data channel */
     int verbose;
   } config;
 
 #ifdef STAT
   struct
   {
-    unsigned VBmaxBytes;    	/* max fill level (bytes) in VB */
-    unsigned VBdroppedFrames;	/* accumulative total number of frames dropped by VB
-				   because VB buffer full */
-    unsigned VBemptyTimes;	/* number of time VD fail to get a frame from VB
-				   immediately */
+    unsigned VBmaxBytes;        /* max fill level (bytes) in VB */
+    unsigned VBdroppedFrames;   /* accumulative total number of frames dropped by VB
+                                   because VB buffer full */
+    unsigned VBemptyTimes;      /* number of time VD fail to get a frame from VB
+                                   immediately */
     unsigned VDnoRef;            /* # of frames without reference */
     unsigned VDagainstSendPattern; /* # of frames against send pattern */
     unsigned VDtooLateI;         /* # of I frames dropped 'cause too late */
     unsigned VDtooLateP;         /* # of P frames dropped 'cause too late */
     unsigned VDtooLateB;         /* # of B frames dropped 'cause too late */
-    unsigned VDlastFrameDecoded;	/* ID of last frame decoded by VD */
+    unsigned VDlastFrameDecoded;        /* ID of last frame decoded by VD */
     unsigned CTRdropLate;
     unsigned CTRdropOutOrder;
     unsigned CTRdispOnTime;
     unsigned CTRdispLate;
-    unsigned fbPacketNumber;	/* # packets sent by feedback mechanism */
+    unsigned fbPacketNumber;    /* # packets sent by feedback mechanism */
     struct {
       int frameId;
       int addUsecPerFrame;
@@ -303,14 +307,14 @@ typedef struct
       int framesDropped;
       float frameRateLimit;
       int advance;
-    } fbPackets[MAX_FB_PACKETS]; 	/* recording FB packet contents */
+    } fbPackets[MAX_FB_PACKETS];        /* recording FB packet contents */
     unsigned VDqueue[MAX_VDQUEUE_SIZE]; /* record number of frames with VD queue
-					   length of index number */
+                                           length of index number */
     int  VBmsgGaps[MSGGAP_MAX + 1 - MSGGAP_MIN]; /* # of ind-sized gaps between msgs */
     char VBframesReceived[(MAX_FRAMES + 7)/8];  /* bit array for frames received by VB */
-    char VDframesDecoded[(MAX_FRAMES + 7)/8];	/* bit array for frames decoded by VD */
-    char VPframesDisplayed[(MAX_FRAMES + 7)/8];	/* bit array for frames displayed by VP */
-    short VBfillLevel[MAX_FRAMES];	/* VB buffer fill level (frames) recorded by CTR */
+    char VDframesDecoded[(MAX_FRAMES + 7)/8];   /* bit array for frames decoded by VD */
+    char VPframesDisplayed[(MAX_FRAMES + 7)/8]; /* bit array for frames displayed by VP */
+    short VBfillLevel[MAX_FRAMES];      /* VB buffer fill level (frames) recorded by CTR */
   } stat;
 #endif
 } SharedData;
@@ -320,30 +324,30 @@ typedef struct
 /* GUI to CTR, (and also CTR to VS and/or AS) */
 
 #define CmdINIT 0    /* followed by: videoHost, videoPath, audioHost, audioPath
-			each item is passed as a string (without 0), led with length(int) */
-#define CmdINITaudio	1   /* for CTR-AS */
-#define CmdINITvideo	2   /* for CTR-VS */
+                        each item is passed as a string (without 0), led with length(int) */
+#define CmdINITaudio    1   /* for CTR-AS */
+#define CmdINITvideo    2   /* for CTR-VS */
 #define CmdSTOP 3
-#define CmdFF	4
-#define CmdFB	5
+#define CmdFF   4
+#define CmdFB   5
 #define CmdSTEP 6
-#define CmdPLAY	7
-#define CmdREF	20		/* this is for sending REFerence frame by VS
-				   for CmdSTEP and CmdPLAY */
-#define CmdPOSITION	8         /* followed by position */
-#define CmdPOSITIONrelease	9 /* followed by position */
-#define CmdVOLUME	10	  /* followed by position */
-#define CmdBALANCE	11	  /* followed by position */
-#define CmdSPEED	12	  /* followed by position */
-#define CmdLOOPenable	13
-#define CmdLOOPdisable	14
-#define CmdSTATstream	23   /* reply with { | type(byte) | size(int) }+ | */
-#define CmdSTATsent	24   /* reply with { | byte }+ | */
-#define CmdCLOSE	18
-#define CmdFAIL		19   /* followed by a string */
-
-#define CmdDONE		15	/* CTR to GUI:
-				   replay for accptance and execution of Above Cmd */
+#define CmdPLAY 7
+#define CmdREF  20              /* this is for sending REFerence frame by VS
+                                   for CmdSTEP and CmdPLAY */
+#define CmdPOSITION     8         /* followed by position */
+#define CmdPOSITIONrelease      9 /* followed by position */
+#define CmdVOLUME       10        /* followed by position */
+#define CmdBALANCE      11        /* followed by position */
+#define CmdSPEED        12        /* followed by position */
+#define CmdLOOPenable   13
+#define CmdLOOPdisable  14
+#define CmdSTATstream   23   /* reply with { | type(byte) | size(int) }+ | */
+#define CmdSTATsent     24   /* reply with { | byte }+ | */
+#define CmdCLOSE        18
+#define CmdFAIL         19   /* followed by a string */
+
+#define CmdDONE         15      /* CTR to GUI:
+                                   replay for accptance and execution of Above Cmd */
 
 #define CmdVPinitScreen 30    /* CTR to VP(GUI), audio-only screen clearning */
 #define CmdVPdisplayFrame 31  /* CTR to VP(GUI) to display the single frame in buffer */
@@ -375,7 +379,7 @@ typedef struct
 {
   int live;
   int format;
-  
+
   int totalHeaders;
   int totalFrames;
   int totalGroups;
@@ -508,7 +512,7 @@ typedef struct
 {
   int live;
   int format;
-  
+
   AudioParameter para;
   int totalSamples;
 } INITaudioReply;
@@ -575,7 +579,7 @@ typedef struct
 
 typedef struct {
   int sh, gop, frame, display, future, past;
-  int refcount;				 /* reference count    */
+  int refcount;                          /* reference count    */
   unsigned char * data;                  /* data buffer for image */
 } FrameBlock;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
index a972440bc29..b45b17c38ee 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
@@ -26,6 +26,10 @@
  */
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // ============================================================================
 //
 // = LIBRARY
@@ -45,7 +49,7 @@
 // ============================================================================
 
 
-#if !defined (AV_COMMAND_HANDLER_H)
+#ifndef AV_COMMAND_HANDLER_H
 #define AV_COMMAND_HANDLER_H
 
 #include "ace/Reactor.h"
@@ -76,7 +80,7 @@ class Receiver_i
 
   void push_audio_mmdevice (CORBA::Object_ptr mmdevice,
                             const char* audio_file,
-			    CORBA::Environment&);
+                            CORBA::Environment&);
 
  private:
   Command_Handler *command_handler_;
@@ -377,7 +381,7 @@ public:
 
   int operation_tag_;
   // operation tag for release/press for position.
-  
+
   int position_val_;
   // value of the position button.
 
@@ -473,7 +477,7 @@ public:
   int step (void);
 
   int play (int flag,
-	    CORBA::Environment& env);
+            CORBA::Environment& env);
 
   int position_action (int operation_tag);
 
@@ -566,7 +570,7 @@ private:
 
   Receiver_i receiver_;
   // Receive object,called by the  agent to give the mmdevice object
-  // reference. 
+  // reference.
 
   char *data_host_;
   // interface name to bind to for data transfer.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.h
index 37d2dfa93ce..da6f73bca54 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.h
@@ -2,17 +2,17 @@
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without written agreement is
  * hereby granted, provided that the above copyright notice and the following
  * two paragraphs appear in all copies of this software.
- * 
+ *
  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
@@ -32,6 +32,10 @@
 #include "util.h"
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /* Code for unbound values in decoding tables */
 #define ERROR -1
 #define DCT_ERROR 63
@@ -47,7 +51,7 @@
 #define END_OF_BLOCK 62
 #define ESCAPE 61
 
-/* Structure for an entry in the decoding table of 
+/* Structure for an entry in the decoding table of
  * macroblock_address_increment */
 typedef struct {
   unsigned int value;       /* value for macroblock_address_increment */
@@ -90,10 +94,10 @@ extern coded_block_pattern_entry coded_block_pattern[512];
 /* Structure for an entry in the decoding table of motion vectors */
 typedef struct {
   int code;              /* value for motion_horizontal_forward_code,
-			  * motion_vertical_forward_code, 
-			  * motion_horizontal_backward_code, or
-			  * motion_vertical_backward_code.
-			  */
+                          * motion_vertical_forward_code,
+                          * motion_horizontal_backward_code, or
+                          * motion_vertical_backward_code.
+                          */
   int num_bits;          /* length of the Huffman code */
 } motion_vectors_entry;
 
@@ -156,127 +160,127 @@ extern unsigned short int dct_coeff_first[256];
   flush_bits(dct_dc_size_chrominance[index].num_bits);   \
 }
 
-#define DecodeDCTCoeff(dct_coeff_tbl, run, level)			\
-{									\
-  unsigned int temp, index;						\
-  unsigned int value, next32bits, flushed;				\
-									\
-  /*									\
-   * Grab the next 32 bits and use it to improve performance of		\
-   * getting the bits to parse. Thus, calls are translated as:		\
-   *									\
-   *	show_bitsX  <-->   next32bits >> (32-X)				\
-   *	get_bitsX   <-->   val = next32bits >> (32-flushed-X);		\
-   *			   flushed += X;				\
-   *			   next32bits &= bitMask[flushed];		\
-   *	flush_bitsX <-->   flushed += X;				\
-   *			   next32bits &= bitMask[flushed];		\
-   *									\
-   * I've streamlined the code a lot, so that we don't have to mask	\
-   * out the low order bits and a few of the extra adds are removed.	\
-   */									\
-  show_bits32(next32bits);						\
-									\
-  /* show_bits8(index); */						\
-  index = next32bits >> 24;						\
-									\
-  if (index > 3) {							\
-    value = dct_coeff_tbl[index];					\
-    run = value >> RUN_SHIFT;						\
-    if (run != END_OF_BLOCK) {						\
-      /* num_bits = (value & NUM_MASK) + 1; */				\
-      /* flush_bits(num_bits); */					\
-      if (run != ESCAPE) {						\
-	 /* get_bits1(value); */					\
-	 /* if (value) level = -level; */				\
-	 flushed = (value & NUM_MASK) + 2;				\
-         level = (value & LEVEL_MASK) >> LEVEL_SHIFT;			\
-	 value = next32bits >> (32-flushed);				\
-	 value &= 0x1;							\
-	 if (value) level = -level;					\
-	 /* next32bits &= ((~0) >> flushed);  last op before update */	\
-       }								\
-       else {    /* run == ESCAPE */					\
-	 /* Get the next six into run, and next 8 into temp */		\
-         /* get_bits14(temp); */					\
-	 flushed = (value & NUM_MASK) + 1;				\
-	 temp = next32bits >> (18-flushed);				\
-	 /* Normally, we'd ad 14 to flushed, but I've saved a few	\
-	  * instr by moving the add below */				\
-	 temp &= 0x3fff;						\
-	 run = temp >> 8;						\
-	 temp &= 0xff;							\
-	 if (temp == 0) {						\
-            /* get_bits8(level); */					\
-	    level = next32bits >> (10-flushed);				\
-	    level &= 0xff;						\
-	    flushed += 22;						\
- 	    assert(level >= 128);					\
-	 } else if (temp != 128) {					\
-	    /* Grab sign bit */						\
-	    flushed += 14;						\
-	    level = ((int) (temp << 24)) >> 24;				\
-	 } else {							\
-            /* get_bits8(level); */					\
-	    level = next32bits >> (10-flushed);				\
-	    level &= 0xff;						\
-	    flushed += 22;						\
-	    level = level - 256;					\
-	    assert(level <= -128 && level >= -255);			\
-	 }								\
-       }								\
-       /* Update bitstream... */					\
-       flush_bits(flushed);						\
-       assert (flushed <= 32);						\
-    }									\
-  }									\
-  else {								\
-    if (index == 2) { 							\
-      /* show_bits10(index); */						\
-      index = next32bits >> 22;						\
-      value = dct_coeff_tbl_2[index & 3];				\
-    }									\
-    else if (index == 3) { 						\
-      /* show_bits10(index); */						\
-      index = next32bits >> 22;						\
-      value = dct_coeff_tbl_3[index & 3];				\
-    }									\
-    else if (index) {	/* index == 1 */				\
-      /* show_bits12(index); */						\
-      index = next32bits >> 20;						\
-      value = dct_coeff_tbl_1[index & 15];				\
-    }									\
-    else {   /* index == 0 */						\
-      /* show_bits16(index); */						\
-      index = next32bits >> 16;						\
-      value = dct_coeff_tbl_0[index & 255];				\
-    }									\
-    run = value >> RUN_SHIFT;						\
-    level = (value & LEVEL_MASK) >> LEVEL_SHIFT;			\
-									\
-    /*									\
-     * Fold these operations together to make it fast...		\
-     */									\
-    /* num_bits = (value & NUM_MASK) + 1; */				\
-    /* flush_bits(num_bits); */						\
-    /* get_bits1(value); */						\
-    /* if (value) level = -level; */					\
-									\
-    flushed = (value & NUM_MASK) + 2;					\
-    value = next32bits >> (32-flushed);					\
-    value &= 0x1;							\
-    if (value) level = -level;						\
-									\
-    /* Update bitstream ... */						\
-    flush_bits(flushed);						\
-    assert (flushed <= 32);						\
-  }									\
+#define DecodeDCTCoeff(dct_coeff_tbl, run, level)                       \
+{                                                                       \
+  unsigned int temp, index;                                             \
+  unsigned int value, next32bits, flushed;                              \
+                                                                        \
+  /*                                                                    \
+   * Grab the next 32 bits and use it to improve performance of         \
+   * getting the bits to parse. Thus, calls are translated as:          \
+   *                                                                    \
+   *    show_bitsX  <-->   next32bits >> (32-X)                         \
+   *    get_bitsX   <-->   val = next32bits >> (32-flushed-X);          \
+   *                       flushed += X;                                \
+   *                       next32bits &= bitMask[flushed];              \
+   *    flush_bitsX <-->   flushed += X;                                \
+   *                       next32bits &= bitMask[flushed];              \
+   *                                                                    \
+   * I've streamlined the code a lot, so that we don't have to mask     \
+   * out the low order bits and a few of the extra adds are removed.    \
+   */                                                                   \
+  show_bits32(next32bits);                                              \
+                                                                        \
+  /* show_bits8(index); */                                              \
+  index = next32bits >> 24;                                             \
+                                                                        \
+  if (index > 3) {                                                      \
+    value = dct_coeff_tbl[index];                                       \
+    run = value >> RUN_SHIFT;                                           \
+    if (run != END_OF_BLOCK) {                                          \
+      /* num_bits = (value & NUM_MASK) + 1; */                          \
+      /* flush_bits(num_bits); */                                       \
+      if (run != ESCAPE) {                                              \
+         /* get_bits1(value); */                                        \
+         /* if (value) level = -level; */                               \
+         flushed = (value & NUM_MASK) + 2;                              \
+         level = (value & LEVEL_MASK) >> LEVEL_SHIFT;                   \
+         value = next32bits >> (32-flushed);                            \
+         value &= 0x1;                                                  \
+         if (value) level = -level;                                     \
+         /* next32bits &= ((~0) >> flushed);  last op before update */  \
+       }                                                                \
+       else {    /* run == ESCAPE */                                    \
+         /* Get the next six into run, and next 8 into temp */          \
+         /* get_bits14(temp); */                                        \
+         flushed = (value & NUM_MASK) + 1;                              \
+         temp = next32bits >> (18-flushed);                             \
+         /* Normally, we'd ad 14 to flushed, but I've saved a few       \
+          * instr by moving the add below */                            \
+         temp &= 0x3fff;                                                \
+         run = temp >> 8;                                               \
+         temp &= 0xff;                                                  \
+         if (temp == 0) {                                               \
+            /* get_bits8(level); */                                     \
+            level = next32bits >> (10-flushed);                         \
+            level &= 0xff;                                              \
+            flushed += 22;                                              \
+            assert(level >= 128);                                       \
+         } else if (temp != 128) {                                      \
+            /* Grab sign bit */                                         \
+            flushed += 14;                                              \
+            level = ((int) (temp << 24)) >> 24;                         \
+         } else {                                                       \
+            /* get_bits8(level); */                                     \
+            level = next32bits >> (10-flushed);                         \
+            level &= 0xff;                                              \
+            flushed += 22;                                              \
+            level = level - 256;                                        \
+            assert(level <= -128 && level >= -255);                     \
+         }                                                              \
+       }                                                                \
+       /* Update bitstream... */                                        \
+       flush_bits(flushed);                                             \
+       assert (flushed <= 32);                                          \
+    }                                                                   \
+  }                                                                     \
+  else {                                                                \
+    if (index == 2) {                                                   \
+      /* show_bits10(index); */                                         \
+      index = next32bits >> 22;                                         \
+      value = dct_coeff_tbl_2[index & 3];                               \
+    }                                                                   \
+    else if (index == 3) {                                              \
+      /* show_bits10(index); */                                         \
+      index = next32bits >> 22;                                         \
+      value = dct_coeff_tbl_3[index & 3];                               \
+    }                                                                   \
+    else if (index) {   /* index == 1 */                                \
+      /* show_bits12(index); */                                         \
+      index = next32bits >> 20;                                         \
+      value = dct_coeff_tbl_1[index & 15];                              \
+    }                                                                   \
+    else {   /* index == 0 */                                           \
+      /* show_bits16(index); */                                         \
+      index = next32bits >> 16;                                         \
+      value = dct_coeff_tbl_0[index & 255];                             \
+    }                                                                   \
+    run = value >> RUN_SHIFT;                                           \
+    level = (value & LEVEL_MASK) >> LEVEL_SHIFT;                        \
+                                                                        \
+    /*                                                                  \
+     * Fold these operations together to make it fast...                \
+     */                                                                 \
+    /* num_bits = (value & NUM_MASK) + 1; */                            \
+    /* flush_bits(num_bits); */                                         \
+    /* get_bits1(value); */                                             \
+    /* if (value) level = -level; */                                    \
+                                                                        \
+    flushed = (value & NUM_MASK) + 2;                                   \
+    value = next32bits >> (32-flushed);                                 \
+    value &= 0x1;                                                       \
+    if (value) level = -level;                                          \
+                                                                        \
+    /* Update bitstream ... */                                          \
+    flush_bits(flushed);                                                \
+    assert (flushed <= 32);                                             \
+  }                                                                     \
 }
 
 #define DecodeDCTCoeffFirst(runval, levelval)         \
 {                                                     \
   DecodeDCTCoeff(dct_coeff_first, runval, levelval);  \
-}          
+}
 
 #define DecodeDCTCoeffNext(runval, levelval)          \
 {                                                     \
@@ -302,12 +306,12 @@ extern unsigned short int dct_coeff_first[256];
  *
  *--------------------------------------------------------------
  */
-#define DecodeMBAddrInc(val)				\
-{							\
-    unsigned int index;					\
-    show_bits11(index);					\
-    val = mb_addr_inc[index].value;			\
-    flush_bits(mb_addr_inc[index].num_bits);		\
+#define DecodeMBAddrInc(val)                            \
+{                                                       \
+    unsigned int index;                                 \
+    show_bits11(index);                                 \
+    val = mb_addr_inc[index].value;                     \
+    flush_bits(mb_addr_inc[index].num_bits);            \
 }
 
 /*
@@ -332,12 +336,12 @@ extern unsigned short int dct_coeff_first[256];
  *--------------------------------------------------------------
  */
 
-#define DecodeMotionVectors(value)			\
-{							\
-  unsigned int index;					\
-  show_bits11(index);					\
-  value = motion_vectors[index].code;			\
-  flush_bits(motion_vectors[index].num_bits);		\
+#define DecodeMotionVectors(value)                      \
+{                                                       \
+  unsigned int index;                                   \
+  show_bits11(index);                                   \
+  value = motion_vectors[index].code;                   \
+  flush_bits(motion_vectors[index].num_bits);           \
 }
 /*
  *--------------------------------------------------------------
@@ -361,18 +365,18 @@ extern unsigned short int dct_coeff_first[256];
  *
  *--------------------------------------------------------------
  */
-#define DecodeMBTypeB(quant, motion_fwd, motion_bwd, pat, intra)	\
-{									\
-  unsigned int index;							\
-									\
-  show_bits6(index);							\
-									\
-  quant = mb_type_B[index].mb_quant;					\
-  motion_fwd = mb_type_B[index].mb_motion_forward;			\
-  motion_bwd = mb_type_B[index].mb_motion_backward;			\
-  pat = mb_type_B[index].mb_pattern;					\
-  intra = mb_type_B[index].mb_intra;					\
-  flush_bits(mb_type_B[index].num_bits);				\
+#define DecodeMBTypeB(quant, motion_fwd, motion_bwd, pat, intra)        \
+{                                                                       \
+  unsigned int index;                                                   \
+                                                                        \
+  show_bits6(index);                                                    \
+                                                                        \
+  quant = mb_type_B[index].mb_quant;                                    \
+  motion_fwd = mb_type_B[index].mb_motion_forward;                      \
+  motion_bwd = mb_type_B[index].mb_motion_backward;                     \
+  pat = mb_type_B[index].mb_pattern;                                    \
+  intra = mb_type_B[index].mb_intra;                                    \
+  flush_bits(mb_type_B[index].num_bits);                                \
 }
 /*
  *--------------------------------------------------------------
@@ -395,21 +399,21 @@ extern unsigned short int dct_coeff_first[256];
  *
  *--------------------------------------------------------------
  */
-#define DecodeMBTypeI(quant, motion_fwd, motion_bwd, pat, intra)	\
-{									\
-  unsigned int index;							\
-  static int quantTbl[4] = {ERROR, 1, 0, 0};				\
-									\
-  show_bits2(index);							\
-									\
-  motion_fwd = 0;							\
-  motion_bwd = 0;							\
-  pat = 0;								\
-  intra = 1;								\
-  quant = quantTbl[index];						\
-  if (index) {								\
-    flush_bits (1 + quant);						\
-  }									\
+#define DecodeMBTypeI(quant, motion_fwd, motion_bwd, pat, intra)        \
+{                                                                       \
+  unsigned int index;                                                   \
+  static int quantTbl[4] = {ERROR, 1, 0, 0};                            \
+                                                                        \
+  show_bits2(index);                                                    \
+                                                                        \
+  motion_fwd = 0;                                                       \
+  motion_bwd = 0;                                                       \
+  pat = 0;                                                              \
+  intra = 1;                                                            \
+  quant = quantTbl[index];                                              \
+  if (index) {                                                          \
+    flush_bits (1 + quant);                                             \
+  }                                                                     \
 }
 /*
  *--------------------------------------------------------------
@@ -433,19 +437,19 @@ extern unsigned short int dct_coeff_first[256];
  *
  *--------------------------------------------------------------
  */
-#define DecodeMBTypeP(quant, motion_fwd, motion_bwd, pat, intra)	\
-{									\
-  unsigned int index;							\
-									\
-  show_bits6(index);							\
-									\
-  quant = mb_type_P[index].mb_quant;					\
-  motion_fwd = mb_type_P[index].mb_motion_forward;			\
-  motion_bwd = mb_type_P[index].mb_motion_backward;			\
-  pat = mb_type_P[index].mb_pattern;					\
-  intra = mb_type_P[index].mb_intra;					\
-									\
-  flush_bits(mb_type_P[index].num_bits);				\
+#define DecodeMBTypeP(quant, motion_fwd, motion_bwd, pat, intra)        \
+{                                                                       \
+  unsigned int index;                                                   \
+                                                                        \
+  show_bits6(index);                                                    \
+                                                                        \
+  quant = mb_type_P[index].mb_quant;                                    \
+  motion_fwd = mb_type_P[index].mb_motion_forward;                      \
+  motion_bwd = mb_type_P[index].mb_motion_backward;                     \
+  pat = mb_type_P[index].mb_pattern;                                    \
+  intra = mb_type_P[index].mb_intra;                                    \
+                                                                        \
+  flush_bits(mb_type_P[index].num_bits);                                \
 }
 /*
  *--------------------------------------------------------------
@@ -466,11 +470,11 @@ extern unsigned short int dct_coeff_first[256];
  *
  *--------------------------------------------------------------
  */
-#define DecodeCBP(coded_bp)						\
-{									\
-  unsigned int index;							\
-									\
-  show_bits9(index);							\
-  coded_bp = coded_block_pattern[index].cbp;				\
-  flush_bits(coded_block_pattern[index].num_bits);			\
+#define DecodeCBP(coded_bp)                                             \
+{                                                                       \
+  unsigned int index;                                                   \
+                                                                        \
+  show_bits9(index);                                                    \
+  coded_bp = coded_block_pattern[index].cbp;                            \
+  flush_bits(coded_block_pattern[index].num_bits);                      \
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h
index f11623f84a5..51320095ed5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h
@@ -2,17 +2,17 @@
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without written agreement is
  * hereby granted, provided that the above copyright notice and the following
  * two paragraphs appear in all copies of this software.
- * 
+ *
  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.h
index 6cf228bf60b..21991215259 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.h
@@ -2,17 +2,17 @@
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without written agreement is
  * hereby granted, provided that the above copyright notice and the following
  * two paragraphs appear in all copies of this software.
- * 
+ *
  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
@@ -21,6 +21,10 @@
  */
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 typedef struct {
   unsigned char value;
   int e1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.h
index 2109c6f6691..96a93ee1878 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.h
@@ -2,17 +2,17 @@
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without written agreement is
  * hereby granted, provided that the above copyright notice and the following
  * two paragraphs appear in all copies of this software.
- * 
+ *
  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
@@ -21,11 +21,15 @@
  */
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 typedef struct {
   unsigned char value;
   int e1;
-  int e2; 
+  int e2;
   int e3;
-  int e4; 
+  int e4;
 } FS4Dither;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h
index b7faf0b2827..40bb64b0985 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h
@@ -1,22 +1,22 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mibload.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mibload.h
index c421a53f167..085d1802ce0 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mibload.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mibload.h
@@ -41,42 +41,42 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */
 /*****************************************************************************/
 
 typedef struct _mib_Widget {
-  char		*mib_class;	/* name of mib class (Button, TextBox, etc..)*/
-  int		 mib_class_num; /* class number for ez reference :) */
-  int		 mib_mynum;	/* numbering for storage format */
-  Widget	 me;		/* Xt widget */
-  int		 mib_selected;	/* is selected */
-  int		 mib_resizing;  /* is resizing 1, or being moved 0 */
-  int		 mib_resizetype;/* 1  = upper left, 2 = upper, 3 = ... */
-  int		 mib_allowresize; /* can this widget be resized ? */
+  char          *mib_class;     /* name of mib class (Button, TextBox, etc..)*/
+  int            mib_class_num; /* class number for ez reference :) */
+  int            mib_mynum;     /* numbering for storage format */
+  Widget         me;            /* Xt widget */
+  int            mib_selected;  /* is selected */
+  int            mib_resizing;  /* is resizing 1, or being moved 0 */
+  int            mib_resizetype;/* 1  = upper left, 2 = upper, 3 = ... */
+  int            mib_allowresize; /* can this widget be resized ? */
 
-  int		 clkx, clky;	/* where user clicked */
+  int            clkx, clky;    /* where user clicked */
 
-  void		*myres;		/* my resources (different for each widget) */
+  void          *myres;         /* my resources (different for each widget) */
 
-  char		*name;		/* reference name of this widget */
-  int		 width, height;	/* width and height */
+  char          *name;          /* reference name of this widget */
+  int            width, height; /* width and height */
 
   int   topAttachment, bottomAttachment, leftAttachment, rightAttachment;
-				/* attachments 1=attached 0=not-attached */
+                                /* attachments 1=attached 0=not-attached */
 
   int   topOffset, bottomOffset, leftOffset, rightOffset;
-				/* offsets if attached */
+                                /* offsets if attached */
 
   struct _mib_Widget *parent;   /* pointer to parent */
   struct _mib_Widget *sibling;  /* remaining linked list of sibling widgets */
-  struct _mib_Widget *prev;	/* previous sibling or parent */
-  struct _mib_Widget *child;	/* linked list of children widgets */
+  struct _mib_Widget *prev;     /* previous sibling or parent */
+  struct _mib_Widget *child;    /* linked list of children widgets */
 } mib_Widget;
 
 /* mib_Buffer structure */
 /*****************************************************************************/
 
 typedef struct _mib_Buffer {
-  void  *buffer;	/* pointer to either a file or a char string */
-  int	 buf_type;	/* type of buffer (defined above) */
-  int	 point;		/* pointer for string */
-  int    buflen;	/* length of string buffer */
+  void  *buffer;        /* pointer to either a file or a char string */
+  int    buf_type;      /* type of buffer (defined above) */
+  int    point;         /* pointer for string */
+  int    buflen;        /* length of string buffer */
 } mib_Buffer;
 
 /* mib_Widget functions */
@@ -93,7 +93,7 @@ int mib_count_all(mib_Widget *, int);
 int mib_load_Root(Widget, mib_Widget **, mib_Buffer *);
 mib_Widget *mib_load_public(mib_Widget *, mib_Widget *, mib_Buffer *);
 int mib_load_mib_class(mib_Widget **, mib_Widget *, char *, char *,
-		mib_Buffer *);
+                mib_Buffer *);
 int mib_load_private(mib_Widget *, mib_Buffer *);
 void mib_reset_size(mib_Widget *);
 int mib_read_line(mib_Buffer *, char *, char *);
@@ -118,38 +118,38 @@ Widget BuildMenu(Widget, int, char *, char, MenuItem *);
 
 /* mib class numbers */
 
-#define MIB_NULL		0
-#define MIB_TEXTBOX		1
-#define MIB_BUTTON		2
-#define MIB_TOGGLE		3
-#define MIB_RADIOBOX		4
-#define MIB_DRAWINGAREA		5
-#define MIB_LABEL		6
-#define MIB_FRAME		7
-#define MIB_SCROLLBAR		8
-#define MIB_TEXTBIG		9
-#define MIB_LIST		10
-#define MIB_SCALE		11
-#define MIB_MENU		12
+#define MIB_NULL                0
+#define MIB_TEXTBOX             1
+#define MIB_BUTTON              2
+#define MIB_TOGGLE              3
+#define MIB_RADIOBOX            4
+#define MIB_DRAWINGAREA         5
+#define MIB_LABEL               6
+#define MIB_FRAME               7
+#define MIB_SCROLLBAR           8
+#define MIB_TEXTBIG             9
+#define MIB_LIST                10
+#define MIB_SCALE               11
+#define MIB_MENU                12
 
 /* number of classes */
-#define MI_NUMCLASSES		12
+#define MI_NUMCLASSES           12
 
 /* for specifying creation of a widget with
    default private values, no values at all (empty),
    or no values and editable */
 
-#define WDEFAULT		1
-#define WEMPTY			2
-#define WEDIT			3
+#define WDEFAULT                1
+#define WEMPTY                  2
+#define WEDIT                   3
 
 /* for specifing whether we are loading an
    interface from a file or from a string and whether it
    is editable :) */
 
-#define MI_FROMFILE		1
-#define MI_EDITFROMFILE		2
-#define MI_FROMSTRING		3
-#define MI_EDITFROMSTRING	4
+#define MI_FROMFILE             1
+#define MI_EDITFROMFILE         2
+#define MI_FROMSTRING           3
+#define MI_EDITFROMSTRING       4
 
-#define MI_MAXSTRLEN		200   /* maximum string length */
+#define MI_MAXSTRLEN            200   /* maximum string length */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h
index 7dab93d341d..9df0e313bbb 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h
@@ -1,22 +1,22 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h
index 762a66d184d..023cd981944 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h
@@ -2,7 +2,7 @@
 
 
 #ifdef __STDC__
-# define	P(s) s
+# define        P(s) s
 #else
 # define P(s) ()
 #endif
@@ -91,11 +91,11 @@ void GrayDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *
 
 /* mono.c */
 void MonoDitherImage(register unsigned char *lum, unsigned char *cr,
-		     unsigned char *cb, unsigned char *out,
-		     int h, int w);
+                     unsigned char *cb, unsigned char *out,
+                     int h, int w);
 void MonoThresholdImage(unsigned char *lum, unsigned char *cr,
-			unsigned char *cb, unsigned char *out,
-			int h, int w);
+                        unsigned char *cb, unsigned char *out,
+                        int h, int w);
 
 /* jrevdct.c */
 void init_pre_idct P((void ));
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.h
index b1ce065cc10..a77b5fdbb4e 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.h
@@ -9,9 +9,9 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */
 
 /* Author: Daeron Meyer */
 
-void	UICreate();
-void	UIEnd();
-Window	MonitorWindow();
+void    UICreate();
+void    UIEnd();
+Window  MonitorWindow();
 void    UISetwin(Window);
 void    UIMinsize(int, int);
 void    UISetFrame();
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
index 272e0add31d..3c68ea365cd 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
@@ -2,17 +2,17 @@
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without written agreement is
  * hereby granted, provided that the above copyright notice and the following
  * two paragraphs appear in all copies of this software.
- * 
+ *
  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
@@ -22,7 +22,7 @@
 
 /* Status codes for bit stream i/o operations. */
 
-#if !defined (AV_UTIL_H)
+#ifndef AV_UTIL_H
 #define AV_UTIL_H
 
 #define NO_VID_STREAM -1
@@ -199,13 +199,13 @@ extern unsigned int *bitBuffer;
 #define get_bitsn(num, result) get_bitsX((num), nBitMask[num], (32-(num)), result)
 
 #ifdef NO_SANITY_CHECKS
-#define show_bits32(result)                              		\
+#define show_bits32(result)                                             \
 {                                                                       \
-  if (bitOffset) {							\
-    result = curBits | (*(bitBuffer+1) >> (32 - bitOffset));		\
+  if (bitOffset) {                                                      \
+    result = curBits | (*(bitBuffer+1) >> (32 - bitOffset));            \
   }                                                                     \
   else {                                                                \
-    result = curBits;							\
+    result = curBits;                                                   \
   }                                                                     \
 }
 
@@ -224,17 +224,17 @@ extern unsigned int *bitBuffer;
 }
 
 #else
-#define show_bits32(result)                               		\
+#define show_bits32(result)                                             \
 {                                                                       \
   /* Check for underflow. */                                            \
   /* if (bufLength < 2) {                                               \
     correct_underflow();                                                \
   }  */                                                                 \
-  if (bitOffset) {							\
-    result = curBits | (*(bitBuffer+1) >> (32 - bitOffset));		\
+  if (bitOffset) {                                                      \
+    result = curBits | (*(bitBuffer+1) >> (32 - bitOffset));            \
   }                                                                     \
   else {                                                                \
-    result = curBits;							\
+    result = curBits;                                                   \
   }                                                                     \
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
index 13096759702..c8940e2a517 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
@@ -2,17 +2,17 @@
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without written agreement is
  * hereby granted, provided that the above copyright notice and the following
  * two paragraphs appear in all copies of this software.
- * 
+ *
  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
@@ -40,7 +40,7 @@ typedef char INT8;
 typedef unsigned int UINT32;
 typedef unsigned short UINT16;
 typedef unsigned char UINT8;
- 
+
 /* Define Parsing error codes. */
 
 #define SKIP_PICTURE -10
@@ -132,7 +132,7 @@ typedef struct GoP {
   unsigned int tc_seconds;               /* Second component of time code. */
   unsigned int tc_pictures;              /* Picture counter of time code.  */
   BOOLEAN closed_gop;                    /* Indicates no pred. vectors to
-					    previous group of pictures.    */
+                                            previous group of pictures.    */
   BOOLEAN broken_link;                   /* B frame unable to be decoded.  */
   char *ext_data;                        /* Extension data.                */
   char *user_data;                       /* User data.                     */
@@ -145,11 +145,11 @@ typedef struct pict {
   unsigned int code_type;                /* Frame type: P, B, I             */
   unsigned int vbv_delay;                /* Buffer delay.                   */
   BOOLEAN full_pel_forw_vector;          /* Forw. vectors specified in full
-					    pixel values flag.              */
+                                            pixel values flag.              */
   unsigned int forw_r_size;              /* Used for vector decoding.       */
   unsigned int forw_f;                   /* Used for vector decoding.       */
-  BOOLEAN full_pel_back_vector;          /* Back vectors specified in full 
-					    pixel values flag.              */
+  BOOLEAN full_pel_back_vector;          /* Back vectors specified in full
+                                            pixel values flag.              */
   unsigned int back_r_size;              /* Used in decoding.               */
   unsigned int back_f;                   /* Used in decoding.               */
   char *extra_info;                      /* Extra bit picture info.         */
@@ -212,12 +212,12 @@ typedef struct vid_stream {
   unsigned int vbv_buffer_size;                /* Minimum buffer size.       */
   BOOLEAN const_param_flag;                    /* Contrained parameter flag. */
   unsigned char intra_quant_matrix[8][8];      /* Quantization matrix for
-						  intracoded frames.         */
-  unsigned char non_intra_quant_matrix[8][8];  /* Quanitization matrix for 
-						  non intracoded frames.     */
+                                                  intracoded frames.         */
+  unsigned char non_intra_quant_matrix[8][8];  /* Quanitization matrix for
+                                                  non intracoded frames.     */
   char *ext_data;                              /* Extension data.            */
   char *user_data;                             /* User data.                 */
-  int gopid;             		       /* id of latest group id      */
+  int gopid;                                   /* id of latest group id      */
   GoP group;                                   /* Current group of pict.     */
   Pict picture;                                /* Current picture.           */
   Slice slice;                                 /* Current slice.             */
@@ -226,7 +226,7 @@ typedef struct vid_stream {
   int state;                                   /* State of decoding.         */
   int bit_offset;                              /* Bit offset in stream.      */
   unsigned int *buffer;                        /* Pointer to next byte in
-						  buffer.                    */
+                                                  buffer.                    */
   int buf_length;                              /* Length of remaining buffer.*/
   unsigned int *buf_start;                     /* Pointer to buffer start.   */
   int max_buf_length;                          /* Max lenght of buffer.      */
@@ -234,7 +234,7 @@ typedef struct vid_stream {
   PictImage *future;                           /* Future predictive frame.   */
   PictImage *current;                          /* Current frame.             */
   PictImage *ring[RING_BUF_SIZE];              /* Ring buffer of frames.     */
-} VidStream;   
+} VidStream;
 
 /* Declaration of global pointer to current video stream. */
 
@@ -257,14 +257,14 @@ extern char *ditherFlags;
 #define CONST_BITS 13
 
 /* Misc DCT definitions */
-#define DCTSIZE		8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	64	/* DCTSIZE squared; # of elements in a block */
+#define DCTSIZE         8       /* The basic DCT block is 8x8 samples */
+#define DCTSIZE2        64      /* DCTSIZE squared; # of elements in a block */
+
+#define GLOBAL                  /* a function referenced thru EXTERNs */
 
-#define GLOBAL			/* a function referenced thru EXTERNs */
-  
 typedef short DCTELEM;
 typedef DCTELEM DCTBLOCK[DCTSIZE2];
- 
+
 
 #ifdef SH_MEM
 extern int gXErrorFlag;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h
index 3b20908a333..050dd00c110 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h
@@ -37,47 +37,51 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */
 #include <Xm/MwmUtil.h>
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 
 /* Structure of mib_Widget */
 /*****************************************************************************/
 
 typedef struct _mib_Widget {
-  char		*mib_class;	/* name of mib class (Button, TextBox, etc..)*/
-  int		 mib_class_num; /* class number for ez reference :) */
-  int		 mib_mynum;	/* numbering for storage format */
-  Widget	 me;		/* Xt widget */
-  int		 mib_selected;	/* is selected */
-  int		 mib_resizing;  /* is resizing 1, or being moved 0 */
-  int		 mib_resizetype;/* 1  = upper left, 2 = upper, 3 = ... */
-  int		 mib_allowresize; /* can this widget be resized ? */
+  char          *mib_class;     /* name of mib class (Button, TextBox, etc..)*/
+  int            mib_class_num; /* class number for ez reference :) */
+  int            mib_mynum;     /* numbering for storage format */
+  Widget         me;            /* Xt widget */
+  int            mib_selected;  /* is selected */
+  int            mib_resizing;  /* is resizing 1, or being moved 0 */
+  int            mib_resizetype;/* 1  = upper left, 2 = upper, 3 = ... */
+  int            mib_allowresize; /* can this widget be resized ? */
 
-  int		 clkx, clky;	/* where user clicked */
+  int            clkx, clky;    /* where user clicked */
 
-  void		*myres;		/* my resources (different for each widget) */
+  void          *myres;         /* my resources (different for each widget) */
 
-  char		*name;		/* reference name of this widget */
-  int		 width, height;	/* width and height */
+  char          *name;          /* reference name of this widget */
+  int            width, height; /* width and height */
 
   int   topAttachment, bottomAttachment, leftAttachment, rightAttachment;
-				/* attachments 1=attached 0=not-attached */
+                                /* attachments 1=attached 0=not-attached */
 
   int   topOffset, bottomOffset, leftOffset, rightOffset;
-				/* offsets if attached */
+                                /* offsets if attached */
 
   struct _mib_Widget *parent;   /* pointer to parent */
   struct _mib_Widget *sibling;  /* remaining linked list of sibling widgets */
-  struct _mib_Widget *prev;	/* previous sibling or parent */
-  struct _mib_Widget *child;	/* linked list of children widgets */
+  struct _mib_Widget *prev;     /* previous sibling or parent */
+  struct _mib_Widget *child;    /* linked list of children widgets */
 } mib_Widget;
 
 /* mib_Buffer structure */
 /*****************************************************************************/
 
 typedef struct _mib_Buffer {
-  void  *buffer;	/* pointer to either a file or a char string */
-  int	 buf_type;	/* type of buffer (defined above) */
-  int	 point;		/* pointer for string */
-  int    buflen;	/* length of string buffer */
+  void  *buffer;        /* pointer to either a file or a char string */
+  int    buf_type;      /* type of buffer (defined above) */
+  int    point;         /* pointer for string */
+  int    buflen;        /* length of string buffer */
 } mib_Buffer;
 
 /* mib_Widget functions */
@@ -98,7 +102,7 @@ int mib_count_all(mib_Widget *, int);
 int mib_load_Root(Widget, mib_Widget **, mib_Buffer *);
 mib_Widget *mib_load_public(mib_Widget *, mib_Widget *, mib_Buffer *);
 int mib_load_mib_class(mib_Widget **, mib_Widget *, char *, char *,
-		mib_Buffer *);
+                mib_Buffer *);
 int mib_load_private(mib_Widget *, mib_Buffer *);
 void mib_reset_size(mib_Widget *);
 int mib_read_line(mib_Buffer *, char *, char *);
@@ -131,38 +135,38 @@ Widget BuildMenu(Widget, int, char *, char, MenuItem *);
 
 /* mib class numbers */
 
-#define MIB_NULL		0
-#define MIB_TEXTBOX		1
-#define MIB_BUTTON		2
-#define MIB_TOGGLE		3
-#define MIB_RADIOBOX		4
-#define MIB_DRAWINGAREA		5
-#define MIB_LABEL		6
-#define MIB_FRAME		7
-#define MIB_SCROLLBAR		8
-#define MIB_TEXTBIG		9
-#define MIB_LIST		10
-#define MIB_SCALE		11
-#define MIB_MENU		12
+#define MIB_NULL                0
+#define MIB_TEXTBOX             1
+#define MIB_BUTTON              2
+#define MIB_TOGGLE              3
+#define MIB_RADIOBOX            4
+#define MIB_DRAWINGAREA         5
+#define MIB_LABEL               6
+#define MIB_FRAME               7
+#define MIB_SCROLLBAR           8
+#define MIB_TEXTBIG             9
+#define MIB_LIST                10
+#define MIB_SCALE               11
+#define MIB_MENU                12
 
 /* number of classes */
-#define MI_NUMCLASSES		12
+#define MI_NUMCLASSES           12
 
 /* for specifying creation of a widget with
    default private values, no values at all (empty),
    or no values and editable */
 
-#define WDEFAULT		1
-#define WEMPTY			2
-#define WEDIT			3
+#define WDEFAULT                1
+#define WEMPTY                  2
+#define WEDIT                   3
 
 /* for specifing whether we are loading an
    interface from a file or from a string and whether it
    is editable :) */
 
-#define MI_FROMFILE		1
-#define MI_EDITFROMFILE		2
-#define MI_FROMSTRING		3
-#define MI_EDITFROMSTRING	4
+#define MI_FROMFILE             1
+#define MI_EDITFROMFILE         2
+#define MI_FROMSTRING           3
+#define MI_EDITFROMSTRING       4
 
-#define MI_MAXSTRLEN		200   /* maximum string length */
+#define MI_MAXSTRLEN            200   /* maximum string length */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibwidgets.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibwidgets.h
index 778e2338682..5d38ec199b8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibwidgets.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibwidgets.h
@@ -13,14 +13,14 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */
 /*****************************************************************************/
 
 typedef struct _mib_TextBox {
-  char  *init_contents;		/* initial text contents */
+  char  *init_contents;         /* initial text contents */
 
 } mib_TextBox;
 
 /* mib_TextBox functions */
 /*****************************************************************************/
 mib_Widget *mib_create_TextBox(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_TextBox(mib_Widget *);
 void mib_save_TextBox(mib_Widget *, FILE *);
 int mib_load_TextBox(mib_Widget *, mib_Buffer *);
@@ -30,14 +30,14 @@ int mib_load_TextBox(mib_Widget *, mib_Buffer *);
 /*****************************************************************************/
 
 typedef struct _mib_Button {
-  char *label;			/* label on button */
+  char *label;                  /* label on button */
 
 } mib_Button;
 
 /* mib_Button functions */
 /*****************************************************************************/
 mib_Widget *mib_create_Button(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_Button(mib_Widget *);
 void mib_save_Button(mib_Widget *, FILE *);
 int mib_load_Button(mib_Widget *, mib_Buffer *);
@@ -47,7 +47,7 @@ int mib_load_Button(mib_Widget *, mib_Buffer *);
 /*****************************************************************************/
 
 typedef struct _mib_Toggle {
-  char *label;			/* label on toggle */
+  char *label;                  /* label on toggle */
   int   isize;
 
 } mib_Toggle;
@@ -55,7 +55,7 @@ typedef struct _mib_Toggle {
 /* mib_Toggle functions */
 /*****************************************************************************/
 mib_Widget *mib_create_Toggle(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_Toggle(mib_Widget *);
 void mib_save_Toggle(mib_Widget *, FILE *);
 int mib_load_Toggle(mib_Widget *, mib_Buffer *);
@@ -64,9 +64,9 @@ int mib_load_Toggle(mib_Widget *, mib_Buffer *);
 /* Structure of mib_RadioBox */
 /*****************************************************************************/
 typedef struct _mib_RadioBox {
-  char **labels;		/* array of labels */
-  int    numlabel;		/* number of labels */
-  Widget *buttons;		/* pointers to each button */
+  char **labels;                /* array of labels */
+  int    numlabel;              /* number of labels */
+  Widget *buttons;              /* pointers to each button */
 
 } mib_RadioBox;
 
@@ -74,7 +74,7 @@ typedef struct _mib_RadioBox {
 
 /*****************************************************************************/
 mib_Widget *mib_create_RadioBox(mib_Widget *, char *, char*, int, int, int,
-					int, int);
+                                        int, int);
 void mib_delete_RadioBox(mib_Widget *);
 void mib_save_RadioBox(mib_Widget *, FILE *);
 int mib_load_RadioBox(mib_Widget *, mib_Buffer *);
@@ -83,14 +83,14 @@ int mib_load_RadioBox(mib_Widget *, mib_Buffer *);
 /* Structure of mib_DrawingArea */
 /*****************************************************************************/
 typedef struct _mib_DrawingArea {
-  int   nothing;	/* couldn't think of anything yet */
+  int   nothing;        /* couldn't think of anything yet */
 
 } mib_DrawingArea;
 
 /* mib_DrawingArea functions */
 /*****************************************************************************/
 mib_Widget *mib_create_DrawingArea(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_DrawingArea(mib_Widget *);
 void mib_save_DrawingArea(mib_Widget *, FILE *);
 int mib_load_DrawingArea(mib_Widget *, mib_Buffer *);
@@ -99,14 +99,14 @@ int mib_load_DrawingArea(mib_Widget *, mib_Buffer *);
 /* Structure of mib_Label */
 /*****************************************************************************/
 typedef struct _mib_Label {
-  char *label;		/* text in label */
+  char *label;          /* text in label */
 
 } mib_Label;
 
 /* mib_Label functions */
 /*****************************************************************************/
 mib_Widget *mib_create_Label(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_Label(mib_Widget *);
 void mib_save_Label(mib_Widget *, FILE *);
 int mib_load_Label(mib_Widget *, mib_Buffer *);
@@ -115,14 +115,14 @@ int mib_load_Label(mib_Widget *, mib_Buffer *);
 /* Structure of mib_Frame */
 /*****************************************************************************/
 typedef struct _mib_Frame {
-  int   shadowtype;	/* 0 = in, 1 = out, 2 = etched_in, 3 = etched_out  */
+  int   shadowtype;     /* 0 = in, 1 = out, 2 = etched_in, 3 = etched_out  */
 
 } mib_Frame;
 
 /* mib_Frame functions */
 /*****************************************************************************/
 mib_Widget *mib_create_Frame(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_Frame(mib_Widget *);
 void mib_save_Frame(mib_Widget *, FILE *);
 int mib_load_Frame(mib_Widget *, mib_Buffer *);
@@ -131,14 +131,14 @@ int mib_load_Frame(mib_Widget *, mib_Buffer *);
 /* Structure of mib_ScrollBar */
 /*****************************************************************************/
 typedef struct _mib_ScrollBar {
-  int	orientation;
+  int   orientation;
 
 } mib_ScrollBar;
 
 /* mib_ScrollBar functions */
 /*****************************************************************************/
 mib_Widget *mib_create_ScrollBar(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_ScrollBar(mib_Widget *);
 void mib_save_ScrollBar(mib_Widget *, FILE *);
 int mib_load_ScrollBar(mib_Widget *, mib_Buffer *);
@@ -147,7 +147,7 @@ int mib_load_ScrollBar(mib_Widget *, mib_Buffer *);
 /* Structure of mib_TextBig */
 /*****************************************************************************/
 typedef struct _mib_TextBig {
-  int	nothing;	/* couldn't think of anything yet */
+  int   nothing;        /* couldn't think of anything yet */
 
 } mib_TextBig;
 
@@ -169,7 +169,7 @@ typedef struct _mib_List {
 /* mib_List functions */
 /*****************************************************************************/
 mib_Widget *mib_create_List(mib_Widget *, char *, char *, int, int, int,
-				int, int);
+                                int, int);
 void mib_delete_List(mib_Widget *);
 void mib_save_List(mib_Widget *, FILE *);
 int mib_load_List(mib_Widget *, mib_Buffer *);
@@ -192,16 +192,16 @@ int mib_load_Scale(mib_Widget *, mib_Buffer *);
 /* Structure of mib_Menu */
 /*****************************************************************************/
 typedef struct _mib_Menu {
-  int       numitems;		/* number of items in menu*/
-  MenuItem *my_menu;		/* array of menu items */
-  Widget   *items;		/* pointers to each item */
+  int       numitems;           /* number of items in menu*/
+  MenuItem *my_menu;            /* array of menu items */
+  Widget   *items;              /* pointers to each item */
 
 } mib_Menu;
 
 /* mib_Menu functions */
 /*****************************************************************************/
 mib_Widget *mib_create_Menu(mib_Widget *, char *, char *, int, int, int,
-		int, int);
+                int, int);
 void mib_delete_Menu(mib_Widget *);
 void mib_save_Menu(mib_Widget *, FILE *);
 int mib_load_Menu(mib_Widget *, mib_Buffer *);
@@ -209,17 +209,17 @@ int mib_load_Menu(mib_Widget *, mib_Buffer *);
 /*****************************************************************************/
 
 typedef struct _mib_widget_funcs {
-  char		*name;
+  char          *name;
 #ifdef __cplusplus
-  mib_Widget	*(*mib_create)(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill);
-  void		 (*mib_delete)(mib_Widget *thisw);
-  void		 (*mib_save)(mib_Widget *thisw, FILE *fout);
-  int		 (*mib_load)(mib_Widget *thisw, mib_Buffer *fin);
+  mib_Widget    *(*mib_create)(mib_Widget *parent, char *name, char *label,
+                int posx, int posy, int width, int height, int mib_fill);
+  void           (*mib_delete)(mib_Widget *thisw);
+  void           (*mib_save)(mib_Widget *thisw, FILE *fout);
+  int            (*mib_load)(mib_Widget *thisw, mib_Buffer *fin);
 #else
-  mib_Widget	*(*mib_create)();
-  void		 (*mib_delete)();
-  void		 (*mib_save)();
-  int		 (*mib_load)();
+  mib_Widget    *(*mib_create)();
+  void           (*mib_delete)();
+  void           (*mib_save)();
+  int            (*mib_load)();
 #endif
 } mib_widget_funcs;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h
index e088d097403..e585f00f01b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h
@@ -1,10 +1,15 @@
 /* _*_ C++ _*_ */
 // $Id$
 
-#if !defined (_MPEG_AUDIO_CONTROL_STATE_H)
+#ifndef _MPEG_AUDIO_CONTROL_STATE_H
 #define _MPEG_AUDIO_CONTROL_STATE_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "mpeg_shared/Audio_ControlS.h"
 #include "Globals.h"
 
@@ -30,7 +35,7 @@ public:
 
   virtual CORBA::Boolean play (const Audio_Control::PLAYPara & para,
                                CORBA::Long_out ats) ;
-  
+
   virtual CORBA::Boolean speed (const Audio_Control::SPEEDPara & para) ;
 
   virtual CORBA::Boolean stop (CORBA::Long cmdsn) ;
@@ -38,13 +43,13 @@ public:
   virtual void close (void) ;
 protected:
   Audio_States state_;
-  // The state 
+  // The state
 
   Audio_Global *audio_global_;
   // Pointer to the global.
   Audio_Control_i *audio_control_i_;
 };
-      
+
 
 class Audio_Control_Waiting_State : public virtual Audio_Control_State
 {
@@ -72,8 +77,8 @@ public:
 };
 
 typedef ACE_Singleton <Audio_Control_Waiting_State, ACE_SYNCH_MUTEX>
-        AUDIO_CONTROL_WAITING_STATE;     
+        AUDIO_CONTROL_WAITING_STATE;
 typedef ACE_Singleton <Audio_Control_Play_State, ACE_SYNCH_MUTEX>
-        AUDIO_CONTROL_PLAY_STATE;        
+        AUDIO_CONTROL_PLAY_STATE;
 
 #endif /*_MPEG_AUDIO_CONTROL_STATE_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h
index d6c7c74c2d0..001bfccb423 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h
@@ -1,7 +1,7 @@
 /* _*_ C++ _*_ */
 //$Id$
 
-#if !defined (_AV_AUDIO_CONTROL_H)
+#ifndef _AV_AUDIO_CONTROL_H
 #define _AV_AUDIO_CONTROL_H
 
 #include "mpeg_shared/Audio_ControlS.h"
@@ -19,7 +19,7 @@ public:
 
   ~Audio_Control_i (void);
   // Default destructor
-  
+
   int create_handlers (void);
   // creates the data and sig handlers.
 
@@ -53,23 +53,23 @@ public:
   virtual void close (
       CORBA::Environment &_tao_environment
       ) ;
-  
+
   void change_state (Audio_Control_State *state);
   // Changes the state of the Audio Control object.
-  
+
   Audio_Control_State *get_state (void);
   // gets the state.
 private:
   int register_handlers (void);
-  
+
   ACE_Reactor *reactor_;
-  
+
   Audio_Control_State *state_;
-  
+
   Audio_Data_Handler *data_handler_;
-  
+
   Audio_Sig_Handler *sig_handler_;
-  
+
   ACE_SOCK_CODgram dgram_;
 
   Audio_Global *audio_global_;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h
index 8f80cf0834a..473827a2adb 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 //$Id$
 
-#if !defined (_AUDIO_SERVER_H)
+#ifndef _AUDIO_SERVER_H
 #define _AUDIO_SERVER_H
 
 #include <sys/types.h>
@@ -28,13 +28,18 @@
 #include "server_proto.h"
 
 #include "ace/SOCK_CODgram.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "tao/TAO.h"
 #include "mpeg_shared/Audio_ControlS.h"
 #include "orbsvcs/CosNamingC.h"
 #include "Globals.h"
 
-class Audio_Sig_Handler 
+class Audio_Sig_Handler
   : public virtual ACE_Event_Handler
 {
   // = TITLE
@@ -49,7 +54,7 @@ public:
   // this will register this sig_handler
   // with the reactor for SIGALRM
 
-  virtual int shutdown (ACE_HANDLE, 
+  virtual int shutdown (ACE_HANDLE,
                         ACE_Reactor_Mask);
 
   virtual int handle_input (ACE_HANDLE);
@@ -68,7 +73,7 @@ class Audio_Data_Handler : public virtual ACE_Event_Handler
 public:
   Audio_Data_Handler (ACE_HANDLE data_fd,
                       Audio_Global *audio_global);
-                      
+
   // Constructor
 
   virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
@@ -96,17 +101,17 @@ public:
   virtual int handle_stop (const AVStreams::flowSpec &the_spec,
                             CORBA::Environment &env) ;
   // Application needs to define this
-  
-  virtual int handle_start (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_start (const AVStreams::flowSpec &the_spec,
                              CORBA::Environment &env) ;
   // Application needs to define this
 
-  
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,
                                CORBA::Environment &env) ;
   // Application needs to define this
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,
                                                       CORBA::Environment &env) ;
 
 private:
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h
index 74f74cfb5d5..c7740c4ccda 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h
@@ -2,22 +2,22 @@
 // $Id$
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -25,24 +25,29 @@
  *         email: scen@cse.ogi.edu
  */
 
-#if !defined (MPEG_GLOBAL_H)
+#ifndef MPEG_GLOBAL_H
 #define MPEG_GLOBAL_H
 
 #include "ace/SOCK_CODgram.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Global symbols, these need to become enums eventually.
 
 #define SESSION_NUM     4
-#define CONN_INET	1
-#define CONN_UNIX	2
-#define CONN_ATM	3
+#define CONN_INET       1
+#define CONN_UNIX       2
+#define CONN_ATM        3
 
-#define SERVER_FDTABLE_SIZE	50
-#define CLIENT_FDTABLE_SIZE	10
+#define SERVER_FDTABLE_SIZE     50
+#define CLIENT_FDTABLE_SIZE     10
 
-#define STATE_PENDING	1
-#define STATE_CONTROL	2
-#define STATE_DATA	3
-#define STATE_SINGLE	4
+#define STATE_PENDING   1
+#define STATE_CONTROL   2
+#define STATE_DATA      3
+#define STATE_SINGLE    4
 
 #define min(a, b) ((a) > (b) ? (b) : (a))
 #define max(a, b) ((a) > (b) ? (a) : (b))
@@ -63,49 +68,49 @@
 
 // Global definitions
 #define nextByte  {int val; fileptr ++; \
-		   if ((val = getc(VIDEO_SINGLETON::instance ()->fp)) == EOF) \
-		   {\
-		     perror("Crossed EOF or error while scanning"); \
-		     return 1; \
-		   } nb = val;}
+                   if ((val = getc(VIDEO_SINGLETON::instance ()->fp)) == EOF) \
+                   {\
+                     perror("Crossed EOF or error while scanning"); \
+                     return 1; \
+                   } nb = val;}
 
 #define computePicSize \
-	if (inpic) \
-	{ \
-	  if (pictype == 'I') \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxI = max(VIDEO_SINGLETON::instance ()->maxI, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minI = min(VIDEO_SINGLETON::instance ()->minI, (int)(fileptr - picptr - 4)); \
-	  } \
-	  else if (pictype == 'P') \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxP = max(VIDEO_SINGLETON::instance ()->maxP, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minP = min(VIDEO_SINGLETON::instance ()->minP, (int)(fileptr - picptr - 4)); \
-	  } \
-	  else \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxB = max(VIDEO_SINGLETON::instance ()->maxB, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minB = min(VIDEO_SINGLETON::instance ()->minB, (int)(fileptr - picptr - 4)); \
-	  } \
-	  VIDEO_SINGLETON::instance ()->frameTable[ftptr].type = pictype; \
-	  VIDEO_SINGLETON::instance ()->frameTable[ftptr++].size = (int)(fileptr - picptr - 4); \
-	  inpic = 0; \
-	}
+        if (inpic) \
+        { \
+          if (pictype == 'I') \
+          { \
+            VIDEO_SINGLETON::instance ()->maxI = max(VIDEO_SINGLETON::instance ()->maxI, (int)(fileptr - picptr - 4)); \
+            VIDEO_SINGLETON::instance ()->minI = min(VIDEO_SINGLETON::instance ()->minI, (int)(fileptr - picptr - 4)); \
+          } \
+          else if (pictype == 'P') \
+          { \
+            VIDEO_SINGLETON::instance ()->maxP = max(VIDEO_SINGLETON::instance ()->maxP, (int)(fileptr - picptr - 4)); \
+            VIDEO_SINGLETON::instance ()->minP = min(VIDEO_SINGLETON::instance ()->minP, (int)(fileptr - picptr - 4)); \
+          } \
+          else \
+          { \
+            VIDEO_SINGLETON::instance ()->maxB = max(VIDEO_SINGLETON::instance ()->maxB, (int)(fileptr - picptr - 4)); \
+            VIDEO_SINGLETON::instance ()->minB = min(VIDEO_SINGLETON::instance ()->minB, (int)(fileptr - picptr - 4)); \
+          } \
+          VIDEO_SINGLETON::instance ()->frameTable[ftptr].type = pictype; \
+          VIDEO_SINGLETON::instance ()->frameTable[ftptr++].size = (int)(fileptr - picptr - 4); \
+          inpic = 0; \
+        }
 
 
 #define FileRead(position, buf, size) \
-	{ \
-	  if (fseek(VIDEO_SINGLETON::instance ()->fp, (position), 0) == -1) \
-	  { \
-	    perror("VS error on fseek VideoFile"); \
-	    return (-1); \
-	  } \
-	  while (fread((buf), (size), 1, VIDEO_SINGLETON::instance ()->fp) == 0) \
-	  { if (errno == EINTR) { errno = 0; continue;}\
+        { \
+          if (fseek(VIDEO_SINGLETON::instance ()->fp, (position), 0) == -1) \
+          { \
+            perror("VS error on fseek VideoFile"); \
+            return (-1); \
+          } \
+          while (fread((buf), (size), 1, VIDEO_SINGLETON::instance ()->fp) == 0) \
+          { if (errno == EINTR) { errno = 0; continue;}\
              perror("VS error on fread VideoFile"); \
              return (-1); \
-	  } \
-	}
+          } \
+        }
 
 #define CheckFrameRange(pnextFrame) \
 { if ((pnextFrame) < 0 || (pnextFrame) >= VIDEO_SINGLETON::instance ()->numF) \
@@ -121,7 +126,7 @@
 #include "include/common.h"
 #include "mpeg_shared/routine.h"
 #include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"   
+#include "mpeg_shared/com.h"
 #include "mpeg_shared/sendpt.h"
 #include "mpeg_server/server_proto.h"
 #include "mpeg_server/Video_Server.h"
@@ -205,7 +210,7 @@ public:
 
   int fileSize;
   int maxS;
-  int maxG;  
+  int maxG;
   int maxI;
   int maxP;
   int maxB;
@@ -252,7 +257,7 @@ public:
     char type;
     unsigned short size;
   } * frameTable;
- 
+
   int preGroup;
   int preHeader;
   int preFrame;
@@ -266,10 +271,10 @@ public:
   // globals functions
   int CmdRead (char *buf, int psize);
   int CmdWrite (char *buf, int size);
-  int SendPacket (int shtag, 
-                  int gop, 
-                  int frame, 
-                  int timeToUse, 
+  int SendPacket (int shtag,
+                  int gop,
+                  int frame,
+                  int timeToUse,
                   int first_time = 0);
   int FBread (char *buf, int size);
   int PLAYliveVideo (PLAYpara * para);
@@ -358,7 +363,7 @@ public:
     int addSamples;
     unsigned nextTime;
     int upp;  /* micro-seconds per packet */
-    int delta_sps ; 
+    int delta_sps ;
     // The members previously in PLAY audio.
 
     int bytes_sent ;
@@ -389,6 +394,6 @@ public:
 
 typedef ACE_Singleton <Audio_Global,ACE_SYNCH_MUTEX> AUDIO_GLOBAL;
 
-  
+
 #endif /* define MPEG_GLOBAL_H */
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h
index d9af5a73250..9363a48ea0d 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h
@@ -4,22 +4,22 @@
 
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -27,10 +27,15 @@
  *         email: scen@cse.ogi.edu
  */
 
-#if !defined (MPEG_VIDEO_CONTROL_STATE_H)
+#ifndef MPEG_VIDEO_CONTROL_STATE_H
 #define MPEG_VIDEO_CONTROL_STATE_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "mpeg_shared/Video_ControlS.h"
 #include "mpeg_server/Video_Control_i.h"
 
@@ -50,7 +55,7 @@ public:
   Video_Control_State (void);
   // constructor
 
-  enum Video_States 
+  enum Video_States
   {
     VIDEO_WAITING,
     VIDEO_PLAY = 1,
@@ -66,12 +71,12 @@ public:
 
   virtual CORBA::Boolean init_video (const Video_Control::INITvideoPara &para,
                                      Video_Control::INITvideoReply_out reply) ;
-  
+
   virtual CORBA::Boolean stat_stream (CORBA::Char_out ch,
                                       CORBA::Long_out size);
 
   virtual void  close (void);
-  
+
   virtual CORBA::Boolean stat_sent (void);
 
   virtual CORBA::Boolean fast_forward (const Video_Control::FFpara &para) ;
@@ -79,7 +84,7 @@ public:
   virtual CORBA::Boolean fast_backward (const Video_Control::FFpara &para) ;
 
   virtual CORBA::Boolean step (const Video_Control::STEPpara &para) ;
-  
+
   virtual CORBA::Boolean play (const Video_Control::PLAYpara &para,
                                CORBA::Long_out vts) ;
 
@@ -88,13 +93,13 @@ public:
   virtual CORBA::Boolean speed (const Video_Control::SPEEDpara &para) ;
 
   virtual CORBA::Boolean stop (CORBA::Long cmdsn) ;
- 
+
 protected:
   Video_States state_;
   // State of this object
 
   Video_Control_i *vci_;
- 
+
 };
 
 class Video_Control_Waiting_State : public virtual Video_Control_State
@@ -105,20 +110,20 @@ class Video_Control_Waiting_State : public virtual Video_Control_State
 public:
   Video_Control_Waiting_State (void);
   // Default constructor, sets the state to WAITING
-  
+
   virtual CORBA::Boolean stat_stream (CORBA::Char_out ch,
                                       CORBA::Long_out size);
-  
+
   virtual void close (void);
-  
+
   virtual CORBA::Boolean stat_sent (void);
-  
+
   virtual CORBA::Boolean fast_forward (const Video_Control::FFpara &para);
-  
+
   virtual CORBA::Boolean fast_backward (const Video_Control::FFpara &para);
 
   virtual CORBA::Boolean step (const Video_Control::STEPpara &para);
-  
+
 
   virtual CORBA::Boolean play (const Video_Control::PLAYpara &para,
                                CORBA::Long_out vts);
@@ -173,9 +178,9 @@ public:
 };
 
 typedef ACE_Singleton <Video_Control_Waiting_State, ACE_SYNCH_MUTEX>
-        VIDEO_CONTROL_WAITING_STATE;     
+        VIDEO_CONTROL_WAITING_STATE;
 typedef ACE_Singleton <Video_Control_Play_State, ACE_SYNCH_MUTEX>
-        VIDEO_CONTROL_PLAY_STATE;        
+        VIDEO_CONTROL_PLAY_STATE;
 typedef ACE_Singleton <Video_Control_Fast_Forward_State, ACE_SYNCH_MUTEX>
         VIDEO_CONTROL_FAST_FORWARD_STATE;
 typedef ACE_Singleton <Video_Control_Fast_Backward_State, ACE_SYNCH_MUTEX>
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
index 52e5d0f96b1..55b782a0e97 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (AV_VIDEO_CONTROL_H)
+#ifndef AV_VIDEO_CONTROL_H
 #define AV_VIDEO_CONTROL_H
 
 #include "mpeg_shared/Video_ControlS.h"
@@ -24,13 +24,13 @@ public:
   virtual CORBA::Boolean init_video (const Video_Control::INITvideoPara &para,
                                      Video_Control::INITvideoReply_out reply,
                                      CORBA::Environment &_tao_environment);
-  
+
   virtual CORBA::Boolean stat_stream (CORBA::Char_out ch,
                                       CORBA::Long_out size,
                                       CORBA::Environment &_tao_environment);
 
   virtual void close (CORBA::Environment &_tao_environment);
-  
+
   virtual CORBA::Boolean stat_sent (CORBA::Environment &_tao_environment);
 
   virtual CORBA::Boolean fast_forward (const Video_Control::FFpara &para,
@@ -42,7 +42,7 @@ public:
 
   virtual CORBA::Boolean step (const Video_Control::STEPpara &para,
                                CORBA::Environment &_tao_environment);
-  
+
   virtual CORBA::Boolean play (const Video_Control::PLAYpara &para,
                                CORBA::Long_out vts,
                                CORBA::Environment &_tao_environment);
@@ -58,14 +58,14 @@ public:
 
   virtual CORBA::Boolean set_peer (char * &peer,
                                    CORBA::Environment &_tao_environment);
-  // called by the client to inform us about it's ip and 
+  // called by the client to inform us about it's ip and
   // udp address.
 
   void change_state (Video_Control_State *state);
   // Used to change the state
 
   Video_Control_State *get_state (void);
-  // Accessor for the state_ 
+  // Accessor for the state_
 
   virtual ~Video_Control_i (void);
   // Destructor
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h
index e50b1ec373e..29ba6ea2d7a 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h
@@ -3,22 +3,22 @@
 
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -26,16 +26,21 @@
  *         email: scen@cse.ogi.edu
  */
 
-#if !defined (MPEG_VIDEO_SERVER_H)
+#ifndef MPEG_VIDEO_SERVER_H
 #define MPEG_VIDEO_SERVER_H
 
 #include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Event_Handler.h"
 
 #include "tao/TAO.h"
 #include "include/common.h"
 #include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"   
+#include "mpeg_shared/com.h"
 #include "mpeg_shared/routine.h"
 #include "mpeg_shared/sendpt.h"
 #include "mpeg_shared/Video_ControlS.h"
@@ -47,7 +52,7 @@
 
 class Video_Control_i;
 
-class Video_Sig_Handler 
+class Video_Sig_Handler
   : public virtual ACE_Event_Handler
 {
   // = TITLE
@@ -69,7 +74,7 @@ public:
   // this will register this sig_handler
   // with the reactor for SIGALRM
 
-  virtual int shutdown (ACE_HANDLE, 
+  virtual int shutdown (ACE_HANDLE,
                         ACE_Reactor_Mask);
 
   virtual int handle_input (ACE_HANDLE);
@@ -109,7 +114,7 @@ public:
 
 private:
   Video_Control_i *vci_;
-  
+
 };
 
 // The stream endpoint
@@ -126,22 +131,22 @@ public:
   virtual int handle_stop (const AVStreams::flowSpec &the_spec,
                             CORBA::Environment &env) ;
   // Application needs to define this
-  
-  virtual int handle_start (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_start (const AVStreams::flowSpec &the_spec,
                              CORBA::Environment &env) ;
   // Application needs to define this
 
-  
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,  
+
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,
                                CORBA::Environment &env) ;
   // Application needs to define this
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,  
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,
                                                       CORBA::Environment &env) ;
 
 private:
   ACE_SOCK_CODgram dgram_;
-  
+
 };
 
 #endif /* MPEG_VIDEO_SERVER_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h
index 12aab8421c5..2076b2921c5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h
@@ -1,22 +1,22 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -43,11 +43,11 @@ void LeaveLiveVideo(void);
              /* each child forked not doing live video should call this */
 void ExitLiveVideo(void);
 int OpenLiveVideo(int * format,
-		  int * width, int * height,
-		  int * averageFrameSize,
-		  double * fps,
-		  int * pelAspactRatio  /* MPEG1 encoding used here */
-		  );   /* -1 -- failed, 0 - succ */
+                  int * width, int * height,
+                  int * averageFrameSize,
+                  double * fps,
+                  int * pelAspactRatio  /* MPEG1 encoding used here */
+                  );   /* -1 -- failed, 0 - succ */
 void StartPlayLiveVideo(void);
 void StopPlayLiveVideo(void);
 int ReadLiveVideoPicture(int * frame, char * buf, int size); /* ret # bytes */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
index 98e82aeb26c..cf97b4b1796 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
@@ -1,22 +1,22 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -26,32 +26,32 @@
 /*
 Some assumptions about the streams created in this file:
 
-	PACKET STREAM:
-	
-		* send(), recv() may not work, we can only use
-		  read()/write().
-		
-		* write(): either send the whole packet, or send nothing
+        PACKET STREAM:
+
+                * send(), recv() may not work, we can only use
+                  read()/write().
+
+                * write(): either send the whole packet, or send nothing
 
-		* read(): read() will read the minimun of the
-		  requested number of bytes and current packet size.
-		  read() can read part of a packet, but it
-		  will not read cross packet boundaris
+                * read(): read() will read the minimun of the
+                  requested number of bytes and current packet size.
+                  read() can read part of a packet, but it
+                  will not read cross packet boundaris
 
-	    There are two modes: non-discard and dicard. If a packets is
-	          not read all its bytes, the remaining bytes will be
-		  or not be discarded.
+            There are two modes: non-discard and dicard. If a packets is
+                  not read all its bytes, the remaining bytes will be
+                  or not be discarded.
 
-		  This is indicated by if (*max_pkt_size) is positive
-		  (non-discard) or negative (discard)
+                  This is indicated by if (*max_pkt_size) is positive
+                  (non-discard) or negative (discard)
 
-	BYTE_STREAM: reliable
+        BYTE_STREAM: reliable
 
-		* write(): might write only part of requested bytes
-		  each time. (this is the case in SunOS4)
+                * write(): might write only part of requested bytes
+                  each time. (this is the case in SunOS4)
 
-		* read(): might read less than requested bytes.
-		  (this is the case in SunOS4).
+                * read(): might read less than requested bytes.
+                  (this is the case in SunOS4).
 */
 
 /* returns: -1 -- failed,  0 -- successful */
@@ -64,7 +64,7 @@ void ComCloseClient(void);
    "" -- UNIX socket, reliable byte stream
    [INET:]real_address -- INET sockets, reliable control byte stream, and
                           *max_pkt_size == 0 : reliable data byte stream, or
-			                != 0 : unreliable packet stream;
+                                        != 0 : unreliable packet stream;
    ATM:real_address -- ATM sockets, both data and control are
                        unreliable packet streams;
    DATM:real_address -- INET/UNIX control reliable byte stream
@@ -73,14 +73,14 @@ void ComCloseClient(void);
    returns: -1 -- failed,  0 -- successful
             *ctr_fd  -- control connection file descriptor
             *data_fd  -- data connection file descriptor
-	    *max_pkt_size -- == 0 : reliable BYTE_STREAM
-	                     > 0  : unreliable non-discard PACKET STREAM
-			            with given maximum packet size (bytes);
-			     < 0  : unreliable discard PACKET STREAM
-			            with given maximum packet size (bytes);
+            *max_pkt_size -- == 0 : reliable BYTE_STREAM
+                             > 0  : unreliable non-discard PACKET STREAM
+                                    with given maximum packet size (bytes);
+                             < 0  : unreliable discard PACKET STREAM
+                                    with given maximum packet size (bytes);
 
           It is suggested that if a BYTE_STREAM is not known to be discarded,
-	  than it is safer to indicate it as discard.
+          than it is safer to indicate it as discard.
    */
 int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size);
 int VideoComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h
index 46432a71797..640037cbd5c 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h
@@ -1,22 +1,22 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -25,7 +25,7 @@
  */
 /* data structure used by StatFile() */
 
-#if !defined (_MPEG_FILE_IO_H)
+#ifndef _MPEG_FILE_IO_H
 #define _MPEG_FILE_IO_H
 
 struct StatBuf
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
index 7befdfaa20d..673cf5a6804 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
@@ -1,31 +1,31 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
  *         Department of Computer Science and Engineering
  *         email: scen@cse.ogi.edu
  */
-#define FILTER_LOWPASS	0
-#define FILTER_MEDIAN	1
-#define FILTER_AVERAGE	2
+#define FILTER_LOWPASS  0
+#define FILTER_MEDIAN   1
+#define FILTER_AVERAGE  2
 
 typedef struct MedianFilter {
   int type;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
index 61a011217d9..fa55050458b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
@@ -1,22 +1,22 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -24,7 +24,7 @@
  *         email: scen@cse.ogi.edu
  */
 /* routine.c */
-#if !defined (_MPEG_ROUTINE_H)
+#ifndef _MPEG_ROUTINE_H
 #define _MPEG_ROUTINE_H
 
 #include "include/common.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h
index f7d2adae6e0..60935fae8ed 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h
@@ -1,22 +1,22 @@
 /* $Id$ */
 /* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
  * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of O.G.I. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  O.G.I. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *
+ * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: Shanwei Cen
@@ -31,5 +31,9 @@
 */
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 void ComputeSendPattern(char * pat, char * buf, int len, int f);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.h
index 79072ae4877..99c6079a419 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.h
@@ -9,7 +9,7 @@
 // = DESCRIPTION
 //    As a trading service dynamic property, retrieves machine
 //    statistics from the rstatd using Sun RPC.
-// 
+//
 // = AUTHORS
 //    Seth Widoff <sbw1@cs.wustl.edu>
 //
@@ -31,7 +31,7 @@ class TAO_Machine_Properties :
 {
 public:
 
-  enum PROP_TYPES 
+  enum PROP_TYPES
   {
     CPU,
     DISK,
@@ -47,11 +47,11 @@ public:
 
   static const int NUM_PROPERTIES;
   static const char* PROP_NAMES[];
-  
+
   TAO_Machine_Properties (void);
-  
-  TAO_Machine_Properties (const ACE_Time_Value& timeout);   
-  
+
+  TAO_Machine_Properties (const ACE_Time_Value& timeout);
+
   virtual CORBA::Any* evalDP (const char* name,
                               CORBA::TypeCode_ptr returned_type,
                               const CORBA::Any& extra_info,
@@ -66,11 +66,11 @@ public:
   virtual int define_properties
     (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_seq,
      CORBA::ULong offset = 0) const;
-  
+
 private:
 
   void init (void);
-  
+
   int retrieve_stats (void);
 
   void compute_cpu (CORBA::Any& value, int elapsed_time);
@@ -83,15 +83,15 @@ private:
   void compute_collisions (CORBA::Any& value, int elapsed_time);
   void compute_interrupts (CORBA::Any& value, int elapsed_time);
   void compute_load (CORBA::Any& value, int elapsed_time);
-  
-  const ACE_Time_Value timeout_;  
+
+  const ACE_Time_Value timeout_;
   ACE_Time_Value timestamp_;
   ACE_Time_Value sample_time_;
-  
+
   statstime stats_;
   statstime old_stats_;
   CLIENT* rstat_client_;
-  
+
 };
 
 #endif /* TAO_MACHINE_PROPERTIES */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h
index 3db368a5bb5..4c236f3e8bb 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h
@@ -2,7 +2,7 @@
 
 // ========================================================================
 // $Id$
-// 
+//
 // = LIBRARY
 //    TAO/orbsvcs/orbsvcs
 //
@@ -12,13 +12,13 @@
 // = DESCRIPTION
 //    Allows a service to export properties to both a Property Set and
 //    a Trading Service simulatenously.
-//    
+//
 // = AUTHORS
 //    Seth Widoff <sbw1@cs.wustl.edu>
 //
 // ========================================================================
 
-#if ! defined (TAO_PROPERTY_EXPORTER_H)
+#ifndef TAO_PROPERTY_EXPORTER_H
 #define TAO_PROPERTY_EXPORTER_H
 
 #include "orbsvcs/CosTradingC.h"
@@ -42,13 +42,13 @@ public:
     (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_seq,
      CORBA::ULong offset = 0) const = 0;
   // Append property definitions to the service type defintition
-  // sequence. The <offset> is the point at which the method can begin 
+  // sequence. The <offset> is the point at which the method can begin
   // placing the PropStructures. define_properties returns the number
   // of properties inserted from the offset.
 };
 
 
-class TAO_Property_Exporter 
+class TAO_Property_Exporter
 // = TITLE
 //   Publish public properties of a servant to a
 //   CosPropertyService::PropSet instance and a Trading Service
@@ -62,82 +62,82 @@ class TAO_Property_Exporter
  public:
 
   TAO_Property_Exporter (CosTrading::Lookup_var lookup_if,
-			 CosPropertyService::PropertySet_ptr prop_set,
-			 CORBA::ULong initial_size = 10);
-  
-  
+                         CosPropertyService::PropertySet_ptr prop_set,
+                         CORBA::ULong initial_size = 10);
+
+
   ~TAO_Property_Exporter (void);
   // Delete all Dynamic Property adapters
-  
+
   void add_static_property (const char* name,
-			    const CORBA::Any& value);
+                            const CORBA::Any& value);
   // Add a property to the Offer and the PropSet.
-  
+
   void add_dynamic_property (const char* name,
-			     const CORBA::Any& intial_value,
-			     TAO_Dynamic_Property& dp);
+                             const CORBA::Any& intial_value,
+                             TAO_Dynamic_Property& dp);
   // Add a property to the PropSet and a dynamic property to the
   // Offer. Have the dynamic property connect to the PropSet accessor
-  // for that name. 
+  // for that name.
 
   void add_dynamic_property (const char* name,
-			     CosTradingDynamic::DynamicProp& dp_struct);
+                             CosTradingDynamic::DynamicProp& dp_struct);
 
   void add_dynamic_property (const char* name,
-			     CosTradingDynamic::DynamicProp* dp_struct);
-  
+                             CosTradingDynamic::DynamicProp* dp_struct);
+
   CosTrading::OfferId export (const CORBA::Object_ptr object_ref,
-			      const CosTrading::ServiceTypeName type,
-			      CORBA::Environment& _env)
+                              const CosTrading::ServiceTypeName type,
+                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosPropertyService::MultipleExceptions,
-		     CosTrading::Register::InvalidObjectRef, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::Register::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::MissingMandatoryProperty, 
-		     CosTrading::DuplicatePropertyName));
+                     CosPropertyService::MultipleExceptions,
+                     CosTrading::Register::InvalidObjectRef,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::Register::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::MissingMandatoryProperty,
+                     CosTrading::DuplicatePropertyName));
   // Export the offer to the trader under the given type.
-  
+
   typedef CosTradingRepos::ServiceTypeRepository TRADING_REPOS;
   CosTrading::OfferId export (const CORBA::Object_ptr object_ref,
-			      const CosTrading::ServiceTypeName type,
-			      const TRADING_REPOS::PropStructSeq& props,
-			      const TRADING_REPOS::ServiceTypeNameSeq& stypes,
-			      CORBA::Environment& _env)
+                              const CosTrading::ServiceTypeName type,
+                              const TRADING_REPOS::PropStructSeq& props,
+                              const TRADING_REPOS::ServiceTypeNameSeq& stypes,
+                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosPropertyService::MultipleExceptions,
-		     CosTrading::IllegalServiceType, 
-		     TRADING_REPOS::ServiceTypeExists, 
-		     TRADING_REPOS::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::DuplicatePropertyName, 
-		     TRADING_REPOS::ValueTypeRedefinition, 
-		     TRADING_REPOS::DuplicateServiceTypeName,
-		     CosTrading::Register::InvalidObjectRef, 
-		     CosTrading::Register::InterfaceTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::MissingMandatoryProperty, 
-		     CosTrading::DuplicatePropertyName));
+                     CosPropertyService::MultipleExceptions,
+                     CosTrading::IllegalServiceType,
+                     TRADING_REPOS::ServiceTypeExists,
+                     TRADING_REPOS::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     TRADING_REPOS::ValueTypeRedefinition,
+                     TRADING_REPOS::DuplicateServiceTypeName,
+                     CosTrading::Register::InvalidObjectRef,
+                     CosTrading::Register::InterfaceTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::MissingMandatoryProperty,
+                     CosTrading::DuplicatePropertyName));
   // Export the offer to the trader under the given type. Register the
   // type with the current definition if the type can't be found in
   // the service type repository.
-  
+
 private:
-  
+
   TAO_Property_Exporter (const TAO_Property_Exporter&);
   void operator= (const TAO_Property_Exporter&);
   // These don't make sense on this class.
 
   const int increment_;
-  
+
   CosTrading::Lookup_var lookup_;
   CosPropertyService::PropertySet_var prop_set_;
 
-  CORBA::ULong pcount_, tcount_;  
+  CORBA::ULong pcount_, tcount_;
   CosTrading::PropertySeq tprops_;
   CosPropertyService::Properties pprops_;
 };
@@ -156,38 +156,38 @@ class TAO_Property_Modifier
 public:
 
   TAO_Property_Modifier (CosTrading::Lookup_var lookup_if,
-			 CosPropertyService::PropertySet_ptr prop_set,
-			 CORBA::ULong initial_size = 10);
+                         CosPropertyService::PropertySet_ptr prop_set,
+                         CORBA::ULong initial_size = 10);
 
   // If no Lookup Interface is provided to the constructor, then
   // resolve_initial_references ("TradingService") will be used.
 
   void delete_property (const char* name);
   // Remove a property from the current prop_set/offer.
-  
+
   void modify_property (const char* name, const CORBA::Any& value);
   // Modify a property from the current prop_set/offer.
-  
+
   void commit (CosTrading::OfferId id, CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosPropertyService::MultipleExceptions,
-		     CosTrading::NotImplemented, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::Register::UnknownPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::Register::MandatoryProperty, 
-		     CosTrading::Register::ReadonlyProperty, 
-		     CosTrading::DuplicatePropertyName));
+                     CosPropertyService::MultipleExceptions,
+                     CosTrading::NotImplemented,
+                     CosTrading::IllegalOfferId,
+                     CosTrading::UnknownOfferId,
+                     CosTrading::Register::ProxyOfferId,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::Register::UnknownPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::Register::MandatoryProperty,
+                     CosTrading::Register::ReadonlyProperty,
+                     CosTrading::DuplicatePropertyName));
   // Commit your changes to the trading service.
 
  private:
 
   const int increment_;
-  
+
   int pdcount_;
   int pmcount_;
 
@@ -196,13 +196,13 @@ public:
 
   CosTrading::Lookup_var lookup_;
   CosPropertyService::PropertySet_var prop_set_;
-  
+
   CosPropertyService::PropertyNames pdelete_;
   CosPropertyService::Properties pmodify_;
-  
+
   CosTrading::PropertyNameSeq tdelete_;
   CosTrading::PropertySeq tmodify_;
-  
+
   TAO_Property_Modifier (const TAO_Property_Modifier&);
   void operator= (const TAO_Property_Modifier&);
   // These don't make sense on this class.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Video_Repository.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Video_Repository.h
index 624635e7244..88dda6f6a5e 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Video_Repository.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Video_Repository.h
@@ -2,16 +2,16 @@
 
 // ============================================================================
 // $Id$
-//  
 //
-// = FILENAME 
+//
+// = FILENAME
 //    Video_Repository.h
-// 
-// = DESCRIPTION 
+//
+// = DESCRIPTION
 //    As a trading service dynamic property, creates a sequence of
 //    structures, each structure describing a movie in the video
-//    repository. 
-// 
+//    repository.
+//
 // = AUTHORS
 //    Seth Widoff <sbw1@cs.wustl.edu>
 //
@@ -20,9 +20,14 @@
 #if (! defined TAO_VIDEO_REPOSITORY_H)
 #define TAO_VIDEO_REPOSITORY_H
 
-#include "orbsvcs/Trader/Trader_Utils.h" 
+#include "orbsvcs/Trader/Trader_Utils.h"
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Video_RepositoryC.h"
 #include "Property_Exporter.h"
 
@@ -31,7 +36,7 @@ class TAO_Video_Repository :
   public TAO_Exportable
 // = DESCRIPTION
 //   When evalDP is invoked by the Dynamic Property Dispatcher, the
-//   TAO_Video_Repository parses the database file and creates a Movie 
+//   TAO_Video_Repository parses the database file and creates a Movie
 //   Sequence, each structure of which describes a movie in the
 //   database. The evalDP then crams the sequence into a dynamically
 //   allocated Any, which it returns to the dispatcher.
@@ -43,21 +48,21 @@ class TAO_Video_Repository :
 public:
 
   static const char* MOVIE_INFO;
-  
+
   TAO_Video_Repository (const char* filename);
   // TAO_Video_Repository requires the pathname of the video
   // repository database.
 
   ~TAO_Video_Repository (void);
-  
+
   virtual CORBA::Any* evalDP (const char* name,
                               CORBA::TypeCode_ptr returned_type,
                               const CORBA::Any& extra_info,
-			      CORBA::Environment& _env)
+                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   virtual void export_properties (TAO_Property_Exporter& prop_exporter);
-  
+
   virtual int define_properties
     (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_seq,
      CORBA::ULong offet = 0) const;
@@ -67,9 +72,9 @@ private:
   void parse_file (const char* database, int num_lines);
 
   static void obtain_movie_info (const char* file_name,
-				 TAO_VR::Movie& movie) {}
+                                 TAO_VR::Movie& movie) {}
   // Extract the techincal information from the actual MPEG file.
-  
+
   TAO_Video_Repository (void) {}
   TAO_Video_Repository& operator= (const TAO_Video_Repository& rep)
     { return *this; }
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.h
index bcaf6e8f20e..754917b3a75 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.h
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    as
-// 
+//
 // = FILENAME
 //    as.h
 //
@@ -14,13 +14,18 @@
 // = AUTHORS
 //    Sumedh Mungee (sumedh@cs.wustl.edu)
 //    Nagarajan Surendran (naga@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (TAO_AV_AS_H)
+#ifndef TAO_AV_AS_H
 #define TAO_AV_AS_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
@@ -28,25 +33,25 @@
 #include "ace/SOCK_CODgram.h"
 #include "ace/Select_Reactor.h"
 
-#include "include/common.h"         
-#include "mpeg_server/server_proto.h"   
-#include "mpeg_shared/fileio.h"         
-#include "mpeg_shared/routine.h"        
-#include "mpeg_shared/com.h"            
+#include "include/common.h"
+#include "mpeg_server/server_proto.h"
+#include "mpeg_shared/fileio.h"
+#include "mpeg_shared/routine.h"
+#include "mpeg_shared/com.h"
 #include "mpeg_server/Audio_Control_i.h"
 #include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 #include "mpeg_server/Audio_Server.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 
-class Audio_Child_Process 
+class Audio_Child_Process
   :public TAO_AV_Child_Process_B <Audio_Server_StreamEndPoint,TAO_VDev,Audio_Control_i>
 {
 public:
   int init (int argc,
             char **argv);
   // init the Video Singleton.
-            
+
   int make_mediactrl (Audio_Control_i *&media_ctrl);
 };
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
index c7823f966ed..7083b7cdedd 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    server
-// 
+//
 // = FILENAME
 //    server.h
 //
@@ -15,13 +15,18 @@
 // = AUTHORS
 //    Sumedh Mungee (sumedh@cs.wustl.edu)
 //    Nagarajan Surendran (naga@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (TAO_AV_SERVER_H)
+#ifndef TAO_AV_SERVER_H
 #define TAO_AV_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
@@ -29,11 +34,11 @@
 #include "ace/SOCK_CODgram.h"
 #include "ace/Select_Reactor.h"
 
-#include "include/common.h"         
-#include "mpeg_server/server_proto.h"   
-#include "mpeg_shared/fileio.h"         
-#include "mpeg_shared/routine.h"        
-#include "mpeg_shared/com.h"            
+#include "include/common.h"
+#include "mpeg_server/server_proto.h"
+#include "mpeg_shared/fileio.h"
+#include "mpeg_shared/routine.h"
+#include "mpeg_shared/com.h"
 #include "mpeg_server/Video_Control_i.h"
 #include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
@@ -53,25 +58,25 @@
 
 class AV_Audio_MMDevice
   : public TAO_MMDevice,
-    public TAO_Exportable   
+    public TAO_Exportable
 {
 public:
 
   static const char* NUMBER_OF_CONNECTIONS;
   static const char* MAX_CONNECTIONS;
   static const char* SERVER_NAME;
-  
+
   AV_Audio_MMDevice (TAO_AV_Endpoint_Process_Strategy *endpoint_strategy);
   // Default constructor
 
   virtual AVStreams::StreamEndPoint_B_ptr
-  create_B (AVStreams::StreamCtrl_ptr the_requester, 
-	    AVStreams::VDev_out the_vdev, 
-	    AVStreams::streamQoS &the_qos, 
-	    CORBA::Boolean_out met_qos, 
-	    char *&named_vdev, 
-	    const AVStreams::flowSpec &the_spec,  
-	    CORBA::Environment &env);
+  create_B (AVStreams::StreamCtrl_ptr the_requester,
+            AVStreams::VDev_out the_vdev,
+            AVStreams::streamQoS &the_qos,
+            CORBA::Boolean_out met_qos,
+            char *&named_vdev,
+            const AVStreams::flowSpec &the_spec,
+            CORBA::Environment &env);
   // Called by StreamCtrl to create a "B" type streamandpoint and vdev
 
   CORBA::ULong connections (void) const;
@@ -84,7 +89,7 @@ public:
      CORBA::ULong offset = 0) const;
 
 private:
-  
+
   CORBA::ULong connections_;
   // Number of active connections
 
@@ -93,7 +98,7 @@ private:
 
 class AV_Server;
 
-class AV_Server_Sig_Handler 
+class AV_Server_Sig_Handler
   : public virtual ACE_Event_Handler
 {
 public:
@@ -105,7 +110,7 @@ public:
   // this will register this sig_handler
   // with the reactor for SIGCHLD,SIGTERM,SIGINT
 
-  virtual int shutdown (ACE_HANDLE, 
+  virtual int shutdown (ACE_HANDLE,
                         ACE_Reactor_Mask);
 
   virtual int handle_input (ACE_HANDLE);
@@ -131,7 +136,7 @@ public:
 
 private:
   const AV_Server& av_server_;
-  
+
   ACE_HANDLE handle_;
   // dummy handle for the sig handler.
   ACE_Sig_Set sig_set;
@@ -140,7 +145,7 @@ private:
 class AV_Server
 {
   // = TITLE
-  //   Defines a class that abstracts the functionality of a 
+  //   Defines a class that abstracts the functionality of a
   //   video and audio server.
   //
   // = DESCRIPTION
@@ -149,7 +154,7 @@ class AV_Server
 public:
 
   static const char* SERVICE_TYPE;
-  
+
   AV_Server (void);
   // constructor
 
@@ -162,10 +167,10 @@ public:
   // Run the AV_Server
 
   void shutdown (void) const;
-  
+
   static void on_exit_routine (void);
-  // Routine called when this process exits.  
-  
+  // Routine called when this process exits.
+
   static pid_t current_pid_;
   // %% the pid the server is currently waiting on
 
@@ -183,7 +188,7 @@ private:
   void export_properties (CORBA::Environment& _env);
 
   int resolve_trader (CORBA::Environment& _env);
-  
+
   TAO_ORB_Manager orb_manager_;
   // the TAO ORB manager.
 
@@ -193,16 +198,16 @@ private:
   TAO_Video_Repository video_rep_;
   // Dynamic property that assesses the contents of the sever's video
   // repository.
- 
+
   CosTrading::Lookup_var trader_;
   // Reference to the Lookup interface of the trading service.
-  
+
   CosTrading::OfferId_var offer_id_;
   // Server offer id.
 
   CosTradingRepos::ServiceTypeRepository::PropStructSeq prop_seq_;
   // Service type definition.
-  
+
   CosNaming::NamingContext_var naming_context_;
   // The root naming context of the naming service
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
index 4d34e1fdfda..e263670efaa 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    server
-// 
+//
 // = FILENAME
 //    server.h
 //
@@ -15,13 +15,18 @@
 // = AUTHORS
 //    Sumedh Mungee (sumedh@cs.wustl.edu)
 //    Nagarajan Surendran (naga@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (TAO_AV_SERVER_H)
+#ifndef TAO_AV_SERVER_H
 #define TAO_AV_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
@@ -29,11 +34,11 @@
 #include "ace/SOCK_CODgram.h"
 #include "ace/Select_Reactor.h"
 
-#include "include/common.h"         
-#include "mpeg_server/server_proto.h"   
-#include "mpeg_shared/fileio.h"         
-#include "mpeg_shared/routine.h"        
-#include "mpeg_shared/com.h"            
+#include "include/common.h"
+#include "mpeg_server/server_proto.h"
+#include "mpeg_shared/fileio.h"
+#include "mpeg_shared/routine.h"
+#include "mpeg_shared/com.h"
 #include "mpeg_server/Video_Control_i.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 
@@ -54,12 +59,12 @@ public:
   Audio_MMDevice (TAO_AV_Endpoint_Process_Strategy *endpoint_strategy_);
   // Default constructor
 
-    virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester, 
-                                                     AVStreams::VDev_out the_vdev, 
-                                                     AVStreams::streamQoS &the_qos, 
-                                                     CORBA::Boolean_out met_qos, 
-                                                     char *&named_vdev, 
-                                                     const AVStreams::flowSpec &the_spec,  
+    virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester,
+                                                     AVStreams::VDev_out the_vdev,
+                                                     AVStreams::streamQoS &the_qos,
+                                                     CORBA::Boolean_out met_qos,
+                                                     char *&named_vdev,
+                                                     const AVStreams::flowSpec &the_spec,
                                                      CORBA::Environment &env);
   // Called by StreamCtrl to create a "B" type streamandpoint and vdev
 
@@ -69,7 +74,7 @@ private:
   // Number of active connections
 };
 
-class AV_Server_Sig_Handler 
+class AV_Server_Sig_Handler
   : public virtual ACE_Event_Handler
 {
 public:
@@ -81,7 +86,7 @@ public:
   // this will register this sig_handler
   // with the reactor for SIGCHLD,SIGTERM,SIGINT
 
-  virtual int shutdown (ACE_HANDLE, 
+  virtual int shutdown (ACE_HANDLE,
                         ACE_Reactor_Mask);
 
   virtual int handle_input (ACE_HANDLE);
@@ -111,14 +116,14 @@ private:
   ACE_Sig_Set sig_set;
 
   TAO_Naming_Client my_name_client_;
-  // Name_Client used for unregistering the audio and video 
-  
+  // Name_Client used for unregistering the audio and video
+
 };
 
 class AV_Server
 {
   // = TITLE
-  //   Defines a class that abstracts the functionality of a 
+  //   Defines a class that abstracts the functionality of a
   //   video and audio server.
   //
   // = DESCRIPTION
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.h
index 21060b26626..a8dc2a63f55 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    vs
-// 
+//
 // = FILENAME
 //    vs.h
 //
@@ -15,13 +15,18 @@
 // = AUTHORS
 //    Sumedh Mungee (sumedh@cs.wustl.edu)
 //    Nagarajan Surendran (naga@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (TAO_AV_VS_H)
+#ifndef TAO_AV_VS_H
 #define TAO_AV_VS_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
@@ -29,25 +34,25 @@
 #include "ace/SOCK_CODgram.h"
 #include "ace/Select_Reactor.h"
 
-#include "include/common.h"         
-#include "mpeg_server/server_proto.h"   
-#include "mpeg_shared/fileio.h"         
-#include "mpeg_shared/routine.h"        
-#include "mpeg_shared/com.h"            
+#include "include/common.h"
+#include "mpeg_server/server_proto.h"
+#include "mpeg_shared/fileio.h"
+#include "mpeg_shared/routine.h"
+#include "mpeg_shared/com.h"
 #include "mpeg_server/Video_Control_i.h"
 #include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 #include "mpeg_server/Video_Server.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 
-class Video_Child_Process 
+class Video_Child_Process
   :public TAO_AV_Child_Process_B <Video_Server_StreamEndPoint,TAO_VDev,Video_Control_i>
 {
 public:
   int init (int argc,
             char **argv);
   // init the Video Singleton.
-            
+
   int make_mediactrl (Video_Control_i *&media_ctrl);
 };
 
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Server_0005fDiscovery_0005fUtil.h b/TAO/orbsvcs/tests/AVStreams/server_discovery/Server_0005fDiscovery_0005fUtil.h
index 94efd7c114d..eaa10aa2770 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Server_0005fDiscovery_0005fUtil.h
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Server_0005fDiscovery_0005fUtil.h
@@ -1,6 +1,6 @@
 // ========================================================================
 // $Id$
-// 
+//
 // = FILENAME
 //    Server_0005fDiscovery_0005fUtil.h
 //
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.h b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.h
index 6bc3449b640..37c9fb15301 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.h
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.h
@@ -1,6 +1,6 @@
 // ========================================================================
 // $Id$
-// 
+//
 // = FILENAME
 //    Trader_Client.h
 //
@@ -32,23 +32,23 @@ public:
 
   int num_movies (void) const
     { return this->movie_info_.length (); }
-  
+
   const char* name (void) const
     { return this->movie_info_[this->index_].name_.in (); }
 
   const char* description (void) const
     { return this->movie_info_[this->index_].description_.in (); }
-  
+
   const char* filename (void) const
     { return this->movie_info_[this->index_].filename_.in (); }
-  
+
   const char* category (void) const
     { return this->movie_info_[this->index_].category_.in (); }
 
 private:
-  
+
   int index_;
-    
+
   TAO_VR::Movie_Info movie_info_;
 };
 
@@ -61,7 +61,7 @@ public:
 
   ~Trader_Client (void);
   // Destory all that was dynamically allocated.
-  
+
   void init (int argc, char** argv);
   // Call once, prior to query_trader.
 
@@ -71,22 +71,22 @@ public:
   void load_movie (const char* server_name, const char* movie_name);
   // Instruct the A/V client to begin an A/V stream with the
   // designated host.
-  
+
   void get_servers (int& length, char**& server_names);
   // Return the list of server names whose offers were obtained from
   // the Trader.
-  
+
   Movie_Iterator* get_movie_info (const char* server_name);
   // Fill in the sequence with movie information for all movies
   // offered by the specified server.
-  
+
   float evaluate_performance_property (const char* server_name,
                                        const char* property_name);
   // Evaluate the specified property with respect to the offer from
   // the specified server.
 
   static Trader_Client* instance (void);
-  
+
 protected:
 
   Trader_Client (void);
@@ -96,16 +96,16 @@ protected:
 private:
 
   static Trader_Client* instance_;
-  
+
   void create_hash_table_entry (CosTrading::Offer& offer);
 
   TAO_VR::Movie_Info* fetch_movie_array (const char* server_name);
-  
+
   typedef
   ACE_Hash_Map_Manager <TAO_String_Hash_Key, CosTrading::Property, ACE_Null_Mutex>
   Property_Map;
-  // Second-tier map --- maps property names to their values. 
-  
+  // Second-tier map --- maps property names to their values.
+
   typedef
   ACE_Hash_Map_Manager <TAO_String_Hash_Key, Property_Map*, ACE_Null_Mutex>
   Server_Map;
@@ -113,10 +113,10 @@ private:
 
   TAO_ORB_Manager orb_manager_;
   // Standard orb stuff.
-  
+
   CosTrading::Lookup_var lookup_;
   // A reference to the trader, what else?
-  
+
   Server_Map map_;
   // The two-tiered map of server names to a map of property names to
   // values.
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index 089b01c88ec..73d15f8326a 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -19,6 +19,11 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -27,7 +32,7 @@
 #include "CC_command.h"
 #include "CC_command.tab.h"
 
-#if !defined(_CC_CLIENT_H_)
+#ifndef _CC_CLIENT_H_
 #define _CC_CLIENT_H_
 
 // Stuff to be used by the command file parser
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 9c4e4f84bfb..4f247f92c51 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -23,7 +23,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 
-#if !defined (_CC_NAMING_SERVICE_H_)
+#ifndef _CC_NAMING_SERVICE_H_
 #define _CC_NAMING_SERVICE_H_
 
 class CC_naming_service
@@ -77,7 +77,7 @@ private:
 
   TAO_Naming_Client my_name_client_;
   // Name service wrapper class
-  
+
   CosConcurrencyControl::LockSetFactory_var factory_;
   // factory pointer for the lock set.
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
index b5bfaa549b9..4c1a643f863 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -13,7 +13,7 @@
 //      concurrency service test.
 //
 // = AUTHORS
-//	Torben Worm <tworm@cs.wustl.edu>
+//      Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
index 3d9bca5b57e..086ea0766b1 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
@@ -23,7 +23,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "CC_naming_service.h"
 
-#if !defined (_CC_TESTS_H_)
+#ifndef _CC_TESTS_H_
 #define _CC_TESTS_H_
 
 // Return codes for the tests
diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.h b/TAO/orbsvcs/tests/Concurrency/NS_client.h
index 427f3d82547..6c6407511e8 100644
--- a/TAO/orbsvcs/tests/Concurrency/NS_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/NS_client.h
@@ -11,19 +11,24 @@
 //
 // = DESCRIPTION
 //      This class tests the facilities to connect to the naming
-//      service	and to resolve the name for the concurrency service client.
+//      service and to resolve the name for the concurrency service client.
 //
 // = AUTHORS
 //      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//	Torben Worm <tworm@cs.wustl.edu>
+//      Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 
-class CosNaming_Client 
+class CosNaming_Client
 {
   // = TITLE
   //    Defines a class that encapsulates behaviour of the CosNaming
@@ -64,7 +69,7 @@ private:
 
   TAO_Naming_Client my_name_client_;
   // And our Naming Client!
-  
+
   int list_contents_;
   // Iterate through the naming service and list the contents.
 
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
index 271ebd86f03..5ffa770d18e 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (EC_BASIC_H)
+#ifndef EC_BASIC_H
 #define EC_BASIC_H
 
 #include "ace/SString.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/High_Res_Timer.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
@@ -120,7 +125,7 @@ public:
   virtual void push (const RtecEventComm::EventSet& events,
                      CORBA::Environment &_env);
   virtual void disconnect_push_consumer (CORBA::Environment &);
-  
+
 private:
   ECB_Test* test_;
   // To callback.
@@ -178,7 +183,7 @@ private:
   // To callback.
 
   int supplier_id_;
-  // This is NOT the supplier ID for the EC, just a number for the 
+  // This is NOT the supplier ID for the EC, just a number for the
 
   RtecScheduler::handle_t rt_info_;
   // The handle for our RT_Info description.
@@ -248,7 +253,7 @@ public:
                      CORBA::Environment &_env);
   // The callback from the Consumer....
 
-  
+
 private:
   ECB_Consumer consumer0_;
   ECB_Consumer consumer1_;
@@ -321,7 +326,7 @@ public:
                      const RtecEventComm::EventSet& events,
                      CORBA::Environment &_env);
   // The callback from the Consumer....
-  
+
 private:
   ECB_Consumer consumer_;
   // The consumer...
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index d3b7aa9a7fa..30cdaa86d40 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -8,10 +8,15 @@
 //
 // ============================================================================
 
-#if !defined (ECM_CONSUMER_H)
+#ifndef ECM_CONSUMER_H
 #define ECM_CONSUMER_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/Channel_Clients_T.h"
 
 class Driver;
@@ -27,17 +32,17 @@ public:
   Test_Consumer (Driver* driver, void* cookie);
 
   void connect (const char* name,
-		int event_a,
-		int event_b,
-		RtecEventChannelAdmin::EventChannel_ptr ec,
-		CORBA::Environment& _env);
+                int event_a,
+                int event_b,
+                RtecEventChannelAdmin::EventChannel_ptr ec,
+                CORBA::Environment& _env);
   // This method connects the consumer to the EC.
 
   void disconnect (CORBA::Environment &_env);
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events,
-		     CORBA::Environment &_env);
+                     CORBA::Environment &_env);
   virtual void disconnect_push_consumer (CORBA::Environment &);
   // The skeleton methods.
 
@@ -48,7 +53,7 @@ private:
   void* cookie_;
   // A magic cookie passed by the driver that we pass back in our
   // callbacks.
-  
+
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC using this proxy.
 };
@@ -72,9 +77,9 @@ public:
   // Execute the test.
 
   void push_consumer (void* consumer_cookie,
-		      ACE_hrtime_t arrival,
-		      const RtecEventComm::EventSet& events,
-		      CORBA::Environment&);
+                      ACE_hrtime_t arrival,
+                      const RtecEventComm::EventSet& events,
+                      CORBA::Environment&);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
@@ -83,7 +88,7 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			  CORBA::Environment &_env);
+                          CORBA::Environment &_env);
   void disconnect_consumers (CORBA::Environment &_env);
   // Connect and disconnect the consumers.
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
index aaea0c22fa4..b690100fbce 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
@@ -9,10 +9,15 @@
 //
 // ============================================================================
 
-#if !defined (ECM_DATA_H)
+#ifndef ECM_DATA_H
 #define ECM_DATA_H
 
 #include "ace/Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "dataC.h"
 
 struct ECM_Data
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 810af9d5cd6..e9e6c6459e6 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -8,10 +8,15 @@
 //
 // ============================================================================
 
-#if !defined (ECM_SUPPLIER_H)
+#ifndef ECM_SUPPLIER_H
 #define ECM_SUPPLIER_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/Channel_Clients_T.h"
 
 class ECMS_Driver;
@@ -32,11 +37,11 @@ public:
   // Run the test, just forwards to the driver
 
   void connect (const char* name,
-		int event_a,
-		int event_b,
-		int event_period,
-		RtecEventChannelAdmin::EventChannel_ptr ec,
-		CORBA::Environment& _env);
+                int event_a,
+                int event_b,
+                int event_period,
+                RtecEventChannelAdmin::EventChannel_ptr ec,
+                CORBA::Environment& _env);
   // This method connects the supplier to the EC.
 
   void disconnect (CORBA::Environment &_env);
@@ -48,7 +53,7 @@ public:
   RtecEventComm::EventSourceID supplier_id (void) const;
   // The supplier ID.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void); 
+  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void);
   // We talk to the EC (as a supplier) using this proxy, no duplicates
   // are done here...
 
@@ -62,7 +67,7 @@ private:
   RtecEventComm::EventSourceID supplier_id_;
   // We generate an id based on the name....
 
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; 
+  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
 
   ACE_PushSupplier_Adapter<Test_Supplier> supplier_;
@@ -89,13 +94,13 @@ public:
   // Execute the test.
 
   int supplier_task (Test_Supplier *supplier,
-		     void *supplier_cookie);
+                     void *supplier_cookie);
   // This method is run by the supplier task.
 
   void push_supplier (void* supplier_cookie,
-		      RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-		      const RtecEventComm::EventSet &events,
-		      CORBA::Environment &);
+                      RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
+                      const RtecEventComm::EventSet &events,
+                      CORBA::Environment &);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -106,7 +111,7 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			  CORBA::Environment &_env);
+                          CORBA::Environment &_env);
   void disconnect_suppliers (CORBA::Environment &_env);
   // Connect the suppliers.
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 386aef0435d..d4df57d892d 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -41,10 +41,15 @@
 //
 // ============================================================================
 
-#if !defined (EC_MCAST_H)
+#ifndef EC_MCAST_H
 #define EC_MCAST_H
 
 #include "ace/SString.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/High_Res_Timer.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
@@ -69,11 +74,11 @@ class ECM_Federation
   //
 public:
   ECM_Federation (char* name,
-		  CORBA::UShort mcast_port,
-		  int supplier_types,
-		  char** supplier_names,
-		  int consumer_types,
-		  char** consumer_names);
+                  CORBA::UShort mcast_port,
+                  int supplier_types,
+                  char** supplier_names,
+                  int consumer_types,
+                  char** consumer_names);
   // Constructor, it assumes ownership of the buffers, strings must be
   // allocated using CORBA::string_alloc(), buffers using operator new.
 
@@ -105,9 +110,9 @@ public:
   // The ipaddr (in host byte order) of the event type <i>
 
   void open (ACE_SOCK_Dgram *dgram,
-	     RtecEventChannelAdmin::EventChannel_ptr ec,
-	     RtecScheduler::Scheduler_ptr scheduler,
-	     CORBA::Environment &_env);
+             RtecEventChannelAdmin::EventChannel_ptr ec,
+             RtecScheduler::Scheduler_ptr scheduler,
+             CORBA::Environment &_env);
   // Connect the UDP sender to the EC.
 
   void close (CORBA::Environment &_env);
@@ -159,27 +164,27 @@ public:
   ECM_Supplier (ECM_Local_Federation* federation);
 
   void open (const char* name,
-	     RtecScheduler::Period period,
-	     RtecEventChannelAdmin::EventChannel_ptr event_channel,
-	     RtecScheduler::Scheduler_ptr scheduler,
-	     CORBA::Environment& _env);
+             RtecScheduler::Period period,
+             RtecEventChannelAdmin::EventChannel_ptr event_channel,
+             RtecScheduler::Scheduler_ptr scheduler,
+             CORBA::Environment& _env);
   // This method connects the supplier to the EC.
 
   void close (CORBA::Environment &_env);
   // Disconnect from the EC.
 
   void activate (const char* name,
-		 RtecScheduler::Period period,
-		 RtecEventChannelAdmin::EventChannel_ptr event_channel,
-		 RtecScheduler::Scheduler_ptr scheduler,
-		 CORBA::Environment& _env);
+                 RtecScheduler::Period period,
+                 RtecEventChannelAdmin::EventChannel_ptr event_channel,
+                 RtecScheduler::Scheduler_ptr scheduler,
+                 CORBA::Environment& _env);
   // Connect as a consumer to start receiving events.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
   // The supplier ID.
 
   void push (const RtecEventComm::EventSet& events,
-	     CORBA::Environment &_env);
+             CORBA::Environment &_env);
   void disconnect_push_consumer (CORBA::Environment &);
   // Implement the callbacks for our consumer personality.
 
@@ -193,14 +198,14 @@ private:
   RtecEventComm::EventSourceID supplier_id_;
   // We generate an id based on the name....
 
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; 
+  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
 
   ACE_PushConsumer_Adapter<ECM_Supplier> consumer_;
   // We also connect to the EC as a consumer so we can receive the
   // timeout events.
 
-  RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; 
+  RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
 };
 
@@ -218,24 +223,24 @@ public:
   ECM_Consumer (ECM_Local_Federation* federation);
 
   void open (const char* name,
-	     RtecEventChannelAdmin::EventChannel_ptr event_channel,
-	     RtecScheduler::Scheduler_ptr scheduler,
-	     ACE_RANDR_TYPE &seed,
-	     CORBA::Environment& _env);
+             RtecEventChannelAdmin::EventChannel_ptr event_channel,
+             RtecScheduler::Scheduler_ptr scheduler,
+             ACE_RANDR_TYPE &seed,
+             CORBA::Environment& _env);
   // This method connects the consumer to the EC.
 
   void close (CORBA::Environment &_env);
   // Disconnect from the EC.
 
   void connect (ACE_RANDR_TYPE& seed,
-		CORBA::Environment &_env);
+                CORBA::Environment &_env);
   void disconnect (CORBA::Environment &_env);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
   virtual void push (const RtecEventComm::EventSet& events,
-		     CORBA::Environment &_env);
+                     CORBA::Environment &_env);
   virtual void disconnect_push_consumer (CORBA::Environment &);
 
 private:
@@ -257,45 +262,45 @@ class ECM_Local_Federation
   // = DESCRIPTION
   //   This class is used to represent a federation that is actually
   //   running in this process.
-  // 
+  //
 public:
   ECM_Local_Federation (ECM_Federation *federation,
-			ECM_Driver *driver);
+                        ECM_Driver *driver);
   // Constructor.
   ~ECM_Local_Federation (void);
   // Destructor
 
   void open (int event_count,
-	     RtecScheduler::Period period,
-	     RtecEventChannelAdmin::EventChannel_ptr event_channel,
-	     RtecScheduler::Scheduler_ptr scheduler,
-	     CORBA::Environment& _env);
+             RtecScheduler::Period period,
+             RtecEventChannelAdmin::EventChannel_ptr event_channel,
+             RtecScheduler::Scheduler_ptr scheduler,
+             CORBA::Environment& _env);
   // Connect both the supplier and the consumer.
 
   void close (CORBA::Environment& _env);
   // Disconnect everybody from the EC
 
   void activate (RtecScheduler::Period period,
-		 RtecEventChannelAdmin::EventChannel_ptr event_channel,
-		 RtecScheduler::Scheduler_ptr scheduler,
-		 CORBA::Environment& _env);
+                 RtecEventChannelAdmin::EventChannel_ptr event_channel,
+                 RtecScheduler::Scheduler_ptr scheduler,
+                 CORBA::Environment& _env);
   // Activate the supplier
 
   void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer,
-			 CORBA::Environment& _env);
+                         CORBA::Environment& _env);
   // The supplier is ready to send a new event.
 
   void consumer_push (ACE_hrtime_t arrival,
-		      const RtecEventComm::EventSet& event,
-		      CORBA::Environment& _env);
+                      const RtecEventComm::EventSet& event,
+                      CORBA::Environment& _env);
   // The consumer just received an event.
 
   const ECM_Federation *federation (void) const;
   // The federation description.
 
   void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-		      RtecScheduler::Scheduler_ptr scheduler,
-		      CORBA::Environment &_env);
+                      RtecScheduler::Scheduler_ptr scheduler,
+                      CORBA::Environment &_env);
   // Connect the UDP receiver to the EC.
 
   void close_receiver (CORBA::Environment &_env);
@@ -418,20 +423,20 @@ public:
   // Run the test, read all the configuration files, etc.
 
   void federation_has_shutdown (ECM_Local_Federation *federation,
-				CORBA::Environment& _env);
+                                CORBA::Environment& _env);
   // One of the federations has completed its simulation, once all of
   // them finish the test exists.
-			  
+
 
 private:
   void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-			 RtecScheduler::Scheduler_ptr scheduler,
-			 CORBA::Environment &_env);
+                         RtecScheduler::Scheduler_ptr scheduler,
+                         CORBA::Environment &_env);
   // Connect the federations to the EC.
 
   void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-			     RtecScheduler::Scheduler_ptr scheduler,
-			     CORBA::Environment &_env);
+                             RtecScheduler::Scheduler_ptr scheduler,
+                             CORBA::Environment &_env);
   // Activate all the federations
 
   void close_federations (CORBA::Environment &_env);
@@ -439,13 +444,13 @@ private:
   // the objects, etc.
 
   void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     RtecScheduler::Scheduler_ptr scheduler,
-		     CORBA::Environment &_env);
+                     RtecScheduler::Scheduler_ptr scheduler,
+                     CORBA::Environment &_env);
   // Connect all the senders, so we can start multicasting events.
 
   void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
-		       RtecScheduler::Scheduler_ptr scheduler,
-		       CORBA::Environment &_env);
+                       RtecScheduler::Scheduler_ptr scheduler,
+                       CORBA::Environment &_env);
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
 
@@ -465,16 +470,16 @@ private:
   // parse the command line arguments
 
   int parse_name_list (FILE* file, int n, char** names,
-		       const char* error_msg);
+                       const char* error_msg);
   // parse one of the lists of names in the federation definition.
 
   int skip_blanks (FILE* file,
-		   const char* error_msg);
+                   const char* error_msg);
   // skip the blanks in the file.
 
   void dump_results (void);
   // Dump the results to the standard output.
-			  
+
 private:
   int event_period_;
   // The events are generated using this interval.
@@ -501,7 +506,7 @@ private:
   int all_federations_count_;
   // The total number of federations we belong to.
 
-  ECM_Federation* all_federations_[MAX_FEDERATIONS]; 
+  ECM_Federation* all_federations_[MAX_FEDERATIONS];
   // All the federations.
 
   ACE_Atomic_Op<ACE_SYNCH_MUTEX,int> federations_running_;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 13cc5a5a4ed..0cf9985583c 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -12,10 +12,15 @@
 //
 // ============================================================================
 
-#if !defined (EC_MULTIPLE_H)
+#ifndef EC_MULTIPLE_H
 #define EC_MULTIPLE_H
 
 #include "ace/SString.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/High_Res_Timer.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
@@ -40,23 +45,23 @@ public:
   Test_Supplier (Test_ECG* test, void* cookie);
 
   void open (const char* name,
-	     int event_a, int event_b,
-	     int message_count,
-	     const RtecScheduler::Period& rate,
-	     RtecEventChannelAdmin::EventChannel_ptr ec,
-	     CORBA::Environment& _env);
+             int event_a, int event_b,
+             int message_count,
+             const RtecScheduler::Period& rate,
+             RtecEventChannelAdmin::EventChannel_ptr ec,
+             CORBA::Environment& _env);
   // This method connects the supplier to the EC.
 
   void close (CORBA::Environment &_env);
   // Disconnect from the EC.
 
   void activate (const char* name,
-		 const RtecScheduler::Period& rate,
-		 RtecEventChannelAdmin::EventChannel_ptr ec,
-		 CORBA::Environment& _env);
+                 const RtecScheduler::Period& rate,
+                 RtecEventChannelAdmin::EventChannel_ptr ec,
+                 CORBA::Environment& _env);
 
   void push (const RtecEventComm::EventSet& events,
-	     CORBA::Environment &_env);
+             CORBA::Environment &_env);
   void disconnect_push_consumer (CORBA::Environment &);
   // Implement the callbacks for our consumer personality.
 
@@ -83,14 +88,14 @@ private:
   int message_count_;
   // The number of events sent by this supplier.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; 
+  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
 
   ACE_PushConsumer_Adapter<Test_Supplier> consumer_;
   // We also connect to the EC as a consumer so we can receive the
   // timeout events.
 
-  RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; 
+  RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
 
 };
@@ -111,16 +116,16 @@ public:
   Test_Consumer (Test_ECG* test, void *cookie);
 
   void open (const char* name,
-	     int event_a, int event_b,
-	     RtecEventChannelAdmin::EventChannel_ptr ec,
-	     CORBA::Environment& _env);
+             int event_a, int event_b,
+             RtecEventChannelAdmin::EventChannel_ptr ec,
+             CORBA::Environment& _env);
   // This method connects the consumer to the EC.
 
   void close (CORBA::Environment &_env);
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events,
-		     CORBA::Environment &_env);
+                     CORBA::Environment &_env);
   virtual void disconnect_push_consumer (CORBA::Environment &);
   // The skeleton methods.
 
@@ -174,51 +179,51 @@ public:
   // Execute the test.
 
   void push_supplier (void* supplier_cookie,
-		      RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-		      const RtecEventComm::EventSet &events,
-		      CORBA::Environment &);
+                      RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
+                      const RtecEventComm::EventSet &events,
+                      CORBA::Environment &);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
   // testing the short-circuit case.
 
   void push_consumer (void* consumer_cookie,
-		      ACE_hrtime_t arrival,
-		      const RtecEventComm::EventSet& events,
-		      CORBA::Environment&);
+                      ACE_hrtime_t arrival,
+                      const RtecEventComm::EventSet& events,
+                      CORBA::Environment&);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
   void shutdown_supplier (void* supplier_cookie,
-			  RtecEventComm::PushConsumer_ptr consumer,
-			  CORBA::Environment& _env);
+                          RtecEventComm::PushConsumer_ptr consumer,
+                          CORBA::Environment& _env);
   // One of the suppliers has completed its work.
-			  
+
 private:
   RtecEventChannelAdmin::EventChannel_ptr
     get_ec (CosNaming::NamingContext_ptr naming_context,
-	    const char* ec_name,
-	    CORBA::Environment &_env);
+            const char* ec_name,
+            CORBA::Environment &_env);
   // Helper routine to obtain an EC given its name.
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			  CORBA::Environment &_env);
+                          CORBA::Environment &_env);
   void disconnect_suppliers (CORBA::Environment &_env);
   // Connect the suppliers.
 
   void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			   CORBA::Environment &_env);
+                           CORBA::Environment &_env);
   // Activate the suppliers, i.e. they start generating events.
 
   void connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-		    RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-		    RtecScheduler::Scheduler_ptr remote_sch,
-		    CORBA::Environment &_env);
+                    RtecEventChannelAdmin::EventChannel_ptr remote_ec,
+                    RtecScheduler::Scheduler_ptr remote_sch,
+                    CORBA::Environment &_env);
   // Connect the EC gateway, it builds the Subscriptions and the
   // Publications list.
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			  CORBA::Environment &_env);
+                          CORBA::Environment &_env);
   void disconnect_consumers (CORBA::Environment &_env);
   // Connect and disconnect the consumers.
 
@@ -244,7 +249,7 @@ private:
 
   void shutdown_consumer (int id);
   // One of the consumers has completed its work.
-			  
+
 private:
   char* lcl_name_;
   // The name of the "local" EC.
@@ -316,7 +321,7 @@ private:
 
   int lp_workload_;
   // The number of iterations of ACE::is_prime() to execute in low
-  // priority consumers. 
+  // priority consumers.
 
   int lp_interval_;
   // The low priority events are generated using this interval.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 04e0cc23617..7e9b3537519 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -10,10 +10,15 @@
 //
 // ============================================================================
 
-#if !defined (ECT_CONSUMER_H)
+#ifndef ECT_CONSUMER_H
 #define ECT_CONSUMER_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/High_Res_Timer.h"
 #include "orbsvcs/Channel_Clients_T.h"
 
@@ -31,10 +36,10 @@ public:
                  int n_suppliers);
 
   void connect (const char* name,
-		int event_a,
-		int event_b,
-		RtecEventChannelAdmin::EventChannel_ptr ec,
-		CORBA::Environment& _env);
+                int event_a,
+                int event_b,
+                RtecEventChannelAdmin::EventChannel_ptr ec,
+                CORBA::Environment& _env);
   // This method connects the consumer to the EC.
 
   void disconnect (CORBA::Environment &_env);
@@ -44,7 +49,7 @@ public:
   // Print out the results
 
   virtual void push (const RtecEventComm::EventSet& events,
-		     CORBA::Environment &_env);
+                     CORBA::Environment &_env);
   virtual void disconnect_push_consumer (CORBA::Environment &);
   // The skeleton methods.
 
@@ -59,7 +64,7 @@ private:
   int n_suppliers_;
   // The number of suppliers that are feeding this consumer, we
   // terminate once we receive a shutdown event from each supplier.
-  
+
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC using this proxy.
 
@@ -101,7 +106,7 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			  CORBA::Environment &_env);
+                          CORBA::Environment &_env);
   void disconnect_consumers (CORBA::Environment &_env);
   // Connect and disconnect the consumers.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 5addf209973..59cbb8fdcdf 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -10,10 +10,15 @@
 //
 // ============================================================================
 
-#if !defined (ECT_SUPPLIER_H)
+#ifndef ECT_SUPPLIER_H
 #define ECT_SUPPLIER_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/High_Res_Timer.h"
 #include "orbsvcs/Channel_Clients_T.h"
 
@@ -38,11 +43,11 @@ public:
                 int burst_count,
                 int burst_size,
                 int event_size,
-		int burst_pause,
-		int event_a,
-		int event_b,
-		RtecEventChannelAdmin::EventChannel_ptr ec,
-		CORBA::Environment& _env);
+                int burst_pause,
+                int event_a,
+                int event_b,
+                RtecEventChannelAdmin::EventChannel_ptr ec,
+                CORBA::Environment& _env);
   // This method connects the supplier to the EC.
 
   void disconnect (CORBA::Environment &_env);
@@ -54,7 +59,7 @@ public:
   RtecEventComm::EventSourceID supplier_id (void) const;
   // The supplier ID.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void); 
+  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void);
   // We talk to the EC (as a supplier) using this proxy, no duplicates
   // are done here...
 
@@ -71,7 +76,7 @@ private:
   RtecEventComm::EventSourceID supplier_id_;
   // We generate an id based on the name....
 
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; 
+  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
 
   ACE_PushSupplier_Adapter<Test_Supplier> supplier_;
@@ -113,7 +118,7 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			  CORBA::Environment &_env);
+                          CORBA::Environment &_env);
   void disconnect_suppliers (CORBA::Environment &_env);
   // Connect the suppliers.
 
@@ -134,7 +139,7 @@ private:
   // How many bursts we will send from each supplier.
 
   int burst_size_;
-  // The number of events 
+  // The number of events
 
   int event_size_;
   // The size of the payload on each event.
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
index 7a36e8f216d..2ef454cc317 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ACE Event Service Benchmarks
-// 
+//
 // = FILENAME
 //    Latency.h
 //
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (EVENT_LATENCY_H)
+#ifndef EVENT_LATENCY_H
 #define EVENT_LATENCY_H
 
 #include "ace/SString.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
 
@@ -38,7 +43,7 @@ public:
   // a "null" push routine, for measuring aggregate timing.
 
   int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     const char *my_name);
+                     const char *my_name);
   // Uses the name server to obtain a reference to the <supplier_name>
   // and registers with channel to receive notifications from the
   // supplier.  Also registers to receive shutdown messages from the
@@ -56,7 +61,7 @@ public:
 
 // (not protected to allow short-circuiting) protected:
   virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
   // disconnects from the channel.
@@ -133,7 +138,7 @@ public:
   class Consumer : public POA_RtecEventComm::PushConsumer {
   public:
     virtual void push (const RtecEventComm::EventSet &events,
-		       CORBA::Environment &);
+                       CORBA::Environment &);
     // The channel pushed some events to us.
 
     virtual void disconnect_push_consumer (CORBA::Environment &);
@@ -148,14 +153,14 @@ public:
   };
 
   Latency_Supplier (const u_int total_messages,
-		    CORBA::Long supplier_id,
+                    CORBA::Long supplier_id,
                     const int timestamp = 0);
   // Construction.  Requires the total number of messages to be
   // sent.  If the timestamp flag is enabled, then events are
   // timestamped, e.g., for use in measuring jitter.
 
   int open_supplier (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-		     const char *name, int master);
+                     const char *name, int master);
   // Registers with the name server under the given <name>.  Also
   // connects to the Event Channel as a supplier of notifications and
   // shutdown messages.  If <master> != 0, then the supplier will
@@ -169,7 +174,7 @@ public:
   // The channel is disconnecting.
 
   void push (const RtecEventComm::EventSet &events,
-	     CORBA::Environment &);
+             CORBA::Environment &);
   // Takes a timestamp and then pushes event_ to all consumers, either
   // directly, or via a channel.
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h b/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h
index acc872f2ee1..d783604a6be 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/orbsvcs/tests/ImplRepo
-// 
+//
 // = FILENAME
 //    ir_implrepo_impl.h
 //
@@ -14,11 +14,11 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (IR_IMPLREPO_IMPL_H)
-#define	IR_IMPLREPO_IMPL_H
+#ifndef IR_IMPLREPO_IMPL_H
+#define IR_IMPLREPO_IMPL_H
 
 #include "Impl_RepoS.h"
 #include "tao/TAO.h"
@@ -36,7 +36,7 @@ typedef IR_Simple_i_ptr IR_Simple_i_ref;
 class IR_iRepo_i : public POA_Implementation_Repository
 {
   // = TITLE
-  //    Implementation Repository 
+  //    Implementation Repository
   //
   // = DESCRIPTION
   //    This provides the interface to communicate directly with the
@@ -55,14 +55,14 @@ public:
                                   CORBA::Object_ptr &obj,
                                   const Implementation_Repository::INET_Addr &addr,
                                   CORBA::Environment &_tao_environment);
-  
+
   // = Other methods
 
   int init (int argc, char **argv, CORBA::Environment& env);
   // Initialize the Server state - parsing arguments and waiting
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
   void start (const char *server);
   // Starts the program registered as <server>
@@ -101,7 +101,7 @@ class IR_Adapter_Activator : public POA_PortableServer::AdapterActivator
   //    Implementation Repository Adapter Activator
   //
   // = DESCRIPTION
-  //    Part of the Default Servant/DSI combination that forwards 
+  //    Part of the Default Servant/DSI combination that forwards
   //    arbitrary requests.  This allows for the setting up of child POAs
   //    with default servants.
 public:
@@ -122,7 +122,7 @@ class IR_Simple_i: public POA_simple_object
   //    Simple Object Implementation
   //
   // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that 
+  //    Implementation of a simple object that has two methods, one that
   //    returns the cube of a long, another that shuts down the server.
 public:
   //  = Constructor and Destructor
diff --git a/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h b/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h
index 6da5fd7fc5c..df38d3b39f0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (IR_SERVER_IMPL_H)
+#ifndef IR_SERVER_IMPL_H
 #define IR_SERVER_IMPL_H
 
 #include "ir_simple_object_impl.h"
@@ -30,7 +30,7 @@ class IR_Server_i
   //   CORBA Server Implementation
   //
   // = DESCRIPTION
-  //   
+  //
 public:
   // = Initialization and termination methods.
   IR_Server_i (void);
@@ -43,7 +43,7 @@ public:
   // Initialize the Server state - parsing arguments and waiting
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
 private:
   IR_Simple_i *server_impl_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h b/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h
index 53d178751b7..eb0d7fc24c0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/tests/Simple
-// 
+//
 // = FILENAME
 //    simple_object_impl.h
 //
@@ -14,11 +14,11 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (IR_SIMPLE_OBJECT_IMPL_H)
-#define	IR_SIMPLE_OBJECT_IMPL_H
+#ifndef IR_SIMPLE_OBJECT_IMPL_H
+#define IR_SIMPLE_OBJECT_IMPL_H
 
 #include "Impl_RepoS.h"
 
@@ -35,7 +35,7 @@ class IR_Simple_i: public POA_simple_object
   //    Simple Object Implementation
   //
   // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that 
+  //    Implementation of a simple object that has two methods, one that
   //    returns the cube of a long, another that shuts down the server.
 public:
   IR_Simple_i (CORBA::ORB_ptr orb_ptr,
diff --git a/TAO/orbsvcs/tests/ImplRepo/server_impl.h b/TAO/orbsvcs/tests/ImplRepo/server_impl.h
index a87424cff4a..c33e6edf8cd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/server_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/server_impl.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (SERVER_IMPL_H)
+#ifndef SERVER_IMPL_H
 #define SERVER_IMPL_H
 
 #include "simple_object_impl.h"
@@ -30,7 +30,7 @@ class Server_i
   //   CORBA Server Implementation
   //
   // = DESCRIPTION
-  //   
+  //
 public:
   // = Initialization and termination methods.
   Server_i (void);
@@ -43,7 +43,7 @@ public:
   // Initialize the Server state - parsing arguments and waiting
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
 private:
   Simple_i server_impl;
@@ -57,7 +57,7 @@ private:
   // The ORB manager.
 
   char *ir_server_key_;
-  
+
   FILE *ior_output_file_;
   // File where the IOR of the server object is stored.
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
index 59bf4106b7b..1b0818a5444 100644
--- a/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/tests/Simple
-// 
+//
 // = FILENAME
 //    simple_object_impl.h
 //
@@ -14,11 +14,11 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (SIMPLE_OBJECT_IMPL_H)
-#define	SIMPLE_OBJECT_IMPL_H
+#ifndef SIMPLE_OBJECT_IMPL_H
+#define SIMPLE_OBJECT_IMPL_H
 
 #include "Simple_ObjectS.h"
 
@@ -35,7 +35,7 @@ class Simple_i: public POA_simple_object
   //    Simple Object Implementation
   //
   // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that 
+  //    Implementation of a simple object that has two methods, one that
   //    returns the cube of a long, another that shuts down the server.
 public:
   Simple_i (const char *obj_name = 0);
diff --git a/TAO/orbsvcs/tests/Logger/Logging_Test_i.h b/TAO/orbsvcs/tests/Logger/Logging_Test_i.h
index 7bd6d8d2622..748473ea51b 100644
--- a/TAO/orbsvcs/tests/Logger/Logging_Test_i.h
+++ b/TAO/orbsvcs/tests/Logger/Logging_Test_i.h
@@ -19,16 +19,21 @@
 //
 // ============================================================================
 
-#if !defined (_LOG_CLIENT_H)
+#ifndef _LOG_CLIENT_H
 #define _LOG_CLIENT_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/LoggerC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 
-class Logger_Client 
+class Logger_Client
 {
   // = TITLE
   //    Defines a class that encapsulates behaviour of the Logger
@@ -51,14 +56,14 @@ public:
 
   int init (int argc, char **argv);
   // Initialize the client communication endpoint with server.
-  
+
   int run (void);
   // Execute client example code.
-  
+
 private:
   int parse_args (void);
   // Parses the arguments passed on the command line.
-  
+
   void init_record (Logger::Log_Record &newrec,
                     Logger::Log_Priority lp,
                     const char *msg);
@@ -66,20 +71,20 @@ private:
 
   int init_naming_service (CORBA::Environment &env);
   // Initialises the name server and resolves the logger_factory
-  
+
   int init_loggers (CORBA::Environment &env);
   // Instantiates the 2 logger member variables
-  
+
   void show_record (Logger::Log_Record &newrec);
   // Shows contents of the record (for debugging purposes).
-  
+
   TAO_Naming_Client my_name_client_;
   // An instance of the name client used for resolving the factory
   // objects.
 
   CORBA::ORB_var orb_;
   // Keep a pointer to the ORB for easy access
-  
+
   int argc_;
   // # of arguments on the command line.
 
@@ -88,7 +93,7 @@ private:
 
   Logger_Factory_var factory_;
   // A pointer to the Logger_Factory; used in init_loggers
-  
+
   Logger_var logger_1_;
   // Logger obj ref.
 
diff --git a/TAO/orbsvcs/tests/Logger/client.h b/TAO/orbsvcs/tests/Logger/client.h
index 51cd09d3fd3..8a6e1978466 100644
--- a/TAO/orbsvcs/tests/Logger/client.h
+++ b/TAO/orbsvcs/tests/Logger/client.h
@@ -22,11 +22,16 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/LoggerC.h"
 
-class Logger_Client 
+class Logger_Client
 {
   // = TITLE
   //    Defines a class that encapsulates behaviour of the Logger
@@ -60,28 +65,28 @@ private:
 
    void show_record (Logger::Log_Record &newrec);
   // Shows contents of the record (for debugging purposes)
-  
+
   CORBA::Object_var
   resolve_name (CosNaming::Name &name, char* namestring,
-		CosNaming::NamingContext_var context,
-		CORBA::Environment &env); 
+                CosNaming::NamingContext_var context,
+                CORBA::Environment &env);
   // Take the Name, give it the proper string name, and
-  // resolve it  
+  // resolve it
   int
   nesting_test (CosNaming::Name &name, char* namestring,
-		CosNaming::NamingContext_var context,
-		CORBA::Environment &env);
+                CosNaming::NamingContext_var context,
+                CORBA::Environment &env);
   // Test the nesting context
-    
+
   int argc_;
   // # of arguments on the command line.
-  
+
   char **argv_;
   // arguments from command line.
-  
+
   int test_nesting_;
   // Test nested naming context or not.
-  
+
   CORBA::ORB_var orb_;
   // Keep a pointer to the orb, to avoid accidental deletes.
 
diff --git a/TAO/orbsvcs/tests/Logger/client_i.h b/TAO/orbsvcs/tests/Logger/client_i.h
index 9d19a096649..0ce8873035d 100644
--- a/TAO/orbsvcs/tests/Logger/client_i.h
+++ b/TAO/orbsvcs/tests/Logger/client_i.h
@@ -22,12 +22,17 @@
 // @@ Add the guard against multiple inclusions.
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/LoggerC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 
-class Logger_Client 
+class Logger_Client
 {
   // = TITLE
   //    Defines a class that encapsulates behaviour of the Logger
@@ -50,14 +55,14 @@ public:
 
   int init (int argc, char **argv);
   // Initialize the client communication endpoint with server.
-  
+
   int run (void);
   // Execute client example code.
-  
+
 private:
   int parse_args (void);
   // Parses the arguments passed on the command line.
-  
+
   void init_record (Logger::Log_Record &newrec,
                     Logger::Log_Priority lp,
                     const char *msg);
@@ -65,20 +70,20 @@ private:
 
   int init_naming_service (CORBA::Environment &env);
   // Initialises the name server and resolves the logger_factory
-  
+
   int init_loggers (CORBA::Environment &env);
   // Instantiates the 2 logger member variables
-  
+
   void show_record (Logger::Log_Record &newrec);
   // Shows contents of the record (for debugging purposes).
-  
+
   TAO_Naming_Client my_name_client_;
   // An instance of the name client used for resolving the factory
   // objects.
 
   CORBA::ORB_var orb_;
   // Keep a pointer to the ORB for easy access
-  
+
   int argc_;
   // # of arguments on the command line.
 
@@ -87,7 +92,7 @@ private:
 
   Logger_Factory_var factory_;
   // A pointer to the Logger_Factory; used in init_loggers
-  
+
   Logger_var logger_1_;
   // Logger obj ref.
 
diff --git a/TAO/orbsvcs/tests/Logger/server_i.h b/TAO/orbsvcs/tests/Logger/server_i.h
index 94b95ae1d6a..0a8736a8ab0 100644
--- a/TAO/orbsvcs/tests/Logger/server_i.h
+++ b/TAO/orbsvcs/tests/Logger/server_i.h
@@ -19,10 +19,15 @@
 //
 // ============================================================================
 
-#if !defined (_C_SERVER_H)
+#ifndef _C_SERVER_H
 #define _C_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "orbsvcs/CosNamingC.h"
@@ -50,11 +55,11 @@ public:
 
   int init (int argc,
             char **argv,
-	    CORBA::Environment& env);
+            CORBA::Environment& env);
   // Initialize the Logger_Server state - parsing arguments and ...
 
   int run (CORBA::Environment& env);
-  // Run the ORB. 
+  // Run the ORB.
 
 private:
   int parse_args (void);
@@ -73,7 +78,7 @@ private:
 
   Logger_Factory_i factory_impl_;
   // Implementation object of the Logger_Factory.
-       
+
   Logger_Factory_var factory_;
   // Factory_var to register with NamingService.
 
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 3ac62f02c2d..dab07813f50 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (PROPERTY_CLIENT_H)
+#ifndef PROPERTY_CLIENT_H
 #define PROPERTY_CLIENT_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
@@ -94,7 +99,7 @@ protected:
 
   TAO_Naming_Client my_name_client_;
   // The Naming Client handles Naming Service work
-  
+
   CosPropertyService::PropertySetDef_var propsetdef_;
   // To test propertySetDef interface.
 };
diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h
index 06f6b41a455..09e5fa5a52b 100644
--- a/TAO/orbsvcs/tests/Property/server.h
+++ b/TAO/orbsvcs/tests/Property/server.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (COSPROPERTYSERVICE_SERVER_H)
+#ifndef COSPROPERTYSERVICE_SERVER_H
 #define COSPROPERTYSERVICE_SERVER_H
 
 #include "tao/TAO.h"
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index 8e783496ce8..6f0721b2376 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -52,7 +52,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 9b63c09979b..2f6e86e8cfe 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -22,12 +22,12 @@
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/CosNamingC.h"
 
-class Naming_Test 
+class Naming_Test
 {
   // = TITLE
   //    This is an abstract class which is subclassed
   //    to create different Naming Service tests.
-  //  
+  //
   // = DESCRIPTION
   //    This is a basic example of the "Strategy" pattern.  This class
   //    provides a common interface for different tests (or
@@ -53,7 +53,7 @@ public:
   // Execute the simple test code.
 };
 
-class Tree_Test : public Naming_Test 
+class Tree_Test : public Naming_Test
 {
   // = TITLE
   //    This class implements a test of all Naming Service functions
@@ -61,13 +61,13 @@ class Tree_Test : public Naming_Test
   //
   // = DESCRIPTION
   //    Bind_context() under the root context with the name level1.
-  //    Create_new_context(), bind() foo object into it, and 
+  //    Create_new_context(), bind() foo object into it, and
   //    bind the context into root/level1 under the name level2.
   //    Resolve (root/level1/level2/foo).
   //    Unbind (root/level1/level2/foo).
   //    Bind (root/level1/level2/foo, obj)
   //    Create_new_context()
-  //    and invoke rebind_context() to substitute it for the current 
+  //    and invoke rebind_context() to substitute it for the current
   //    level2 context.
   //    Bind (root/level1/level2/foo, obj)
   //    Resolve (root/level1/level2/foo).
@@ -78,7 +78,7 @@ public:
   // Execute the tree test code.
 };
 
-class Iterator_Test : public Naming_Test 
+class Iterator_Test : public Naming_Test
 {
   // = TITLE
   //    This class implements a test of Naming Service functions
@@ -94,16 +94,16 @@ public:
   virtual int execute (TAO_Naming_Client &root_context);
   // Execute the iterator test code.
 };
- 
-class Exceptions_Test : public Naming_Test 
+
+class Exceptions_Test : public Naming_Test
 {
   // = TITLE
   //    This class implements a test of exceptions in the Naming Service.
   //
   // = DESCRIPTION
   //    Makes sure that Naming Service throws exceptions as expected, and
-  //    data inside exceptions is set correctly.  The test creates a tree of 
-  //    of Naming Contexts: root context -> level1 -> level2.  It then binds() an 
+  //    data inside exceptions is set correctly.  The test creates a tree of
+  //    of Naming Contexts: root context -> level1 -> level2.  It then binds() an
   //    object with the name foo to each of Naming Contexts in the tree.
   //    Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
   //    Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
@@ -136,7 +136,7 @@ private:
                         CORBA::Environment &_env);
 };
 
-class Destroy_Test : public Naming_Test 
+class Destroy_Test : public Naming_Test
 {
   // = TITLE
   //    This class implements a test of destroy() function
@@ -149,7 +149,7 @@ class Destroy_Test : public Naming_Test
   //    Unbind the object and call destroy on the context.
   //    Attempt to call destroy on the object again - OBJECT_NOT_EXIST
   //    exception should be raised.
-  //    
+  //
 public:
   virtual int execute (TAO_Naming_Client &root_context);
   // Execute the destroy test code.
@@ -157,12 +157,12 @@ public:
 private:
   // = The following functions isolate specific tests.
   void not_empty_test (CosNaming::NamingContext_var &ref,
-		       CORBA::Environment &_env);
+                       CORBA::Environment &_env);
   void not_exist_test (CosNaming::NamingContext_var &ref,
-		       CORBA::Environment &_env);
+                       CORBA::Environment &_env);
 };
 
-class CosNaming_Client 
+class CosNaming_Client
 {
   // = TITLE,
   //    Defines a class that encapsulates behaviour of the CosNaming
@@ -190,7 +190,7 @@ public:
   // Initialize the client communication endpoint with server.
 
   // = Symbolic ids.
-  enum 
+  enum
   {
     OBJ1_ID = 5,
     OBJ2_ID = 6
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 17eb8b73e1b..52139a62312 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -2,7 +2,7 @@
 
 // ========================================================================
 //
-// = FILE  
+// = FILE
 //     Offer_Exporter.h
 //
 // = DESCRIPTION
@@ -11,7 +11,7 @@
 // = AUTHOR
 //     Seth Widoff <sbw1@cs.wustl.edu>
 //
-// ======================================================================= 
+// =======================================================================
 
 #ifndef TAO_OFFER_EXPORTER_H
 #define TAO_OFFER_EXPORTER_H
@@ -25,106 +25,106 @@ public:
 
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose,
-		      CORBA::Environment& env)
+                      CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   ~TAO_Offer_Exporter (void);
-  
+
   void export_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::Register::InvalidObjectRef, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::Register::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::MissingMandatoryProperty, 
-		     CosTrading::DuplicatePropertyName));
-  // Export a number of offers to the Trading Service. 
-  
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::Register::InvalidObjectRef,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::Register::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::MissingMandatoryProperty,
+                     CosTrading::DuplicatePropertyName));
+  // Export a number of offers to the Trading Service.
+
   void export_offers_to_all (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::Register::InvalidObjectRef, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::Register::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::MissingMandatoryProperty, 
-		     CosTrading::DuplicatePropertyName));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::Register::InvalidObjectRef,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::Register::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::MissingMandatoryProperty,
+                     CosTrading::DuplicatePropertyName));
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
-  
+
   void withdraw_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalOfferId,
+                     CosTrading::UnknownOfferId,
+                     CosTrading::Register::ProxyOfferId));
   // Withdraw all exported offers.
 
   void describe_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalOfferId,
+                     CosTrading::UnknownOfferId,
+                     CosTrading::Register::ProxyOfferId));
   // Describe all the offers registered with the bootstrapped trader.
 
   void modify_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::NotImplemented, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::Register::UnknownPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::Register::MandatoryProperty, 
-		     CosTrading::Register::ReadonlyProperty, 
-		     CosTrading::DuplicatePropertyName));
-  // Remove some properties and change some properties in each offer. 
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::NotImplemented,
+                     CosTrading::IllegalOfferId,
+                     CosTrading::UnknownOfferId,
+                     CosTrading::Register::ProxyOfferId,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::Register::UnknownPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::Register::MandatoryProperty,
+                     CosTrading::Register::ReadonlyProperty,
+                     CosTrading::DuplicatePropertyName));
+  // Remove some properties and change some properties in each offer.
 
   void withdraw_offers_using_constraints (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::IllegalConstraint, 
-		     CosTrading::Register::NoMatchingOffers));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::IllegalConstraint,
+                     CosTrading::Register::NoMatchingOffers));
   // Withdraw a number of offers based on a constraint string.
-  
+
 private:
 
   CosTrading::OfferIdSeq* grab_offerids (CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::NotImplemented));
+                     CosTrading::NotImplemented));
 
   void create_offers (void);
   // Fill in each of the offer structures.
 
   void export_to (CosTrading::Register_ptr reg,
                   CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::Register::InvalidObjectRef, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::Register::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::MissingMandatoryProperty, 
-		     CosTrading::DuplicatePropertyName));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::Register::InvalidObjectRef,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::Register::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::PropertyTypeMismatch,
+                     CosTrading::ReadonlyDynamicProperty,
+                     CosTrading::MissingMandatoryProperty,
+                     CosTrading::DuplicatePropertyName));
   // Export the offers to the give Register interface.
 
   typedef ACE_Unbounded_Queue<TAO_Dynamic_Property*> DP_Queue;
 
   CORBA::Boolean verbose_;
   // True if the user wants verbose output.
-  
+
   CosTrading::Register_var register_;
   CosTrading::Admin_var admin_;
-  
+
   TT_Info::Printer printer_[NUM_OFFERS];
   TT_Info::Plotter plotter_[NUM_OFFERS];
   TT_Info::File_System fs_[NUM_OFFERS];
@@ -134,7 +134,7 @@ private:
   CosTrading::PropertySeq props_printers_[NUM_OFFERS];
   CosTrading::PropertySeq props_fs_[NUM_OFFERS];
   // Property sequences describing each service.
-  
+
   DP_Queue clean_up_;
   // A list of dynamic properties to clean up upon destruction.
 };
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index ce620dcae4e..759c434ef5c 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -2,7 +2,7 @@
 
 // ========================================================================
 //
-// = FILE  
+// = FILE
 //     Offer_Importer.h
 //
 // = DESCRIPTION
@@ -11,13 +11,18 @@
 // = AUTHOR
 //     Seth Widoff <sbw1@cs.wustl.edu>
 //
-// ======================================================================= 
+// =======================================================================
 
 #ifndef TAO_OFFER_IMPORTER
 #define TAO_OFFER_IMPORTER
 
 #include "TT_Info.h"
 #include "ace/Task_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/Trader/Trader_Utils.h"
 
 class TAO_Offer_Importer
@@ -29,62 +34,62 @@ public:
 
   void perform_queries (CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType,
-		     CosTrading::UnknownServiceType,
-		     CosTrading::IllegalConstraint,
-		     CosTrading::Lookup::IllegalPreference,
-		     CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
-		     CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::IllegalConstraint,
+                     CosTrading::Lookup::IllegalPreference,
+                     CosTrading::Lookup::IllegalPolicyName,
+                     CosTrading::Lookup::PolicyTypeMismatch,
+                     CosTrading::Lookup::InvalidPolicyValue,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTrading::DuplicatePolicyName));
   // Barrage the bootstrapped-to trader with queries.
 
   void perform_directed_queries (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::IllegalConstraint, 
-		     CosTrading::Lookup::IllegalPreference, 
-		     CosTrading::Lookup::IllegalPolicyName, 
-		     CosTrading::Lookup::PolicyTypeMismatch, 
-		     CosTrading::Lookup::InvalidPolicyValue, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::IllegalConstraint,
+                     CosTrading::Lookup::IllegalPreference,
+                     CosTrading::Lookup::IllegalPolicyName,
+                     CosTrading::Lookup::PolicyTypeMismatch,
+                     CosTrading::Lookup::InvalidPolicyValue,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTrading::DuplicatePolicyName));
   // Direct a query to a trader two graph edges distant from the
   // bootstrapped-to trader.
-  
+
 private:
 
   void perform_queries_with_policies (const TAO_Policy_Manager& policy_manager,
                                       CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::IllegalConstraint, 
-		     CosTrading::Lookup::IllegalPreference, 
-		     CosTrading::Lookup::IllegalPolicyName, 
-		     CosTrading::Lookup::PolicyTypeMismatch, 
-		     CosTrading::Lookup::InvalidPolicyValue, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTrading::IllegalConstraint,
+                     CosTrading::Lookup::IllegalPreference,
+                     CosTrading::Lookup::IllegalPolicyName,
+                     CosTrading::Lookup::PolicyTypeMismatch,
+                     CosTrading::Lookup::InvalidPolicyValue,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTrading::DuplicatePolicyName));
   // Perform a query on the bootstrapped-to trader given the policies
   // pass in <policy_manager>.
-  
+
   void display_results (const CosTrading::OfferSeq& offer_seq,
-			CosTrading::OfferIterator_ptr offer_iterator,
-			CORBA::Environment& _env) const
+                        CosTrading::OfferIterator_ptr offer_iterator,
+                        CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CORBA::SystemException));
   // Display the results of the query to the screen.
 
   CORBA::Boolean verbose_;
   // Output the contents of each returned offer, if true.
-  
+
   CosTrading::Lookup_ptr lookup_;
-  // The interface on which to perform all those wonderful queries. 
+  // The interface on which to perform all those wonderful queries.
 };
 
 #endif /* TAO_OFFER_IMPORTER */
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index a695c4ef495..004caf3410d 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -2,7 +2,7 @@
 
 // ========================================================================
 //
-// = FILE  
+// = FILE
 //     Offer_Exporter.h
 //
 // = DESCRIPTION
@@ -11,7 +11,7 @@
 // = AUTHOR
 //     Seth Widoff <sbw1@cs.wustl.edu>
 //
-// ======================================================================= 
+// =======================================================================
 
 #ifndef TAO_SERVICE_TYPE_EXPORTER_H
 #define TAO_SERVICE_TYPE_EXPORTER_H
@@ -26,96 +26,96 @@ public:
                              CORBA::Boolean verbose,
                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException));
-  
+
   void remove_all_types (CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::HasSubTypes));
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType,
+                     CosTradingRepos::ServiceTypeRepository::HasSubTypes));
   // Remove all service types from the trading service instance.
-  
+
   void add_all_types (CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, 
-		     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::DuplicatePropertyName, 
-		     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, 
-		     CosTrading::UnknownServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
-  // Add all the generated service types to the trading service instance. 
+                     CosTrading::IllegalServiceType,
+                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
+                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
+                     CosTrading::UnknownServiceType,
+                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+  // Add all the generated service types to the trading service instance.
 
   void add_all_types_to_all (CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, 
-		     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::DuplicatePropertyName, 
-		     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, 
-		     CosTrading::UnknownServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+                     CosTrading::IllegalServiceType,
+                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
+                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
+                     CosTrading::UnknownServiceType,
+                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
-      
+
   void list_all_types (CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException));
   // List all the service types registered with the trading service
-  // instance. 
+  // instance.
 
   void describe_all_types (CORBA::Environment& _env)
   TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType, 
-		   CosTrading::UnknownServiceType));
+                   CosTrading::IllegalServiceType,
+                   CosTrading::UnknownServiceType));
   // Describe all the service types registered with the trading
-  // service instance. 
+  // service instance.
 
   void fully_describe_all_types (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     CosTrading::IllegalServiceType,
+                     CosTrading::UnknownServiceType));
   // Same as describe_all_types, but fully describe lists the
   // properties of all service types the described service type
-  // inherits from. 
-  
+  // inherits from.
+
 private:
 
   void create_types (void);
-  // Generate the service type description structures. 
-  
+  // Generate the service type description structures.
+
   void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
                          CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, 
-		     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::DuplicatePropertyName, 
-		     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, 
-		     CosTrading::UnknownServiceType, 
-		     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+                     CosTrading::IllegalServiceType,
+                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
+                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
+                     CosTrading::IllegalPropertyName,
+                     CosTrading::DuplicatePropertyName,
+                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
+                     CosTrading::UnknownServiceType,
+                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
   // Add all types to a sepcified service type repository reference.
-  
-  void 
+
+  void
   dump_typestruct (const char* type_name,
-		   const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct) const;
+                   const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct) const;
   // Dump the contents of a service type description to standard
-  // output. 
+  // output.
 
   CORBA::Boolean verbose_;
   // True if the user want profuse output.
-  
+
   CosTrading::Lookup_ptr lookup_;
   // A reference to the lookup interface of the trading service
-  // instance. 
-  
+  // instance.
+
   CosTradingRepos::ServiceTypeRepository_var repos_;
-  // A reference to a service type repository instance. 
-  
+  // A reference to a service type repository instance.
+
   CosTradingRepos::ServiceTypeRepository::TypeStruct type_structs_[NUM_TYPES];
   // Descriptions of all the service types whose property names are
-  // defined in TT_Info. 
+  // defined in TT_Info.
 };
 
 #endif /* TAO_SERVICE_TYPE_EXPORTER_H */
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 09817920f5c..8dc42e58f4c 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -2,7 +2,7 @@
 
 // ========================================================================
 //
-// = FILE  
+// = FILE
 //     Simple_Dyanmic.h
 //
 // = DESCRIPTION
@@ -11,7 +11,7 @@
 // = AUTHOR
 //     Seth Widoff <sbw1@cs.wustl.edu>
 //
-// ======================================================================= 
+// =======================================================================
 
 #ifndef TAO_SIMPLE_DYNAMIC_H
 #define TAO_SIMPLE_DYNAMIC_H
@@ -21,14 +21,14 @@
 template<class T>
 class TAO_Simple_Dynamic_Property : public TAO_Dynamic_Property
 {
-public: 
+public:
 
   TAO_Simple_Dynamic_Property (const T& dp);
-  
+
   virtual CORBA::Any* evalDP (const char* name,
                               CORBA::TypeCode_ptr returned_type,
-                              const CORBA::Any& extra_info,	      
-			      CORBA::Environment& _env)
+                              const CORBA::Any& extra_info,
+                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 private:
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index efc7f96b1ad..89ed2742f50 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -11,9 +11,9 @@ class TT_Info
 public:
 
   static void dump_properties (const CosTrading::PropertySeq& prop_seq,
-			       CORBA::Boolean print_dynamic = 1);
+                               CORBA::Boolean print_dynamic = 1);
   // Dump the contents of this property sequence.
-  
+
   enum INTERFACES
   {
     REMOTE_IO,
@@ -24,20 +24,20 @@ public:
   };
 
   // = Test servants.
-  
+
   class Remote_Output :
     public POA_TAO_Trader_Test::Remote_Output
   {
   public:
-    
+
     Remote_Output (void) {}
-    
+
     virtual void confirm (CORBA::Environment& _env)
       TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
-  
+
   class Printer :
     public POA_TAO_Trader_Test::Printer
   {
@@ -48,33 +48,33 @@ public:
     virtual void confirm (CORBA::Environment& _env)
       TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
-    // the exported object. 
+    // the exported object.
   };
-  
+
   class Plotter :
     public POA_TAO_Trader_Test::Plotter
   {
   public:
     Plotter (void) {}
-    
+
     virtual void confirm (CORBA::Environment& _env)
       TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
-    // the exported object. 
+    // the exported object.
   };
-  
+
   class File_System :
     public POA_TAO_Trader_Test::File_System
   {
-  public:  
+  public:
     File_System (void) {}
 
     virtual void confirm (CORBA::Environment& _env)
       TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
-    // the exported object. 
+    // the exported object.
   };
-  
+
   class PostScript_Printer :
     public POA_TAO_Trader_Test::PostScript_Printer
   {
@@ -84,14 +84,14 @@ public:
     virtual void confirm (CORBA::Environment& _env)
       TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
-    // the exported object. 
+    // the exported object.
   };
 
 #define NUM_TYPES 5
   static const char* INTERFACE_NAMES[];
-  
+
   // = Remote IO property descriptions
-  
+
   enum REMOTE_IO_PROPERTIES
   {
     NAME,
@@ -104,9 +104,9 @@ public:
 
   static const char* REMOTE_IO_NAME;
   static const char* REMOTE_IO_PROPERTY_NAMES[];
-  
-  // = Plotter property descriptions 
-  
+
+  // = Plotter property descriptions
+
   enum PLOTTER_PROPERTIES
   {
     PLOTTER_NUM_COLORS,
@@ -118,10 +118,10 @@ public:
   };
 
   static const char* PLOTTER_NAME;
-  static const char* PLOTTER_PROPERTY_NAMES[]; 
-  
+  static const char* PLOTTER_PROPERTY_NAMES[];
+
   // = Printer property descriptions
-  
+
   enum PRINTER_PROPERTIES
   {
     PRINTER_COLOR,
@@ -135,9 +135,9 @@ public:
 
   static const char* PRINTER_NAME;
   static const char* PRINTER_PROPERTY_NAMES[];
-  
+
   // = File System Property Descriptions
-  
+
   enum FILESYSTEM_PROPERTIES
   {
     DISK_SIZE,
@@ -148,8 +148,8 @@ public:
   static const char* FILESYSTEM_NAME;
   static const char* FILESYSTEM_PROPERTY_NAMES[];
 
-  // = PostScript Printer property descriptions.  
-  
+  // = PostScript Printer property descriptions.
+
   enum PS_PRINTER_PROPERTIES
   {
     VERSION
@@ -157,7 +157,7 @@ public:
 
   static const char* PS_PRINTER_NAME;
   static const char* PS_PRINTER_PROPERTY_NAMES[];
-  
+
   // = Offer Info
 
 #define NUM_OFFERS 15
@@ -166,9 +166,9 @@ public:
   static const char* MODEL_NUMBERS[];
 
   // = Query info
-  
+
   static const int NUM_QUERIES;
-  static const char* QUERIES[][3];  
+  static const char* QUERIES[][3];
 };
 
 #endif /* TAO_TRADER_TEST_UTILS_H */
diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/client.h b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/client.h
index 94cc36a14bd..5c199c16815 100644
--- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/client.h
@@ -20,6 +20,11 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "cubit.H"
 
 class Cubit_Client
@@ -45,8 +50,8 @@ public:
   // Initialize the client communication endpoint with server.
 
   void print_exception (const char * str,
-			const CORBA_Environment &env=Cubit_Client::env_);
-			
+                        const CORBA_Environment &env=Cubit_Client::env_);
+
 private:
   int func (u_int i);
   // simple function that returns the substraction of 117 from the parameter.
diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/cubit_i.h
index 9db23e7dbb6..abd6ad919ee 100644
--- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/cubit_i.h
@@ -4,20 +4,24 @@
 //
 // = LIBRARY
 //    TAO/tests/IDL_Cubit
-// 
+//
 // = FILENAME
 //    cubit_i.h
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
+//
 // ============================================================================
 
-#if !defined (_CUBIT_I_HH)
-#define	_CUBIT_I_HH
+#ifndef _CUBIT_I_HH
+#define _CUBIT_I_HH
 
 #include "ace/ACE.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <api/api.H>
 #include <api/binding.H>
 #include <corba/eoa.H>
@@ -35,7 +39,7 @@ class Cubit_i;
 typedef Cubit_i *Cubit_i_ptr;
 typedef Cubit_i_ptr Cubit_i_ref;
 
-class Cubit_i 
+class Cubit_i
   // = TITLE
   //    Illustrates how to integrate a servant with the
   //    generated skeleton.
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Task_Client.h
index 5b04c3a73b5..62ea98eb6e8 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Task_Client.h
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#if !defined (TASK_CLIENT_H)
+#ifndef TASK_CLIENT_H
 #define TASK_CLIENT_H
 
 #include <corba/cool.H>
@@ -21,6 +21,11 @@
 #include "cubit.H"
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
@@ -35,7 +40,7 @@
 //
 // I will integrate this, together with the sqrt() function when
 // the implementation is complete.  --Sergio.
-// @@ Sergio, can you please use the ACE_timer_t here rather than #define'ing double? 
+// @@ Sergio, can you please use the ACE_timer_t here rather than #define'ing double?
 #if defined (ACE_LACKS_FLOATING_POINT)
 #define double ACE_UINT32
 #define fabs(X) ((X) >= 0 ? (X) : -(X))
@@ -46,14 +51,14 @@
 
 // Arbitrary generator used by the client to create the numbers to be
 // cubed.
-inline int 
-func (unsigned i) 
-{ 
-  return i - 117; 
+inline int
+func (unsigned i)
+{
+  return i - 117;
 }
 
-// The various datatypes which the client and the server can exchange. 
-enum Cubit_Datatypes 
+// The various datatypes which the client and the server can exchange.
+enum Cubit_Datatypes
 {
   CB_OCTET,
   CB_SHORT,
@@ -62,9 +67,9 @@ enum Cubit_Datatypes
 };
 
 const int CB_40HZ_CONSUMER = 0;
-const int CB_20HZ_CONSUMER = 1;    
-const int CB_10HZ_CONSUMER = 2;    
-const int CB_5HZ_CONSUMER = 3;    
+const int CB_20HZ_CONSUMER = 1;
+const int CB_10HZ_CONSUMER = 2;
+const int CB_5HZ_CONSUMER = 3;
 const int CB_1HZ_CONSUMER = 4;
 
 const int CB_40HZ_CONSUMER_RATE = 40;
@@ -82,7 +87,7 @@ class Task_State
 
   // = DESCRIPTION
   //     This class maintains state which is common to the potentially
-  //     multiple concurrent clients. 
+  //     multiple concurrent clients.
 {
 public:
   ACE_Barrier *barrier_;
@@ -149,7 +154,7 @@ public:
 
 class Client : public ACE_Task<ACE_MT_SYNCH>
   // = TITLE
-  //     The Cubit client. 
+  //     The Cubit client.
 {
 public:
   Client (Task_State *ts);
@@ -168,15 +173,15 @@ public:
 
 private:
 
-  int run_tests (Cubit_ptr, 
-                 unsigned int, 
-                 unsigned int, 
-                 Cubit_Datatypes, 
+  int run_tests (Cubit_ptr,
+                 unsigned int,
+                 unsigned int,
+                 Cubit_Datatypes,
                  double frequency);
   // makes the calls to the servant
 
-  void put_latency (double *jitter, 
-                    double latency, 
+  void put_latency (double *jitter,
+                    double latency,
                     unsigned int);
   // Records the latencies in the Task_State
 
@@ -185,7 +190,7 @@ private:
 
   Task_State *ts_;
   // pointer to shared state
-  
+
 };
 
 #endif /* !defined (TASK_CLIENT_H) */
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.h b/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.h
index b4066444a7c..734b559dafe 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.h
@@ -17,6 +17,11 @@
 #include "cubit.H"
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/pccTimer.h b/TAO/performance-tests/Cubit/COOL/MT_Cubit/pccTimer.h
index 453977e6661..2f4acc12fe2 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/pccTimer.h
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/pccTimer.h
@@ -4,7 +4,7 @@
  *
  * Component =   PCC2 Timer Header File
  *
- * Synopsis  =   
+ * Synopsis  =
  *
  *
  ****************************************************************
@@ -35,7 +35,7 @@ pccTimer2Reset();
 void
 pccTimer2Start();
 void
-pccTimer2Stop(); 
+pccTimer2Stop();
 void
 pccTimerInit();
 
@@ -46,7 +46,7 @@ pccTimerInit();
 #define PCC2_TIMER2_START                0x10
 #define PCC2_TIMER2_STOP                 0x20
 #define PCC2_TIMER2_BPOINT                0x40
-#define PCC2_USERDATA             	0x100
+#define PCC2_USERDATA                   0x100
 
 #include <c_defs.h>
 #include <mem/chAddr_f.h>
diff --git a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/clnt.h b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/clnt.h
index 5713668e0e5..cf6e3187228 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/clnt.h
+++ b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/clnt.h
@@ -9,31 +9,36 @@
 //    clnt.h
 //
 // = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit 
+//      This class implements a simple "cube" CORBA client for the Cubit
 //      example using stubs generated by the TAO ORB IDL compiler.
 //
 // = AUTHORS
 //      Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
 //
 // ============================================================================
-#if !defined (_CLNT_H_)
+#ifndef _CLNT_H_
 #define _CLNT_H_
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "pbroker/corba/orb.h"
 #include "pbroker/corba/request.h"
 #include "pbroker/corba/environ.h"
 #include "cubit.h"
 
-class Cubit_Client 
+class Cubit_Client
   // = TITLE
   //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an 
+  //    example.  Provides a better understanding of the logic in an
   //    object oriented way.
   //
   // = DESCRIPTION
   //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the 
+  //    Cubit CORBA server.  All the complexity for initializing the
   //    server is hidden in the class.  Just the run() interface is needed.
 {
  public:
@@ -59,7 +64,7 @@ private:
 
   void cube_union_stub (void);
   // Exercise the union.  Cube a union.
-  
+
   void cube_union_dii (void);
   // Exercise the union using dii.
 
@@ -107,7 +112,7 @@ private:
 
   CORBA::Object_ptr objref_;
   // storage of the factory objref
-  
+
   CORBA::Environment env_;
   // Environment variable
 
diff --git a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h
index b97c92c2e7d..b1b21e9deeb 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h
@@ -4,22 +4,27 @@
 //
 // = LIBRARY
 //    TAO/tests/Cubit/CORBAplus/IDL_Cubit
-// 
+//
 // = FILENAME
 //    cubit_i.h
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
+//
 // ============================================================================
 
-#if !defined (_CUBIT_I_HH)
-#define	_CUBIT_I_HH
+#ifndef _CUBIT_I_HH
+#define _CUBIT_I_HH
 
 #include <pbroker/corba/lifecycl/actvtr.h>
 #include <pbroker/corba/lifecycl/impldecl.h>
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "cubit_s.h"
 
 // Forward declarations
@@ -83,13 +88,13 @@ class Cubit_Factory_i: public Cubit_Factory_base_impl
 public:
   XPS_CAST1_DECL(Cubit_Factory_i,Cubit_Factory_base_impl)
   XPS_DEFINE_IMPLEMENTATION(Cubit_Factory_decl)
-    
-  Cubit_Factory_i (void) 
+
+  Cubit_Factory_i (void)
     {Cubit_Factory_i ("keyone", 1);}
-  
-  Cubit_Factory_i (const CORBA_ReferenceData & refData) 
+
+  Cubit_Factory_i (const CORBA_ReferenceData & refData)
     {Cubit_Factory_i ("keyone", 1);}
-  
+
   Cubit_Factory_i (const char *key, int numobjs);
   // constructor
 
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h
index fa82b6a4d7b..6a5d2782b22 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h
@@ -5,6 +5,11 @@
 #include "pbroker/corba/environ.h"
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h
index 8ba58a1ccd7..2e4e350ed09 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h
@@ -4,18 +4,18 @@
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
 //
-// TEST:	hand-written Cubit Implementation
+// TEST:        hand-written Cubit Implementation
 //
 // Modified version of Cubit Example written by Sun Microsystems Inc.
 // Modified by: Brian Mendel
 
 /**************************************************************************
 This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
+implementation
 ***************************************************************************/
 
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
+#ifndef _CUBIT_I_HH
+#define _CUBIT_I_HH
 
 #include "cubit_s.h"
 
@@ -28,25 +28,25 @@ class Cubit_i : public Cubit_base_impl
 public:
   Cubit_i (const char *obj_name = 0);
   ~Cubit_i (void);
-   
+
   virtual
   CORBA::Octet cube_octet (CORBA::Octet       o);
 
   virtual
   CORBA::Short cube_short (CORBA::Short       s);
-  
+
   virtual
   CORBA::Long cube_long (CORBA::Long        l);
-  
+
   virtual
     Cubit::Many cube_struct (const Cubit::Many        &values);
-  
+
   /*  virtual
   Cubit::oneof *cube_union (Cubit::oneof       &values,
   CORBA::Environment &env); */
-  
+
   virtual
   void please_exit (void);
 };
 
-#endif	// _CUBIT_I_HH
+#endif  // _CUBIT_I_HH
diff --git a/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/client_i.h b/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/client_i.h
index 6dbe4bb6362..a8769d7b1c1 100644
--- a/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/client_i.h
+++ b/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/client_i.h
@@ -19,6 +19,11 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 #include "ace/Timeprobe.h"
 #include "gpp_header.hh"
@@ -79,10 +84,10 @@ private:
 
   void cube_long (int i);
   // calculate the cube from a long.
-  
+
   void cube_octet (int i);
   // Cube an octet.
-  
+
   void cube_short (int i);
   // Cube a short.
 
diff --git a/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/server_i.h b/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/server_i.h
index 310338e8432..2ac0625197c 100644
--- a/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/server_i.h
+++ b/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/server_i.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_C_SERVER_H)
+#ifndef _C_SERVER_H
 #define _C_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "gpp_header.hh"
 #include "naming.hh"
@@ -50,7 +55,7 @@ public:
   // Initialize the Cubit_Server state - parsing arguments and ...
 
   int run (void);
-  // Run the orb 
+  // Run the orb
 
 private:
   int parse_args (void);
@@ -72,7 +77,7 @@ private:
 
   //  Cubit_Factory_i factory_impl_;
   // Implementation object of the cubit factory.
-       
+
   //Cubit_Factory_var factory;
   // Factory_var to register with NamingService.
 
diff --git a/TAO/performance-tests/Cubit/Orbix/client/cubit.h b/TAO/performance-tests/Cubit/Orbix/client/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/performance-tests/Cubit/Orbix/client/cubit.h
+++ b/TAO/performance-tests/Cubit/Orbix/client/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/performance-tests/Cubit/Orbix/factory_client/cubit.h b/TAO/performance-tests/Cubit/Orbix/factory_client/cubit.h
index 3a2dd546608..80e2c0590f5 100644
--- a/TAO/performance-tests/Cubit/Orbix/factory_client/cubit.h
+++ b/TAO/performance-tests/Cubit/Orbix/factory_client/cubit.h
@@ -14,7 +14,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -29,12 +29,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -93,12 +93,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -712,7 +712,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
@@ -732,7 +732,7 @@ public:
 class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -747,12 +747,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -811,12 +811,12 @@ protected:
     }
 public:
     static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
+            Cubit_Factory_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit_Factory* _bind (CORBA::Environment &IT_env);
    static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
+        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil();
     }
 
     Cubit_Factory_ptr operator->() const { return *_ptr;}
@@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit_Factory(X) Cubit_Factory##X
 
 #define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit_Factory##X : public virtual Cubit_Factory {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit_Factory(), m_obj(objp) {        \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);        \
+           }                                                            \
+           Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit_Factory() {     \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit_Factory##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit_Factory	\
+#define QUALS_Cubit_Factory     \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
@@ -1070,19 +1070,19 @@ return m_obj->create_cubit (  name,IT_env);\
 class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -1100,7 +1100,7 @@ public:
     Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
     m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
 }
 
         virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/performance-tests/Cubit/Orbix/tpool/cubit.h b/TAO/performance-tests/Cubit/Orbix/tpool/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpool/cubit.h
+++ b/TAO/performance-tests/Cubit/Orbix/tpool/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/performance-tests/Cubit/Orbix/tpool/tpool.h b/TAO/performance-tests/Cubit/Orbix/tpool/tpool.h
index 337a7f54e65..536aeedad22 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpool/tpool.h
+++ b/TAO/performance-tests/Cubit/Orbix/tpool/tpool.h
@@ -2,6 +2,11 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Task.h"
 
diff --git a/TAO/performance-tests/Cubit/Orbix/tpr/cubit.h b/TAO/performance-tests/Cubit/Orbix/tpr/cubit.h
index 1fd0a2d3c7d..37fb9f317d4 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpr/cubit.h
+++ b/TAO/performance-tests/Cubit/Orbix/tpr/cubit.h
@@ -5,6 +5,11 @@
 #define cubit_hh
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <CORBA.h>
 
 
@@ -13,7 +18,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -28,12 +33,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -92,12 +97,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -711,7 +716,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/performance-tests/Cubit/Orbix/tpr/cubitC.h b/TAO/performance-tests/Cubit/Orbix/tpr/cubitC.h
index 584efa67c8d..5c020bd0c4b 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpr/cubitC.h
+++ b/TAO/performance-tests/Cubit/Orbix/tpr/cubitC.h
@@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef;
 class Cubit_var
 {
     public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
+        Cubit_var();
+        Cubit_var(Cubit_ptr);
+        Cubit_var(const Cubit_var&);
+        ~Cubit_var();
+        Cubit_var& operator=(Cubit_ptr);
+        operator Cubit_ptr() const { return _ptr; }
 #if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
+        operator Cubit *&() { return _ptr; }
 #else
-	operator Cubit_ptr&() { return _ptr; }
+        operator Cubit_ptr&() { return _ptr; }
 #endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
+        Cubit_ptr operator->() const { return _ptr;}
+        friend NCistream& operator>>(NCistream&, Cubit_var&);
+        friend NCostream& operator<<(NCostream&, const Cubit_var&);
+        friend istream& operator>>(istream&, Cubit_var&);
+        friend ostream& operator<<(ostream&, const Cubit_var&);
     private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
+        Cubit_ptr       _ptr;
+        void operator=(const Cubit_var&) {}
 };
 #endif
 class Cubit: public virtual CORBA_Object
 {
     private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
+        static const CORBA::TypeInfo _class_info;
+        Cubit(const Cubit&) {}
+        void operator=(const Cubit&){}
     public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
+        static const CORBA::TypeInfo *_desc();
+        virtual const CORBA::TypeInfo *_type_info() const;
+        virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
+        static CORBA::Object *_factory();
     protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
+        Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
+        Cubit(NCistream& strm) :CORBA_Object(strm) {}
+        virtual ~Cubit() {}
     public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
+        static Cubit_ptr _duplicate(Cubit_ptr obj) {
+                if (obj ) obj->_ref();
+                return obj;
+        }
+        static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
+        static Cubit_ptr _narrow(CORBA::Object *obj);
+        static Cubit_ptr _clone(Cubit_ptr obj) {
+                CORBA::Object_var obj_var(__clone(obj));
 
 #if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
+                return _narrow(obj_var.operator CORBA::Object_ptr());
 #else
-		return _narrow(obj_var);
+                return _narrow(obj_var);
 #endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
+        }
+        static Cubit_ptr _bind(const char *object_name = NULL,
+                const char *host_name = NULL,
+                const CORBA::BindOptions* opt = NULL);
+
+        virtual CORBA::Octet cube_octet(CORBA::Octet o);
+
+        virtual CORBA::Short cube_short(CORBA::Short s);
+
+        virtual CORBA::Long cube_long(CORBA::Long l);
+
+        struct Many {
+                CORBA::Octet    o;
+                CORBA::Long     l;
+                CORBA::Short    s;
+        };
+        friend NCostream& operator<<(NCostream&, const Many& );
+        friend NCistream& operator>>(NCistream&, Many& );
+
+        friend ostream& operator<<(ostream&, const Many& );
+        inline friend istream& operator>>(istream& _strm, Many& _obj) {
+                NCistream _istrm(_strm);
+                _istrm >> _obj;
+                return _strm;
+        }
+
+
+        typedef Many *Many_ptr;
+        class Many_var
+        {
+            public:
+                Many_var() { _ptr = (Many*)NULL;}
+                Many_var(Many *ptr) {
+                        _ptr = ptr;
+                }
+                Many_var(const Many_var& var) {
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                }
+                ~Many_var() {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                }
+                Many_var& operator=(Many *ptr) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                Many_var& operator=(const Many_var& var) {
+                        if (_ptr != (Many *)NULL) delete _ptr;
+                        if (var._ptr)
+                                _ptr = new Many(*var._ptr);
+                        else
+                                _ptr = (Many *)NULL;
+                        return *this;
+                }
+                Many *operator->() { return _ptr; }
+                operator Many () const { return *_ptr; }
+                operator Many& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const Many_var& var) {
+                        if (var._ptr == (Many *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                Many_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new Many;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                Many *_ptr;
+        };
+
+
+        virtual Cubit::Many cube_struct(const Cubit::Many& values);
+
+        enum discrim {
+                e_0th,
+                e_1st,
+                e_2nd,
+                e_3rd,
+                e_4th,
+                e_5th
+        };
+        inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
+                _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                if (_temp >= 6)
+                        throw CORBA::BAD_PARAM();
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+        inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
+                if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
+                        _strm << "discrim:";
+                        switch(_enum_type) {
+                                case e_0th:
+                                        _strm << "e_0th" << endl;
+                                        break;
+                                case e_1st:
+                                        _strm << "e_1st" << endl;
+                                        break;
+                                case e_2nd:
+                                        _strm << "e_2nd" << endl;
+                                        break;
+                                case e_3rd:
+                                        _strm << "e_3rd" << endl;
+                                        break;
+                                case e_4th:
+                                        _strm << "e_4th" << endl;
+                                        break;
+                                case e_5th:
+                                        _strm << "e_5th" << endl;
+                                        break;
+                        }
+                }
+                else
+                        _strm << (CORBA::ULong)_enum_type;
+                return _strm;
+        }
+        inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
+                CORBA::ULong _temp;
+                _strm >> _temp;
+                _enum_type = discrim(_temp);
+                return _strm;
+        }
+
+
+        class oneof
+        {
+            public:
+            private:
+                discrim _disc;
+                CORBA::Octet    __o;
+                CORBA::Short    __s;
+                CORBA::Long     __l;
+                Cubit::Many     __cm;
+            public:
+                oneof() : _disc(discrim(0)) {}
+                ~oneof() {}
+                oneof(const oneof& obj);
+                oneof& operator=(const oneof& obj);
+
+                void _d(discrim val) { _disc = val; }
+                discrim _d() const { return _disc; }
+
+                void o(CORBA::Octet val) {
+                        __o = val;
+                        _disc = Cubit::e_0th;
+                }
+                CORBA::Octet o() const { return __o; }
+
+                void s(CORBA::Short val) {
+                        __s = val;
+                        _disc = Cubit::e_1st;
+                }
+                CORBA::Short s() const { return __s; }
+
+                void l(CORBA::Long val) {
+                        __l = val;
+                        _disc = Cubit::e_2nd;
+                }
+                CORBA::Long l() const { return __l; }
+
+                void cm(const Cubit::Many& val) {
+                        __cm = val;
+                        _disc = Cubit::e_3rd;
+                }
+                const Cubit::Many& cm() const { return __cm; }
+                Cubit::Many& cm() { return __cm; }
+
+                friend NCostream& operator<<(NCostream&, const oneof& );
+                friend NCistream& operator>>(NCistream&, oneof& );
+                friend ostream& operator<<(ostream&, const oneof&);
+                inline friend istream& operator>>(istream& strm, oneof& obj) {
+                        NCistream istrm(strm);
+                        strm >> obj;
+                        return strm;
+                }
+        };
+
+        typedef oneof *oneof_ptr;
+        class oneof_var
+        {
+            public:
+                oneof_var() { _ptr = (oneof*)NULL;}
+                oneof_var(oneof *ptr) {
+                        _ptr = ptr;
+                }
+                oneof_var(const oneof_var& var) {
+                        _ptr = new oneof(*var._ptr);
+                }
+                ~oneof_var() {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                }
+                oneof_var& operator=(oneof *ptr) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = ptr;
+                        return *this;
+                }
+                oneof_var& operator=(const oneof_var& var) {
+                        if (_ptr != (oneof *)NULL) delete _ptr;
+                        _ptr = new oneof(*var._ptr);
+                        return *this;
+                }
+                oneof *operator->() { return _ptr; }
+                operator oneof () const { return *_ptr; }
+                operator oneof& () { return *_ptr; }
+                inline friend NCostream& operator<<(NCostream& strm,
+                                const oneof_var& var) {
+                        if (var._ptr == (oneof *)NULL) {
+                                throw CORBA::BAD_PARAM();
+                        }
+                        else
+                                strm << *var._ptr;
+                        return strm;
+                }
+                inline friend NCistream& operator>>(NCistream& strm,
+                                oneof_var& var) {
+                        if ( ! var._ptr)
+                                var._ptr = new oneof;
+                        strm >> *var._ptr;
+                        return strm;
+                }
+            private:
+                oneof *_ptr;
+        };
+
+
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values);
+
+        virtual void please_exit();
+
+        inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
+                CORBA::Object_var _obj(obj);
+                _obj = CORBA::Object::_read(strm, Cubit::_desc());
+                obj = Cubit::_narrow(_obj);
+                return strm;
+        }
+        inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
+                strm << (CORBA::Object_ptr)obj;
+                return strm;
+        }
+        inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
+                NCistream istrm(strm);
+                istrm >> obj;
+                return strm;
+        }
 };
 
 
diff --git a/TAO/performance-tests/Cubit/Orbix/tpr/cubitS.h b/TAO/performance-tests/Cubit/Orbix/tpr/cubitS.h
index 3ca717e2b49..7132e9d229c 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpr/cubitS.h
+++ b/TAO/performance-tests/Cubit/Orbix/tpr/cubitS.h
@@ -20,100 +20,100 @@
 class _sk_Cubit : public Cubit
 {
     protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
+        _sk_Cubit(const char *object_name = (const char *)NULL);
+        _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
+        virtual ~_sk_Cubit() {}
     public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
+        static const CORBA::TypeInfo _skel_info;
+
+        // The following operations need to be implemented by the server.
+        virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
+        virtual CORBA::Short cube_short(CORBA::Short s) = 0;
+        virtual CORBA::Long cube_long(CORBA::Long l) = 0;
+        virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
+        virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
+        virtual void please_exit() = 0;
+
+        // Skeleton Operations implemented automatically
+
+        static void _cube_octet(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_short(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_long(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_struct(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _cube_union(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
+        static void _please_exit(void *obj,
+                        CORBA::MarshalStream &strm,
+                        CORBA::Principal_ptr principal,
+                        const char *oper,
+                        void *priv_data);
+
 };
 template <class T>
 class _tie_Cubit : public Cubit
 {
     public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
+        _tie_Cubit(T& t, const char *obj_name=(char*)NULL) :
+                        Cubit(obj_name),
+                        _ref(t) {
+                _object_name(obj_name);
+        }
+        _tie_Cubit(T& t, const char *service_name,
+                        const CORBA::ReferenceData& id)
+                        :_ref(t) {
+                _service(service_name, id);
+        }
+        ~_tie_Cubit() {}
+        CORBA::Octet cube_octet(CORBA::Octet o) {
+                return _ref.cube_octet(
+                o);
+        }
+        CORBA::Short cube_short(CORBA::Short s) {
+                return _ref.cube_short(
+                s);
+        }
+        CORBA::Long cube_long(CORBA::Long l) {
+                return _ref.cube_long(
+                l);
+        }
+        Cubit::Many cube_struct(const Cubit::Many& values) {
+                return _ref.cube_struct(
+                values);
+        }
+        Cubit::oneof cube_union(const Cubit::oneof& values) {
+                return _ref.cube_union(
+                values);
+        }
+        void please_exit() {
+                _ref.please_exit();
+        }
 
     private:
-	T& _ref;
+        T& _ref;
 };
 
 #endif
diff --git a/TAO/performance-tests/Cubit/Orbix/tpr/tpr.h b/TAO/performance-tests/Cubit/Orbix/tpr/tpr.h
index b5e8be94cf1..7912a2dc92c 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpr/tpr.h
+++ b/TAO/performance-tests/Cubit/Orbix/tpr/tpr.h
@@ -2,11 +2,16 @@
 
 #include "cubit.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 
 //
 // Create a thread filter to dispatch incoming calls
 //
 class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
+        virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
 };
diff --git a/TAO/performance-tests/Cubit/Orbix/tps/cubit.h b/TAO/performance-tests/Cubit/Orbix/tps/cubit.h
index 3a2dd546608..80e2c0590f5 100644
--- a/TAO/performance-tests/Cubit/Orbix/tps/cubit.h
+++ b/TAO/performance-tests/Cubit/Orbix/tps/cubit.h
@@ -14,7 +14,7 @@
 class Cubit_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -29,12 +29,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -93,12 +93,12 @@ protected:
     }
 public:
     static Cubit_ptr _duplicate(
-            Cubit_ptr, 
+            Cubit_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit* _bind (CORBA::Environment &IT_env);
    static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
+        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil();
     }
 
     Cubit_ptr operator->() const { return *_ptr;}
@@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit(X) Cubit##X
 
 #define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit##X : public virtual Cubit {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit(), m_obj(objp) {        \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);        \
+           }                                                            \
+           Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit() {     \
+                m_pptr = new Cubit_dispatch             \
+                        (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit	\
+#define QUALS_Cubit     \
 virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_octet (  o,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_short (  s,IT_env);\
 }\
-	\
+        \
 virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_long (  l,IT_env);\
 }\
-	\
+        \
 virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_struct (  values,IT_env);\
 }\
-	\
+        \
 virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->cube_union (  values,IT_env);\
 }\
-	\
+        \
 virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 m_obj->please_exit (IT_env);\
 }\
@@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\
 class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -712,7 +712,7 @@ public:
     CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
     m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_IR, this);
 }
 
         virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
@@ -732,7 +732,7 @@ public:
 class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
 public:
 
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
+      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m,
         CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
 
@@ -747,12 +747,12 @@ public:
        : PPTR (IT_OR,IT_p,IT_o) {}
 
 
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
+   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m,
         char *IT_i, CORBA::Object* IT_ob, void* IT_im)
        : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
 
 
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
+   virtual unsigned char dispatch (CORBA::Request &IT_r,
         unsigned char IT_isTarget, void* IT_pp=NULL);
 
 
@@ -811,12 +811,12 @@ protected:
     }
 public:
     static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
+            Cubit_Factory_ptr,
             CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
 public:
    static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
+                const CORBA::Context &IT_c,
+                CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
    static Cubit_Factory* _bind (CORBA::Environment &IT_env);
    static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
                  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
@@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
     }
 
     operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
+        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil();
     }
 
     Cubit_Factory_ptr operator->() const { return *_ptr;}
@@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem
 #define TIE_Cubit_Factory(X) Cubit_Factory##X
 
 #define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
+        class Cubit_Factory##X : public virtual Cubit_Factory {         \
+          X* m_obj;                                             \
+        public:                                                 \
+                                                                \
+                                                                \
+           Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
+                : Cubit_Factory(), m_obj(objp) {        \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);        \
+           }                                                            \
+           Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
+                : Cubit_Factory() {     \
+                m_pptr = new Cubit_Factory_dispatch             \
+                        (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);   \
+                m_obj = (X*)(m_pptr->getImplObj ());                    \
+           }                                                            \
+                                                                \
+           virtual ~Cubit_Factory##X  () {                              \
+                if (_okToDeleteImpl ()) delete m_obj; }                                 \
+           virtual void* _deref () {                                    \
+                return m_obj; }                                 \
+                                                                \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
-								\
-	};						\
+                                                                \
+        };                                              \
 
 
-#define QUALS_Cubit_Factory	\
+#define QUALS_Cubit_Factory     \
 virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
 return m_obj->create_cubit (  name,IT_env);\
 }\
@@ -1070,19 +1070,19 @@ return m_obj->create_cubit (  name,IT_env);\
 class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
 public:
    Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
+                : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
 
     virtual void* New (char *IT_OR, CORBA::Environment&);
 
     virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual void* New2 (); 
+    virtual void* New2 ();
 
     virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
 
     virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
 
-    virtual CORBA::Object* New2Object (); 
+    virtual CORBA::Object* New2Object ();
 
     virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
 
@@ -1100,7 +1100,7 @@ public:
     Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
   if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
     m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
+         (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
 }
 
         virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
diff --git a/TAO/performance-tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/performance-tests/Cubit/Orbix/tps/cubit_impl.h
index 0fea9857af3..13e65492916 100644
--- a/TAO/performance-tests/Cubit/Orbix/tps/cubit_impl.h
+++ b/TAO/performance-tests/Cubit/Orbix/tps/cubit_impl.h
@@ -7,6 +7,10 @@
 #include "cubit.h"
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #ifdef Cubit_USE_BOA
 class Cubit_Impl : public virtual CubitBOAImpl {
 #else
diff --git a/TAO/performance-tests/Cubit/Orbix/tps/tps.h b/TAO/performance-tests/Cubit/Orbix/tps/tps.h
index 362c9ed4e91..169b44dfd62 100644
--- a/TAO/performance-tests/Cubit/Orbix/tps/tps.h
+++ b/TAO/performance-tests/Cubit/Orbix/tps/tps.h
@@ -3,6 +3,11 @@
 #include "cubit.h"
 #include "cubit_impl.h"
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Task.h"
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 2afe1be97a5..7229424b1ea 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_CUBIT_CLIENT_H)
+#ifndef _CUBIT_CLIENT_H
 #define _CUBIT_CLIENT_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 #include "tao/corba.h"
 #include "cubitC.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 2f2e65cb619..361cf838b46 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_CUBIT_SERVER_H)
+#ifndef _CUBIT_SERVER_H
 #define _CUBIT_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "Cubit_Client.h"
@@ -47,11 +52,11 @@ public:
 
   int init (int argc,
             char **argv,
-	    CORBA::Environment& env);
+            CORBA::Environment& env);
   // Initialize the Cubit_Server state - parsing arguments and ...
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
 private:
   int parse_args (void);
@@ -65,7 +70,7 @@ private:
 
   Cubit_Factory_i *factory_impl_;
   // Implementation object of the cubit factory.
-       
+
   int argc_;
   // Number of commandline arguments.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index b4c43ab1e07..318d821af33 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -4,17 +4,17 @@
 //
 // = LIBRARY
 //    TAO/tests/IDL_Cubit
-// 
+//
 // = FILENAME
 //    Cubit_Client.h
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
+//
 // ============================================================================
 
-#if !defined (_CUBIT_I_H)
-#define	_CUBIT_I_H
+#ifndef _CUBIT_I_H
+#define _CUBIT_I_H
 
 #include "cubitS.h"
 
@@ -64,23 +64,23 @@ public:
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
-				   Cubit::long_seq_out output,
-				   CORBA::Environment &env);
+                                   Cubit::long_seq_out output,
+                                   CORBA::Environment &env);
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
-				    Cubit::octet_seq_out output,
-				    CORBA::Environment &_env);
+                                    Cubit::octet_seq_out output,
+                                    CORBA::Environment &_env);
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
                                    Cubit::many_seq_out output,
                                    CORBA::Environment &_tao_environment);
   // Cube an Many sequence.
-  
+
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
-			      Cubit::RtiPacket_out output,
-			      CORBA::Environment &env);
+                              Cubit::RtiPacket_out output,
+                              CORBA::Environment &env);
   // Cube a sequence.
 
   virtual void shutdown (CORBA::Environment &env);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
index 9793c60632b..31b2ca800f0 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    TAO/tests/IDL_Cubit
-// 
+//
 // = FILENAME
 //    RTI_IO.h
 //
 // = AUTHOR
 //    Dave Meyer <dmeyer@std.saic.com>
-// 
+//
 // ============================================================================
 
-#if !defined (_RTIFUNCS_H)
+#ifndef _RTIFUNCS_H
 #define _RTIFUNCS_H
 
 #include "cubitC.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 84100d9c182..e08c85d7af9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CUBIT_TASK_H)
+#ifndef MT_CUBIT_TASK_H
 #define MT_CUBIT_TASK_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/ARGV.h"
 #include "tao/TAO.h"
 #include "cubit_i.h"
@@ -31,8 +36,8 @@ public:
   Cubit_Task (const char *args,
               const char* orbname,
               u_int num_of_objs,
-	      ACE_Thread_Manager *thr_mgr,
-	      u_int task_id);
+              ACE_Thread_Manager *thr_mgr,
+              u_int task_id);
   // Constructor.
 
   virtual int svc (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index bf9fc4af03b..334a2d76491 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (GLOBALS_H)
+#ifndef GLOBALS_H
 #define GLOBALS_H
 
 // ============================================================================
@@ -21,6 +21,11 @@
 // ============================================================================
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Get_Opt.h"
 #include "ace/Synch_T.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index d5ccfc21ff0..23b53972a78 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (TASK_CLIENT_H)
+#ifndef TASK_CLIENT_H
 #define TASK_CLIENT_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
index b42ea4c334c..653426c106b 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
@@ -11,14 +11,19 @@
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan and Nagarajan
-//    Surendran. 
+//    Surendran.
 //
 // ============================================================================
 
-#if !defined (_MT_CUBIT_TIMER_H)
+#ifndef _MT_CUBIT_TIMER_H
 #define _MT_CUBIT_TIMER_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/High_Res_Timer.h"
 
 class MT_Cubit_Timer
@@ -37,10 +42,10 @@ public:
 private:
   ACE_High_Res_Timer timer_;
   // timer.
-  
+
   ACE_Time_Value delta_;
   // Elapsed time in microseconds.
-  
+
   u_int granularity_;
   // This is the granularity of the timing of the CORBA requests. A
   // value of 5 represents that we will take time every 5 requests,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
index cd8e4074f39..cad2577da57 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
@@ -11,11 +11,11 @@
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan and Nagarajan
-//    Surendran. 
+//    Surendran.
 //
 // ============================================================================
 
-#if !defined (UTIL_THREAD_H)
+#ifndef UTIL_THREAD_H
 #define UTIL_THREAD_H
 
 #include "Task_Client.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
index 7cc2dab60b2..b01a1acc4b6 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
@@ -16,6 +16,11 @@
 // ============================================================================
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -42,7 +47,7 @@ class Client_i : public virtual MT_Priority
 public:
   Client_i (void);
   //constructor.
-  
+
   ~Client_i (void);
   // destructor.
 
@@ -109,7 +114,7 @@ private:
 
   ACE_High_Res_Timer timer_;
   // Timer for timing the tests.
-  
+
   MT_Priority priority_;
   // Priority helper object.
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index fd2622208ab..c8292d754f2 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_CUBIT_I_H)
+#ifndef _CUBIT_I_H
 #define _CUBIT_I_H
 
 #include "cubitS.h"
@@ -27,19 +27,19 @@ public:
   // = Initialization and termination methods.
   Cubit_i (CORBA::ORB_ptr orb);
   ~Cubit_i (void);
-   
+
   virtual CORBA::Octet cube_octet (CORBA::Octet o,
                                    CORBA::Environment &env);
 
   virtual CORBA::Short cube_short (CORBA::Short s,
                                    CORBA::Environment &env);
-  
+
   virtual CORBA::Long cube_long (CORBA::Long l,
                                  CORBA::Environment &env);
-  
+
   virtual Cubit::Many cube_struct (const Cubit::Many &values,
                                    CORBA::Environment &env);
-  
+
   virtual void noop (CORBA::Environment &env);
 
   virtual void shutdown (CORBA::Environment &env);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
index b409b7d904e..9a2432155c9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -11,11 +11,11 @@
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee,Sergio Flores-Gaitan and Nagarajan
-//    Surendran. 
+//    Surendran.
 //
 // ============================================================================
 
-#if !defined (SERVER_H)
+#ifndef SERVER_H
 #define SERVER_H
 
 // ACE includes.
@@ -28,6 +28,11 @@
 #endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "ace/ARGV.h"
@@ -50,7 +55,7 @@ extern "C" STATUS vmeDrv (void);
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* VME_DRIVER */
 
-class Server  
+class Server
 {
   // = TITLE
   //     A multithreaded cubit server class.
@@ -132,7 +137,7 @@ private:
 
   MT_Priority priority_;
   // Priority helper object.
-  
+
   ACE_Thread_Manager servant_manager_;
   // Thread manager for the servant threads.
 };
diff --git a/TAO/performance-tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/performance-tests/Cubit/VisiBroker/base_server/Profile_Timer.h
index 4198fba9a10..8a4f73314ce 100644
--- a/TAO/performance-tests/Cubit/VisiBroker/base_server/Profile_Timer.h
+++ b/TAO/performance-tests/Cubit/VisiBroker/base_server/Profile_Timer.h
@@ -3,7 +3,7 @@
 
 /* An interval timer class using C++. */
 
-#if !defined (ACE_PROFILE_TIMER_H)
+#ifndef ACE_PROFILE_TIMER_H
 #define ACE_PROFILE_TIMER_H
 
 #include <sys/types.h>
@@ -38,21 +38,21 @@ private:
   prusage_t begin_usage_;
   prusage_t end_usage_;
   prusage_t last_usage_;
-  int	    proc_fd_;
+  int       proc_fd_;
 };
 
 /* Start timing */
 
-inline int 
-Profile_Timer::start (void) 
+inline int
+Profile_Timer::start (void)
 {
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
 }
 
 /* Stop timing */
 
-inline int 
-Profile_Timer::stop (void) 
+inline int
+Profile_Timer::stop (void)
 {
   this->last_usage_ = this->end_usage_;
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
diff --git a/TAO/performance-tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/performance-tests/Cubit/VisiBroker/client/Profile_Timer.h
index 4198fba9a10..8a4f73314ce 100644
--- a/TAO/performance-tests/Cubit/VisiBroker/client/Profile_Timer.h
+++ b/TAO/performance-tests/Cubit/VisiBroker/client/Profile_Timer.h
@@ -3,7 +3,7 @@
 
 /* An interval timer class using C++. */
 
-#if !defined (ACE_PROFILE_TIMER_H)
+#ifndef ACE_PROFILE_TIMER_H
 #define ACE_PROFILE_TIMER_H
 
 #include <sys/types.h>
@@ -38,21 +38,21 @@ private:
   prusage_t begin_usage_;
   prusage_t end_usage_;
   prusage_t last_usage_;
-  int	    proc_fd_;
+  int       proc_fd_;
 };
 
 /* Start timing */
 
-inline int 
-Profile_Timer::start (void) 
+inline int
+Profile_Timer::start (void)
 {
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
 }
 
 /* Stop timing */
 
-inline int 
-Profile_Timer::stop (void) 
+inline int
+Profile_Timer::stop (void)
 {
   this->last_usage_ = this->end_usage_;
   return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
diff --git a/TAO/performance-tests/Demux/CodeGen/tao.h b/TAO/performance-tests/Demux/CodeGen/tao.h
index d35b3548996..13bf7094339 100644
--- a/TAO/performance-tests/Demux/CodeGen/tao.h
+++ b/TAO/performance-tests/Demux/CodeGen/tao.h
@@ -4,6 +4,11 @@
 #include <fstream.h>
 
 #include "ace/SString.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Containers.h"
 #include "ace/Singleton.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Thruput/COOL/ttcp_decl.h b/TAO/performance-tests/Thruput/COOL/ttcp_decl.h
index 5d0b7002e4c..7f8d161e143 100644
--- a/TAO/performance-tests/Thruput/COOL/ttcp_decl.h
+++ b/TAO/performance-tests/Thruput/COOL/ttcp_decl.h
@@ -11,6 +11,11 @@
 #define _TTCP_DECL_H_
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 
 /* File to be included if Quantify is to be used */
diff --git a/TAO/performance-tests/Thruput/COOL/ttcp_i.h b/TAO/performance-tests/Thruput/COOL/ttcp_i.h
index 92743612475..3fb4ebe6152 100644
--- a/TAO/performance-tests/Thruput/COOL/ttcp_i.h
+++ b/TAO/performance-tests/Thruput/COOL/ttcp_i.h
@@ -4,17 +4,17 @@
 //
 // = COOL tests
 //    Throughput measurement using the TTCP benchmark adapted to work using COOL
-// 
+//
 // = FILENAME
-//   ttcp_i.h 
+//   ttcp_i.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
 //    Sergio Flores-Gaitan   Ported to COOL
-// 
+//
 // ============================================================================
 
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 #include "ttcp.H"
@@ -24,18 +24,18 @@ class ttcp_sequence_i
 public:
   ttcp_sequence_i (const char *obj_name = 0);
 
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-			     CORBA::Environment &IT_env);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-			    CORBA::Environment &IT_env);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-			      CORBA::Environment &IT_env);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-			    CORBA::Environment &IT_env);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-			      CORBA::Environment &IT_env);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-			     CORBA::Environment &IT_env);
+  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq,
+                             CORBA::Environment &IT_env);
+  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq,
+                            CORBA::Environment &IT_env);
+  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq,
+                              CORBA::Environment &IT_env);
+  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq,
+                            CORBA::Environment &IT_env);
+  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq,
+                              CORBA::Environment &IT_env);
+  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq,
+                             CORBA::Environment &IT_env);
 
   /* Routines to calculate the time required to transfer */
   virtual void start_timer (CORBA::Environment &IT_env);
diff --git a/TAO/performance-tests/Thruput/CORBAplus/ttcp_decl.h b/TAO/performance-tests/Thruput/CORBAplus/ttcp_decl.h
index 32ebbde6945..66a87dadee2 100644
--- a/TAO/performance-tests/Thruput/CORBAplus/ttcp_decl.h
+++ b/TAO/performance-tests/Thruput/CORBAplus/ttcp_decl.h
@@ -11,6 +11,11 @@
 #define _TTCP_DECL_H_
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 
 /* File to be included if Quantify is to be used */
diff --git a/TAO/performance-tests/Thruput/CORBAplus/ttcp_i.h b/TAO/performance-tests/Thruput/CORBAplus/ttcp_i.h
index b052d603400..e969820f2a4 100644
--- a/TAO/performance-tests/Thruput/CORBAplus/ttcp_i.h
+++ b/TAO/performance-tests/Thruput/CORBAplus/ttcp_i.h
@@ -3,17 +3,17 @@
 // ============================================================================
 //
 // = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using 
+//    Throughput measurement using the TTCP benchmark adapted to work using
 //    CORBAplus PowerBroker from Expersoft
 // = FILENAME
-//   ttcp_i.h 
+//   ttcp_i.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 #include <pbroker/corba/lifecycl/actvtr.h>
@@ -23,6 +23,11 @@
 #include "pbroker/corba/environ.h"
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ttcp_s.h"
 
 class ttcp_sequence_i: public ttcp_sequence_base_impl
@@ -33,12 +38,12 @@ public:
 
   ttcp_sequence_i(const char *obj_name);
 
-  ttcp_sequence_i (void) 
+  ttcp_sequence_i (void)
     { ttcp_sequence_i ("keyone");}
-  
-  ttcp_sequence_i (const CORBA_ReferenceData & refData) 
+
+  ttcp_sequence_i (const CORBA_ReferenceData & refData)
     { ttcp_sequence_i ("keyone");}
-  
+
   virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq);
   virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq);
   virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq);
diff --git a/TAO/performance-tests/Thruput/Orbix/ttcp_i.h b/TAO/performance-tests/Thruput/Orbix/ttcp_i.h
index 1a346e65401..7c81620f271 100644
--- a/TAO/performance-tests/Thruput/Orbix/ttcp_i.h
+++ b/TAO/performance-tests/Thruput/Orbix/ttcp_i.h
@@ -3,11 +3,11 @@
 
 
 // ttcp_i.h
-// 
+//
 // This header file provides facility to use it either as a BOA approach or as
 // a TIE approach.
 //
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 #include "ttcp.h"
@@ -24,35 +24,35 @@
 
 
 #if defined(USE_TIE)
-class ttcp_sequence_i 
-#else	// use BOA 
-class ttcp_sequence_i 
-  	: public virtual ttcp_sequenceBOAImpl
+class ttcp_sequence_i
+#else   // use BOA
+class ttcp_sequence_i
+        : public virtual ttcp_sequenceBOAImpl
 #endif
 {
 public:
   ttcp_sequence_i();
 
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendCompositeSeq (const ttcp_sequence::CompositeSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
+  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq,
+        CORBA::Environment &IT_env=CORBA::default_environment);
+  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq,
+        CORBA::Environment &IT_env=CORBA::default_environment);
+  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq,
+        CORBA::Environment &IT_env=CORBA::default_environment);
+  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq,
+        CORBA::Environment &IT_env=CORBA::default_environment);
+  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq,
+        CORBA::Environment &IT_env=CORBA::default_environment);
+  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq,
+        CORBA::Environment &IT_env=CORBA::default_environment);
+  virtual void sendCompositeSeq (const ttcp_sequence::CompositeSeq& ttcp_seq,
+        CORBA::Environment &IT_env=CORBA::default_environment);
 
   /* Routines to calculate the time required to transfer */
   virtual void start_timer (CORBA::Environment &IT_env=
-	CORBA::default_environment);
+        CORBA::default_environment);
   virtual void stop_timer (CORBA::Environment &IT_env=
-	CORBA::default_environment);
+        CORBA::default_environment);
 private:
   unsigned long nbytes_;
 };
diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_decl.h b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
index a8279942199..8a8fd8ba372 100644
--- a/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
+++ b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
@@ -11,6 +11,11 @@
 #define _TTCP_DECL_H_
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 
 /* File to be included if Quantify is to be used */
diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_i.h b/TAO/performance-tests/Thruput/TAO/ttcp_i.h
index bfa0ffb0f44..72a3a3b2275 100644
--- a/TAO/performance-tests/Thruput/TAO/ttcp_i.h
+++ b/TAO/performance-tests/Thruput/TAO/ttcp_i.h
@@ -4,37 +4,37 @@
 //
 // = TAO tests
 //    Throughput measurement using the TTCP benchmark adapted to work using TAO
-// 
+//
 // = FILENAME
-//   ttcp_i.h 
+//   ttcp_i.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 #include "ttcpS.h"
 
-class ttcp_sequence_i: public POA_ttcp_sequence 
+class ttcp_sequence_i: public POA_ttcp_sequence
 {
 public:
   ttcp_sequence_i();
 
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
+  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq,
+        CORBA::Environment &IT_env);
+  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq,
+        CORBA::Environment &IT_env);
+  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq,
+        CORBA::Environment &IT_env);
+  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq,
+        CORBA::Environment &IT_env);
+  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq,
+        CORBA::Environment &IT_env);
+  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq,
+        CORBA::Environment &IT_env);
 
   /* Routines to calculate the time required to transfer */
   virtual void start_timer (CORBA::Environment &IT_env);
diff --git a/TAO/tao/Align.h b/TAO/tao/Align.h
index 6f5d4e67504..f1b75a7c0b5 100644
--- a/TAO/tao/Align.h
+++ b/TAO/tao/Align.h
@@ -49,7 +49,7 @@ typedef u_long long ptr_arith_t;
 // Since the alignment is a power of two its binary representation is:
 //    alignment      = 0...010...0
 //
-// hence 
+// hence
 //
 //    alignment - 1  = 0...001...1 = T1
 //
@@ -57,7 +57,7 @@ typedef u_long long ptr_arith_t;
 //
 //  ~(alignment - 1) = 1...110...0 = T2
 //
-// Notice that there is a multiple of <alignment> in the range 
+// Notice that there is a multiple of <alignment> in the range
 // [<value>,<value> + T1], also notice that if
 //
 // X = ( <value> + T1 ) & T2
@@ -69,7 +69,7 @@ typedef u_long long ptr_arith_t;
 // because the & operator only changes the last bits, and since X is a
 // multiple of <alignment> (its last bits are zero) we have found the
 // multiple we wanted.
-// 
+//
 
 #define align_binary(ptr, alignment) \
     ((ptr + ((ptr_arith_t)((alignment)-1))) & (~((ptr_arith_t)((alignment)-1))))
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 4b70303ec7c..e26bc3387a7 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -140,27 +140,27 @@ public:
   // For reading from a output CDR stream.
 
   TAO_OutputCDR (size_t size = 0,
-		 int byte_order = TAO_ENCAP_BYTE_ORDER,
-		 TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY,
-		 ACE_Allocator* buffer_allocator = 0,
-		 ACE_Allocator* data_block_allocator = 0);
+                 int byte_order = TAO_ENCAP_BYTE_ORDER,
+                 TAO_Marshal_Factory *f =
+                     TAO_Marshal::DEFAULT_MARSHAL_FACTORY,
+                 ACE_Allocator* buffer_allocator = 0,
+                 ACE_Allocator* data_block_allocator = 0);
   // Default constructor, allocates <size> bytes in the internal
   // buffer, if <size> == 0 it allocates the default size.
 
   TAO_OutputCDR (char *data, size_t size,
-		 int byte_order = TAO_ENCAP_BYTE_ORDER,
-		 TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY,
-		 ACE_Allocator* buffer_allocator = 0,
-		 ACE_Allocator* data_block_allocator = 0);
+                 int byte_order = TAO_ENCAP_BYTE_ORDER,
+                 TAO_Marshal_Factory *f =
+                     TAO_Marshal::DEFAULT_MARSHAL_FACTORY,
+                 ACE_Allocator* buffer_allocator = 0,
+                 ACE_Allocator* data_block_allocator = 0);
   // Build a CDR stream with an initial buffer, it will *not* remove
   // <data>, since it did not allocated it.
 
   TAO_OutputCDR (ACE_Message_Block *data,
-		 int byte_order = TAO_ENCAP_BYTE_ORDER,
-		 TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
+                 int byte_order = TAO_ENCAP_BYTE_ORDER,
+                 TAO_Marshal_Factory *f =
+                     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
   // Build a CDR stream with an initial Message_Block chain, it will *not*
   // remove <data>, since it did not allocate it.
 
@@ -192,31 +192,31 @@ public:
   // Note: the portion written starts at <x> and ends at <x + length>.
   // The length is *NOT* stored into the CDR stream.
   CORBA_Boolean write_boolean_array (const CORBA::Boolean* x,
-				     CORBA::ULong length);
+                                     CORBA::ULong length);
   CORBA_Boolean write_char_array (const CORBA::Char* x,
-				  CORBA::ULong length);
+                                  CORBA::ULong length);
   CORBA_Boolean write_wchar_array (const CORBA::WChar* x,
-				   CORBA::ULong length);
+                                   CORBA::ULong length);
   CORBA_Boolean write_octet_array (const CORBA::Octet* x,
-				   CORBA::ULong length);
+                                   CORBA::ULong length);
   CORBA_Boolean write_short_array (const CORBA::Short* x,
-				   CORBA::ULong length);
+                                   CORBA::ULong length);
   CORBA_Boolean write_ushort_array (const CORBA::UShort* x,
-				    CORBA::ULong length);
+                                    CORBA::ULong length);
   CORBA_Boolean write_long_array (const CORBA::Long* x,
-				  CORBA::ULong length);
+                                  CORBA::ULong length);
   CORBA_Boolean write_ulong_array (const CORBA::ULong* x,
-				   CORBA::ULong length);
+                                   CORBA::ULong length);
   CORBA_Boolean write_longlong_array (const CORBA::LongLong* x,
-				      CORBA::ULong length);
+                                      CORBA::ULong length);
   CORBA_Boolean write_ulonglong_array (const CORBA::ULongLong* x,
-				       CORBA::ULong length);
+                                       CORBA::ULong length);
   CORBA_Boolean write_float_array (const CORBA::Float* x,
-				   CORBA::ULong length);
+                                   CORBA::ULong length);
   CORBA_Boolean write_double_array (const CORBA::Double* x,
-				    CORBA::ULong length);
+                                    CORBA::ULong length);
   CORBA_Boolean write_longdouble_array (const CORBA::LongDouble* x,
-					CORBA::ULong length);
+                                        CORBA::ULong length);
 
   CORBA_Boolean write_octet_array_mb (const ACE_Message_Block* mb);
   // Write an octet array contained inside a MB, this can be optimized
@@ -317,7 +317,7 @@ private:
   // operations using asignment.
 
   CORBA_Boolean write_array (const void* x, size_t size, size_t align,
-			     CORBA::ULong length);
+                             CORBA::ULong length);
   // write an array of <length> elements, each of <size> bytes and
   // the start aligned at a multiple of <align>. The elements are
   // assumed to be packed with the right alignment restrictions.
@@ -384,31 +384,31 @@ public:
   // This class is able to "read" an InputCDR from a socket.
 
   TAO_InputCDR (const char* buf, size_t bufsiz,
-		int byte_order = TAO_ENCAP_BYTE_ORDER,
-		TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
+                int byte_order = TAO_ENCAP_BYTE_ORDER,
+                TAO_Marshal_Factory *f =
+                     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
   // Create an input stream from an arbitrary buffer, care must be
   // exercised wrt alignment, because this contructor will *not* work
   // if the buffer is unproperly aligned.
 
   TAO_InputCDR (size_t bufsiz,
-		int byte_order = TAO_ENCAP_BYTE_ORDER,
-		TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
+                int byte_order = TAO_ENCAP_BYTE_ORDER,
+                TAO_Marshal_Factory *f =
+                     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
   // Create an empty input stream. The caller is responsible for
   // putting the right data and providing the right alignment.
 
   TAO_InputCDR (ACE_Message_Block *data,
-		int byte_order =
+                int byte_order =
                     TAO_ENCAP_BYTE_ORDER,
-		TAO_Marshal_Factory *f =
+                TAO_Marshal_Factory *f =
                     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
   // Create an input stream from an ACE_Message_Block
 
   TAO_InputCDR (ACE_Data_Block *data,
-		int byte_order =
+                int byte_order =
                     TAO_ENCAP_BYTE_ORDER,
-		TAO_Marshal_Factory *f =
+                TAO_Marshal_Factory *f =
                     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
   // Create an input stream from an ACE_Data_Block
 
@@ -419,8 +419,8 @@ public:
   // efficiently.
 
   TAO_InputCDR (const TAO_InputCDR& rhs,
-		size_t size,
-		CORBA::Long offset);
+                size_t size,
+                CORBA::Long offset);
   // When interpreting indirected TypeCodes it is useful to make a
   // "copy" of the stream starting in the new position.
 
@@ -460,31 +460,31 @@ public:
   // elements.
   // They return 0 on failure and 1 on success.
   CORBA_Boolean read_boolean_array (CORBA::Boolean* x,
-				    CORBA::ULong length);
+                                    CORBA::ULong length);
   CORBA_Boolean read_char_array (CORBA::Char* x,
-				 CORBA::ULong length);
+                                 CORBA::ULong length);
   CORBA_Boolean read_wchar_array (CORBA::WChar* x,
-				  CORBA::ULong length);
+                                  CORBA::ULong length);
   CORBA_Boolean read_octet_array (CORBA::Octet* x,
-				  CORBA::ULong length);
+                                  CORBA::ULong length);
   CORBA_Boolean read_short_array (CORBA::Short* x,
-				  CORBA::ULong length);
+                                  CORBA::ULong length);
   CORBA_Boolean read_ushort_array (CORBA::UShort* x,
-				   CORBA::ULong length);
+                                   CORBA::ULong length);
   CORBA_Boolean read_long_array (CORBA::Long* x,
-				 CORBA::ULong length);
+                                 CORBA::ULong length);
   CORBA_Boolean read_ulong_array (CORBA::ULong* x,
-				  CORBA::ULong length);
+                                  CORBA::ULong length);
   CORBA_Boolean read_longlong_array (CORBA::LongLong* x,
-				     CORBA::ULong length);
+                                     CORBA::ULong length);
   CORBA_Boolean read_ulonglong_array (CORBA::ULongLong* x,
-				      CORBA::ULong length);
+                                      CORBA::ULong length);
   CORBA_Boolean read_float_array (CORBA::Float* x,
-				  CORBA::ULong length);
+                                  CORBA::ULong length);
   CORBA_Boolean read_double_array (CORBA::Double* x,
-				   CORBA::ULong length);
+                                   CORBA::ULong length);
   CORBA_Boolean read_longdouble_array (CORBA::LongDouble* x,
-				       CORBA::ULong length);
+                                       CORBA::ULong length);
 
   // = TAO specific methods.
 
@@ -567,7 +567,7 @@ private:
   // operations using asignment.
 
   CORBA_Boolean read_array (void* x, size_t size, size_t align,
-			    CORBA::ULong length);
+                            CORBA::ULong length);
   // read an array of <length> elements, each of <size> bytes and
   // the start aligned at a multiple of <align>. The elements are
   // assumed to be packed with the right alignment restrictions.
@@ -600,27 +600,27 @@ private:
 #else
 // CDR output operators for primitive types
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::Short x);
+                                            CORBA::Short x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::UShort x);
+                                            CORBA::UShort x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::Long x);
+                                            CORBA::Long x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::ULong x);
+                                            CORBA::ULong x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::LongLong x);
+                                            CORBA::LongLong x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::ULongLong x);
+                                            CORBA::ULongLong x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::Float x);
+                                            CORBA::Float x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    CORBA::Double x);
+                                            CORBA::Double x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    const CORBA::Any &x);
+                                            const CORBA::Any &x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    const CORBA::Object *x);
+                                            const CORBA::Object *x);
 extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr,
-					    const CORBA::TypeCode *x);
+                                            const CORBA::TypeCode *x);
 
 // CDR output operator from helper classes
 extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr,
@@ -634,31 +634,31 @@ extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr,
 extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr,
                                              CORBA::Any::from_string x);
 extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr,
-					     const char* x);
+                                             const char* x);
 
 // CDR input operators for primitive types
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::Short &x);
+                                            CORBA::Short &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::UShort &x);
+                                            CORBA::UShort &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::Long &x);
+                                            CORBA::Long &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::ULong &x);
+                                            CORBA::ULong &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::LongLong &x);
+                                            CORBA::LongLong &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::ULongLong &x);
+                                            CORBA::ULongLong &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::Float &x);
+                                            CORBA::Float &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::Double &x);
+                                            CORBA::Double &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::Any &x);
+                                            CORBA::Any &x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::Object *&x);
+                                            CORBA::Object *&x);
 extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr,
-					    CORBA::TypeCode *&x);
+                                            CORBA::TypeCode *&x);
 
 // CDR output operator from helper classes
 extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr,
@@ -672,7 +672,7 @@ extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr,
 extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr,
                                              CORBA::Any::to_string x);
 extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr,
-					     char*& x);
+                                             char*& x);
 
 #endif /* __ACE_INLINE */
 
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index afa0e0f050b..78f8f734b58 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //     TAO
-// 
+//
 // = FILENAME
 //     Client_Strategy_Factory.h
 //
@@ -26,13 +26,13 @@ public:
   // = Intialization and termination methods.
   TAO_Client_Strategy_Factory (void);
   // Constructor.
-  
+
   virtual ~TAO_Client_Strategy_Factory (void);
   // Destructor
 
   virtual ACE_Lock* create_iiop_profile_lock (void);
-  // create the lock for the forwarding IIOP Profile used by 
-  // the TAO_GIOP_Invocation::location_forward and the 
+  // create the lock for the forwarding IIOP Profile used by
+  // the TAO_GIOP_Invocation::location_forward and the
   // TAO_GIOP_Invocation::start
 
   virtual ACE_Creation_Strategy<TAO_Client_Connection_Handler> *create_client_creation_strategy (void);
diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h
index a13284ec412..666101b3192 100644
--- a/TAO/tao/Connect.h
+++ b/TAO/tao/Connect.h
@@ -18,6 +18,11 @@
 // ============================================================================
 
 #  include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #  include "ace/Acceptor.h"
 #  include "ace/SOCK_Acceptor.h"
 #  include "ace/Synch.h"
@@ -68,7 +73,7 @@ public:
   // Object termination hook.
 
 protected:
-  
+
   int check_unexpected_data (void);
   // This method checks for unexpected data
 
@@ -76,7 +81,7 @@ protected:
   // State flag which, if non-zero, indicates that this handler is
   // looking to get input.  Otherwise, any input received is
   // unexpected.
-  
+
   int input_available_;
   // Flag indicating whether or not input is available.  Only valid
   // when <expecting_response_> is non-zero.
@@ -128,7 +133,7 @@ protected:
 
   ACE_thread_t calling_thread_;
   // the thread ID of the thread we were running in.
-  
+
   ACE_SYNCH_CONDITION* cond_response_available_;
   // wait on reponse if the leader-follower model is active
 };
@@ -194,9 +199,9 @@ protected:
 
   virtual void send_response (TAO_OutputCDR &response);
   // Send <response> to the client on the other end.
-  
+
   void send_error (CORBA::ULong request_id,
-		   CORBA::Exception *ex);
+                   CORBA::Exception *ex);
   // Send <error> to the client on the other end, which
   // means basically sending the exception.
 
@@ -211,7 +216,7 @@ protected:
   // Perform appropriate closing.
 
   TAO_ORB_Core *orb_core_;
-  // Cache the ORB Core to minimize 
+  // Cache the ORB Core to minimize
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 6bcda5a3390..93d8ffde1d0 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -30,7 +30,7 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO 
+#define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
@@ -55,21 +55,21 @@ public:
   CORBA_DynAny_var (CORBA_DynAny_ptr);
   CORBA_DynAny_var (const CORBA_DynAny_var &); // copy constructor
   ~CORBA_DynAny_var (void); // destructor
-  
+
   CORBA_DynAny_var &operator= (CORBA_DynAny_ptr);
   CORBA_DynAny_var &operator= (const CORBA_DynAny_var &);
   CORBA_DynAny_ptr operator-> (void) const;
-  
+
   operator const CORBA_DynAny_ptr &() const;
   operator CORBA_DynAny_ptr &();
-  
+
   // These are here to satisfy g++'s way of dealing with templates.
   // These operators are not called in any TAO code but are
   // given a semi-reasonable definition anyway.
   CORBA::Boolean operator == (const CORBA_DynAny_var &);
   CORBA::Boolean operator != (const CORBA_DynAny_var &);
-  
-  // in, inout, out, _retn 
+
+  // in, inout, out, _retn
   CORBA_DynAny_ptr in (void) const;
   CORBA_DynAny_ptr &inout (void);
   CORBA_DynAny_ptr &out (void);
@@ -99,7 +99,7 @@ public:
   operator CORBA_DynAny_ptr &();
   CORBA_DynAny_ptr &ptr (void);
   CORBA_DynAny_ptr operator-> (void);
-  
+
 private:
   CORBA_DynAny_ptr &ptr_;
 };
@@ -118,7 +118,7 @@ public:
   static CORBA_DynAny_ptr _duplicate (CORBA_DynAny_ptr obj);
   static CORBA_DynAny_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynAny_ptr _nil (void);
@@ -166,7 +166,7 @@ public:
 
   class InvalidValue;
   typedef InvalidValue *InvalidValue_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -203,7 +203,7 @@ public:
 
   class TypeMismatch;
   typedef TypeMismatch *TypeMismatch_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -240,7 +240,7 @@ public:
 
   class InvalidSeq;
   typedef InvalidSeq *InvalidSeq_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -272,202 +272,202 @@ public:
 #endif /* end #if !defined */
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
       CORBA::Environment::default_environment ()
      );
   virtual void assign (
       CORBA_DynAny_ptr dyn_any,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void from_any (
       const CORBA::Any & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * to_any (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void destroy (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
       CORBA::Environment::default_environment ()
      );
   virtual void insert_boolean (
       CORBA::Boolean value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_octet (
       CORBA::Octet value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_char (
       CORBA::Char value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_short (
       CORBA::Short value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ushort (
       CORBA::UShort value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_long (
       CORBA::Long value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulong (
       CORBA::ULong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_float (
       CORBA::Float value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_double (
       CORBA::Double value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_string (
       const char * value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_reference (
       CORBA::Object_ptr value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_longlong (
       CORBA::LongLong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulonglong (
       CORBA::ULongLong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_wchar (
       CORBA::WChar value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_any (
       const CORBA::Any & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Octet get_octet (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Char get_char (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Short get_short (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::UShort get_ushort (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Long get_long (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong get_ulong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Float get_float (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Double get_double (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual char * get_string (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::WChar get_wchar (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * get_any (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean next (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean seek (
       CORBA::Long index,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void rewind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynAny (void); // default constructor
-  CORBA_DynAny (STUB_Object *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  CORBA_DynAny (STUB_Object *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_DynAny (void);
@@ -501,14 +501,14 @@ public:
   CORBA_DynEnum_var (CORBA_DynEnum_ptr);
   CORBA_DynEnum_var (const CORBA_DynEnum_var &); // copy constructor
   ~CORBA_DynEnum_var (void); // destructor
-  
+
   CORBA_DynEnum_var &operator= (CORBA_DynEnum_ptr);
   CORBA_DynEnum_var &operator= (const CORBA_DynEnum_var &);
   CORBA_DynEnum_ptr operator-> (void) const;
-  
+
   operator const CORBA_DynEnum_ptr &() const;
   operator CORBA_DynEnum_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_DynEnum_ptr in (void) const;
   CORBA_DynEnum_ptr &inout (void);
   CORBA_DynEnum_ptr &out (void);
@@ -538,7 +538,7 @@ public:
   operator CORBA_DynEnum_ptr &();
   CORBA_DynEnum_ptr &ptr (void);
   CORBA_DynEnum_ptr operator-> (void);
-  
+
 private:
   CORBA_DynEnum_ptr &ptr_;
 };
@@ -557,39 +557,39 @@ public:
   static CORBA_DynEnum_ptr _duplicate (CORBA_DynEnum_ptr obj);
   static CORBA_DynEnum_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynEnum_ptr _nil (void);
 
   virtual char * value_as_string (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_string (
       const char * value_as_string,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_ulong (
       CORBA::ULong value_as_ulong,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynEnum (void); // default constructor
-  CORBA_DynEnum (STUB_Object *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  CORBA_DynEnum (STUB_Object *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_DynEnum (void);
@@ -621,16 +621,16 @@ public:
   NameValuePair_var (NameValuePair *);
   NameValuePair_var (const NameValuePair_var &); // copy constructor
   ~NameValuePair_var (void); // destructor
-  
+
   NameValuePair_var &operator= (NameValuePair *);
   NameValuePair_var &operator= (const NameValuePair_var &);
   NameValuePair *operator-> (void);
   const NameValuePair *operator-> (void) const;
-  
+
   operator const NameValuePair &() const;
   operator NameValuePair &();
   operator NameValuePair &() const;
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const NameValuePair &in (void) const;
   NameValuePair &inout (void);
   NameValuePair *&out (void);
@@ -652,7 +652,7 @@ public:
   operator NameValuePair *&();
   NameValuePair *&ptr (void);
   NameValuePair *operator-> (void);
-  
+
 private:
   NameValuePair *&ptr_;
   // assignment from T_var not allowed
@@ -669,16 +669,16 @@ class _TAO_Unbounded_Sequence_NameValuePairSeq : public TAO_Unbounded_Base_Seque
 {
 public:
   // = Initialization and termination methods.
-  
+
   _TAO_Unbounded_Sequence_NameValuePairSeq (void) // Default constructor.
   {
   }
-  
+
   _TAO_Unbounded_Sequence_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
   {
   }
-  
+
   _TAO_Unbounded_Sequence_NameValuePairSeq (CORBA::ULong maximum,
     CORBA::ULong length,
     NameValuePair *data,
@@ -686,26 +686,26 @@ public:
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   _TAO_Unbounded_Sequence_NameValuePairSeq (const _TAO_Unbounded_Sequence_NameValuePairSeq &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
     NameValuePair *tmp1 = allocbuf (this->maximum_);
     NameValuePair * const tmp2 = ACE_reinterpret_cast (NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     this->buffer_ = tmp1;
   }
-  
+
   _TAO_Unbounded_Sequence_NameValuePairSeq &operator= (const _TAO_Unbounded_Sequence_NameValuePairSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -718,23 +718,23 @@ public:
     }
     else
       this->buffer_ = allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     NameValuePair *tmp1 = ACE_reinterpret_cast (NameValuePair *, this->buffer_);
     NameValuePair * const tmp2 = ACE_reinterpret_cast (NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   ~_TAO_Unbounded_Sequence_NameValuePairSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
+
   // = Accessors.
   NameValuePair &operator[] (CORBA::ULong i)
   // operator []
@@ -743,7 +743,7 @@ public:
     NameValuePair* tmp = ACE_reinterpret_cast(NameValuePair*,this->buffer_);
     return tmp[i];
   }
-  
+
   const NameValuePair &operator[] (CORBA::ULong i) const
   // operator []
   {
@@ -751,51 +751,51 @@ public:
     NameValuePair * const tmp = ACE_reinterpret_cast (NameValuePair* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // = Static operations.
   static NameValuePair *allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
     return new NameValuePair[size];
   }
-  
+
   static void freebuf (NameValuePair *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   virtual void _allocate_buffer (CORBA::ULong length)
   {
     NameValuePair* tmp = allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       NameValuePair *old = ACE_reinterpret_cast (NameValuePair *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   virtual void _deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     NameValuePair *tmp = ACE_reinterpret_cast (NameValuePair *,this->buffer_);
-    
+
     freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   NameValuePair *get_buffer (CORBA::Boolean orphan = 0)
   {
     NameValuePair *result = 0;
@@ -827,12 +827,12 @@ public:
     }
     return result;
   }
-  
+
   const NameValuePair *get_buffer (void) const
   {
     return ACE_reinterpret_cast(const NameValuePair * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   void replace (CORBA::ULong max,
   CORBA::ULong length,
   NameValuePair *data,
@@ -848,7 +848,7 @@ public:
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 };
 
 #endif /* end #if !defined */
@@ -861,21 +861,21 @@ public:
 // NameValuePairSeq
 // *************************************************************
 
-class  NameValuePairSeq : public 
+class  NameValuePairSeq : public
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
        || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_NameValuePairSeq
 #else /* AHETI */
   TAO_Unbounded_Sequence<NameValuePair>
-#endif /* AHETI */ 
+#endif /* AHETI */
 {
 public:
   NameValuePairSeq (void); // default ctor
   NameValuePairSeq (CORBA::ULong max); // uses max size
   NameValuePairSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    NameValuePair *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    NameValuePair *buffer,
     CORBA::Boolean release=0
   );
   NameValuePairSeq (const NameValuePairSeq &); // copy ctor
@@ -900,17 +900,17 @@ public:
   NameValuePairSeq_var (NameValuePairSeq *);
   NameValuePairSeq_var (const NameValuePairSeq_var &); // copy constructor
   ~NameValuePairSeq_var (void); // destructor
-  
+
   NameValuePairSeq_var &operator= (NameValuePairSeq *);
   NameValuePairSeq_var &operator= (const NameValuePairSeq_var &);
   NameValuePairSeq *operator-> (void);
   const NameValuePairSeq *operator-> (void) const;
-  
+
   operator const NameValuePairSeq &() const;
   operator NameValuePairSeq &();
   operator NameValuePairSeq &() const;
   NameValuePair &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const NameValuePairSeq &in (void) const;
   NameValuePairSeq &inout (void);
   NameValuePairSeq *&out (void);
@@ -940,7 +940,7 @@ public:
   NameValuePairSeq *&ptr (void);
   NameValuePairSeq *operator-> (void);
   NameValuePair &operator[] (CORBA::ULong index);
-  
+
 private:
   NameValuePairSeq *&ptr_;
   // assignment from T_var not allowed
@@ -972,14 +972,14 @@ public:
   CORBA_DynStruct_var (CORBA_DynStruct_ptr);
   CORBA_DynStruct_var (const CORBA_DynStruct_var &); // copy constructor
   ~CORBA_DynStruct_var (void); // destructor
-  
+
   CORBA_DynStruct_var &operator= (CORBA_DynStruct_ptr);
   CORBA_DynStruct_var &operator= (const CORBA_DynStruct_var &);
   CORBA_DynStruct_ptr operator-> (void) const;
-  
+
   operator const CORBA_DynStruct_ptr &() const;
   operator CORBA_DynStruct_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_DynStruct_ptr in (void) const;
   CORBA_DynStruct_ptr &inout (void);
   CORBA_DynStruct_ptr &out (void);
@@ -1009,7 +1009,7 @@ public:
   operator CORBA_DynStruct_ptr &();
   CORBA_DynStruct_ptr &ptr (void);
   CORBA_DynStruct_ptr operator-> (void);
-  
+
 private:
   CORBA_DynStruct_ptr &ptr_;
 };
@@ -1028,38 +1028,38 @@ public:
   static CORBA_DynStruct_ptr _duplicate (CORBA_DynStruct_ptr obj);
   static CORBA_DynStruct_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynStruct_ptr _nil (void);
 
   virtual char * current_member_name (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual NameValuePairSeq * get_members (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_members (
       const NameValuePairSeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynStruct (void); // default constructor
-  CORBA_DynStruct (STUB_Object *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  CORBA_DynStruct (STUB_Object *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_DynStruct (void);
@@ -1093,14 +1093,14 @@ public:
   CORBA_DynUnion_var (CORBA_DynUnion_ptr);
   CORBA_DynUnion_var (const CORBA_DynUnion_var &); // copy constructor
   ~CORBA_DynUnion_var (void); // destructor
-  
+
   CORBA_DynUnion_var &operator= (CORBA_DynUnion_ptr);
   CORBA_DynUnion_var &operator= (const CORBA_DynUnion_var &);
   CORBA_DynUnion_ptr operator-> (void) const;
-  
+
   operator const CORBA_DynUnion_ptr &() const;
   operator CORBA_DynUnion_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_DynUnion_ptr in (void) const;
   CORBA_DynUnion_ptr &inout (void);
   CORBA_DynUnion_ptr &out (void);
@@ -1130,7 +1130,7 @@ public:
   operator CORBA_DynUnion_ptr &();
   CORBA_DynUnion_ptr &ptr (void);
   CORBA_DynUnion_ptr operator-> (void);
-  
+
 private:
   CORBA_DynUnion_ptr &ptr_;
 };
@@ -1149,55 +1149,55 @@ public:
   static CORBA_DynUnion_ptr _duplicate (CORBA_DynUnion_ptr obj);
   static CORBA_DynUnion_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynUnion_ptr _nil (void);
 
   virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_as_default (
       CORBA::Boolean set_as_default,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual char * member_name (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void member_name (
       const char * member_name,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind member_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynUnion (void); // default constructor
-  CORBA_DynUnion (STUB_Object *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  CORBA_DynUnion (STUB_Object *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_DynUnion (void);
@@ -1219,16 +1219,16 @@ class _TAO_Unbounded_Sequence_AnySeq : public TAO_Unbounded_Base_Sequence
 {
 public:
   // = Initialization and termination methods.
-  
+
   _TAO_Unbounded_Sequence_AnySeq (void) // Default constructor.
   {
   }
-  
+
   _TAO_Unbounded_Sequence_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
   {
   }
-  
+
   _TAO_Unbounded_Sequence_AnySeq (CORBA::ULong maximum,
     CORBA::ULong length,
     CORBA::Any *data,
@@ -1236,26 +1236,26 @@ public:
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   _TAO_Unbounded_Sequence_AnySeq (const _TAO_Unbounded_Sequence_AnySeq &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
     CORBA::Any *tmp1 = allocbuf (this->maximum_);
     CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     this->buffer_ = tmp1;
   }
-  
+
   _TAO_Unbounded_Sequence_AnySeq &operator= (const _TAO_Unbounded_Sequence_AnySeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -1268,23 +1268,23 @@ public:
     }
     else
       this->buffer_ = allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
     CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   ~_TAO_Unbounded_Sequence_AnySeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
+
   // = Accessors.
   CORBA::Any &operator[] (CORBA::ULong i)
   // operator []
@@ -1293,7 +1293,7 @@ public:
     CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
     return tmp[i];
   }
-  
+
   const CORBA::Any &operator[] (CORBA::ULong i) const
   // operator []
   {
@@ -1301,51 +1301,51 @@ public:
     CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // = Static operations.
   static CORBA::Any *allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
     return new CORBA::Any[size];
   }
-  
+
   static void freebuf (CORBA::Any *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   virtual void _allocate_buffer (CORBA::ULong length)
   {
     CORBA::Any* tmp = allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   virtual void _deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-    
+
     freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   CORBA::Any *get_buffer (CORBA::Boolean orphan = 0)
   {
     CORBA::Any *result = 0;
@@ -1377,12 +1377,12 @@ public:
     }
     return result;
   }
-  
+
   const CORBA::Any *get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   void replace (CORBA::ULong max,
   CORBA::ULong length,
   CORBA::Any *data,
@@ -1398,7 +1398,7 @@ public:
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 };
 
 #endif /* end #if !defined */
@@ -1411,21 +1411,21 @@ public:
 // AnySeq
 // *************************************************************
 
-class  AnySeq : public 
+class  AnySeq : public
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
        || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_AnySeq
 #else /* AHETI */
   TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* AHETI */ 
+#endif /* AHETI */
 {
 public:
   AnySeq (void); // default ctor
   AnySeq (CORBA::ULong max); // uses max size
   AnySeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA::Any *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Any *buffer,
     CORBA::Boolean release=0
   );
   AnySeq (const AnySeq &); // copy ctor
@@ -1450,17 +1450,17 @@ public:
   AnySeq_var (AnySeq *);
   AnySeq_var (const AnySeq_var &); // copy constructor
   ~AnySeq_var (void); // destructor
-  
+
   AnySeq_var &operator= (AnySeq *);
   AnySeq_var &operator= (const AnySeq_var &);
   AnySeq *operator-> (void);
   const AnySeq *operator-> (void) const;
-  
+
   operator const AnySeq &() const;
   operator AnySeq &();
   operator AnySeq &() const;
   CORBA::Any &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const AnySeq &in (void) const;
   AnySeq &inout (void);
   AnySeq *&out (void);
@@ -1490,7 +1490,7 @@ public:
   AnySeq *&ptr (void);
   AnySeq *operator-> (void);
   CORBA::Any &operator[] (CORBA::ULong index);
-  
+
 private:
   AnySeq *&ptr_;
   // assignment from T_var not allowed
@@ -1522,14 +1522,14 @@ public:
   CORBA_DynSequence_var (CORBA_DynSequence_ptr);
   CORBA_DynSequence_var (const CORBA_DynSequence_var &); // copy constructor
   ~CORBA_DynSequence_var (void); // destructor
-  
+
   CORBA_DynSequence_var &operator= (CORBA_DynSequence_ptr);
   CORBA_DynSequence_var &operator= (const CORBA_DynSequence_var &);
   CORBA_DynSequence_ptr operator-> (void) const;
-  
+
   operator const CORBA_DynSequence_ptr &() const;
   operator CORBA_DynSequence_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_DynSequence_ptr in (void) const;
   CORBA_DynSequence_ptr &inout (void);
   CORBA_DynSequence_ptr &out (void);
@@ -1559,7 +1559,7 @@ public:
   operator CORBA_DynSequence_ptr &();
   CORBA_DynSequence_ptr &ptr (void);
   CORBA_DynSequence_ptr operator-> (void);
-  
+
 private:
   CORBA_DynSequence_ptr &ptr_;
 };
@@ -1578,39 +1578,39 @@ public:
   static CORBA_DynSequence_ptr _duplicate (CORBA_DynSequence_ptr obj);
   static CORBA_DynSequence_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynSequence_ptr _nil (void);
 
   virtual CORBA::ULong length (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void length (
       CORBA::ULong length,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual AnySeq * get_elements (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const AnySeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynSequence (void); // default constructor
-  CORBA_DynSequence (STUB_Object *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  CORBA_DynSequence (STUB_Object *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_DynSequence (void);
@@ -1644,14 +1644,14 @@ public:
   CORBA_DynArray_var (CORBA_DynArray_ptr);
   CORBA_DynArray_var (const CORBA_DynArray_var &); // copy constructor
   ~CORBA_DynArray_var (void); // destructor
-  
+
   CORBA_DynArray_var &operator= (CORBA_DynArray_ptr);
   CORBA_DynArray_var &operator= (const CORBA_DynArray_var &);
   CORBA_DynArray_ptr operator-> (void) const;
-  
+
   operator const CORBA_DynArray_ptr &() const;
   operator CORBA_DynArray_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_DynArray_ptr in (void) const;
   CORBA_DynArray_ptr &inout (void);
   CORBA_DynArray_ptr &out (void);
@@ -1681,7 +1681,7 @@ public:
   operator CORBA_DynArray_ptr &();
   CORBA_DynArray_ptr &ptr (void);
   CORBA_DynArray_ptr operator-> (void);
-  
+
 private:
   CORBA_DynArray_ptr &ptr_;
 };
@@ -1700,30 +1700,30 @@ public:
   static CORBA_DynArray_ptr _duplicate (CORBA_DynArray_ptr obj);
   static CORBA_DynArray_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynArray_ptr _nil (void);
 
   virtual AnySeq * get_elements (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const AnySeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynArray (void); // default constructor
-  CORBA_DynArray (STUB_Object *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  CORBA_DynArray (STUB_Object *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_DynArray (void);
diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h
index 25929e6e430..71ec439914d 100644
--- a/TAO/tao/DynAny_i.h
+++ b/TAO/tao/DynAny_i.h
@@ -14,13 +14,13 @@
 // =========================================================================
 
 #ifndef TAO_DYNANY_I_H
-#define	TAO_DYNANY_I_H
+#define TAO_DYNANY_I_H
 
 #include "tao/corba.h"
 
 class TAO_Export TAO_DynAny_i : public POA_CORBA::DynAny
 {
-  // = TITLE 
+  // = TITLE
   //    TAO_DynAny_i
   //
   // = DESCRIPTION
@@ -29,7 +29,7 @@ class TAO_Export TAO_DynAny_i : public POA_CORBA::DynAny
 public:
   TAO_DynAny_i (CORBA_TypeCode_ptr tc);
   // constructor with TypeCode argument
-  
+
   TAO_DynAny_i (const CORBA_Any& any);
   // constructor with Any argument
 
@@ -64,7 +64,7 @@ public:
   CORBA::Boolean next (CORBA::Environment &);
   // Returns next component, again here there is only one
 
-  CORBA::Boolean seek (CORBA::Long index, 
+  CORBA::Boolean seek (CORBA::Long index,
                        CORBA::Environment &);
   // In this class, returns true only for index of 0
 
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
index 7b0e124e7e0..73d8d330551 100644
--- a/TAO/tao/DynArray_i.h
+++ b/TAO/tao/DynArray_i.h
@@ -19,6 +19,10 @@
 
 #include "ace/Containers.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class TAO_Export TAO_DynArray_i : public POA_CORBA::DynArray
 {
   // = TITLE
@@ -74,7 +78,7 @@ public:
   CORBA::Boolean next (CORBA::Environment &);
   // Returns next component
 
-  CORBA::Boolean seek (CORBA::Long index, 
+  CORBA::Boolean seek (CORBA::Long index,
                        CORBA::Environment &);
   // Jump to component at <index>
 
diff --git a/TAO/tao/DynEnum_i.h b/TAO/tao/DynEnum_i.h
index 8f65b184d15..104e82474e3 100644
--- a/TAO/tao/DynEnum_i.h
+++ b/TAO/tao/DynEnum_i.h
@@ -19,6 +19,10 @@
 
 #include "ace/Containers.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class TAO_Export TAO_DynEnum_i : public POA_CORBA::DynEnum
 {
   // = TITLE
@@ -78,7 +82,7 @@ public:
   CORBA::Boolean next (CORBA::Environment &);
   // Returns next component
 
-  CORBA::Boolean seek (CORBA::Long index, 
+  CORBA::Boolean seek (CORBA::Long index,
                        CORBA::Environment &);
   // Jump to component at <index>
 
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
index a65bd5c240b..3b178c6cf62 100644
--- a/TAO/tao/DynSequence_i.h
+++ b/TAO/tao/DynSequence_i.h
@@ -19,6 +19,10 @@
 
 #include "ace/Containers.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class TAO_Export TAO_DynSequence_i : public POA_CORBA::DynSequence
 {
   // = TITLE
@@ -81,7 +85,7 @@ public:
   CORBA::Boolean next (CORBA::Environment &);
   // Returns next component
 
-  CORBA::Boolean seek (CORBA::Long index, 
+  CORBA::Boolean seek (CORBA::Long index,
                        CORBA::Environment &);
   // Jump to component at <index>
 
diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h
index 7764e8c36bb..472adbfe23c 100644
--- a/TAO/tao/DynStruct_i.h
+++ b/TAO/tao/DynStruct_i.h
@@ -15,10 +15,14 @@
 // ========================================================================
 
 #ifndef TAO_DYNSTRUCT_I_H
-#define	TAO_DYNSTRUCT_I_H
+#define TAO_DYNSTRUCT_I_H
 
 #include "ace/Containers.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class TAO_Export TAO_DynStruct_i : public POA_CORBA::DynStruct
 {
   // = TITLE
@@ -79,7 +83,7 @@ public:
   CORBA::Boolean next (CORBA::Environment &);
   // Returns next component
 
-  CORBA::Boolean seek (CORBA::Long index, 
+  CORBA::Boolean seek (CORBA::Long index,
                        CORBA::Environment &);
   // Jump to component at <index>
 
diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h
index 98a8d559799..fa2789f2fdc 100644
--- a/TAO/tao/DynUnion_i.h
+++ b/TAO/tao/DynUnion_i.h
@@ -93,7 +93,7 @@ public:
   CORBA::Boolean next (CORBA::Environment &);
   // Returns next component
 
-  CORBA::Boolean seek (CORBA::Long index, 
+  CORBA::Boolean seek (CORBA::Long index,
                        CORBA::Environment &);
   // Jump to component at <index>
 
@@ -184,7 +184,7 @@ private:
   TAO_DynUnion_i (const TAO_DynUnion_i &src);
   TAO_DynUnion_i &operator= (const TAO_DynUnion_i &src);
 
-  // Some specialized instantiations of template class (defined in 
+  // Some specialized instantiations of template class (defined in
   // DynUnion_i_T.h)
 
   class WChar_extractor : public DU_Extractor_base
@@ -193,7 +193,7 @@ private:
     CORBA::Boolean check_match (const CORBA_Any& inside_any,
                                 const CORBA_Any& outside_any);
   private:
-    CORBA::WChar arg_index_; 
+    CORBA::WChar arg_index_;
     CORBA::WChar member_index_;
   };
 
@@ -203,7 +203,7 @@ private:
     CORBA::Boolean check_match (const CORBA_Any& inside_any,
                                 const CORBA_Any& outside_any);
   private:
-    CORBA::ULong arg_index_; 
+    CORBA::ULong arg_index_;
     CORBA::ULong member_index_;
   };
 
diff --git a/TAO/tao/DynUnion_i_T.h b/TAO/tao/DynUnion_i_T.h
index 421da84d973..5d6cc452e52 100644
--- a/TAO/tao/DynUnion_i_T.h
+++ b/TAO/tao/DynUnion_i_T.h
@@ -27,7 +27,7 @@ class DU_Extractor_base
   //    Base class of template class below
   //
 public:
-  virtual 
+  virtual
   CORBA::Boolean check_match (const CORBA_Any& inside_any,
                               const CORBA_Any& outside_any) = 0;
 };
@@ -39,19 +39,19 @@ class DU_Extractor : public DU_Extractor_base
   //    DU_Extractor
   //
   // = DESCRIPTION
-  //    Template class functor to compare Anys in TAO_DynUnion_i 
+  //    Template class functor to compare Anys in TAO_DynUnion_i
   //    constructor with an Any arg and member function from_any().
-  //    Some compilers won't accept these eclarations inside 
+  //    Some compilers won't accept these eclarations inside
   //    TAO_DynUnion_i or even at global scope in the same file.
   //
 public:
   CORBA::Boolean check_match (const CORBA_Any& inside_any,
                               const CORBA_Any& outside_any);
 private:
-  Type arg_index_; 
+  Type arg_index_;
   Type member_index_;
 };
-  
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/DynUnion_i_T.cpp"
 // On Win32 platforms, this code will be included as template source
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index afb0f487b2d..0a5e4e94047 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -33,13 +33,13 @@ class TAO_Export CORBA_Environment
   // = TITLE
   //   CORBA_Environment
   //
-  // = DESCRIPTION 
+  // = DESCRIPTION
   //
   //   A CORBA_Environment is a way to automagically ensure that
   //   exception data is freed -- the "var" class for Exceptions.  It
   //   adds just a bit of convenience function support, helping
   //   classify exceptions as well as reducing memory leakage.
-  // 
+  //
   //   The thread has a default environment to simplify porting
   //   between platforms that support native C++ exceptions and those
   //   that don't. This is a TSS resource (always), but with a twist:
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 06dfcc9f13d..f99d600ac33 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -268,7 +268,7 @@ public:
   // in CPU time; it allocates no new memory.
 
   static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-					  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Make the TypeCode for the CORBA::UnknownUserException standard
   // exception.
 
@@ -280,7 +280,7 @@ public:
   // Runtime finalization of all standard exception typecodes.
 
   static CORBA_Exception *create_system_exception (const char* id,
-						   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Create a CORBA::SystemException given the interface repository
   // ID.
 
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index e4094d9e765..f82b14491fb 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -307,17 +307,17 @@ public:
 
   static CORBA::Boolean start_message (TAO_GIOP::Message_Type t,
                                        TAO_OutputCDR &msg,
-				       TAO_ORB_Core* orb_core);
+                                       TAO_ORB_Core* orb_core);
   // Build the header for a message of type <t> into stream <msg>.
 
   static CORBA::Boolean send_request (TAO_SVC_HANDLER *handler,
                                       TAO_OutputCDR &stream,
-				      TAO_ORB_Core* orb_core);
+                                      TAO_ORB_Core* orb_core);
   // Send message, returns TRUE if success, else FALSE.
 
   static TAO_GIOP::Message_Type recv_request (TAO_SVC_HANDLER *&handler,
-					      TAO_InputCDR &msg,
-					      TAO_ORB_Core *orb_core);
+                                              TAO_InputCDR &msg,
+                                              TAO_ORB_Core *orb_core);
   // Reads message, returns message type from header.
 
   static void make_error (TAO_OutputCDR &msg, ...);
@@ -342,33 +342,33 @@ public:
   // Returns the stringified <MsgType>.
 
   static TAO_GIOP_ReplyStatusType convert_CORBA_to_GIOP_exception (CORBA::ExceptionType corba_type);
-  // Convert the exception type from CORBA to GIOP 
+  // Convert the exception type from CORBA to GIOP
 
 
 private:
   static CORBA::Boolean start_message_lite (TAO_GIOP::Message_Type t,
-					    TAO_OutputCDR &msg);
+                                            TAO_OutputCDR &msg);
   // Build the lightweight header for a message of type <t> into
   // stream <msg>.
 
   static CORBA::Boolean start_message_std (TAO_GIOP::Message_Type t,
-					   TAO_OutputCDR &msg);
+                                           TAO_OutputCDR &msg);
   // Build the standard header for a message of type <t> into
   // stream <msg>.
 
   static int parse_header_std (TAO_InputCDR &cdr,
-			       int& do_byte_swap,
-			       TAO_GIOP::Message_Type& message_type,
-			       CORBA::ULong& message_size);
+                               int& do_byte_swap,
+                               TAO_GIOP::Message_Type& message_type,
+                               CORBA::ULong& message_size);
   static int parse_header_lite (TAO_InputCDR &cdr,
-				int& do_byte_swap,
-				TAO_GIOP::Message_Type& message_type,
-				CORBA::ULong& message_size);
+                                int& do_byte_swap,
+                                TAO_GIOP::Message_Type& message_type,
+                                CORBA::ULong& message_size);
   static int parse_header (TAO_InputCDR &cdr,
-			   int& do_byte_swap,
-			   TAO_GIOP::Message_Type& message_type,
-			   CORBA::ULong& message_size,
-			   TAO_ORB_Core *orb_core);
+                           int& do_byte_swap,
+                           TAO_GIOP::Message_Type& message_type,
+                           CORBA::ULong& message_size,
+                           TAO_ORB_Core *orb_core);
   // Parse the header, extracting all the relevant info.
 };
 
diff --git a/TAO/tao/IIOP_Interpreter.h b/TAO/tao/IIOP_Interpreter.h
index adafb4710ca..dfefb3bf4ca 100644
--- a/TAO/tao/IIOP_Interpreter.h
+++ b/TAO/tao/IIOP_Interpreter.h
@@ -106,10 +106,10 @@ public:
                                                 size_t &alignment,
                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
   static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
-						  TAO_InputCDR *stream,
-						  CORBA::TCKind kind,
-						  size_t &alignment,
-						  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  TAO_InputCDR *stream,
+                                                  CORBA::TCKind kind,
+                                                  size_t &alignment,
+                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // For a given typecode, figure out its size and alignment needs.
   // This version is used mostly when traversing other typecodes, and
   // follows these rules:
@@ -166,8 +166,8 @@ public:
 
 #if defined (TAO_NO_COPY_OCTET_SEQUENCES)
   static size_t calc_seq_attributes (TAO_InputCDR *stream,
-				     size_t &alignment,
-				     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                     size_t &alignment,
+                                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Calculate size and alignment for a sequence, most of them have
   // the same requirements, but for the sequences of Octets that are
   // optimized to minimize copying.
diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h
index 0234d6fbd11..0250ab8c331 100644
--- a/TAO/tao/IIOP_Object.h
+++ b/TAO/tao/IIOP_Object.h
@@ -149,19 +149,19 @@ class TAO_Export IIOP_Object : public STUB_Object
   //   specific to objrefs with IIOP::Profile.
 public:
   virtual void do_static_call (CORBA_Environment &env,
-			       const TAO_Call_Data *info,
-			       void** args);
+                               const TAO_Call_Data *info,
+                               void** args);
   // SII-based "Stub interpreter" for static stubs.  IDL compiler just
   // dumps a read-only description of the call into "calldata" and do
   // varargs calls to this routine, which does all the work.
 
   virtual void do_dynamic_call (const char *opname,
-				CORBA::Boolean is_roundtrip,
-				CORBA::NVList_ptr args,
-				CORBA::NamedValue_ptr result,
-				CORBA::Flags flags,
-				CORBA::ExceptionList &exceptions,
-				CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                CORBA::Boolean is_roundtrip,
+                                CORBA::NVList_ptr args,
+                                CORBA::NamedValue_ptr result,
+                                CORBA::Flags flags,
+                                CORBA::ExceptionList &exceptions,
+                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // DII-based invocation analogue of the <do_static_call> above.
   // Differs in how the vararg calling convention is implemented --
   // DII doesn't use the normal call stack with its implicit typing,
@@ -185,7 +185,7 @@ public:
   // IIOP engine does not need to worry about such issues since it
   // only supports one protocol -- the problem won't show up.
   // "Multiprotocol ORBs" will need to solve that problem though.  ]
-  
+
   // = Construction
   IIOP_Object (char *repository_id);
   // Construct from a repository (type) ID.
@@ -243,15 +243,15 @@ public:
 
 protected:
   void put_params (CORBA_Environment &env,
-		   const TAO_Call_Data *info,
-		   TAO_GIOP_Invocation &call,
-		   void** args);
+                   const TAO_Call_Data *info,
+                   TAO_GIOP_Invocation &call,
+                   void** args);
   // Helper method to factor out common code in static oneway
   // vs. twoway invocations.
 
   void put_params (TAO_GIOP_Invocation &call,
-		   CORBA::NVList_ptr args,
-		   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                   CORBA::NVList_ptr args,
+                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Helper method to factor out common code in dynamic oneway
   // vs. twoway invocations.
 
@@ -261,7 +261,7 @@ protected:
 
   ACE_Lock* fwd_profile_lock_ptr_;
   // Mutex to protect access to the forwarding profile
-  
+
   size_t fwd_profile_success_;
   // Have we successfully talked to the forward profile yet?
 
diff --git a/TAO/tao/InconsistentTypeCodeC.h b/TAO/tao/InconsistentTypeCodeC.h
index 9a3b273abdb..86907bbd215 100644
--- a/TAO/tao/InconsistentTypeCodeC.h
+++ b/TAO/tao/InconsistentTypeCodeC.h
@@ -30,7 +30,7 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO 
+#define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 60e1e79965a..423bae09e10 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -80,21 +80,21 @@ protected:
 
 private:
 
-  CORBA::Boolean 
+  CORBA::Boolean
   write_request_header (const TAO_GIOP_ServiceContextList& svc_ctx,
                         CORBA::ULong request_id,
                         CORBA::Boolean is_roundtrip,
                         const TAO_opaque* key,
                         const char* opname,
                         CORBA::Principal_ptr principal);
-  CORBA::Boolean 
+  CORBA::Boolean
   write_request_header_std (const TAO_GIOP_ServiceContextList& svc_ctx,
                             CORBA::ULong request_id,
                             CORBA::Boolean is_roundtrip,
                             const TAO_opaque* key,
                             const char* opname,
                             CORBA::Principal_ptr principal);
-  CORBA::Boolean 
+  CORBA::Boolean
   write_request_header_lite (const TAO_GIOP_ServiceContextList& svc_ctx,
                              CORBA::ULong request_id,
                              CORBA::Boolean is_roundtrip,
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 4b39aeba081..2bbc58abcc0 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -195,13 +195,13 @@ typedef u_int CORBA_Flags;
 
   typedef struct TAO_Leader_Follower_Info_Struct
     {
-      ACE_SYNCH_MUTEX leader_follower_lock_; 
+      ACE_SYNCH_MUTEX leader_follower_lock_;
       // do protect the access to the following three members
-  
+
       ACE_Unbounded_Set<ACE_SYNCH_CONDITION *> follower_set_;
       // keep a set of followers around (protected)
 
-      int leaders_; 
+      int leaders_;
       // 0 if no leader is around, 1 if there is a leader
       // > 1 if we do nested upcalls (protected)
 
@@ -508,7 +508,7 @@ public:
   typedef CORBA_ORB_var ORB_var;
   typedef CORBA_ORB_out ORB_out;
 
-  typedef CORBA_Request Request; 
+  typedef CORBA_Request Request;
   typedef Request *Request_ptr;
   typedef CORBA_Request_var Request_var;
   typedef CORBA_Request_out Request_out;
@@ -794,10 +794,10 @@ class TAO_Export CORBA_ORB
   //   as how to marshal and unmarshal them.
   //
 public:
-  
+
   // ORB_Core has special privileges
   friend class TAO_ORB_Core;
-  
+
   static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
   // Return a duplicate of <{orb}>.  When work with this duplicate is
   // complete, it should be freed up using <CORBA::release()>.
@@ -961,7 +961,7 @@ public:
   int should_shutdown (void);
   // Get the shutdown flag value
 
-  // Forward declaration and typedefs for the exception thrown by 
+  // Forward declaration and typedefs for the exception thrown by
   // the ORB Dynamic Any factory functions.
   class CORBA_ORB_InconsistentTypeCode;
   typedef CORBA_ORB_InconsistentTypeCode InconsistentTypeCode;
diff --git a/TAO/tao/ORB_Strategies_T.h b/TAO/tao/ORB_Strategies_T.h
index 2485fe7f2c5..ab1137cb540 100644
--- a/TAO/tao/ORB_Strategies_T.h
+++ b/TAO/tao/ORB_Strategies_T.h
@@ -19,6 +19,10 @@
 
 #include "ace/Strategies_T.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 template <class SH>
 class TAO_Reactive_Strategy : public ACE_Reactive_Strategy<SH>
 {
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index d8d4aead193..92fcf2ba861 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -41,7 +41,7 @@ public:
   // return a NUL object
 
   static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
-				   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // no-op it is just here to simplify some templates.
 
   // These calls correspond to over-the-wire operations, or at least
@@ -132,7 +132,7 @@ public:
   // get the underlying stub object
 
   virtual void _use_locate_requests (CORBA::Boolean use_it);
-  // the the object to use a locate request for the first call to 
+  // the the object to use a locate request for the first call to
   // the object
 
 protected:
@@ -228,7 +228,7 @@ public:
   // destructor
 
   virtual void _downcast (CORBA_Object* base_ptr,
-			  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                          CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
   virtual CORBA_Object* _upcast (void) = 0;
   virtual void _release (void) = 0;
 };
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 03976bba051..df8e28a944a 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -4,7 +4,7 @@
 // Hand-modified by Chris Cleeland.
 //
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
+// TAO ORB and the TAO IDL Compiler have been developed by Washington
 // University Computer Science's Distributed Object Computing Group.
 //
 // Information on TAO is available at
@@ -19,7 +19,7 @@
 // *************************************************************
 // TAO_tao_seq_Octet
 // *************************************************************
-  
+
 typedef TAO_Unbounded_Sequence<CORBA::Octet > TAO_tao_seq_Octet;
 typedef TAO_tao_seq_Octet* TAO_tao_seq_Octet_ptr;
 
@@ -39,17 +39,17 @@ public:
   TAO_tao_seq_Octet_var (TAO_tao_seq_Octet *);
   TAO_tao_seq_Octet_var (const TAO_tao_seq_Octet_var &); // copy constructor
   ~TAO_tao_seq_Octet_var (void); // destructor
-    
+
   TAO_tao_seq_Octet_var &operator= (TAO_tao_seq_Octet *);
   TAO_tao_seq_Octet_var &operator= (const TAO_tao_seq_Octet_var &);
   TAO_tao_seq_Octet *operator-> (void);
   const TAO_tao_seq_Octet *operator-> (void) const;
-    
+
   operator const TAO_tao_seq_Octet &() const;
   operator TAO_tao_seq_Octet &();
   operator TAO_tao_seq_Octet &() const;
   CORBA::Octet &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const TAO_tao_seq_Octet &in (void) const;
   TAO_tao_seq_Octet &inout (void);
   TAO_tao_seq_Octet *&out (void);
@@ -77,7 +77,7 @@ public:
   TAO_tao_seq_Octet *&ptr (void);
   TAO_tao_seq_Octet *operator-> (void);
   CORBA::Octet &operator[] (CORBA::ULong index);
-    
+
 private:
   TAO_tao_seq_Octet *&ptr_;
   // assignment from T_var not allowed
diff --git a/TAO/tao/Object_Table.h b/TAO/tao/Object_Table.h
index fbfabbb29a2..d9a565d0682 100644
--- a/TAO/tao/Object_Table.h
+++ b/TAO/tao/Object_Table.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    TAO
-// 
+//
 // = FILENAME
 //    objtable.h
 //
 // = AUTHOR
 //    Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
 #ifndef TAO_OBJTABLE_H
@@ -69,12 +69,12 @@ class TAO_Export TAO_Object_Table_Impl
   //   Servants.
   //
   // = DESCRIPTION
-  //   
+  //
   // = NOTES
   //   Iterators may return free entries, whose "int_id" (the servant)
   //   is 0.
 public:
-  enum 
+  enum
   {
     // Default table size
     DEFAULT_TABLE_SIZE = TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE
@@ -83,14 +83,14 @@ public:
   virtual ~TAO_Object_Table_Impl (void);
   // Destructor.
 
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant) = 0;
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant) = 0;
   // Associate <{id}> with <{servant}>, returning 0 if object is
   // registered successfully, 1 if it's already registered, and -1 if
   // a failure occurs during registration.
 
   virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant) = 0;
+                      PortableServer::Servant &servant) = 0;
   // Remote any association among <id> and <servant>.
   // Returns 0 if the operation was succesful, <-1> otherwise.
 
@@ -98,12 +98,12 @@ public:
   virtual TAO_Object_Table_Iterator_Impl *end () const = 0;
   // Iterator interface
 
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant) = 0;
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant) = 0;
   // Find object associated with <{id}>.
   // If the ObjectId is found it sets <{servant}> and returns a
   // non-negative integer.  If not found, <{servant}> is unchanged and
-  // the value <-1> is returned. 
+  // the value <-1> is returned.
 
   virtual int find (const PortableServer::Servant servant);
   // Returns 0 if <servant> is in the table, <-1> otherwise.
@@ -117,12 +117,12 @@ public:
   // search on the iterator) makes sense, since the operation is not
   // time critical.
   virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
+                    PortableServer::ObjectId_out id);
   // Find the <id> for <servant>.
   // Returns <-1> if <servant> is not found or if more than one <id>
   // is associated with <servant>, returns <0> otherwise.
 
-  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, 
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
                                                       CORBA::Environment &env) = 0;
   // Create an object id
 
@@ -155,9 +155,9 @@ public:
   // Increase the current position.
 
   friend int operator==(const TAO_Object_Table_Iterator &l,
-			const TAO_Object_Table_Iterator &r);
+                        const TAO_Object_Table_Iterator &r);
   friend int operator!=(const TAO_Object_Table_Iterator &l,
-			const TAO_Object_Table_Iterator &r);
+                        const TAO_Object_Table_Iterator &r);
   // Compare two iterators.
 
 protected:
@@ -170,33 +170,33 @@ class TAO_Export TAO_Object_Table
   //     to pointers to CORBA objects.
 {
 public:
-  TAO_Object_Table (TAO_Object_Table_Impl *impl, 
+  TAO_Object_Table (TAO_Object_Table_Impl *impl,
                     int delete_impl = 0);
   // Constructor: Must pass valid <impl>
 
   TAO_Object_Table (int user_id_policy);
   // Constructor: System creates table based on <user_id_policy>
-  
+
   virtual ~TAO_Object_Table (void);
   // Destructor.
 
-  int bind (const PortableServer::ObjectId &id, 
-	    PortableServer::Servant servant);
+  int bind (const PortableServer::ObjectId &id,
+            PortableServer::Servant servant);
   // Associate <{id}> with <{servant}>, returning 0 if object is
   // registered successfully, 1 if it's already registered, and -1 if
   // a failure occurs during registration.
 
   int unbind (const PortableServer::ObjectId &id,
-	      PortableServer::Servant &servant);
+              PortableServer::Servant &servant);
   // Remote any association among <id> and <servant>.
   // Returns 0 if the operation was succesful, <-1> otherwise.
 
-  int find (const PortableServer::ObjectId &id, 
-	    PortableServer::Servant &servant);
+  int find (const PortableServer::ObjectId &id,
+            PortableServer::Servant &servant);
   // Find object associated with <{id}>.
   // If the ObjectId is found it sets <{servant}> and returns a
   // non-negative integer.  If not found, <{servant}> is unchanged and
-  // the value <-1> is returned. 
+  // the value <-1> is returned.
 
   int find (const PortableServer::Servant servant);
   // Returns 0 if <servant> is in the table, <-1> otherwise.
@@ -210,12 +210,12 @@ public:
   // search on the iterator) makes sense, since the operation is not
   // time critical.
   int find (const PortableServer::Servant servant,
-	    PortableServer::ObjectId_out id);
+            PortableServer::ObjectId_out id);
   // Find the <id> for <servant>.
   // Returns <-1> if <servant> is not found or if more than one <id>
   // is associated with <servant>, returns <0> otherwise.
 
-  PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, 
+  PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
                                               CORBA::Environment &env);
   // Create an object id
 
@@ -266,21 +266,21 @@ class TAO_Export TAO_Dynamic_Hash_ObjTable : public TAO_Object_Table_Impl
 public:
   TAO_Dynamic_Hash_ObjTable (CORBA::ULong size);
   // constructor. If size is 0, some default is used.
-  
+
   virtual ~TAO_Dynamic_Hash_ObjTable (void);
 
   // Implement TAO_Dynamic_Hash_ObjTable....
   virtual int find (const PortableServer::Servant servant);
   virtual int find (const PortableServer::ObjectId &id);
   virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant);
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant);
+                    PortableServer::ObjectId_out id);
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant);
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant);
   virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant);
-  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, 
+                      PortableServer::Servant &servant);
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
                                                       CORBA::Environment &env);
   virtual CORBA::ULong system_id_size (void) const;
   virtual TAO_Object_Table_Iterator_Impl *begin (void) const;
@@ -289,11 +289,11 @@ public:
   // Dynamic Hashing scheme using template specialization for char*
   typedef ACE_Hash_Map_Manager<PortableServer::ObjectId,
                                PortableServer::Servant,
-                               ACE_SYNCH_NULL_MUTEX> 
+                               ACE_SYNCH_NULL_MUTEX>
           Hash_Map;
   typedef ACE_Hash_Map_Iterator<PortableServer::ObjectId,
                                 PortableServer::Servant,
-                                ACE_SYNCH_NULL_MUTEX> 
+                                ACE_SYNCH_NULL_MUTEX>
           Iterator;
 
 protected:
@@ -360,14 +360,14 @@ class TAO_Export TAO_Linear_ObjTable : public TAO_Object_Table_Impl
   //   for the lookups.
   //
 public:
-  
-  enum 
+
+  enum
   {
     // Grow table exponentially up to 64K
-    MAX_EXPONENTIAL = 65536, 
+    MAX_EXPONENTIAL = 65536,
 
     // Afterwards grow in chunks of 32K
-    LINEAR_INCREASE = 32768  
+    LINEAR_INCREASE = 32768
   };
 
   TAO_Linear_ObjTable (CORBA::ULong size);
@@ -376,14 +376,14 @@ public:
   virtual int find (const PortableServer::Servant servant);
   virtual int find (const PortableServer::ObjectId &id);
   virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant);
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant);
+                    PortableServer::ObjectId_out id);
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant);
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant);
   virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant);
-  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, 
+                      PortableServer::Servant &servant);
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
                                                       CORBA::Environment &env);
   virtual CORBA::ULong system_id_size (void) const;
   virtual TAO_Object_Table_Iterator_Impl *begin () const;
@@ -426,15 +426,15 @@ public:
   virtual int find (const PortableServer::Servant servant);
   virtual int find (const PortableServer::ObjectId &id);
   virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant);
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant);
+                    PortableServer::ObjectId_out id);
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant);
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant);
   virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant);
+                      PortableServer::Servant &servant);
   virtual CORBA::ULong system_id_size (void) const;
-  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, 
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
                                                       CORBA::Environment &env);
 
 protected:
diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h
index d612d88fd9b..e82cb6aaee4 100644
--- a/TAO/tao/Operation_Table.h
+++ b/TAO/tao/Operation_Table.h
@@ -38,13 +38,13 @@ class TAO_Export TAO_Operation_Table
   //     operation names.
 public:
   virtual int find (const char *opname,
-		   TAO_Skeleton &skelfunc) = 0;
+                   TAO_Skeleton &skelfunc) = 0;
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
 
   virtual int bind (const char *opname,
-		    const TAO_Skeleton skel_ptr) = 0;
+                    const TAO_Skeleton skel_ptr) = 0;
   // Associate the skeleton <{skel_ptr}> with an operation named
   // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
 
@@ -139,12 +139,12 @@ public:
   // destructor
 
   virtual int bind (const char *opname,
-		    const TAO_Skeleton skel_ptr);
+                    const TAO_Skeleton skel_ptr);
   // Associate the skeleton <{skel_ptr}> with an operation named
   // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
 
   virtual int find (const char *opname,
-		    TAO_Skeleton &skelfunc);
+                    TAO_Skeleton &skelfunc);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
@@ -168,13 +168,13 @@ public:
   // Destructor.
 
   virtual int find (const char *opname,
-		    TAO_Skeleton &skel_ptr);
+                    TAO_Skeleton &skel_ptr);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
 
   virtual int bind (const char *opname,
-		    const TAO_Skeleton skelptr);
+                    const TAO_Skeleton skelptr);
   // Associate the skeleton <{skel_ptr}> with an operation named
   // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
 
@@ -214,13 +214,13 @@ public:
   // destructor.
 
   virtual int find (const char *opname,
-		    TAO_Skeleton &skel_ptr);
+                    TAO_Skeleton &skel_ptr);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
 
   virtual int bind (const char *opname,
-		    const TAO_Skeleton skelptr);
+                    const TAO_Skeleton skelptr);
   // Associate the skeleton <{skel_ptr}> with an operation named
   // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
 
@@ -261,7 +261,7 @@ public:
   // on failure.
 
   virtual int bind (const char *opname,
-		    const TAO_Skeleton skel_ptr);
+                    const TAO_Skeleton skel_ptr);
   // Associate the skeleton <{skel_ptr}> with an operation named
   // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
 
@@ -278,13 +278,13 @@ class TAO_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table
 {
   // = TITLE
   //     Helper class for using binary search operatin lookup strategy
-  //     in the server skeletons.  
+  //     in the server skeletons.
   //
   // = DESCRIPTION
   //     This class declares pure virtual method called 'lookup ()'
   //     which will be generated by the GPERF program. This method is
   //     used by 'bind ()' and 'find ()' methods. Subclasses will
-  //     define the lookup method. 
+  //     define the lookup method.
 public:
   TAO_Binary_Search_OpTable (void);
   // Do nothing constructor.
@@ -299,7 +299,7 @@ public:
   // on failure.
 
   virtual int bind (const char *opname,
-		    const TAO_Skeleton skel_ptr);
+                    const TAO_Skeleton skel_ptr);
   // Associate the skeleton <{skel_ptr}> with an operation named
   // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
 
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index 428dc784d6e..4a6ad5eb919 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -35,6 +35,10 @@
 // String
 #include "ace/SString.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Map
 #include "ace/Hash_Map_Manager.h"
 
@@ -66,7 +70,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::ThreadPolicyValue value_;
@@ -90,7 +94,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::LifespanPolicyValue value_;
@@ -114,7 +118,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::IdUniquenessPolicyValue value_;
@@ -138,7 +142,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::IdAssignmentPolicyValue value_;
@@ -162,7 +166,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::ImplicitActivationPolicyValue value_;
@@ -186,7 +190,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::ServantRetentionPolicyValue value_;
@@ -210,7 +214,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::RequestProcessingPolicyValue value_;
@@ -240,7 +244,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::SynchronizationPolicyValue value_;
@@ -328,11 +332,11 @@ public:
   TAO_Creation_Time (void);
 
   virtual void creation_time (const void *creation_time);
-  
+
   virtual const void *creation_time (void) const;
-  
+
   static int creation_time_length (void);
-  
+
   int operator== (const TAO_Creation_Time &rhs) const;
 
   int operator!= (const TAO_Creation_Time &rhs) const;
@@ -342,7 +346,7 @@ public:
   int operator!= (const TAO_Temporary_Creation_Time &rhs) const;
 
 protected:
-  
+
   enum
   {
     SEC_FIELD = 0,
@@ -362,13 +366,13 @@ public:
   TAO_Temporary_Creation_Time (void);
 
   virtual void creation_time (const void *creation_time);
-  
+
   int operator== (const TAO_Creation_Time &rhs) const;
 
   int operator!= (const TAO_Creation_Time &rhs) const;
 
 protected:
-  
+
   void *time_stamp_;
 };
 
@@ -482,7 +486,7 @@ public:
                                CORBA::Object_ptr forward_to,
                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  // Utility functions for the other 
+  // Utility functions for the other
   static void encode_sequence_to_string (CORBA::String &str,
                                          const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
   static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
@@ -494,7 +498,7 @@ public:
 
   static PortableServer::ObjectId *string_to_ObjectId (const char *id);
 
-  static PortableServer::ObjectId *string_to_ObjectId (const char *string, 
+  static PortableServer::ObjectId *string_to_ObjectId (const char *string,
                                                        int size);
 
   static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
@@ -654,12 +658,12 @@ protected:
                          TAO_Temporary_Creation_Time &poa_creation_time);
 
   virtual int rfind (const TAO_ObjectKey &key,
-                     char c, 
+                     char c,
                      int pos = TAO_POA::String::npos) const;
 
   // Should really be protected, but some compilers complain
 public:
-  enum LOCATION_RESULT 
+  enum LOCATION_RESULT
   {
     FOUND,
     DEFAULT_SERVANT,
@@ -709,7 +713,7 @@ protected:
   static char persistent_key_char (void);
 
   static char transient_key_char (void);
-  
+
   static CORBA::ULong persistent_key_type_length (void);
 
   virtual CORBA::Boolean system_id (void);
@@ -719,7 +723,7 @@ protected:
   static char system_id_key_char (void);
 
   static char user_id_key_char (void);
-  
+
   static CORBA::ULong system_id_key_type_length (void);
 
   virtual void create_internal_lock (void);
@@ -748,7 +752,7 @@ protected:
 
   PortableServer::Servant default_servant_;
 
-  typedef ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex> 
+  typedef ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
           CHILDREN;
 
   CHILDREN children_;
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index de0e67479b7..45e1a2806aa 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -915,7 +915,7 @@ public:
   //
   // **************************************************
 
-  enum SynchronizationPolicyValue 
+  enum SynchronizationPolicyValue
   {
     DEFAULT_LOCK,
     NULL_LOCK,
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index d9004eec426..394b4fb600d 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -185,250 +185,250 @@ public:
   virtual ~DynAny (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void assign (
       CORBA_DynAny_ptr dyn_any,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void from_any (
       const CORBA::Any & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void destroy (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void insert_boolean (
       CORBA::Boolean value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void insert_octet (
       CORBA::Octet value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_char (
       CORBA::Char value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_short (
       CORBA::Short value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_ushort (
       CORBA::UShort value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_long (
       CORBA::Long value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_ulong (
       CORBA::ULong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_float (
       CORBA::Float value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_double (
       CORBA::Double value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_string (
       const char * value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_reference (
       CORBA::Object_ptr value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_longlong (
       CORBA::LongLong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_ulonglong (
       CORBA::ULongLong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_wchar (
       CORBA::WChar value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_any (
       const CORBA::Any & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Octet get_octet (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Char get_char (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Short get_short (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::UShort get_ushort (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Long get_long (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::ULong get_ulong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Float get_float (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Double get_double (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual char * get_string (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::WChar get_wchar (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Any * get_any (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Boolean next (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Boolean seek (
       CORBA::Long index,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void rewind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void _dispatch (
       CORBA::ServerRequest &_tao_req,
       void *_tao_context,
-      CORBA::Environment &_tao_env = 
+      CORBA::Environment &_tao_env =
         CORBA::Environment::default_environment ()
     );
 
   CORBA_DynAny *_this (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -448,194 +448,194 @@ public:
   DynAny_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void assign (
       CORBA_DynAny_ptr CORBA_Dyn_any,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void from_any (
       const CORBA::Any & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * to_any (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void destroy (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_boolean (
       CORBA::Boolean value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_octet (
       CORBA::Octet value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_char (
       CORBA::Char value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_short (
       CORBA::Short value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ushort (
       CORBA::UShort value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_long (
       CORBA::Long value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulong (
       CORBA::ULong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_float (
       CORBA::Float value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_double (
       CORBA::Double value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_string (
       const char * value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_reference (
       CORBA::Object_ptr value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_longlong (
       CORBA::LongLong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulonglong (
       CORBA::ULongLong value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_wchar (
       CORBA::WChar value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_any (
       const CORBA::Any & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Octet get_octet (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Char get_char (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Short get_short (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::UShort get_ushort (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Long get_long (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong get_ulong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Float get_float (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Double get_double (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual char * get_string (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::WChar get_wchar (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * get_any (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean next (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean seek (
       CORBA::Long index,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void rewind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
 
@@ -659,43 +659,43 @@ public:
   virtual ~DynEnum (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual char * value_as_string (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void value_as_string (
       const char * value_as_string,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void value_as_ulong (
       CORBA::ULong value_as_ulong,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void _dispatch (
       CORBA::ServerRequest &_tao_req,
       void *_tao_context,
-      CORBA::Environment &_tao_env = 
+      CORBA::Environment &_tao_env =
         CORBA::Environment::default_environment ()
     );
 
   CORBA_DynEnum *_this (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -716,25 +716,25 @@ public:
   DynEnum_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual char * value_as_string (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_string (
       const char * value_as_string,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_ulong (
       CORBA::ULong value_as_ulong,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
 
@@ -757,42 +757,42 @@ public:
   virtual ~DynStruct (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual char * current_member_name (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual NameValuePairSeq * get_members (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_members (
       const NameValuePairSeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void _dispatch (
       CORBA::ServerRequest &_tao_req,
       void *_tao_context,
-      CORBA::Environment &_tao_env = 
+      CORBA::Environment &_tao_env =
         CORBA::Environment::default_environment ()
     );
 
   CORBA_DynStruct *_this (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -813,24 +813,24 @@ public:
   DynStruct_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual char * current_member_name (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual NameValuePairSeq * get_members (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_members (
       const NameValuePairSeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
 
@@ -853,63 +853,63 @@ public:
   virtual ~DynUnion (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_as_default (
       CORBA::Boolean set_as_default,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual char * member_name (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void member_name (
       const char * member_name,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TCKind member_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void _dispatch (
       CORBA::ServerRequest &_tao_req,
       void *_tao_context,
-      CORBA::Environment &_tao_env = 
+      CORBA::Environment &_tao_env =
         CORBA::Environment::default_environment ()
     );
 
   CORBA_DynUnion *_this (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -930,41 +930,41 @@ public:
   DynUnion_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_as_default (
       CORBA::Boolean set_as_default,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual char * member_name (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void member_name (
       const char * member_name,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind member_kind (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
 
@@ -987,36 +987,36 @@ public:
   virtual ~DynSequence (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual CORBA::ULong length (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void length (
       CORBA::ULong length,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual AnySeq * get_elements (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_elements (
       const AnySeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   static void type_skel (
-      CORBA::ServerRequest &req, 
+      CORBA::ServerRequest &req,
       void *obj,
       void *context,
       CORBA::Environment &env =
@@ -1026,12 +1026,12 @@ public:
   virtual void _dispatch (
       CORBA::ServerRequest &_tao_req,
       void *_tao_context,
-      CORBA::Environment &_tao_env = 
+      CORBA::Environment &_tao_env =
         CORBA::Environment::default_environment ()
     );
 
   CORBA_DynSequence *_this (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1052,25 +1052,25 @@ public:
   DynSequence_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual CORBA::ULong length (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void length (
       CORBA::ULong length,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual AnySeq * get_elements (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const AnySeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
 
@@ -1093,32 +1093,32 @@ public:
   virtual ~DynArray (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual AnySeq * get_elements (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_elements (
       const AnySeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void _dispatch (
       CORBA::ServerRequest &_tao_req,
       void *_tao_context,
-      CORBA::Environment &_tao_env = 
+      CORBA::Environment &_tao_env =
         CORBA::Environment::default_environment ()
     );
 
   CORBA_DynArray *_this (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1139,16 +1139,16 @@ public:
   DynArray_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
     );
   virtual AnySeq * get_elements (
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const AnySeq & value,
-      CORBA::Environment &_tao_environment = 
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
 
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 268af6b4881..bc9c7c59940 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO
-// 
+//
 // = FILENAME
 //    principal.h
 //
@@ -14,7 +14,7 @@
 //
 // = AUTHOR
 //     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
+//
 // ============================================================================
 
 #ifndef TAO_PRINCIPAL_H
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index aadf9d151e0..652e3e983c2 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -59,8 +59,8 @@ public:
   // shrink and then delete could result in a memory leak.
 
   virtual void _downcast (void *target,
-			  CORBA_Object *src,
-			  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Object *src,
+                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Used for sequences of objects to downcast a recently demarshalled
   // object reference into the right type.
 
@@ -249,13 +249,13 @@ public:
 
   const char *in (void) const;
   // for in parameter.
-  
+
   char *&inout (void);
   // for inout parameter.
-  
+
   char *&out (void);
   // for out parameter.
-  
+
   char *_retn (void);
   // for string of return type.
 
@@ -413,9 +413,9 @@ public:
   TAO_Unbounded_Sequence (void);
   TAO_Unbounded_Sequence (CORBA::ULong max);
   TAO_Unbounded_Sequence (CORBA::ULong max,
-			  CORBA::ULong length,
-			  CORBA::Octet *data,
-			  CORBA::Boolean release = 0);
+                          CORBA::ULong length,
+                          CORBA::Octet *data,
+                          CORBA::Boolean release = 0);
   ~TAO_Unbounded_Sequence (void);
   // see TAO_Unbounded_Sequence in "Sequence_T.h"
 
@@ -464,7 +464,7 @@ public:
   // release the copy.
 
   TAO_Unbounded_Sequence (CORBA::ULong length,
-			  const ACE_Message_Block* mb);
+                          const ACE_Message_Block* mb);
   // Create a sequence of octets from a single message block (i.e. it
   // ignores any chaining in the meesage block).
 
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 8218fe56995..e18a3dac000 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -36,9 +36,9 @@ public:
   // Constructor using a maximum length value.
 
   TAO_Unbounded_Sequence (CORBA::ULong max,
-			  CORBA::ULong length,
-			  T *data,
-			  CORBA::Boolean release = 0);
+                          CORBA::ULong length,
+                          T *data,
+                          CORBA::Boolean release = 0);
   // Constructor using the data and memory management flag.  Memory
   // *must* be allocated using the ::allocbuf static method, since in
   // the future this classes may use a global ACE_Allocator.
@@ -132,7 +132,7 @@ public:
 
   TAO_Bounded_Sequence (CORBA::ULong length,
                         T *data,
-			CORBA::Boolean release=0);
+                        CORBA::Boolean release=0);
   // Constructor using the data and memory management flag.
 
   TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T,MAX> &);
@@ -289,13 +289,13 @@ public:
 
   const T *in (void) const;
   // for in parameter.
-  
+
   T *&inout (void);
   // for inout parameter.
-  
+
   T *&out (void);
   // for out parameter.
-  
+
   T *_retn (void);
   // for return type
 
@@ -351,9 +351,9 @@ public:
   // to 0 and the release flag to TRUE.
 
   TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
-				 CORBA::ULong length,
-				 T* *data,
-				 CORBA::Boolean release=0);
+                                 CORBA::ULong length,
+                                 T* *data,
+                                 CORBA::Boolean release=0);
   // The ``T *data'' constructor (as shown in the example above)
   // allows the length and contents of a bounded or unbounded sequence
   // to be set. For unbounded sequences, it also allows the initial
@@ -423,10 +423,10 @@ public:
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
   virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
+                               CORBA::ULong old_length);
   virtual void _downcast (void* target,
-			  CORBA_Object* src,
-			  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Object* src,
+                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
@@ -452,8 +452,8 @@ public:
   // contents vector, so it always sets the release flag to TRUE.
 
   TAO_Bounded_Object_Sequence (CORBA::ULong length,
-			       T* *value,
-			       CORBA::Boolean release=0);
+                               T* *value,
+                               CORBA::Boolean release=0);
   // Constructor from data.
 
   TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T,MAX> &);
@@ -479,10 +479,10 @@ public:
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
   virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
+                               CORBA::ULong old_length);
   virtual void _downcast (void* target,
-			  CORBA_Object* src,
-			  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Object* src,
+                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
@@ -512,9 +512,9 @@ public:
   // Constructor with a "hint" for the maximum capacity.
 
   TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
-				 CORBA::ULong length,
-				 T* *data,
-				 CORBA::Boolean release=0);
+                                 CORBA::ULong length,
+                                 T* *data,
+                                 CORBA::Boolean release=0);
   // Constructor with a given buffer.
 
   TAO_Unbounded_Pseudo_Sequence(const TAO_Unbounded_Pseudo_Sequence<T> &);
@@ -542,7 +542,7 @@ public:
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
   virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
+                               CORBA::ULong old_length);
 };
 
 // *************************************************************
@@ -563,8 +563,8 @@ public:
   // default ctor.
 
   TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
-			       T* *value,
-			       CORBA::Boolean release=0);
+                               T* *value,
+                               CORBA::Boolean release=0);
   // Constructor from data.
 
   TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T,MAX> &);
@@ -590,7 +590,7 @@ public:
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
   virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
+                               CORBA::ULong old_length);
 };
 
 // *************************************************************
@@ -616,8 +616,8 @@ public:
   // contents vector, so it always sets the release flag to TRUE.
 
   TAO_Bounded_String_Sequence (CORBA::ULong length,
-			       char* *value,
-			       CORBA::Boolean release = 0);
+                               char* *value,
+                               CORBA::Boolean release = 0);
   // {SPEC}
   // The ``T *data'' constructor (as shown in the example above)
   // allows the length and contents of a bounded or unbounded sequence
@@ -677,7 +677,7 @@ public:
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
   virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
+                               CORBA::ULong old_length);
 };
 
 // *************************************************************
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index 30e0dbc489e..ab4053aaad2 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -52,7 +52,7 @@ protected:
   // Copy constructor, protected so no instances can be created.
 
   virtual CORBA::Boolean _is_a (const char* logical_type_id,
-				CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Local implementation of the CORBA::Object::_is_a method.
 
   virtual void _dispatch (CORBA::ServerRequest &request,
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index ea4e26caa9d..3665a9a8952 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -184,7 +184,7 @@ public:
   // = Initialization and termination methods.
   IIOP_ServerRequest (TAO_InputCDR &input,
                       TAO_OutputCDR &output,
-		      TAO_ORB_Core *orb_core,
+                      TAO_ORB_Core *orb_core,
                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Constructor
   IIOP_ServerRequest (CORBA::ULong &request_id,
diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
index 0ee14aee3fd..1c61d2b23d1 100644
--- a/TAO/tao/TAO.h
+++ b/TAO/tao/TAO.h
@@ -5,61 +5,61 @@
 //
 // = LIBRARY
 //    tao
-// 
+//
 // = FILENAME
 //   tao.h
 //
 // = DESCRIPTION
-//   Externally visible TAO extensions.   
+//   Externally visible TAO extensions.
 //
 // = AUTHOR
 //    Chris Cleeland
-// 
+//
 // ============================================================================
 
 #ifndef TAO_H
-#define	TAO_H
+#define TAO_H
 
 #include "tao/corba.h"
 
 class TAO_Export TAO_ORB_Manager
 {
   // = TITLE
-  //     Helper class for simple ORB/POA initialization and 
+  //     Helper class for simple ORB/POA initialization and
   //     registering servants with the POA.
 public:
   // = Initialization and termination methods.
   TAO_ORB_Manager (CORBA::ORB_ptr orb = 0,
                    PortableServer::POA_ptr poa = 0,
-                   PortableServer::POAManager_ptr poa_manager = 0); 
+                   PortableServer::POAManager_ptr poa_manager = 0);
   // Constructor.
 
   ~TAO_ORB_Manager (void);
   // Destructor.
-      
-  int init (int& argc, 
+
+  int init (int& argc,
             char *argv[],
             CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Initialize the ORB/root POA, using the supplied command line
   // arguments or the default ORB components.  Returns -1 on failure.
-      
+
   int init_child_poa (int& argc,
-		      char *argv[],
-		      char *poa_name,
-		      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                      char *argv[],
+                      char *poa_name,
+                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Creates a child poa under the root poa with PERSISTENT and
   // USER_ID policies.  Call this if you want a <child_poa> with the
   // above policies, otherwise call init.  Returns -1 on failure.
-		      
+
   CORBA::String activate (PortableServer::Servant servant,
                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Activate <servant>, using the POA <activate_object> call.  Users
   // can call this method multiple times to activate multiple objects.
   // Returns 0 on failure.
-      
+
   CORBA::String activate_under_child_poa (const char *servant_name,
-					  PortableServer::Servant servant,
-					  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                          PortableServer::Servant servant,
+                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Precondition: init_child_poa has been called.  Activate <servant>
   // using the POA <activate_object_with_id> created from the string
   // servant_name. Users should call this to activate objects under
@@ -69,7 +69,7 @@ public:
            ACE_Time_Value *tv = 0);
   // Run the ORB event loop with the specified <tv> time value Returns
   // -1 on failure.
-      
+
   CORBA::ORB_ptr orb (void);
   // Accessor which returns the ORB pointer.
 
@@ -78,11 +78,11 @@ public:
 
   PortableServer::POA_ptr child_poa (void);
   // Accessor which returns the child poa
-  
+
 protected:
   CORBA::ORB_var orb_;
   // The ORB.
-      
+
   PortableServer::POA_var poa_;
   // The POA for this ORB.
 
@@ -92,7 +92,7 @@ protected:
   PortableServer::POAManager_var poa_manager_;
   // The POA manager of poa_.
 };
-  
+
 class TAO_Export TAO
 {
   // = TITLE
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
index 9dd77ebfe77..0ba63c68061 100644
--- a/TAO/tao/TAO_Internal.h
+++ b/TAO/tao/TAO_Internal.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO
-// 
+//
 // = FILENAME
 //    TAO_Internal.h
 //
@@ -14,7 +14,7 @@
 //
 // = AUTHOR
 //    Chris Cleeland
-// 
+//
 // ============================================================================
 
 #ifndef TAO_INTERNAL_H
@@ -49,7 +49,7 @@ protected:
   // of loading services found in a file, then you should change the
   // code in here in order to get service entries into the service
   // repository.
-  
+
 private:
   TAO_Internal (void);
   // Private CTOR prevents this class from being instantiated.
diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h
index b59ed47a08e..dc801dc2290 100644
--- a/TAO/tao/Timeprobe.h
+++ b/TAO/tao/Timeprobe.h
@@ -11,4 +11,8 @@
 
 #include "ace/Timeprobe.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #endif /* TAO_TIMEPROBE_H */
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 3a004f10b6f..903a26779b9 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -92,7 +92,7 @@ public:
 
   CORBA::Boolean equivalent (CORBA::TypeCode_ptr,
                              CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
-  // Unaliases receiver and argument before comparing.                           
+  // Unaliases receiver and argument before comparing.
 
   CORBA::TCKind kind (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
   // For all TypeCode kinds, returns the "kind" of the typecode.
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 356cf1d27de..fe805f57f85 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -30,6 +30,11 @@
 
 // ACE specific includes
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "ace/SOCK_Stream.h"
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
index 3a93c1f85bd..b5ae4428af7 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -6,7 +6,7 @@
 //
 // = LIBRARY
 //    TAO
-// 
+//
 // = FILENAME
 //    debug.h
 //
@@ -15,11 +15,11 @@
 //
 // = AUTHOR
 //     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
+//
 // ============================================================================
 
 #ifndef TAO_DEBUG_H
-#define	TAO_DEBUG_H
+#define TAO_DEBUG_H
 
 // These are global to simplify is use by other code, very much in
 // particular by getopt and related argument-parsing code
@@ -28,7 +28,7 @@
 // such as process initialization.  They're treated as immutable.
 
 // 0 to ??; higher == more
-extern TAO_Export u_int TAO_debug_level;	
+extern TAO_Export u_int TAO_debug_level;
 
 // debug messages on (1) or off (0)
 extern TAO_Export u_int TAO_orbdebug;
@@ -46,35 +46,35 @@ extern TAO_Export char *TAO_debug_filter;
 #include <string.h>
 
 // 1, 2, 3 argument messages -- generic
-#define dmsg(s)		{ if (TAO_debug_level) dmsg_v (s); }
-#define dmsg1(s,a1)	{ if (TAO_debug_level) dmsg_v (s, a1); }
-#define dmsg2(s,a1,a2)	{ if (TAO_debug_level) dmsg_v (s, a1, a2); }
+#define dmsg(s)         { if (TAO_debug_level) dmsg_v (s); }
+#define dmsg1(s,a1)     { if (TAO_debug_level) dmsg_v (s, a1); }
+#define dmsg2(s,a1,a2)  { if (TAO_debug_level) dmsg_v (s, a1, a2); }
 
 // dump CORBA_Exception, if any, with id tag
-#define dexc(env,s)	{ if (TAO_debug_level && env.exception ()) \
-				_dmsg_x (env, s); }
+#define dexc(env,s)     { if (TAO_debug_level && env.exception ()) \
+                                _dmsg_x (env, s); }
 
 // dump POSIX error indication, if any, with ID tag
-#define dperror(str)	{ if (TAO_debug_level) dmsg_v ("%s: %s", \
-				str, strerror (errno)); }
+#define dperror(str)    { if (TAO_debug_level) dmsg_v ("%s: %s", \
+                                str, strerror (errno)); }
 
 // dump socket error indication, if any, with ID tag
 #if defined (_WINSOCKAPI_)
-#define	dsockerr(s) { if (TAO_debug_level) dmsg_v ("%s:  winsock error %d", \
+#define dsockerr(s) { if (TAO_debug_level) dmsg_v ("%s:  winsock error %d", \
                                                    s, WSAGetLastError()); }
 #else
-#define	dsockerr(s)	dperror(s)
+#define dsockerr(s)     dperror(s)
 #endif /* _WINSOCKAPI_ */
 
-#else	/* !DEBUG */
+#else   /* !DEBUG */
 #define dmsg(s) { }
 #define dmsg1(s,a1) { }
 #define dmsg2(s,a1,a2) { }
 
 #define dexc(env, s) { }
-#define	dperror(s) { }
-#define	dsockerr(s) { }
-#endif	/* DEBUG */
+#define dperror(s) { }
+#define dsockerr(s) { }
+#endif  /* DEBUG */
 
 // These don't compile out; you must #ifdef them.  This is done
 // intentionally since CPP macros have severe limits, and varargs _(or
@@ -94,7 +94,7 @@ extern void TAO_Export dmsg_filter (const char *filter,
 // Filter according to TAO_debug_level instead of category.  (For
 // speed, test against TAO_debug_level directly.)
 
-extern void TAO_Export dmsg_filter (u_int level, 
+extern void TAO_Export dmsg_filter (u_int level,
                                     const char *fmt,
                                     ...);
 
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 1049c05036b..4d45819f211 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -123,7 +123,7 @@ protected:
   TAO_Object_Table_Impl *create_user_id_policy_object_table (void);
   TAO_Object_Table_Impl *create_system_id_policy_object_table (void);
   TAO_Object_Table_Impl *create_object_table_i (TAO_Demux_Strategy table_type);
-  
+
   u_long thread_flags_;
   // Default thread flags passed to thr_create().
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 89ddd971edf..c1a4efd5343 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -25,6 +25,10 @@
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if !defined (TAO_REACTOR)
 #define TAO_REACTOR ACE_Select_Reactor
 #endif /* TAO_REACTOR */
diff --git a/TAO/tao/singletons.h b/TAO/tao/singletons.h
index 818817476b5..cedac8b7a99 100644
--- a/TAO/tao/singletons.h
+++ b/TAO/tao/singletons.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO
-// 
+//
 // = FILENAME
 //    singletons.h
 //
@@ -17,7 +17,7 @@
 //
 // = COPYRIGHT
 //    Copyright 1997
-// 
+//
 // ============================================================================
 
 #ifndef TAO_SINGLETONS_H
diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h
index 412a4ecfd75..611ba23c473 100644
--- a/TAO/tao/try_macros.h
+++ b/TAO/tao/try_macros.h
@@ -120,7 +120,7 @@ TAO_TRY_LABEL: \
 if (TAO_TRY_FLAG) \
 do {
 
-// This serves a similar purpose as the macro above, 
+// This serves a similar purpose as the macro above,
 // The second "do" scope is for the TAO_CHECK_ENV continues.
 #define TAO_TRY_EX(LABEL) \
 do { \
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
index 78db5b7ffe5..b41e140fc83 100644
--- a/TAO/tao/varout.h
+++ b/TAO/tao/varout.h
@@ -37,7 +37,7 @@ class TAO_Object_Field_T : public TAO_Object_Field
   //   The downcasting to the right type must be executed by classes
   //   with compile-time knowledge of the object type.
   //   The solution addopted in TAO is to create a special manager
-  //   class for that field, 
+  //   class for that field,
 public:
   TAO_Object_Field_T (void);
   // default constructor
@@ -85,7 +85,7 @@ public:
   // TAO extension for access to the underlying pointer.
 
   virtual void _downcast (CORBA_Object* base_ptr,
-			  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
   virtual CORBA_Object* _upcast (void);
   virtual void _release (void);
   // Implement the TAO_Object_Field methods.
@@ -703,7 +703,7 @@ public:
 private:
   T_ptr &ptr_;
 };
-#endif /* 0 */ 
+#endif /* 0 */
 
 #if defined (__ACE_INLINE__)
 #include "tao/varout.i"
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index 8080a408b87..f91911e61c2 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -5,8 +5,8 @@
 ACE_RCSID(Multiple_Inheritance, Multiple_Inheritance_i, "$Id$")
 
 class Multiple_Inheritance_i : public POA_D
-{       
-public:         
+{
+public:
   virtual CORBA::String method1 (CORBA::Environment &)
     {
       return CORBA::string_dup ("method1");
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index 0a2300f6110..d9b643a66ef 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -10,7 +10,7 @@
 //    MT_Object_A_i.h
 //
 // = DESCRIPTION
-//    This class implements the Object A of the 
+//    This class implements the Object A of the
 //    Nested Upcalls - MT Client test
 //
 // = AUTHORS
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (MT_OBJECT_IMPL_H)
+#ifndef MT_OBJECT_IMPL_H
 #  define MT_OBJECT_IMPL_H
 
 #include "MT_Client_TestS.h"
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index b46b41f6d79..b0ddfdec286 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CLIENT_H)
+#ifndef MT_CLIENT_H
 #define MT_CLIENT_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "tao/corba.h"
@@ -43,9 +48,9 @@ public:
   int run (void);
   // Execute client example code.
 
-  int init (int argc, 
+  int init (int argc,
             char **argv,
-	    int client_number);
+            int client_number);
   // Initialize the client communication endpoint with server.
 
 private:
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 84bfc68d5fa..47448a588a0 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -10,7 +10,7 @@
 //    local_server.h
 //
 // = DESCRIPTION
-//     This class implements a simple server for the 
+//     This class implements a simple server for the
 //     Nested Upcalls - MT Client test
 //
 // = AUTHORS
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CLIENT_TEST_MT_SERVER_H)
+#ifndef MT_CLIENT_TEST_MT_SERVER_H
 #define MT_CLIENT_TEST_MT_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "MT_Object_i.h"
@@ -70,7 +75,7 @@ private:
   // The ORB manager
 
   MT_Object_i mT_Object_i_;
-  // Implementation object 
+  // Implementation object
 
   MT_Object_var mT_Object_var_;
   // reference for the distant MT Object
@@ -95,7 +100,7 @@ class MT_Server_Task : public ACE_Task<ACE_SYNCH>
   //    No big purpose, just wrapping
 public:
   MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
-                  int argc, 
+                  int argc,
                   char **argv,
                   TAO_ORB_Manager* orb_manager_ptr);
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index cb58c0d6376..b744c1b78c3 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -10,7 +10,7 @@
 //    server_A.h
 //
 // = DESCRIPTION
-//      This class implements a simple server for the 
+//      This class implements a simple server for the
 //      Nested Upcalls - MT Client test
 //
 // = AUTHORS
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CLIENT_TEST_MT_OBJECT_SERVER_H)
+#ifndef MT_CLIENT_TEST_MT_OBJECT_SERVER_H
 #define MT_CLIENT_TEST_MT_OBJECT_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "MT_Object_i.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
index 73c3195c4fe..8198739eff4 100644
--- a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#if !defined (_NESTEDUPCALLS_I_H)
+#ifndef _NESTEDUPCALLS_I_H
 #define _NESTEDUPCALLS_I_H
 
 //#include "cubitS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h
index 706a4d9105a..5e2f2fbc187 100644
--- a/TAO/tests/NestedUpcall/Reactor/client.h
+++ b/TAO/tests/NestedUpcall/Reactor/client.h
@@ -18,6 +18,11 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "reactor_i.h"
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h
index c8443da0bcb..c3b0a729696 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 // $Id$
 
-#if !defined (EVENTHANDLER_I_H)
+#ifndef EVENTHANDLER_I_H
 #  define EVENTHANDLER_I_H
 
 #include "ReactorS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
index 3d4ede734c9..bc7b11c391a 100644
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 // $Id$
 
-#if !defined (REACTOR_I_H)
+#ifndef REACTOR_I_H
 #  define REACTOR_I_H
 
 #include "ReactorS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/server.h b/TAO/tests/NestedUpcall/Reactor/server.h
index cb02f84b701..73acff90fcf 100644
--- a/TAO/tests/NestedUpcall/Reactor/server.h
+++ b/TAO/tests/NestedUpcall/Reactor/server.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_NUC_SERVER_H)
+#ifndef _NUC_SERVER_H
 #define _NUC_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "orbsvcs/CosNamingC.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index d96de135ef8..197b491070f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -10,7 +10,7 @@
 //    Initiator_i.h
 //
 // = DESCRIPTION
-//    This class implements the Initiator of the 
+//    This class implements the Initiator of the
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (INITIATOR_IMPL_H)
+#ifndef INITIATOR_IMPL_H
 #  define INITIATOR_IMPL_H
 
 #include "Triangle_TestS.h"
@@ -28,7 +28,7 @@ class Initiator_i : public POA_Initiator
   // = TITLE
   //     Implement the <Initiator> IDL interface.
 public:
-  Initiator_i (Object_A_ptr object_A_ptr, 
+  Initiator_i (Object_A_ptr object_A_ptr,
                   Object_B_ptr object_B_ptr);
   // Constructor.
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index a1da7af1796..3f41df62c63 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -10,7 +10,7 @@
 //    Object_A_i.h
 //
 // = DESCRIPTION
-//    This class implements the Object A of the 
+//    This class implements the Object A of the
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (OBJECT_B_IMPL_H)
+#ifndef OBJECT_B_IMPL_H
 #  define OBJECT_B_IMPL_H
 
 #include "Triangle_TestS.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 0757357d510..01366ff476e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -10,7 +10,7 @@
 //    Object_B_i.h
 //
 // = DESCRIPTION
-//    This class implements the Object B of the 
+//    This class implements the Object B of the
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (OBJECT_B_IMPL_H)
+#ifndef OBJECT_B_IMPL_H
 #  define OBJECT_B_IMPL_H
 
 #include "Triangle_TestS.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 628889f8254..89c9d5e4ccc 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -10,7 +10,7 @@
 //    initiator.h
 //
 // = DESCRIPTION
-//      This class implements a simple server for the 
+//      This class implements a simple server for the
 //      Nested Upcalls - Triangle test
 //
 // = AUTHORS
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_TRIANGLE_TEST_INITITATOR_SERVER_H)
+#ifndef _TRIANGLE_TEST_INITITATOR_SERVER_H
 #define _TRIANGLE_TEST_INITITATOR_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "Initiator_i.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index 070bf80d0f9..b15a1618a1f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -10,7 +10,7 @@
 //    server_A.h
 //
 // = DESCRIPTION
-//      This class implements a simple server for the 
+//      This class implements a simple server for the
 //      Nested Upcalls - Triangle test
 //
 // = AUTHORS
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_TRIANGLE_TEST_OBJECT_A_SERVER_H)
+#ifndef _TRIANGLE_TEST_OBJECT_A_SERVER_H
 #define _TRIANGLE_TEST_OBJECT_A_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "Object_A_i.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 51028a046e2..9e5356842d6 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -10,7 +10,7 @@
 //    server_B.h
 //
 // = DESCRIPTION
-//      This class implements a simple server for the 
+//      This class implements a simple server for the
 //      Nested Upcalls - Triangle test
 //
 // = AUTHORS
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_TRIANGLE_TEST_OBJECT_B_SERVER_H)
+#ifndef _TRIANGLE_TEST_OBJECT_B_SERVER_H
 #define _TRIANGLE_TEST_OBJECT_B_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "Object_B_i.h"
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index 62681bd5041..a696b661dd3 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_ANY_H)
+#ifndef PARAM_TEST_ANY_H
 #define PARAM_TEST_ANY_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index f22ae99df0c..4262819fe33 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_BOUNDED_LONG_SEQUENCE_H)
+#ifndef PARAM_TEST_BOUNDED_LONG_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_LONG_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index cb2257e2810..777436d236f 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H)
+#ifndef PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index 23f97b76538..a444ddfbd39 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_BOUNDED_STRING_SEQUENCE_H)
+#ifndef PARAM_TEST_BOUNDED_STRING_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_STRING_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index 16a9098789c..9efa9c7c956 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_BOUNDED_STRING_H)
+#ifndef PARAM_TEST_BOUNDED_STRING_H
 #define PARAM_TEST_BOUNDED_STRING_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index ada88f76732..dd4c0575d53 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H)
+#ifndef PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h
index 9321f3ae53f..adab6ad81fc 100644
--- a/TAO/tests/Param_Test/client.h
+++ b/TAO/tests/Param_Test/client.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_CLIENT_H)
+#ifndef PARAM_TEST_CLIENT_H
 #define PARAM_TEST_CLIENT_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/driver.h b/TAO/tests/Param_Test/driver.h
index 0b035be7f87..a39aedc41d7 100644
--- a/TAO/tests/Param_Test/driver.h
+++ b/TAO/tests/Param_Test/driver.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (DRIVER_H)
+#ifndef DRIVER_H
 #define DRIVER_H
 
 #include "options.h"
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index 6f3e7bc9ef0..5f08f531182 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_EXCEPTION_H)
+#ifndef PARAM_TEST_EXCEPTION_H
 #define PARAM_TEST_EXCEPTION_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index 66b093b8180..a54a0d41768 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_FIXED_ARRAY_H)
+#ifndef PARAM_TEST_FIXED_ARRAY_H
 #define PARAM_TEST_FIXED_ARRAY_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index c9d62df4a64..b997a672ea6 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_FIXED_STRUCT_H)
+#ifndef PARAM_TEST_FIXED_STRUCT_H
 #define PARAM_TEST_FIXED_STRUCT_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h
index e76394ba6e1..fb128fbfb2d 100644
--- a/TAO/tests/Param_Test/helper.h
+++ b/TAO/tests/Param_Test/helper.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (HELPER_H)
+#ifndef HELPER_H
 #define HELPER_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index 90843c0aa57..68cdfba74fb 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_NESTED_STRUCT_H)
+#ifndef PARAM_TEST_NESTED_STRUCT_H
 #define PARAM_TEST_NESTED_STRUCT_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index 18b8e40a211..faa6e27c15b 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -9,14 +9,14 @@
 //    objref.h
 //
 // = DESCRIPTION
-//     Tests object references 
+//     Tests object references
 //
 // = AUTHORS
 //      Aniruddha Gokhale
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_OBJREF_H)
+#ifndef PARAM_TEST_OBJREF_H
 #define PARAM_TEST_OBJREF_H
 
 #include "param_testCli.h"
@@ -79,7 +79,7 @@ private:
 
   // Need these for DII.
   // SII requests that involve aliased objref types can rely on
-  // their stubs and skeletons to convert to CORBA::Object so the 
+  // their stubs and skeletons to convert to CORBA::Object so the
   // ORB can deal with it. DII requests cannot convert for every
   // possible aliased objref type, so we must convert ourselves
   // before invoking the DII request, and use the interface's
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index 20e6283deed..71d1de317c3 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_OBJREF_STRUCT_H)
+#ifndef PARAM_TEST_OBJREF_STRUCT_H
 #define PARAM_TEST_OBJREF_STRUCT_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index e3898028d33..d477450aa8a 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (OPTIONS_H)
+#ifndef OPTIONS_H
 #define OPTIONS_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 
 class Options
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 806018ca5c7..2ec44acf398 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_I_H)
+#ifndef PARAM_TEST_I_H
 #define PARAM_TEST_I_H
 
 #include "param_testSer.h"
@@ -224,9 +224,9 @@ public:
   // test for arrays of variable types
 
   virtual CORBA::ULong test_exception (CORBA::ULong s1,
-				       CORBA::ULong& s2,
-				       CORBA::ULong_out s3,
-				       CORBA::Environment &env);
+                                       CORBA::ULong& s2,
+                                       CORBA::ULong_out s3,
+                                       CORBA::Environment &env);
 
   void shutdown (CORBA::Environment &env);
 
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index e4ed1320818..5f8139f655b 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -16,12 +16,16 @@
 //
 // ============================================================================
 
-#if !defined (RESULTS_H)
+#ifndef RESULTS_H
 #define RESULTS_H
 
 #include "tao/corba.h"
 #include "ace/Profile_Timer.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class Results
 {
 public:
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index f6b96562d88..c2ed72e7143 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_SHORT_H)
+#ifndef PARAM_TEST_SHORT_H
 #define PARAM_TEST_SHORT_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/tests.h b/TAO/tests/Param_Test/tests.h
index 146c5228d30..f1845ebd497 100644
--- a/TAO/tests/Param_Test/tests.h
+++ b/TAO/tests/Param_Test/tests.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (TESTS_H)
+#ifndef TESTS_H
 #define TESTS_H
 
 #include "any.h"
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index 06d667e9afe..5c8896e6551 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_TYPECODE_H)
+#ifndef PARAM_TEST_TYPECODE_H
 #define PARAM_TEST_TYPECODE_H
 
 #include "param_testCli.h"
@@ -65,7 +65,7 @@ private:
   CORBA::TypeCode_var tc_holder_;
   // place for selected typecode to stay during time
   // between init_parameters () and reset_parameters ().
-  
+
   char *opname_;
   // operation name
 
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index c13681b6ee9..9c3ebeba014 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H)
+#ifndef PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index ed0244b9459..d106e8e1bb1 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H)
+#ifndef PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index d6ea252182b..e1395f0ffae 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H)
+#ifndef PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H
 
 #include "param_testCli.h"
@@ -65,7 +65,7 @@ public:
 protected:
   CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1,
                           const Param_Test::Coffee_Mix &s2,
-						  CORBA::Environment& env);
+                                                  CORBA::Environment& env);
   // compare
 
   void print_sequence (const Param_Test::Coffee_Mix &s);
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index eb480025031..7c6c276b30d 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H)
+#ifndef PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index 7ee69db9964..6b081ffd069 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H)
+#ifndef PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index 678a0a10e24..82de5ff5103 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_UNBOUNDED_STRING_H)
+#ifndef PARAM_TEST_UNBOUNDED_STRING_H
 #define PARAM_TEST_UNBOUNDED_STRING_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index 0baf2d16787..3889561dab2 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H)
+#ifndef PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H
 #define PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index 0b281c158ba..3b898b08639 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_ULONGLONG_H)
+#ifndef PARAM_TEST_ULONGLONG_H
 #define PARAM_TEST_ULONGLONG_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index 996f091c595..96737fd2080 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_VAR_ARRAY_H)
+#ifndef PARAM_TEST_VAR_ARRAY_H
 #define PARAM_TEST_VAR_ARRAY_H
 
 #include "param_testCli.h"
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index 288fc0fa9eb..9ab1af5a7bd 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (PARAM_TEST_VAR_STRUCT_H)
+#ifndef PARAM_TEST_VAR_STRUCT_H
 #define PARAM_TEST_VAR_STRUCT_H
 
 #include "param_testCli.h"
diff --git a/TAO/utils/IOR-parser/ior-handler.h b/TAO/utils/IOR-parser/ior-handler.h
index f1d6eb4f263..ff8970d488f 100644
--- a/TAO/utils/IOR-parser/ior-handler.h
+++ b/TAO/utils/IOR-parser/ior-handler.h
@@ -16,10 +16,15 @@
 //
 // ============================================================================
 
-#if !defined (__IORPARSER_H__)
+#ifndef __IORPARSER_H__
 #define __IORPARSER_H__
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Basic_Types.h"    // To determine BYTE_ORDER
 
 // Maximum length of the stringified IOR, the type_id, and the
@@ -38,57 +43,57 @@ class IOR
   //
   // = DESCRIPTION
   //     This structure assumes that the profile_id is
-  //     TAG_INTERNET_IOP and that there is only one TaggedProfile in 
+  //     TAG_INTERNET_IOP and that there is only one TaggedProfile in
   //     the IOR.
 public:
   u_long typeIdLen;
   // The length of the type_id field of the IOR
-  
+
   char typeId[MAX_TYPE_ID_LEN];
   // The string in the type_id field of the IOR
-  
+
   char idlInterface[MAX_TYPE_ID_LEN];
   // The IDL interface of the server that published the IOR (can be extracted
   // from the type_id field)
-  
+
   u_long profileBodyLen;
   // The length of the body of the profile field of the IOR
-  
+
   u_long hostLen;
   // The length of the hostname embedded in the IOR
-  
+
   char HostName[MAX_HOSTNAME_LEN];
   // The server's hostname embedded in the IOR
-  
+
   u_long portNum;
   // The server's port number embedded in the IOR
-  
+
   u_long objectKeyLen;
   // The length of the object_key field of the IOR
-  
+
   char objectKey[MAX_OBJ_KEY_LEN];
   // The object_key field of the IOR
 };
 
 class IorHandler
 {
-  // = TITLE 
+  // = TITLE
   //     This is the class that takes in a real (valid) IOR and
   //     parses it.
   //
   // = DESCRIPTION
   //     This class prints out the useful information in the
-  //     IORs generated by VisiBroker, Orbix and TAO   
+  //     IORs generated by VisiBroker, Orbix and TAO
 public:
   IorHandler (void);
   // Constructor
- 
+
   void interpretIor (char *thisIor, struct IOR *thisIorInfo);
   // The main IOR parsing routine
-  
+
   char *getIdlInterface (char *typeId, int *validTypeId);
   // Extracts the IDL interface from the type_id field in the IOR
-  
+
   void readIorFromFile (char *filename);
   // Reads in the IOR from a specified file
 
@@ -96,25 +101,25 @@ public:
   // Holds the stringified IOR during parsing
 
   struct IOR parsedIOR;
-  // Holds the parsed IOR 
+  // Holds the parsed IOR
 
 private:
   int hexChar2int (char thisChar);
   // Converts a pair of hexadecimal-encoded characters in the stringified
-  // IOR into their integer value 
-  
+  // IOR into their integer value
+
   u_long getOctet8Field (char *readPtr, int *hexCharsRead);
   // Interpret the next 8 octets into an unsigned long
-  
+
   u_long getOctet4Field (char *readPtr, int *hexCharsRead);
   // Interpret the next 4 octets into an unsigned long
-  
+
   u_long getOctet2Field (char *readPtr, int *hexCharsRead);
   // Interpret the next 2 octets into an unsigned long
 
   void skipSpaceIfAny (char *readPtr, int *hexCharsRead);
-  // Skip the space character encountered while parsing the IOR       
-  
+  // Skip the space character encountered while parsing the IOR
+
   void skipNullOctets (char *readPtr, int *hexCharsRead, int expectingStr);
   // Skip the null octets encountered while parsing the IOR
 
@@ -123,10 +128,10 @@ private:
 
   char getCharacter (char *readPtr, int *offset);
   // Extracts a single character from the IOR
-  
+
   char *getString (char *readPtr, int givenLen);
   // Extracts a character string of a given length from the IOR
-  
+
 };
 
 #endif /* __IORPARSER_H__ */
diff --git a/ace/ACE.h b/ace/ACE.h
index 4f077e8da59..2b089ca2808 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    ACE.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 // This #include must come first to avoid recursive include problems.
@@ -21,7 +21,7 @@
 #define ACE_ACE_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Forward declarations.
@@ -71,31 +71,31 @@ public:
   // E.g., the "0" in SunPro C++ 4.32.0
 
   // = Recv operations that factor out differences between Win32 and UNIX.
-  static ssize_t recv (ACE_HANDLE handle, 
-                       void *buf, 
-                       size_t len, 
+  static ssize_t recv (ACE_HANDLE handle,
+                       void *buf,
+                       size_t len,
                        int flags);
   // Receive up to <len> bytes into <buf> from <handle> (uses the
   // <ACE_OS::recv> call).
 
-  static ssize_t recv (ACE_HANDLE handle, 
-                       void *buf, 
+  static ssize_t recv (ACE_HANDLE handle,
+                       void *buf,
                        size_t len);
   // Receive up to <len> bytes into <buf> from <handle> (uses the
   // <ACE_OS::read> system call on UNIX and the <ACE_OS::recv> call on
   // Win32).
 
   // = Recv operations that receive exactly n bytes.
-  static ssize_t recv_n (ACE_HANDLE handle, 
-                         void *buf, 
-                         size_t len, 
+  static ssize_t recv_n (ACE_HANDLE handle,
+                         void *buf,
+                         size_t len,
                          int flags);
   // Receive <len> bytes into <buf> from <handle> (uses the
   // <ACE_OS::recv> call).  If <handle> is set to non-blocking mode
   // this call will poll until all <len> bytes are received.
 
-  static ssize_t recv_n (ACE_HANDLE handle, 
-                         void *buf, 
+  static ssize_t recv_n (ACE_HANDLE handle,
+                         void *buf,
                          size_t len);
   // Receive <len> bytes into <buf> from <handle> (uses the
   // <ACE_OS::read> system call on UNIX and the <ACE_OS::recv> call on
@@ -103,9 +103,9 @@ public:
   // poll until all <len> bytes are received.
 
   // = Timed <recv> operations.
-  static ssize_t recv (ACE_HANDLE handle, 
-                       void *buf, 
-                       size_t len, 
+  static ssize_t recv (ACE_HANDLE handle,
+                       void *buf,
+                       size_t len,
                        int flags,
                        const ACE_Time_Value *timeout);
   // Wait up to <timeout> amount of time to receive up to <len> bytes
@@ -116,9 +116,9 @@ public:
   // elapses).  If <recv> times out a -1 is returned with <errno ==
   // ETIME>.  If it succeeds the number of bytes received is returned.
 
-  static ssize_t recv (ACE_HANDLE handle, 
-                       void *buf, 
-                       size_t len, 
+  static ssize_t recv (ACE_HANDLE handle,
+                       void *buf,
+                       size_t len,
                        const ACE_Time_Value *timeout);
   // Wait up to <timeout> amount of time to receive up to <len> bytes
   // into <buf> from <handle> (uses the <ACE_OS::read> call).  The
@@ -142,7 +142,7 @@ public:
 
   static ssize_t recvfrom (ACE_HANDLE handle,
                            char *buf,
-                           int len, 
+                           int len,
                            int flags,
                            struct sockaddr *addr,
                            int *addrlen,
@@ -156,9 +156,9 @@ public:
   // == ETIME>.  If it succeeds the number of bytes received is
   // returned.
 
-  static ssize_t recv_n (ACE_HANDLE handle, 
-                         void *buf, 
-                         size_t len, 
+  static ssize_t recv_n (ACE_HANDLE handle,
+                         void *buf,
+                         size_t len,
                          int flags,
                          const ACE_Time_Value *timeout);
   // Try to recv exactly <len> bytes into <buf> from <handle> (uses
@@ -171,9 +171,9 @@ public:
   // <recv_n> return <len> (i.e., the number of bytes requested to be
   // read).
 
-  static ssize_t recv_n (ACE_HANDLE handle, 
-                         void *buf, 
-                         size_t len, 
+  static ssize_t recv_n (ACE_HANDLE handle,
+                         void *buf,
+                         size_t len,
                          const ACE_Time_Value *timeout);
   // Try to recv exactly <len> bytes into <buf> from <handle> (uses
   // the <ACE_OS::recv> call).  The <timeout> indicates how long to
@@ -186,31 +186,31 @@ public:
   // read).
 
   // = Send operations that factor out differences between Win32 and UNIX.
-  static ssize_t send (ACE_HANDLE handle, 
-                       const void *buf, 
-                       size_t len, 
+  static ssize_t send (ACE_HANDLE handle,
+                       const void *buf,
+                       size_t len,
                        int flags);
   // Send up to <len> bytes into <buf> from <handle> (uses the
   // <ACE_OS::send> call).
 
-  static ssize_t send (ACE_HANDLE handle, 
-                       const void *buf, 
+  static ssize_t send (ACE_HANDLE handle,
+                       const void *buf,
                        size_t len);
   // Send up to <len> bytes into <buf> from <handle> (uses the
   // <ACE_OS::write> system call on UNIX and the <ACE_OS::send> call
   // on Win32).
 
   // = Send operations that send exactly n bytes.
-  static ssize_t send_n (ACE_HANDLE handle, 
-                         const void *buf, 
-                         size_t len, 
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const void *buf,
+                         size_t len,
                          int flags);
   // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::send>
   // system call).  If <handle> is set to non-blocking mode this call
   // will poll until all <len> bytes are sent.
 
-  static ssize_t send_n (ACE_HANDLE handle, 
-                         const void *buf, 
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const void *buf,
                          size_t len);
   // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write>
   // system call on UNIX and the <ACE_OS::recv> call on Win32).  If
@@ -218,9 +218,9 @@ public:
   // all <len> bytes are sent.
 
   // = Timed <send> operations.
-  static ssize_t send (ACE_HANDLE handle, 
-                       const void *buf, 
-                       size_t len, 
+  static ssize_t send (ACE_HANDLE handle,
+                       const void *buf,
+                       size_t len,
                        const ACE_Time_Value *timeout);
   // Wait up to <timeout> amount of time to send up to <len> bytes
   // into <buf> from <handle> (uses the <ACE_OS::write> system call on
@@ -231,9 +231,9 @@ public:
   // <send> times out a -1 is returned with <errno == ETIME>.  If it
   // succeeds the number of bytes sent is returned.
 
-  static ssize_t send (ACE_HANDLE handle, 
-                       const void *buf, 
-                       size_t len, 
+  static ssize_t send (ACE_HANDLE handle,
+                       const void *buf,
+                       size_t len,
                        int flags,
                        const ACE_Time_Value *timeout);
   // Wait up to <timeout> amount of time to send up to <len> bytes
@@ -244,8 +244,8 @@ public:
   // elapses).  If <send> times out a -1 is returned with <errno ==
   // ETIME>.  If it succeeds the number of bytes sent is returned.
 
-  static ssize_t sendmsg (ACE_HANDLE handle, 
-                          const struct msghdr *msg, 
+  static ssize_t sendmsg (ACE_HANDLE handle,
+                          const struct msghdr *msg,
                           int flags,
                           const ACE_Time_Value *timeout);
   // Wait up to <timeout> amount of time to send the <msg> to <handle>
@@ -258,7 +258,7 @@ public:
 
   static ssize_t sendto (ACE_HANDLE handle,
                          const char *buf,
-                         int len, 
+                         int len,
                          int flags,
                          const struct sockaddr *addr,
                          int addrlen,
@@ -271,9 +271,9 @@ public:
   // elapses).  If <sendto> times out a -1 is returned with <errno ==
   // ETIME>.  If it succeeds the number of bytes sent is returned.
 
-  static ssize_t send_n (ACE_HANDLE handle, 
-                         const void *buf, 
-                         size_t len, 
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const void *buf,
+                         size_t len,
                          int flags,
                          const ACE_Time_Value *timeout);
   // Try to send exactly <len> bytes into <buf> from <handle> (uses
@@ -286,9 +286,9 @@ public:
   // <send_n> return <len> (i.e., the number of bytes requested to be
   // sent).
 
-  static ssize_t send_n (ACE_HANDLE handle, 
-                         const void *buf, 
-                         size_t len, 
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const void *buf,
+                         size_t len,
                          const ACE_Time_Value *timeout);
   // Try to send exactly <len> bytes into <buf> from <handle> (uses
   // the <ACE_OS::send> call).  The <timeout> indicates how long to
@@ -302,7 +302,7 @@ public:
 
   // = Timed Scatter-read and gather-write functions.
 
-  static ssize_t writev (ACE_HANDLE handle, 
+  static ssize_t writev (ACE_HANDLE handle,
                          const iovec *iov,
                          int iovcnt,
                          const ACE_Time_Value *timeout);
@@ -335,8 +335,8 @@ public:
   // These encapsulate differences between UNIX and Win32 and also
   // send and recv exactly n bytes.
 
-  static ssize_t read_n (ACE_HANDLE handle, 
-                         void *buf, 
+  static ssize_t read_n (ACE_HANDLE handle,
+                         void *buf,
                          size_t len);
   // Receive <len> bytes into <buf> from <handle> (uses the
   // <ACE_OS::read> call, which uses the <read> system call on UNIX
@@ -344,8 +344,8 @@ public:
   // non-blocking mode this call will poll until all <len> bytes are
   // received.
 
-  static ssize_t write_n (ACE_HANDLE handle, 
-                          const void *buf, 
+  static ssize_t write_n (ACE_HANDLE handle,
+                          const void *buf,
                           size_t len);
   // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write>
   // calls, which is uses the <write> system call on UNIX and the
@@ -369,7 +369,7 @@ public:
   // socket internally (and free it).  Returns -1 on failure and 0 on
   // success.
 
-  static int get_ip_interfaces (size_t &count, 
+  static int get_ip_interfaces (size_t &count,
                                 ACE_INET_Addr *&addr_array);
   // Return count and array of all configured IP interfaces on this
   // host, rc = 0 on success (count == number of interfaces else -1).
@@ -386,13 +386,13 @@ public:
   // made.  Caller must <close> the handle.
 
   static int handle_timed_accept (ACE_HANDLE listener,
-                                  ACE_Time_Value *timeout, 
+                                  ACE_Time_Value *timeout,
                                   int restart);
   // Wait up to <timeout> amount of time to passively establish a
   // connection.  This method doesn't perform the <accept>, it just
   // does the timed wait...
 
-  static ACE_HANDLE handle_timed_complete (ACE_HANDLE listener, 
+  static ACE_HANDLE handle_timed_complete (ACE_HANDLE listener,
                                            ACE_Time_Value *timeout,
                                            int is_tli = 0);
   // Wait up to <timeout> amount of time to complete an actively
@@ -404,18 +404,18 @@ public:
 
   static ACE_HANDLE handle_timed_open (ACE_Time_Value *timeout,
                                        LPCTSTR name,
-                                       int flags, 
+                                       int flags,
                                        int perms);
   // Wait up to <timeout> amount of time to actively open a device.
   // This method doesn't perform the <connect>, it just does the timed
   // wait...
 
   // = Set/get/clear various flags related to I/O HANDLE.
-  static int set_flags (ACE_HANDLE handle, 
+  static int set_flags (ACE_HANDLE handle,
                         int flags);
   // Set flags associated with <handle>.
 
-  static int clr_flags (ACE_HANDLE handle, 
+  static int clr_flags (ACE_HANDLE handle,
                         int flags);
   // Clear flags associated with <handle>.
 
@@ -454,7 +454,7 @@ public:
   // new> rather than <malloc>.
 
 #   if defined (ACE_WIN32)
-  static wchar_t *strnew (const wchar_t *s); 
+  static wchar_t *strnew (const wchar_t *s);
   // This method is just like <strdup>, except that it uses <operator
   // new> rather than <malloc>.
 #endif /* ACE_WIN32 */
@@ -486,7 +486,7 @@ public:
   // "<pathname>.exe".  Always returns <pathname> on UNIX.
 
   static const char *basename (const char *pathname,
-			       char delim);
+                               char delim);
   // Returns the "basename" of a <pathname>.
 
 #if defined (ACE_HAS_UNICODE)
@@ -503,7 +503,7 @@ public:
   static const wchar_t *execname (const wchar_t *pathname);
 
   static const wchar_t *basename (const wchar_t *pathname,
-				  wchar_t delim);
+                                  wchar_t delim);
   // Returns the "basename" of a <pathname>.
 #endif /* ACE_HAS_UNICODE */
 
@@ -522,8 +522,8 @@ public:
 
   // = Methods for searching and opening shared libraries.
 
-  static int ldfind (const ASYS_TCHAR *filename, 
-                     ASYS_TCHAR *pathname, 
+  static int ldfind (const ASYS_TCHAR *filename,
+                     ASYS_TCHAR *pathname,
                      size_t maxlen);
   // Finds the file <filename> either using an absolute path or using
   // a relative path in conjunction with ACE_LD_SEARCH_PATH (e.g.,
@@ -534,17 +534,17 @@ public:
   // Win32) if the <filename> doesn't match directly.
 
   static FILE *ldopen (const ASYS_TCHAR *filename,
-		       const ASYS_TCHAR *type);
+                       const ASYS_TCHAR *type);
   // Uses <ldopen> to locate and open the appropriate <filename> and
   // returns a pointer to the file, else it returns a NULL
   // pointer. <type> specifies how the file should be open.
 
   static ACE_HANDLE open_temp_file (const char *name,
-                                    int mode, 
+                                    int mode,
                                     int perm = 0);
   // Opening the temp file.  File is automagically unlinked when it is
   // closed.  This is useful for have temp files.
-  
+
   // = Shield us from Win32's inability to select on STDIN.
 
   // = Miscelleous functions.
@@ -605,7 +605,7 @@ public:
   // may not have a chance to cleanup before it shuts down.
 
   static void unique_name (const void *object,
-                           LPTSTR name, 
+                           LPTSTR name,
                            size_t length);
   // This method uses process id and object pointer to come up with a
   // machine wide unique name.  The process ID will provide uniqueness
diff --git a/ace/ARGV.h b/ace/ARGV.h
index 73db55ddd99..9edebe6c1e7 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    ARGV.h
 //
 // = AUTHOR
 //    Doug Schmidt, Everett Anderson
-// 
+//
 // ============================================================================
 
 #ifndef ACE_ARGUMENT_VECTOR_H
 #define ACE_ARGUMENT_VECTOR_H
 
 #include "ace/ACE.h"
-#include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Containers.h"
+
 class ACE_Export ACE_ARGV
 {
   // = TITLE
@@ -62,7 +63,7 @@ public:
 
   // = Accessor arguments.
   const ASYS_TCHAR *operator[] (size_t index);
-  // Returns the <index>th string in the ARGV array.  
+  // Returns the <index>th string in the ARGV array.
 
   ASYS_TCHAR **argv (void);
   // Returns the <argv> array.  Caller should not delete this memory
@@ -71,7 +72,7 @@ public:
   // saved to the queue.
 
   size_t argc (void) const;
-  // Returns <argc>. 
+  // Returns <argc>.
 
   const ASYS_TCHAR *buf (void);
   // Returns the <buf>.  Caller should not delete this memory since
@@ -90,13 +91,13 @@ public:
   // What state is this ACE_ARGV in?
 
   // These are the states possible via the different constructors.
-  enum States 
+  enum States
   {
-    TO_STRING = 1,    
+    TO_STRING = 1,
     // ACE_ARGV converts buf[] to ASYS_TCHAR *argv[]
-    TO_PTR_ARRAY = 2, 
+    TO_PTR_ARRAY = 2,
     // ACE_ARGV converts ASYS_TCHAR *argv[] to buf[]
-    ITERATIVE = 3    
+    ITERATIVE = 3
     // Builds buf[] or ASYS_TCHAR *argv[] iteratively with add()
   };
 
@@ -109,7 +110,7 @@ private:
   // Converts buf_ into the ASYS_TCHAR *argv[] format.
 
   int argv_to_string (ASYS_TCHAR **argv, ASYS_TCHAR *&buf);
-  // Returns the string created from argv in buf and 
+  // Returns the string created from argv in buf and
   // returns the number of arguments.
 
   int substitute_env_args_;
@@ -119,10 +120,10 @@ private:
   // Current state marker.
 
   size_t argc_;
-  // Number of arguments in the ARGV array. 
+  // Number of arguments in the ARGV array.
 
   ASYS_TCHAR **argv_;
-  // The array of string arguments. 
+  // The array of string arguments.
 
   ASYS_TCHAR *buf_;
   // Buffer containing the <argv> contents.
diff --git a/ace/Acceptor.h b/ace/Acceptor.h
index 09739f5e817..d42360a35e8 100644
--- a/ace/Acceptor.h
+++ b/ace/Acceptor.h
@@ -5,27 +5,28 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Acceptor.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_ACCEPTOR_H
 #define ACE_ACCEPTOR_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Object.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Strategies.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Object.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Strategies.h"
+
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 class ACE_Acceptor : public ACE_Service_Object
 {
@@ -52,13 +53,13 @@ class ACE_Acceptor : public ACE_Service_Object
   //     a group.
 public:
   // = Initialization and termination methods.
-  ACE_Acceptor (ACE_Reactor * = 0, 
+  ACE_Acceptor (ACE_Reactor * = 0,
                 int use_select = 1);
   // "Do-nothing" constructor.
 
   ACE_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-		ACE_Reactor * = ACE_Reactor::instance (),
-		int flags = 0,
+                ACE_Reactor * = ACE_Reactor::instance (),
+                int flags = 0,
                 int use_select = 1,
                 int reuse_addr = 1);
   // Initialize and register <this> with the Reactor and listen for
@@ -72,9 +73,9 @@ public:
   // <PEER_ACCEPTOR>.  If it is non-zero this will allow the OS to
   // reuse this listen port.
 
-  int open (const ACE_PEER_ACCEPTOR_ADDR &, 
-	    ACE_Reactor * = ACE_Reactor::instance (),
-	    int flags = 0,
+  int open (const ACE_PEER_ACCEPTOR_ADDR &,
+            ACE_Reactor * = ACE_Reactor::instance (),
+            int flags = 0,
             int use_select = 1,
             int reuse_addr = 1);
   // Initialize and register <this> with the Reactor and listen for
@@ -138,8 +139,8 @@ protected:
   // multi-processing).
 
   // = Demultiplexing hooks.
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
+                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
   // Perform termination activities when <this> is removed from the
   // <reactor>.
 
@@ -198,32 +199,32 @@ class ACE_Strategy_Acceptor : public ACE_Acceptor <SVC_HANDLER, ACE_PEER_ACCEPTO
 public:
   // = Initialization and termination methods.
   ACE_Strategy_Acceptor (const ASYS_TCHAR service_name[] = 0,
-			 const ASYS_TCHAR service_description[] = 0,
+                         const ASYS_TCHAR service_description[] = 0,
                          int use_select = 1);
   // Default constructor.
 
   ACE_Strategy_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-			 ACE_Reactor * = ACE_Reactor::instance (),
-			 ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-			 ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0,
-			 ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
-			 ACE_Scheduling_Strategy<SVC_HANDLER> * = 0,
-			 const ASYS_TCHAR service_name[] = 0,
-			 const ASYS_TCHAR service_description[] = 0,
+                         ACE_Reactor * = ACE_Reactor::instance (),
+                         ACE_Creation_Strategy<SVC_HANDLER> * = 0,
+                         ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0,
+                         ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
+                         ACE_Scheduling_Strategy<SVC_HANDLER> * = 0,
+                         const ASYS_TCHAR service_name[] = 0,
+                         const ASYS_TCHAR service_description[] = 0,
                          int use_select = 1);
   // Initialize the appropriate strategies for creation, passive
   // connection acceptance, and concurrency, and then register <this>
   // with the Reactor and listen for connection requests at the
   // designated <local_addr>.
 
-  int open (const ACE_PEER_ACCEPTOR_ADDR &, 
-	    ACE_Reactor * = ACE_Reactor::instance (),
-	    ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-	    ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0,
-	    ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
-	    ACE_Scheduling_Strategy<SVC_HANDLER> * = 0,
-	    const ASYS_TCHAR *service_name = 0,
-	    const ASYS_TCHAR *service_description = 0,
+  int open (const ACE_PEER_ACCEPTOR_ADDR &,
+            ACE_Reactor * = ACE_Reactor::instance (),
+            ACE_Creation_Strategy<SVC_HANDLER> * = 0,
+            ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0,
+            ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
+            ACE_Scheduling_Strategy<SVC_HANDLER> * = 0,
+            const ASYS_TCHAR *service_name = 0,
+            const ASYS_TCHAR *service_description = 0,
             int use_select = 1);
   // Initialize the appropriate strategies for creation, passive
   // connection acceptance, and concurrency, and then register <this>
@@ -296,7 +297,7 @@ protected:
 
   // = Demultiplexing hooks.
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
   // Perform termination activities when <this> is removed from the
   // <Reactor>.
 
@@ -368,7 +369,7 @@ class ACE_Oneshot_Acceptor : public ACE_Service_Object
   // = DESCRIPTION
   //     This class works similarly to the regular <ACE_Acceptor>,
   //     with the following differences:
-  //    
+  //
   //     1. This class doesn't automagically register <this> with the
   //        <ACE_Reactor> since it expects to have its <accept> method
   //        called directly.  However, it stashes the <ACE_Reactor>
@@ -387,8 +388,8 @@ public:
   // Constructor.
 
   ACE_Oneshot_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-			ACE_Reactor *reactor = ACE_Reactor::instance (),
-			ACE_Concurrency_Strategy<SVC_HANDLER> * = 0);
+                        ACE_Reactor *reactor = ACE_Reactor::instance (),
+                        ACE_Concurrency_Strategy<SVC_HANDLER> * = 0);
   // Initialize the appropriate strategies for concurrency and then
   // open the <peer_acceptor> at the designated <local_addr>.  Note
   // that unlike the <ACE_Acceptor> and <ACE_Strategy_Acceptor>, this
@@ -396,9 +397,9 @@ public:
   // this point -- it just stashes the <reactor> away in case it's
   // needed later.
 
-  int open (const ACE_PEER_ACCEPTOR_ADDR &, 
-	    ACE_Reactor *reactor = ACE_Reactor::instance (),
-	    ACE_Concurrency_Strategy<SVC_HANDLER> * = 0);
+  int open (const ACE_PEER_ACCEPTOR_ADDR &,
+            ACE_Reactor *reactor = ACE_Reactor::instance (),
+            ACE_Concurrency_Strategy<SVC_HANDLER> * = 0);
   // Initialize the appropriate strategies for concurrency and then
   // open the <peer_acceptor> at the designated <local_addr>.  Note
   // that unlike the <ACE_Acceptor> and <ACE_Strategy_Acceptor>, this
@@ -411,13 +412,13 @@ public:
 
   // = Explicit factory operation.
   virtual int accept (SVC_HANDLER * = 0,
-		      ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0, 
-		      const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
-		      int restart = 1,
+                      ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0,
+                      const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
+                      int restart = 1,
                       int reset_new_handle = 0);
   // Create a <SVC_HANDLER>, accept the connection into the
   // <SVC_HANDLER>, and activate the <SVC_HANDLER>.
-  
+
   virtual int cancel (void);
   // Cancel a oneshot acceptor that was started asynchronously.
 
@@ -446,9 +447,9 @@ protected:
   // object" via multi-threading or multi-processing).
 
   int shared_accept (SVC_HANDLER *svc_handler,
-		     ACE_PEER_ACCEPTOR_ADDR *remote_addr,
-		     ACE_Time_Value *timeout,
-		     int restart,
+                     ACE_PEER_ACCEPTOR_ADDR *remote_addr,
+                     ACE_Time_Value *timeout,
+                     int restart,
                      int reset_new_handle);
   // Factors out the code shared between the <accept> and
   // <handle_input> methods.
@@ -458,16 +459,16 @@ protected:
   // Returns the listening acceptor's <ACE_HANDLE>.
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
   // Perform termination activities when <this> is removed from the
   // <reactor>.
-       
+
   virtual int handle_input (ACE_HANDLE);
   // Accept one connection from a client and activates the
-  // SVC_HANDLER. 
+  // SVC_HANDLER.
 
-  virtual int handle_timeout (const ACE_Time_Value &tv, 
-			      const void *arg);
+  virtual int handle_timeout (const ACE_Time_Value &tv,
+                              const void *arg);
   // Called when an acceptor times out...
 
   // = Dynamic linking hooks.
@@ -493,8 +494,8 @@ protected:
 
 private:
   int register_handler (SVC_HANDLER *svc_handler,
-			const ACE_Synch_Options &options,
-			int restart);
+                        const ACE_Synch_Options &options,
+                        int restart);
   // Insert ourselves into the <ACE_Reactor> so that we can continue
   // accepting this connection asynchronously.  This method should NOT
   // be called by developers directly.
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index 5913142b9e4..c2e9b232269 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -5,27 +5,28 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Activation_Queue.h
 //
 // = AUTHOR
 //    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-// 
+//    <schmidt@cs.wustl.edu>
+//
 // ============================================================================
 
 #ifndef ACE_ACTIVATION_QUEUE_H
 #define ACE_ACTIVATION_QUEUE_H
 
 #include "ace/Synch_T.h"
-#include "ace/Message_Queue.h"
-#include "ace/Method_Request.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Message_Queue.h"
+#include "ace/Method_Request.h"
+
 class ACE_Export ACE_Activation_Queue
 {
   // = TITLE
@@ -56,8 +57,8 @@ public:
   ACE_Method_Request *dequeue (ACE_Time_Value *tv = 0);
   // Dequeue the next available <Method_Request>.
 
-  int enqueue (ACE_Method_Request *new_method_request, 
-	       ACE_Time_Value *tv = 0);
+  int enqueue (ACE_Method_Request *new_method_request,
+               ACE_Time_Value *tv = 0);
   // Enqueue the <Method_Request> in priority order.  The priority is
   // determined by the <priority> method of the <new_message_request>.
 
@@ -70,7 +71,7 @@ public:
 protected:
   ACE_Message_Queue<ACE_SYNCH> *queue_;
   // Stores the <Method_Requests>.
-  
+
   int delete_queue_;
   // Keeps track of whether we need to delete the queue.
 };
diff --git a/ace/Addr.h b/ace/Addr.h
index 4e2985bf98b..1d9a2051ed8 100644
--- a/ace/Addr.h
+++ b/ace/Addr.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Addr.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_ADDR_H
@@ -20,10 +20,10 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ACE_Export ACE_Addr 
+class ACE_Export ACE_Addr
 {
   //  = TITLE
   //     Defines the base class for the "address family independent"
@@ -32,26 +32,26 @@ public:
   // = Initialization and termination methods.
   ACE_Addr (int type = -1,
             int size = -1);
-  // Initializes instance variables. 
+  // Initializes instance variables.
 
   virtual ~ACE_Addr (void);
   // Destructor.
 
-  // = Get/set the size of the address. 
+  // = Get/set the size of the address.
 
   int get_size (void) const;
   // Return the size of the address.
 
   void set_size (int size);
-  // Sets the size of the address. 
+  // Sets the size of the address.
 
-  // = Get/set the type of the address. 
+  // = Get/set the type of the address.
 
   int get_type (void) const;
-  // Get the type of the address. 
+  // Get the type of the address.
 
   void set_type (int type);
-  // Set the type of the address. 
+  // Set the type of the address.
 
   virtual void *get_addr (void) const;
   // Return a pointer to the address.
@@ -93,10 +93,10 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
-  int addr_type_; 
+  int addr_type_;
   // e.g., AF_UNIX, AF_INET, AF_SPIPE, etc.
 
-  int addr_size_; 
+  int addr_size_;
   // Number of bytes in the address.
 };
 
diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h
index 49675d227a4..7209b67eab8 100644
--- a/ace/Arg_Shifter.h
+++ b/ace/Arg_Shifter.h
@@ -3,15 +3,15 @@
 
 // ========================================================================
 //
-// = LIBRARY 
+// = LIBRARY
 //     ace
-//  
-// = FILENAME 
+//
+// = FILENAME
 //     Arg_Shifter.h
-// 
-// = AUTHOR 
-//     Seth Widoff 
-// 
+//
+// = AUTHOR
+//     Seth Widoff
+//
 // ========================================================================
 
 #ifndef ACE_ARG_SHIFTER_H
@@ -44,10 +44,10 @@ public:
   // indices to the end of the vector, forbidding iteration. Following
   // iteration over argv, the argc value will contain the number of
   // unconsumed arguments.
-  
+
   ~ACE_Arg_Shifter (void);
   // Destructor.
-  
+
   char *get_current (void) const;
   // Get the current head of the vector.
 
@@ -65,24 +65,24 @@ public:
   int is_option_next (void) const;
   // Returns 1 if there's a next item in the vector and it begins with
   // '-'.
-  
+
   int is_parameter_next (void) const;
   // Returns 1 if there's a next item in the vector and it doesn't
   // begin with '-'.
-  
+
   int num_ignored_args (void) const;
   // Returns the number of irrelevant args seen.
-  
+
 private:
   int &argc_;
   // The size of the argument vector.
 
   int total_size_;
   // The size of argv_.
-  
+
   char **temp_;
   // The temporary array over which we traverse.
-  
+
   char **argv_;
   // The array in which the arguments are reordered.
 
@@ -92,10 +92,10 @@ private:
   int back_;
   // The index of <argv_> in which we'll stick the next unknown
   // argument.
-  
+
   int front_;
   // The index of <argv_> in which we'll stick the next known
-  // argument. 
+  // argument.
 };
 
 #endif /* ACE_ARG_SHIFTER_H */
diff --git a/ace/Array.h b/ace/Array.h
index 715787503ab..faa4a450607 100644
--- a/ace/Array.h
+++ b/ace/Array.h
@@ -24,7 +24,7 @@
 #include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index d3e01b25b84..41f3ce435ea 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -4,13 +4,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Asynch_Acceptor.h
 //
 // = AUTHOR
 //    Irfan Pyarali (irfan@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_ASYNCH_ACCEPTOR_H
@@ -19,7 +19,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
@@ -32,7 +32,7 @@ class ACE_Message_Block;
 class ACE_INET_Addr;
 
 template <class HANDLER>
-class ACE_Asynch_Acceptor : public ACE_Handler 
+class ACE_Asynch_Acceptor : public ACE_Handler
 {
   // = TITLE
   //     This class is an example of the Acceptor Pattern.  This class
@@ -41,11 +41,11 @@ class ACE_Asynch_Acceptor : public ACE_Handler
   //
   // = DESCRIPTION
   //     Unlike the <ACE_Acceptor>, however, this class is designed to
-  //     be used asynchronously.  
+  //     be used asynchronously.
 public:
   ACE_Asynch_Acceptor (void);
   // A do nothing constructor.
-  
+
   virtual ~ACE_Asynch_Acceptor (void);
   // Virtual destruction
 
@@ -76,7 +76,7 @@ public:
   // <backlog> number of asynchronous accepts are started.
 
   virtual ACE_HANDLE get_handle (void) const;
-  // Get the underlying handle. 
+  // Get the underlying handle.
 
   virtual void set_handle (ACE_HANDLE handle);
   // Set the underlying listen handle. It is the user's responsibility
@@ -94,15 +94,15 @@ public:
   // operations issued by other threads.
 
   virtual int validate_new_connection (const ACE_INET_Addr &remote_address);
-  // Template method for address validation.  
+  // Template method for address validation.
   //
   // Default implemenation always validates the remote address.
 
   virtual int should_reissue_accept (void);
-  // Template method for deciding whether to reissue accept.  
+  // Template method for deciding whether to reissue accept.
   //
   // Default implemenation always returns this->reissue_accept_.
-  
+
   //
   // These are low level tweaking methods
   //
@@ -116,7 +116,7 @@ public:
   virtual void validate_new_connection (int new_value);
   // Set and get flag that indicates if address validation is
   // required.
-  
+
   virtual int reissue_accept (void) const;
   virtual void reissue_accept (int new_value);
   // Set and get flag that indicates if a new accept should be
@@ -132,25 +132,25 @@ public:
 protected:
 
   virtual void handle_accept (const ACE_Asynch_Accept::Result &result);
-  // This is called when an outstanding accept completes. 
+  // This is called when an outstanding accept completes.
 
   ACE_HANDLE handle (void) const;
   // Return the listen handle.
 
   void parse_address (const ACE_Asynch_Accept::Result &result,
-		      ACE_INET_Addr &remote_address,
-		      ACE_INET_Addr &local_address);
+                      ACE_INET_Addr &remote_address,
+                      ACE_INET_Addr &local_address);
   // This parses the address from read buffer.
 
   virtual HANDLER *make_handler (void);
   // This is the template method used to create new handler.
   // Subclasses must overwrite this method if a new handler creation
   // strategy is required.
-  
+
 private:
   ACE_HANDLE listen_handle_;
   // Handle used to listen for new connections.
-  
+
   ACE_Asynch_Accept asynch_accept_;
   // <Asynch_Accept> used to make life easier :-)
 
@@ -159,7 +159,7 @@ private:
 
   int validate_new_connection_;
   // Flag that indicates if address validation is required.
-  
+
   int reissue_accept_;
   // Flag that indicates if a new accept should be reissued when a
   // accept completes.
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 6289dfafda4..0667f1bdb22 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -30,7 +30,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 67df8fb59e6..592faef550b 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -5,14 +5,14 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Auto_Ptr.h
 //
 // = AUTHOR
-//    Doug Schmidt, based on code from Jack Reeves (jack@fx.com) and 
+//    Doug Schmidt, based on code from Jack Reeves (jack@fx.com) and
 //    Dr. Harald M. Mueller (mueller@garwein.hai.siemens.co.at)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_AUTO_PTR_H
@@ -21,11 +21,11 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class X>
-class ACE_Auto_Basic_Ptr 
+class ACE_Auto_Basic_Ptr
 {
   // = TITLE
   //     Implements the draft C++ standard auto_ptr abstraction.
@@ -70,13 +70,13 @@ public:
   // = Initialization and termination methods
   /* explicit */ auto_ptr (X *p = 0);
 
-  X *operator-> () const;  
+  X *operator-> () const;
 };
 
 #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 
 template<class X>
-class ACE_Auto_Basic_Array_Ptr 
+class ACE_Auto_Basic_Array_Ptr
 {
   // = TITLE
   //     Implements an extension to the draft C++ standard auto_ptr
@@ -88,7 +88,7 @@ public:
   ACE_Auto_Basic_Array_Ptr (const ACE_Auto_Basic_Array_Ptr<X> &ap);
   ACE_Auto_Basic_Array_Ptr<X> &operator= (const ACE_Auto_Basic_Array_Ptr<X> &rhs);
   ~ACE_Auto_Basic_Array_Ptr (void);
-  
+
   // = Accessor methods.
   X &operator* () const;
   X &operator[] (int i) const;
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index a134592784f..8c37257b337 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -48,7 +48,7 @@
 #define ACE_BASIC_TYPES_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // A char always has 1 byte, by definition.
diff --git a/ace/CLASSIX/CLASSIX_Addr.h b/ace/CLASSIX/CLASSIX_Addr.h
index f3cbae992ff..0afb1675a89 100644
--- a/ace/CLASSIX/CLASSIX_Addr.h
+++ b/ace/CLASSIX/CLASSIX_Addr.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
 //    CLASSIX_Addr.h
 //
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_CLASSIX_ADDR_H)
+#ifndef ACE_CLASSIX_ADDR_H
 #define ACE_CLASSIX_ADDR_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Addr.h"
 
 #include <ipc/chIpc.h>
@@ -27,24 +32,24 @@ class ACE_Export ACE_CLASSIX_Addr : public ACE_Addr
 {
   // = TITLE
   //    Defines the ClassiX IPC address format.
-  //    
+  //
   // = DESCRIPTION
   //   This class defines basic interfaces for "ACE-like" address for
   //   Chorus port.
 public:
-  enum 
+  enum
   {
     ACE_CLASSIX_ADDR_UNKNOWN = ACE_INVALID_HANDLE, /* K_NONEPORT */
     ACE_CLASSIX_ADDR_DEFAULT = K_DEFAULTPORT,
     AF_CLASSIX               = AF_MAX + 1
   };
-    
+
   enum Addr_Type
   {
-    PORT,			// use Peer_Port
-    GROUP,			// use Peer_Group
-    STAMP,			// use peer_Stamp
-    DYNAMIC,		        // use Peer_Group
+    PORT,                       // use Peer_Port
+    GROUP,                      // use Peer_Group
+    STAMP,                      // use peer_Stamp
+    DYNAMIC,                    // use Peer_Group
     UNDEFINED
   };
 
@@ -59,11 +64,11 @@ public:
   // = Direct initialization methods (useful after the object has been
   // constructed).
   // Returns 0 on success, -1 otherwise.
-  // 
+  //
 
   /* -----------------------------------------------------*/
   // = ACCESS
-  // 
+  //
   virtual const KnUniqueId& get_id (void) const;
   // Returns a reference to the unique identifier
 
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.h b/ace/CLASSIX/CLASSIX_CLD_Connector.h
index 3d0f1f7b45b..2825841bcdd 100644
--- a/ace/CLASSIX/CLASSIX_CLD_Connector.h
+++ b/ace/CLASSIX/CLASSIX_CLD_Connector.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_CLD_Connector.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 */
 
@@ -20,6 +20,11 @@
 #define ACE_CLASSIX_CLD_CONNECTOR_H
 
 #include "ace/CLASSIX/CLASSIX_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /* ------------------------------------------------------------------------- */
 
 class ACE_CLASSIX_CLD_Connector
@@ -30,14 +35,14 @@ class ACE_CLASSIX_CLD_Connector
     // = DESCRIPTION
     //     This is used when a client needs to communicate with a server
     //     whose SAP address is known beforehand.
-    //     
+    //
     //     Although there is a connection
     //     procedure, no connection is actually taken place
     //     between the client and server, since Chorus IPC does not have
     //     connection semantics.
     //     The connect procedure is necessary for
     //     compatibility with <ACE_SOCK_Connector> class.
-    //     
+    //
     //     This class will simplify the client's
     //     program, since it provides connection-like communication
     //     mechanism.
@@ -45,7 +50,7 @@ class ACE_CLASSIX_CLD_Connector
     // = NOTES
     //     The server in this case trusts everyone who lands on the
     //     server's SAP.
-    //     
+    //
     // = SEE ALSO
     //   ACE_CLASSIX_COD_Connector
 {
@@ -54,25 +59,25 @@ class ACE_CLASSIX_CLD_Connector
     enum OPTIONS
     {
         // Do not enable the local SAP
-	// (so that the Reactor will not monitor the port)
-	ENABLE	= 0x1
+        // (so that the Reactor will not monitor the port)
+        ENABLE  = 0x1
     };
 
     // = Initialization routines.
     ACE_CLASSIX_CLD_Connector (void);
     // Default constructor.
 
-    ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream, 
-			       const ACE_Addr &remote_sap 
-			       = ACE_Addr::sap_any,
-			       ACE_Time_Value *timeout = 0,
-			       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-			       int reuse_addr = 0,
-			       int flags = 0,
-			       int perms = 0,
-			       int protocol_family 
-			       = ACE_CLASSIX_Addr::AF_CLASSIX, 
-			       int protocol = 0);
+    ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream,
+                               const ACE_Addr &remote_sap
+                               = ACE_Addr::sap_any,
+                               ACE_Time_Value *timeout = 0,
+                               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                               int reuse_addr = 0,
+                               int flags = 0,
+                               int perms = 0,
+                               int protocol_family
+                               = ACE_CLASSIX_Addr::AF_CLASSIX,
+                               int protocol = 0);
     // Emulates connection semantics so that it can be plugged into
     // <ACE_Connector>
     // Actively connect local SAP and remote SAP togeter.
@@ -82,28 +87,28 @@ class ACE_CLASSIX_CLD_Connector
     // the acceptor's address.  In connectionless mode, we do not have
     // an acceptor.  The <remote_sap> address will be copied to the new stream
     // if things goes well.
-    // 
+    //
     // If <local_sap> refers to any address, a port will be
     // allocated and will be used as a local SAP.
     //
     // The rest parameters are there so that this class can be plugged into
     // <ACE_Connector>.
 
-    virtual int connect (ACE_CLASSIX_Stream &new_stream, 
-		 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
-		 ACE_Time_Value *timeout = 0,
-		 const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		 int reuse_addr = 0,
-		 int flags = 0,
-		 int perms = 0,
-		 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
-		 int protocol = 0); 
+    virtual int connect (ACE_CLASSIX_Stream &new_stream,
+                 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
+                 ACE_Time_Value *timeout = 0,
+                 const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                 int reuse_addr = 0,
+                 int flags = 0,
+                 int perms = 0,
+                 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
+                 int protocol = 0);
 
     // Factory method used in <ACE_Connector>::connect_svc_handler()
 
     // Initialization method when default constructor is used.
-    // See the comments for the corresponding constructor 
-    
+    // See the comments for the corresponding constructor
+
     virtual int reset_new_handle (ACE_HANDLE handle);
     // Factory method used in ACE_Connector::handle_output().
     // Meant for resetting any event associations on this handle
@@ -113,7 +118,7 @@ class ACE_CLASSIX_CLD_Connector
     void dump(void) const;
 
  private:
- 
+
     ACE_CLASSIX_CLD_Connector(ACE_CLASSIX_CLD_Connector const&);
     ACE_CLASSIX_CLD_Connector const& operator=(ACE_CLASSIX_CLD_Connector const&);
 };
diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.h b/ace/CLASSIX/CLASSIX_CO_Acceptor.h
index 264b723c044..02f58f89bb4 100644
--- a/ace/CLASSIX/CLASSIX_CO_Acceptor.h
+++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
 //    CLASSIX_CO_Acceptor.h
 //
 // = AUTHOR
 //    Nokia Telecommunications
-// 
+//
 // ============================================================================
 
-#if !defined (ACE_CLASSIX_CO_ACCEPTOR_H)
+#ifndef ACE_CLASSIX_CO_ACCEPTOR_H
 #define ACE_CLASSIX_CO_ACCEPTOR_H
 
 #include "ace/CLASSIX/CLASSIX_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Time_Value.h"
 
 class ACE_Export ACE_CLASSIX_CO_Acceptor
@@ -30,13 +35,13 @@ class ACE_Export ACE_CLASSIX_CO_Acceptor
   //     This class is the counter part of the <ACE_CLASSIX_Connector>
   //     class.  It exchanges SAP information to set up a logical
   //     connection.
-  //     
+  //
   //     Data format passed between a connector and this class uses
   //     Peer_Union structure.
   //
   // = SEE ALSO
   //     ACE_CLASSIX_Connector
-  //     
+  //
 public:
   struct Peer_Port
   {
@@ -68,21 +73,21 @@ public:
   ACE_CLASSIX_CO_Acceptor (ACE_Reactor* = ACE_Reactor::instance());
   // Default constructor.
 
-  ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, 
-			   int reuse_addr = 0, 
-			   int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, 
-			   int backlog = 0, 
-			   int protocol = 0,
-			   ACE_Reactor* = ACE_Reactor::instance());
+  ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap,
+                           int reuse_addr = 0,
+                           int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
+                           int backlog = 0,
+                           int protocol = 0,
+                           ACE_Reactor* = ACE_Reactor::instance());
   // Initiate a passive mode socket.
 
   virtual ~ACE_CLASSIX_CO_Acceptor (void);
   // Default dtor.
 
-  int open (const ACE_Addr &local_sap, 
-            int reuse_addr = 0, 
-            int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, 
-            int backlog = 5, 
+  int open (const ACE_Addr &local_sap,
+            int reuse_addr = 0,
+            int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
+            int backlog = 5,
             int protocol = 0,
             ACE_Reactor* = ACE_Reactor::instance());
   // Initiate a passive mode socket.
@@ -90,9 +95,9 @@ public:
   // Closes down the listening port.
 
   // = Passive connection acceptance method.
-  int accept (ACE_CLASSIX_Stream &new_stream, 
+  int accept (ACE_CLASSIX_Stream &new_stream,
               ACE_Addr *remote_addr = 0,
-              ACE_Time_Value *timeout = 0, 
+              ACE_Time_Value *timeout = 0,
               int restart = 1,
               int reset_new_handle = 0) const;
   // Accept a new data transfer connection.  A <timeout> of 0 means
@@ -101,7 +106,7 @@ public:
 
   // = ACCESS
   ACE_HANDLE get_handle (void) const;
-  // Get the underlying descriptor. 
+  // Get the underlying descriptor.
   int get_local_addr (ACE_Addr &) const;
   // Return the local endpoint address in the referenced ACE_Addr.
   // Returns 0 if successful, else -1.
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.h b/ace/CLASSIX/CLASSIX_CO_Connector.h
index 6b8616e4125..610739dc18d 100644
--- a/ace/CLASSIX/CLASSIX_CO_Connector.h
+++ b/ace/CLASSIX/CLASSIX_CO_Connector.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_CO_Connector.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 */
 
@@ -20,6 +20,11 @@
 #define ACE_CLASSIX_CO_CONNECTOR_H
 
 #include "ace/CLASSIX/CLASSIX_CLD_Connector.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /* ------------------------------------------------------------------------- */
 
 class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector
@@ -30,7 +35,7 @@ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector
     // = DESCRIPTION
     //     This is used when a client needs to communicate with a server
     //     whose SAP address is unknown.
-    //     
+    //
     //     <ACE_CLASSIX_Connect> and <ACE_CLASSIX_Acceptor> exchanges
     //     address(SAP) information to establish a logical link.
     //
@@ -43,24 +48,24 @@ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector
     // = SEE ALSO
     //   ACE_CLASSIX_CLD_Connector
     //   ACE_CLASSIX_Acceptor
-    //   
+    //
 {
   public:
     // = Initialization routines.
     ACE_CLASSIX_CO_Connector (void);
     // Default constructor.
 
-    ACE_CLASSIX_CO_Connector (ACE_CLASSIX_Stream &new_stream, 
-			       const ACE_Addr &remote_sap 
-			       = ACE_Addr::sap_any,
-			       ACE_Time_Value *timeout = 0,
-			       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-			       int reuse_addr = 0,
-			       int flags = 0,
-			       int perms = 0,
-			       int protocol_family 
-			       = ACE_CLASSIX_Addr::AF_CLASSIX, 
-			       int protocol = 0);
+    ACE_CLASSIX_CO_Connector (ACE_CLASSIX_Stream &new_stream,
+                               const ACE_Addr &remote_sap
+                               = ACE_Addr::sap_any,
+                               ACE_Time_Value *timeout = 0,
+                               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                               int reuse_addr = 0,
+                               int flags = 0,
+                               int perms = 0,
+                               int protocol_family
+                               = ACE_CLASSIX_Addr::AF_CLASSIX,
+                               int protocol = 0);
     // Emulates connection semantics so that it can be plugged into
     // <ACE_Connector>
     // Actively connect local SAP and remote SAP togeter.
@@ -70,34 +75,34 @@ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector
     // the acceptor's address.  In connectionless mode, we do not have
     // an acceptor.  The <remote_sap> address will be copied to the new stream
     // if things goes well.
-    // 
+    //
     // If <local_sap> refers to any address, a port will be
     // allocated and will be used as a local SAP.
     //
     // The rest parameters are there so that this class can be plugged into
     // <ACE_Connector>.
 
-    int connect (ACE_CLASSIX_Stream &new_stream, 
-		 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
-		 ACE_Time_Value *timeout = 0,
-		 const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		 int reuse_addr = 0,
-		 int flags = 0,
-		 int perms = 0,
-		 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
-		 int protocol = 0); 
+    int connect (ACE_CLASSIX_Stream &new_stream,
+                 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
+                 ACE_Time_Value *timeout = 0,
+                 const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                 int reuse_addr = 0,
+                 int flags = 0,
+                 int perms = 0,
+                 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
+                 int protocol = 0);
 
     // Factory method used in <ACE_Connector>::connect_svc_handler()
 
     // Initialization method when default constructor is used.
-    // See the comments for the corresponding constructor 
-    
+    // See the comments for the corresponding constructor
+
     // = HELPER
     void dump(void) const;
 
 
  private:
- 
+
     ACE_CLASSIX_CO_Connector(ACE_CLASSIX_CO_Connector const&);
     ACE_CLASSIX_CO_Connector const& operator=(ACE_CLASSIX_CO_Connector const&);
 };
diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
index 4edc717e394..a21a770f83d 100644
--- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
+++ b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_Dgram_Mcast.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_DGRAM_MCAST_H
@@ -32,37 +32,37 @@ class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream
     //   messages.
     //
     //   This class is most likely used in the server.
-    //   
+    //
 {
  public:
     // = INITIALIZATION
     ACE_CLASSIX_Dgram_Mcast(void);
     // Default constructor, does not setup anything
 
-    ACE_CLASSIX_Dgram_Mcast(int /* stamp */, 
-			    const ACE_CLASSIX_Port& = 
-			    *ACE_CLASSIX_DEFAULT_PORT::instance());
+    ACE_CLASSIX_Dgram_Mcast(int /* stamp */,
+                            const ACE_CLASSIX_Port& =
+                            *ACE_CLASSIX_DEFAULT_PORT::instance());
     // remote SAP = port group, local SAP = default port
 
-    int set_saps(int /* stamp */, 
-	     const ACE_CLASSIX_Port& = 
-	     *ACE_CLASSIX_DEFAULT_PORT::instance());
+    int set_saps(int /* stamp */,
+             const ACE_CLASSIX_Port& =
+             *ACE_CLASSIX_DEFAULT_PORT::instance());
     // remote SAP = port group, local SAP = default port
 
-    //virtual ssize_t send (const void *, /* buf */ 
+    //virtual ssize_t send (const void *, /* buf */
     // size_t /* n */) const;
 
 
     // = HELPER
     void dump (void) const;
     // Dump the state of an object.
-    
+
     ACE_ALLOC_HOOK_DECLARE;
     // Declare the dynamic allocation hooks.
 
  protected:
 
-    virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ 
+    virtual int set_mode_(u_int = K_BROADMODE); /* theMode */
     // Sets the addressing mode with the current setting of coTarget
     virtual int set_mode_(u_int, /* mode */ int /* site */);
     // Sets the addressing mode as well as the coTarget
@@ -75,13 +75,18 @@ class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream
  private:
    // Disable copy constructor
   ACE_CLASSIX_Dgram_Mcast(ACE_CLASSIX_Dgram_Mcast const&);
-  ACE_CLASSIX_Dgram_Mcast const& operator=(ACE_CLASSIX_Dgram_Mcast const&); 
+  ACE_CLASSIX_Dgram_Mcast const& operator=(ACE_CLASSIX_Dgram_Mcast const&);
 };
 
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
 #include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_CLASSIX_DGRAM_MCAST_H */
diff --git a/ace/CLASSIX/CLASSIX_Group.h b/ace/CLASSIX/CLASSIX_Group.h
index db5d900f633..ed92c5970d1 100644
--- a/ace/CLASSIX/CLASSIX_Group.h
+++ b/ace/CLASSIX/CLASSIX_Group.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX/Group.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_GROUP_H
@@ -19,26 +19,31 @@
 
 /* ------------------------------------------------------------------------- */
 #include "ace/CLASSIX/CLASSIX_Addr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/CLASSIX/CLASSIX_Port.h"
 
 class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr
     // = TITLE
     //   Wrapper over Chorus's Group concept.
-    //   
+    //
     // = DESCRIPTION
     //   Provides interface to insert and remove ports in the group which is
     //   created based on a given KnCap. This"<KnCap> is the unique
     //   identifier of the group.
-    //   
+    //
     // = NOTE
     //   Chorus does not provide facility to remove a group from the system,
     //   nor explicitly create a group.
     //   As such, the wrapper allows users to freely change from one group
     //   to the other within the same <ACE_CLASSIX_Group> instance.
-    //   
+    //
     // = SEE ALSO
     //   <ACE_CLASSIX_Group_Stamp>, <ACE_CLASSIX_Group_Dynamic>
-    //   
+    //
 {
  public:
     // = INITIALIZATION
@@ -46,7 +51,7 @@ class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr
     // Sets up the group wrapper using the supplied group id.
     ACE_CLASSIX_Group(const KnCap&);
     // Sets up the group wrapper using the supplied KnCap
-	
+
     // = ACCESS
     int is_configured(void) const;
     // Returns 1, if it contains valid group id; 0, otherwise.
@@ -90,8 +95,8 @@ class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr
 
     struct group_addr
     {
-	int              config_; // 1, if the following fields are valid
-	KnCap            group_;
+        int              config_; // 1, if the following fields are valid
+        KnCap            group_;
     };
     group_addr        addr_;
 
diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.h b/ace/CLASSIX/CLASSIX_Group_Dynamic.h
index 1252cfa1b8b..7531d69404f 100644
--- a/ace/CLASSIX/CLASSIX_Group_Dynamic.h
+++ b/ace/CLASSIX/CLASSIX_Group_Dynamic.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_Group_Dynamic.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_GROUP_DYNAMIC_H
@@ -20,22 +20,26 @@
 /* ------------------------------------------------------------------------- */
 #include "ace/CLASSIX/CLASSIX_Group.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group
     // = TITLE
     //   Wrapper over Chorus's Group which is created dynamically and not named
     //   by a <Stamp>.
-    //   
+    //
     // = DESCRIPTION
     //   This is a subclass of <ACE_CLASSIX_Group>.
-    //   
+    //
     //   Its encapsulated group is created dynamically and the
     //   <KnCap> is the name as well as the unique identifier.
-    //   
+    //
     // = SEE ALSO
     //   <ACE_CLASSIX_Group>, <ACE_CLASSIX_Group_Stamp>
 {
   public:
- 
+
   ACE_CLASSIX_Group_Dynamic(void);
   // default constructor... create a group use Chorus IPC's K_DYNAMIC option
 
@@ -43,7 +47,7 @@ class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group
     // returns Dynamic type
 
   private:
- 
+
   ACE_CLASSIX_Group_Dynamic(ACE_CLASSIX_Group_Dynamic const&);
   ACE_CLASSIX_Group_Dynamic const& operator=(ACE_CLASSIX_Group_Dynamic const&);
 };
diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.h b/ace/CLASSIX/CLASSIX_Group_Stamp.h
index cf1e818510f..a69d732edc2 100644
--- a/ace/CLASSIX/CLASSIX_Group_Stamp.h
+++ b/ace/CLASSIX/CLASSIX_Group_Stamp.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_Group_Stamp.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_GROUP_STAMP_H
@@ -20,28 +20,32 @@
 /* ------------------------------------------------------------------------- */
 #include "ace/CLASSIX/CLASSIX_Group.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group
     // = TITLE
     //   Wrapper over Chorus's Group using <Stamp> for naming the group.
-    //   
+    //
     // = DESCRIPTION
     //   This is a subclass of <ACE_CLASSIX_Group>.
-    //   
+    //
     //   Its encapsulated group is named by a <stamp>.  However,
     //   <KnCap> is still the unique identifier of the group.
     //
     // = NOTE
     //   As at the time of writing, The stamp is contained in the ui.uiTail
     //   field of <KnCap>.
-    //   
+    //
     // = SEE ALSO
     //   <ACE_CLASSIX_Group>, <ACE_CLASSIX_Group_Dynamic>
-    //   
+    //
 {
  public:
     enum
     {
-	ILLEGAL_STAMP = 0
+        ILLEGAL_STAMP = 0
         /* Have we defined the range of valid stamps? */
     };
 
@@ -51,7 +55,7 @@ class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group
     ACE_CLASSIX_Group_Stamp(int /* stamp */);
     // creates a group use the specfied stamp
     virtual void set_addr(void*,  /* pointer to the stamp */
-			  int = 0 /* not used */);
+                          int = 0 /* not used */);
     // Replaces the existing group according to the supplied stamp
 
     // = ACCESS
diff --git a/ace/CLASSIX/CLASSIX_OS.h b/ace/CLASSIX/CLASSIX_OS.h
index 6caccfe8a69..e708a5e7d9e 100644
--- a/ace/CLASSIX/CLASSIX_OS.h
+++ b/ace/CLASSIX/CLASSIX_OS.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_OS.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_OS_H
@@ -19,6 +19,11 @@
 
 /* ------------------------------------------------------------------------- */
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Select_Reactor.h"
 #include "ace/Singleton.h"
 #include "ace/CLASSIX/CLASSIX_Port_Core.h"
@@ -30,10 +35,10 @@
 class ACE_Export ACE_CLASSIX_Mgr
     // = TITLE
     //   Class to manage resouces, especially static resources
-    //   
+    //
     // = DESCRIPTION
     //   It is intended that one <ACE_CLASSIX_Mgr> per actor
-    //   
+    //
 {
  public:
     friend ACE_Singleton<ACE_CLASSIX_Mgr, ACE_SYNCH_NULL_MUTEX>;
@@ -82,23 +87,23 @@ private:
 class ACE_CLASSIX_Msg
     // = TITLE
     //   Class wrapper over Chorus's KnMsgDesc structure
-    //   
+    //
     // = DESCRIPTION
     //   Provides initialization and reset methods to construct a KnMsgDesc.
-    //   
+    //
     //   The flags in the <flags> field of the KnMsgDesc structure is always
     //   set to 0. Therefore, the message body will always be copied and
     //   the message is assumed to be part of the user(kernel) address
     //   space when the caller is a USER(SUPERVISOR) thread.
     //   (Chorus may not support the options defined in the flag, so we
     //   choose not to use the flag, i.e. set it to null).
-    //   
-    //   The message annex is not used.  
+    //
+    //   The message annex is not used.
 
     // = SEE ALSO
     //   ipcSend(2)
 {
- public: 
+ public:
     // = initialization
     ACE_CLASSIX_Msg();
     // default constructor
diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.h b/ace/CLASSIX/CLASSIX_Peer_SAP.h
index 5e391c48014..8a3d784ebcb 100644
--- a/ace/CLASSIX/CLASSIX_Peer_SAP.h
+++ b/ace/CLASSIX/CLASSIX_Peer_SAP.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_Peer_SAP.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_PEER_SAP_H
@@ -30,7 +30,7 @@ class ACE_CLASSIX_Peer_SAP
     //   In CLASSIX, a local SAP is always a port, a peer SAP can be
     //   a port or a group of port.  This class is for peer SAP and
     //   <ACE_SAP> is for local SAP.
-    //   
+    //
     // = SEE ALSO
     //   <ACE_SAP>
 {
@@ -40,10 +40,10 @@ class ACE_CLASSIX_Peer_SAP
     // Default constructor.
     // Needs to be initialized by a set() operation.
     ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port_Core&);/* peer port */
-                                                 
+
     ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port&);/* peer port address */
     ACE_CLASSIX_Peer_SAP(const ACE_Addr&);        /* peer port address */
-                                                 
+
     ACE_CLASSIX_Peer_SAP(const KnUniqueId&);      /* peer port address */
     ACE_CLASSIX_Peer_SAP(const KnCap&);           /* peer group address */
     ACE_CLASSIX_Peer_SAP(int /* stamp */);       /* stamp for peer group */
@@ -51,12 +51,12 @@ class ACE_CLASSIX_Peer_SAP
     ~ACE_CLASSIX_Peer_SAP(void);
 
     int set(const ACE_CLASSIX_Port_Core&); /* peer port */
-                                                 
+
     int set(const ACE_Addr&);              /* peer port address */
-                                                 
-    int set(const KnUniqueId&);	           /* peer port address */
-    int set(const KnCap&);	           /* peer group address */
-    int set(int /* stamp */);	/* stamp for the peer group */
+
+    int set(const KnUniqueId&);            /* peer port address */
+    int set(const KnCap&);                 /* peer group address */
+    int set(int /* stamp */);   /* stamp for the peer group */
 
     // = ACCESS
     const ACE_CLASSIX_Addr* get_addr(void) const;
@@ -73,13 +73,13 @@ class ACE_CLASSIX_Peer_SAP
     // = HELPER
     void dump (void) const;
     // Dump the state of an object.
-    
+
     ACE_ALLOC_HOOK_DECLARE;
     // Declare the dynamic allocation hooks.
 
  protected:
 #if 0
-    virtual set_mode_(u_int = K_BROADMODE); /* theMode */ 
+    virtual set_mode_(u_int = K_BROADMODE); /* theMode */
     // Sets the addressing mode with the current setting of coTarget
     virtual set_mode_(u_int, /* mode */ int /* site */);
     // Sets the addressing mode as well as the coTarget
@@ -89,13 +89,18 @@ class ACE_CLASSIX_Peer_SAP
  private:
     // Disable copy constructor
     ACE_CLASSIX_Peer_SAP(ACE_CLASSIX_Peer_SAP const&);
-    ACE_CLASSIX_Peer_SAP const& operator=(ACE_CLASSIX_Peer_SAP const&); 
+    ACE_CLASSIX_Peer_SAP const& operator=(ACE_CLASSIX_Peer_SAP const&);
 };
 
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
 #include "ace/CLASSIX/CLASSIX_Peer_SAP.i"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_CLASSIX_PEER_SAP_H */
diff --git a/ace/CLASSIX/CLASSIX_Port.h b/ace/CLASSIX/CLASSIX_Port.h
index 28d44a24ce5..2bb45d4cf7c 100644
--- a/ace/CLASSIX/CLASSIX_Port.h
+++ b/ace/CLASSIX/CLASSIX_Port.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    CLASSIX_Port.h
 //
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_CLASSIX_PORT_H)
+#ifndef ACE_CLASSIX_PORT_H
 #define ACE_CLASSIX_PORT_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/CLASSIX/CLASSIX_OS.h"
 #include "ace/CLASSIX/CLASSIX_Addr.h"
 
@@ -27,13 +32,13 @@ class ACE_Export ACE_CLASSIX_Port : public ACE_CLASSIX_Addr
     // = TITLE
     //    Defines the ClassiX IPC Port address format for "ACE Socket" like
     //    interfaces
-    //    
+    //
     // = DESCRIPTION
     //   The port address contains two fields:
     //   a global unique identifier  and a local identifier.
     //   The global unique identifier is also referred to as the port address
     //   and the local identifier as the port no.
-    //   
+    //
     // = NOTE
     //   In Chorus, one can always convert from a port unique identifier to
     //   a port no and vice versa.  This class is implemented based on this
@@ -41,14 +46,14 @@ class ACE_Export ACE_CLASSIX_Port : public ACE_CLASSIX_Addr
     //
     // = SEE ALSO
     //   <ACE_CLASSIX_PORT_Default>, <ACE_CLASSIX_Port_Core>
-    //   
+    //
 public:
     /* -----------------------------------------------------*/
     // = Initialization methods.
     ACE_CLASSIX_Port ();
     // Default constructor.
     // The address corresponds to the default port of the actor.
- 
+
     ACE_CLASSIX_Port (const ACE_CLASSIX_Port &);
     // Copy constructor.
     ACE_CLASSIX_Port (const ACE_Addr &);
@@ -57,10 +62,10 @@ public:
     ACE_CLASSIX_Port (const ACE_CLASSIX_Port_Core&);
     // Creates an <ACE_CLASSIX_Port> from <ACE_CLASSIX_Port_Core>
 
-    ACE_CLASSIX_Port (const KnUniqueId& /* port_id */);  
+    ACE_CLASSIX_Port (const KnUniqueId& /* port_id */);
     // Creates an <ACE_CLASSIX_Port> from the given <port_id>
 
-    ACE_CLASSIX_Port (ACE_HANDLE /* port_no */);  
+    ACE_CLASSIX_Port (ACE_HANDLE /* port_no */);
     // Creates an <ACE_CLASSIX_Port> from the given <port_no>
 
     ACE_CLASSIX_Port (void* /* location */, int /* length */);
@@ -80,7 +85,7 @@ public:
     // Sets the <ACE_CLASSIX_Port_Basic> from a <port_id>
 
     virtual void set_addr (void * /* addr location */,
-			   int /* len */);
+                           int /* len */);
     // Set the address as the one pointed to by the location pointer.
     // The address contains <len> bytes.
     // Would prefer to return the status, but the base class uses void.
@@ -101,7 +106,7 @@ public:
 
     /* -----------------------------------------------------*/
     // = Control
-    // 
+    //
     virtual int enable(int   /* receive priority */) const;
     // Puts the port into the set of monitored ports.
     virtual int disable(void) const;
@@ -111,7 +116,7 @@ public:
 
     /* -----------------------------------------------------*/
     // = Comparison
-    // 
+    //
     int operator == (const ACE_CLASSIX_Port &) const;
     // Compare two addresses for equality.  The addresses are considered
     // equal if they have the same content in the KnUniqueId address structure.
@@ -121,10 +126,10 @@ public:
 
     /* -----------------------------------------------------*/
     // = Helper
-    // 
+    //
     void dump (void) const;
     // Dump the state of an object.
-    
+
 
     ACE_ALLOC_HOOK_DECLARE;
     // Declare the dynamic allocation hooks.
@@ -135,13 +140,13 @@ private:
     // constructed).
     // Will create/reset the port only if the port no was <ACE_CLASSIX_ANY>
     // Returns 0 on success, -1 otherwise.
-    // 
+    //
 
     int set_ (const ACE_Addr &);
     // Sets the <ACE_CLASSIX_Port_Basic> from another <ACE_CLASSIX_Port_Basic>.
 
 
- 
+
 private:
     ACE_CLASSIX_Port_Core::Addr           addr_;
 };
diff --git a/ace/CLASSIX/CLASSIX_Port_Core.h b/ace/CLASSIX/CLASSIX_Port_Core.h
index e4955063279..5fdfb6309bd 100644
--- a/ace/CLASSIX/CLASSIX_Port_Core.h
+++ b/ace/CLASSIX/CLASSIX_Port_Core.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_Port_Core.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_PORT_CORE_H
@@ -19,6 +19,11 @@
 
 /* ------------------------------------------------------------------------- */
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include <ipc/chIpc.h>
 
 
@@ -28,7 +33,7 @@ class ACE_Export ACE_CLASSIX_Port_Core
     // = TITLE
     //    Defines interfaces for allocation/deallocation of a Chorus
     //    IPC port
-    //    
+    //
     // = DESCRIPTION
     //   This class allocates a port in the constructor and deallocates it in
     //   the destructor.
@@ -38,10 +43,10 @@ public:
     // = Initialization methods.
     ACE_CLASSIX_Port_Core (void);
     // Allocates a port from the OS
-    // 
+    //
     virtual ~ACE_CLASSIX_Port_Core (void);
     // Deallocates the port from the OS.
-    
+
     virtual const KnUniqueId& get_id (void) const;
     // Returns a reference to the port id.
     virtual ACE_HANDLE get_handle (void) const;
@@ -59,18 +64,18 @@ public:
 #endif
     /* -----------------------------------------------------*/
     // = Helper
-    // 
+    //
     void dump (void) const;
     // Dump the state of an object.
-    
+
 
     ACE_ALLOC_HOOK_DECLARE;
     // Declare the dynamic allocation hooks.
 
     struct Addr
     {
-	KnUniqueId                  id;    // port address: unique identifier
-	ACE_HANDLE                  handle;// port no: local identifier.
+        KnUniqueId                  id;    // port address: unique identifier
+        ACE_HANDLE                  handle;// port no: local identifier.
 
     };
 
@@ -81,7 +86,7 @@ protected:
 
     ACE_CLASSIX_Port_Core::Addr addr_;
     int                         config_; // Sets to 1, if configured;
-					 // 0 otherwise
+                                         // 0 otherwise
 private:
     // Disallow copy constructor/assignment
     ACE_CLASSIX_Port_Core(ACE_CLASSIX_Port_Core const&);
diff --git a/ace/CLASSIX/CLASSIX_Port_Default.h b/ace/CLASSIX/CLASSIX_Port_Default.h
index 39229c6b1a0..698c9ff9afe 100644
--- a/ace/CLASSIX/CLASSIX_Port_Default.h
+++ b/ace/CLASSIX/CLASSIX_Port_Default.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    CLASSIX_Port_Default.h
 //
@@ -18,13 +18,18 @@
 #define ACE_CLASSIX_PORT_DEFAULT_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/CLASSIX/CLASSIX_Port.h"
 
 class ACE_CLASSIX_Port_Default : public ACE_CLASSIX_Port
 {
     // = TITLE
     //    Implements the address wrapper of an actor's default port.
-    //    
+    //
     // = DESCRIPTION
     //   This corresponds to the address of an actor's default port
     //   which does not change
@@ -35,12 +40,12 @@ class ACE_CLASSIX_Port_Default : public ACE_CLASSIX_Port
     //   of this class is a singleton.  The protected constructor and the
     //   friendship with the ACE_Singleton preventys this class from being
     //   instantiated by other classes.
-    //   
+    //
     // = NOTE
     //
     // = SEE ALSO
     //   <ACE_CLASSIX_PORT>
-    //   
+    //
     friend class ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX>;
 
     /* -----------------------------------------------------*/
@@ -66,7 +71,7 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 /* ------------------------------------------------------------------------- */
-typedef ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX> 
+typedef ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX>
         ACE_CLASSIX_DEFAULT_PORT;
 /* ------------------------------------------------------------------------- */
 
diff --git a/ace/CLASSIX/CLASSIX_SAP.h b/ace/CLASSIX/CLASSIX_SAP.h
index 5301c2e226e..cefbdf031c8 100644
--- a/ace/CLASSIX/CLASSIX_SAP.h
+++ b/ace/CLASSIX/CLASSIX_SAP.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_SAP.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_SAP_H
@@ -20,28 +20,32 @@
 /* ------------------------------------------------------------------------- */
 #include "ace/CLASSIX/CLASSIX_Port.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class ACE_CLASSIX_SAP
     // = TITLE
     //   Class implementing the SAP over a Chorus port.
-    //   
+    //
     // = DESCRIPTION
     //   A SAP has a port which is referred to as the local port.
     //   This class provides methods to manipulate this port.
     //
     //   The SAP will always put the port in DISABLED state on exit.
-    //   
+    //
     //   In CLASSIX, a local SAP is always a port, a peer SAP can be
     //   a port or a group of port.  This class is for local SAP and
     //   <ACE_Peer_SAP> is for peer SAP.
     //
     // = SEE ALSO
     //   <ACE_Peer_SAP>
-    //   
+    //
 {
  public:
     enum
     {
-	DEFAULT_PRIORITY = 10
+        DEFAULT_PRIORITY = 10
     };
 
     // = INITIALIZATION
@@ -106,7 +110,7 @@ class ACE_CLASSIX_SAP
     int control(u_int, /* mode */ int /* site */ );
     // Interface for CLASSIX' send mode
 #endif
-	
+
 
     // = HELPER
     void dump(void) const;
@@ -117,7 +121,7 @@ class ACE_CLASSIX_SAP
 
  protected:
 #if 0
-    virtual set_mode_(u_int = K_BROADMODE); /* theMode */ 
+    virtual set_mode_(u_int = K_BROADMODE); /* theMode */
     // Sets the addressing mode with the current setting of coTarget
     virtual set_mode_(u_int, /* mode */ int /* site */);
     // Sets the addressing mode as well as the coTarget
diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.h b/ace/CLASSIX/CLASSIX_Select_Reactor.h
index b525c3a9950..baf37704c04 100644
--- a/ace/CLASSIX/CLASSIX_Select_Reactor.h
+++ b/ace/CLASSIX/CLASSIX_Select_Reactor.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //     ACE
-// 
+//
 // = FILENAME
 //     CLASSIX_Reactor.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 */
 
@@ -21,13 +21,18 @@
 
 /* ------------------------------------------------------------------------- */
 #include "ace/Timer_Queue.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Select_Reactor.h"
 #include "ace/Message_Block.h"
 #include "ace/CLASSIX/CLASSIX_SAP.h"
 
 class ACE_CLASSIX_Select_Reactor;
 
-class ACE_Export ACE_CLASSIX_Select_Reactor_Notify : 
+class ACE_Export ACE_CLASSIX_Select_Reactor_Notify :
     public ACE_Reactor_Notify
 {
   // = TITLE
@@ -44,20 +49,20 @@ public:
     ~ACE_CLASSIX_Select_Reactor_Notify(void);
 
     virtual int open (ACE_Reactor_Impl *,
-		      ACE_Timer_Queue * = 0,
-		      int  = 0 /* dusable_notify_pip */);
-    // Enables the notification port and register it with the reactor 
+                      ACE_Timer_Queue * = 0,
+                      int  = 0 /* dusable_notify_pip */);
+    // Enables the notification port and register it with the reactor
     virtual int close (void);
     // Disables the notification port
 
     int dispatch_notifications (int &number_of_active_handles,
-				const ACE_Handle_Set &rd_mask);
+                                const ACE_Handle_Set &rd_mask);
     // Handles pending threads (if any) that are waiting to unblock the
     // Select_Reactor.
 
     ssize_t notify (ACE_Event_Handler * = 0,
-		    ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
-		    ACE_Time_Value * = 0);
+                    ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
+                    ACE_Time_Value * = 0);
     // Called by a thread when it wants to unblock the Select_Reactor.
     // This wakeups the <ACE_Select_Reactor> if currently blocked in
     // select()/poll().  Pass over both the <Event_Handler> *and* the
@@ -94,7 +99,7 @@ private:
     // <disable_notify_pipe>.
     ACE_CLASSIX_Port_Core    notification_port_; // CLASSIX' IPC port
     ACE_CLASSIX_SAP          notification_sap_;
-    // The HANDLE that the Select_Reactor is listening on and 
+    // The HANDLE that the Select_Reactor is listening on and
     // the HANDLE that threads wanting the attention of the
     // Select_Reactor will write t are the same.
     // It can be seen that the notification port is implicitly connected to the
@@ -105,11 +110,11 @@ private:
 class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
     // = TITLE
     //   Implementing a Reactor for monitoring incoming data
-    //   
+    //
     // = DESCRIPTION
     //     This class redefines the wait_for_events() method of
     //     <ACE_Select_Reactor> class.
-    //     
+    //
     //     The wait_for_events() method uses ipcReceive() to monitor
     //     all ENABLED ports for incoming messages.  The ipcReceive() is
     //     set up such that it will find out the size of the message but will
@@ -124,12 +129,12 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
     //     thread and it shall not hold up this thread in the handle_input()
     //     routine for too long. This will allow the Reactor to respond to
     //     events more quickly.
-    //     
+    //
     //  = NOTE
     //   Since chorus does not allow ipcReceive to monitor a subset of
     //   ENABLED ports.  One cannot have two ACE_CLASSIX_Select_Reactors
     //   in one actor.
-    //   
+    //
 {
   public:
 
@@ -139,7 +144,7 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
     // handle_input() routine.
     // The handle_input() routine should not hold the reactor for too long.
     virtual int current_info(ACE_HANDLE /* port */,
-			     size_t& /* msg size */);
+                             size_t& /* msg size */);
     // Retruns the current messageage to the caleer if the supplied
     // handle id is the same as the <current_handle_>
     // Returns 0, if <msg size> constains the size of the message
@@ -153,8 +158,8 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
   // repository of the default size.
 
   ACE_CLASSIX_Select_Reactor (size_t size,
-			      int restart = 0,
-			      ACE_Timer_Queue * = 0);
+                              int restart = 0,
+                              ACE_Timer_Queue * = 0);
   // Initializes <ACE_CLASSIX_Select_Reactor> with the handler repository of
   // size <size>.
 
@@ -163,8 +168,8 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
                                         ACE_Time_Value *);
   // Wait for events to occur.
 
-  virtual int set_current_info_(ACE_HANDLE /* handle */, 
-				size_t /* size of data */);
+  virtual int set_current_info_(ACE_HANDLE /* handle */,
+                                size_t /* size of data */);
   // record the handler and the size of the message that the handler shall
   // read next.
 
diff --git a/ace/CLASSIX/CLASSIX_Stream.h b/ace/CLASSIX/CLASSIX_Stream.h
index b9282e4450b..75ec415fe38 100644
--- a/ace/CLASSIX/CLASSIX_Stream.h
+++ b/ace/CLASSIX/CLASSIX_Stream.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //     ace
-// 
+//
 // = FILENAME
 //     CLASSIX_Stream.h
 //
 // = AUTHOR(S)
 //     Nokia Telecommunications
-// 
+//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_STREAM_H
@@ -19,6 +19,11 @@
 
 /* ------------------------------------------------------------------------- */
 #include "ace/CLASSIX/CLASSIX_SAP.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/CLASSIX/CLASSIX_Peer_SAP.h"
 #include "ace/CLASSIX/CLASSIX_Port_Default.h"
 
@@ -27,14 +32,14 @@ class ACE_CLASSIX_Stream
     //   Provides the stream interface for CLASSIX IPC communications.
     //
     // = DESCRIPTION
-    //   This classes provides a stream wrapper over CLASSIX' 
-    //   IPC. It is designed to be an alternative to Stream type of 
+    //   This classes provides a stream wrapper over CLASSIX'
+    //   IPC. It is designed to be an alternative to Stream type of
     //   communication in the UNIX AF_INET environment.
     //
     //   To the user, the stream is connection-oriented.  The stream
     //   is implemented on top of IPC, it is connectionless and its
     //   reliability is as good as what  the raw IPC can offer.
-    //   
+    //
     //   Since CLASSIX IPC is not intended to go across wide area network,
     //   it can be seen as an
     //   alternative to AF_INET's connection oriented stream, even though
@@ -42,57 +47,57 @@ class ACE_CLASSIX_Stream
     //
     //   This class  contains a local sap, peer sap and data holding
     //   delivery mode information.
-    //   
+    //
     //   When a stream is created, the peer SAP information must be provided.
     //   The local SAP information may be provided in the constructor or
     //   open().  The local SAP information given in open() overrides the
     //   existing one. If the local SAP address is not given at all, it will
     //   allocate a port and use it as the local SAP.
-    //   
+    //
 {
  public:
     ACE_CLASSIX_Stream(void);
     // Default constructor, does not setup anything
     ACE_CLASSIX_Stream(const ACE_CLASSIX_Port_Core&, /* remote port */
-			const ACE_CLASSIX_Port& = 
-		  *ACE_CLASSIX_DEFAULT_PORT::instance()); /* local address */
-                                                 
+                        const ACE_CLASSIX_Port& =
+                  *ACE_CLASSIX_DEFAULT_PORT::instance()); /* local address */
+
     ACE_CLASSIX_Stream(const ACE_CLASSIX_Port&,    /* remote port address */
-		       const ACE_CLASSIX_Port& = 
-		   *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */
-                                                 
+                       const ACE_CLASSIX_Port& =
+                   *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */
+
     ACE_CLASSIX_Stream(const KnUniqueId&,          /* remote port address */
-		       const ACE_CLASSIX_Port& = 
-		   *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */
-                                                 
+                       const ACE_CLASSIX_Port& =
+                   *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */
+
     // = IO
     // Returns -1, if fault has occured during receive.  errno contains
     // the error condition.
     // Returns no of bytes received/sent,  otherwise.
-    // 
-    virtual ssize_t send_n (const void *, /* buf */ 
-			    size_t, /* n */ 
-			    int /* flags */);
+    //
+    virtual ssize_t send_n (const void *, /* buf */
+                            size_t, /* n */
+                            int /* flags */);
     // Sends exactly n bytes (keep trying until n bytes are sent)
     virtual ssize_t send_n (const void *, /* buf */ size_t /* n */) const;
     // Sends n bytes(keep trying until n bytes are sent)
     // Uses the current addressing mode
-    virtual ssize_t send (const void *, /* buf */ 
-			  size_t, /* n */ 
-			  int /* flags */);
+    virtual ssize_t send (const void *, /* buf */
+                          size_t, /* n */
+                          int /* flags */);
     // Sends n bytes. Same as send_n(buf, n, flag)
-    virtual ssize_t send (const void *, /* buf */ 
-			  size_t /* n */) const;
+    virtual ssize_t send (const void *, /* buf */
+                          size_t /* n */) const;
     // Sends n bytes. same as send_n(buf, n).
-    virtual ssize_t reply (const void *, /* buf */ 
-			   size_t /* n */) const;
+    virtual ssize_t reply (const void *, /* buf */
+                           size_t /* n */) const;
     // Sends n bytes to the sender of the cureent thread's current message.
 
     ssize_t ipcRecv (void *,             /* buffer */
-		     size_t,             /* length */
-		     int  = 0,           /* flag: 0 or MSG_PEEK  */
-		     ACE_Time_Value* = 0) const; /* timeout */
-    // Recv an <n> byte buffer 
+                     size_t,             /* length */
+                     int  = 0,           /* flag: 0 or MSG_PEEK  */
+                     ACE_Time_Value* = 0) const; /* timeout */
+    // Recv an <n> byte buffer
     // Wait up to <timeout> amount of time to receive up to <n> bytes
     // into <buf> from <handle> (uses the <recv> call).  If <recv> times
     // out a -1 is returned with <errno == ETIMEOUT>.  If it succeeds the
@@ -101,9 +106,9 @@ class ACE_CLASSIX_Stream
     // will block until action is possible, else will wait until the
     // relative time specified in *<timeout> elapses).
     ssize_t ipcRecv_n (void *,             /* buffer */
-		       size_t,             /* length */
-		       int  = 0,           /* flag: 0 or MSG_PEEK  */
-		       ACE_Time_Value* = 0) const; /* timeout */
+                       size_t,             /* length */
+                       int  = 0,           /* flag: 0 or MSG_PEEK  */
+                       ACE_Time_Value* = 0) const; /* timeout */
     // Continue until receives n bytes of data or an error has occurred.
     // Retruns the no of bytes actually received.
     // If it is less than expected, errno contains error info.
@@ -142,10 +147,10 @@ class ACE_CLASSIX_Stream
     int is_selectable(void) const;
     // Retruns 1, if the local SAP is enabled.
     int is_writer_closed(void) const;
-    // Retruns 1, if writer side is closed.    
+    // Retruns 1, if writer side is closed.
     int is_reader_closed(void) const;
     // Retruns 1, if reader side is closed.
- 
+
 
     // = CONTROL
     int  set_peer_sap(const ACE_Addr&);
@@ -201,7 +206,7 @@ class ACE_CLASSIX_Stream
     // = HELPER
     void dump (void) const;
     // Dump the state of an object.
-    
+
     ACE_ALLOC_HOOK_DECLARE;
     // Declare the dynamic allocation hooks.
 
@@ -223,7 +228,7 @@ class ACE_CLASSIX_Stream
     void set_target_(void);
     // set the delivery target structure using the existing peer information
 
-    virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ 
+    virtual int set_mode_(u_int = K_BROADMODE); /* theMode */
     // Sets the addressing mode with the current setting of coTarget
     virtual int set_mode_(u_int, /* mode */ int /* site */);
     // Sets the addressing mode as well as the coTarget
@@ -235,12 +240,12 @@ class ACE_CLASSIX_Stream
     ACE_CLASSIX_Port_Core   *local_port_;
     // if non-zero, it will be
     // deleted on exit.
-						
+
     ACE_CLASSIX_Peer_SAP     peer_sap_;
-    int                      peer_sap_closed_; 
+    int                      peer_sap_closed_;
     // 0 if it's not closed(default),
     // 1 if it's closed.
-    
+
     // Mode applied destination address
     // Can be changed by control()/set_mode_()
     // Mode is applicable in IPC classes other than the Stream class.
@@ -253,7 +258,7 @@ class ACE_CLASSIX_Stream
  private:
    // Disable copy constructor
   ACE_CLASSIX_Stream(ACE_CLASSIX_Stream const&);
-  ACE_CLASSIX_Stream const& operator=(ACE_CLASSIX_Stream const&); 
+  ACE_CLASSIX_Stream const& operator=(ACE_CLASSIX_Stream const&);
 };
 
 /* ------------------------------------------------------------------------- */
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h
index fbf106356e6..912b7a76c68 100644
--- a/ace/CORBA_Handler.h
+++ b/ace/CORBA_Handler.h
@@ -19,12 +19,13 @@
 #define ACE_CORBA_HANDLER_H
 
 #include "ace/Service_Config.h"
-#include "ace/Pipe.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Pipe.h"
+
 #if (defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)) || (defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0))
 #define EXCEPTIONS
 #define WANT_ORBIX_FDS
diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h
index 46c222f6106..e5dbc821641 100644
--- a/ace/CORBA_Ref.h
+++ b/ace/CORBA_Ref.h
@@ -24,7 +24,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class CORBA_REF>
diff --git a/ace/Connector.h b/ace/Connector.h
index 08d7f877366..6e607beeb4b 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -5,43 +5,44 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Connector.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_CONNECTOR_H
 #define ACE_CONNECTOR_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Object.h"
 #include "ace/Map_Manager.h"
 #include "ace/Svc_Handler.h"
 #include "ace/Strategies.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 template <class SVC_HANDLER>
 class ACE_Svc_Tuple
 {
   // = TITLE
   //    Holds the ACE_Svc_Handler and its argument and
-  //    <ACE_Timer_Handle> until an asynchronous connection completes. 
+  //    <ACE_Timer_Handle> until an asynchronous connection completes.
   //
   // = DESCRIPTION
   //    This is a no-brainer...
 public:
   // = Initialization methods.
-  ACE_Svc_Tuple (SVC_HANDLER *, 
-		 ACE_HANDLE,
-		 const void * = 0, 
-		 long timer_id = -1);
+  ACE_Svc_Tuple (SVC_HANDLER *,
+                 ACE_HANDLE,
+                 const void * = 0,
+                 long timer_id = -1);
 
   // = Get SVC_HANDLER.
   SVC_HANDLER *svc_handler (void);
@@ -114,7 +115,7 @@ public:
 #endif /* ACE_HAS_TYPENAME_KEYWORD */
 
   ACE_Connector (ACE_Reactor *r = ACE_Reactor::instance (),
-		 int flags = 0);
+                 int flags = 0);
   // Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
   // should be initialized prior to being activated.  Right now, the
   // only flag that is processed is <ACE_NONBLOCK>, which enabled
@@ -122,7 +123,7 @@ public:
 
 
   virtual int open (ACE_Reactor *r = ACE_Reactor::instance (),
-		    int flags = 0);
+                    int flags = 0);
   // Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
   // should be initialized prior to being activated.  Right now, the
   // only flag that is processed is <ACE_NONBLOCK>, which enabled
@@ -134,13 +135,13 @@ public:
   // = Connection establishment methods.
 
   virtual int connect (SVC_HANDLER *&svc_handler,
-		       const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-		       const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
-		       const ACE_PEER_CONNECTOR_ADDR &local_addr 
-		         = (ACE_PEER_CONNECTOR_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY,
-		       int reuse_addr = 0,
-		       int flags = O_RDWR,
-		       int perms = 0);
+                       const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                       const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
+                       const ACE_PEER_CONNECTOR_ADDR &local_addr
+                         = (ACE_PEER_CONNECTOR_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY,
+                       int reuse_addr = 0,
+                       int flags = O_RDWR,
+                       int perms = 0);
   // Initiate connection of <svc_handler> to peer at <remote_addr>
   // using <synch_options>.  If the caller wants to designate the
   // selected <local_addr> they can (and can also insist that the
@@ -150,10 +151,10 @@ public:
   // within connect with certain permissions.
 
   virtual int connect_n (size_t n,
-			 SVC_HANDLER *svc_handlers[],
-			 ACE_PEER_CONNECTOR_ADDR remote_addrs[],
+                         SVC_HANDLER *svc_handlers[],
+                         ACE_PEER_CONNECTOR_ADDR remote_addrs[],
                          ASYS_TCHAR *failed_svc_handlers = 0,
-			 const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults);
+                         const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults);
   // Initiate connection of <n> <svc_handlers> to peers at
   // <remote_addrs> using <synch_options>.  Returns -1 if failure
   // occurs and 0 otherwise.  If <failed_svc_handlers> is non-NULL, a
@@ -198,12 +199,12 @@ protected:
   // else 0.
 
   virtual int connect_svc_handler (SVC_HANDLER *&svc_handler,
-				   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-				   ACE_Time_Value *timeout,
-				   const ACE_PEER_CONNECTOR_ADDR &local_addr,
-				   int reuse_addr,
-				   int flags,
-				   int perms);
+                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   ACE_Time_Value *timeout,
+                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   int reuse_addr,
+                                   int flags,
+                                   int perms);
   // Bridge method for connecting the <svc_handler> to the
   // <remote_addr>.  The default behavior delegates to the
   // <PEER_CONNECTOR::connect>.
@@ -241,13 +242,13 @@ protected:
 
   // = Demultiplexing hooks.
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
   // Terminate the Client ACE_Connector by iterating over any
   // unconnected ACE_Svc_Handler's and removing them from the
   // ACE_Reactor.
 
-  virtual int handle_timeout (const ACE_Time_Value &tv, 
-			      const void *arg);
+  virtual int handle_timeout (const ACE_Time_Value &tv,
+                              const void *arg);
   // This method is called if a connection times out before
   // completing.
 
@@ -260,8 +261,8 @@ protected:
   // Default version does no work and returns -1.  Must be overloaded
   // by application developer to do anything meaningful.
 
-  int create_AST (SVC_HANDLER *, 
-		  const ACE_Synch_Options &);
+  int create_AST (SVC_HANDLER *,
+                  const ACE_Synch_Options &);
   // Creates and inserts an ACE_Svc_Tuple into the <handler_map_>.
   // so that we can continue accepting this connection asynchronously.
 
@@ -305,17 +306,17 @@ class ACE_Strategy_Connector : public ACE_Connector <SVC_HANDLER, ACE_PEER_CONNE
   //     particular concurrency mechanism.
 public:
   ACE_Strategy_Connector (ACE_Reactor *r = ACE_Reactor::instance (),
-			  ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-			  ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0,
-			  ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
-			  int flags = 0);
+                          ACE_Creation_Strategy<SVC_HANDLER> * = 0,
+                          ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0,
+                          ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
+                          int flags = 0);
   // Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
   // should be initialized prior to being activated.  Right now, the
   // only flag that is processed is <ACE_NONBLOCK>, which enabled
   // non-blocking I/O on the <SVC_HANDLER> when it is opened.
 
   virtual int open (ACE_Reactor *r,
-		    int flags);
+                    int flags);
   // Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
   // should be initialized prior to being activated.  Right now, the
   // only flag that is processed is <ACE_NONBLOCK>, which enabled
@@ -323,10 +324,10 @@ public:
   // Default strategies would be created and used.
 
   virtual int open (ACE_Reactor *r = ACE_Reactor::instance (),
-		    ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-		    ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0,
-		    ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
-		    int flags = 0);
+                    ACE_Creation_Strategy<SVC_HANDLER> * = 0,
+                    ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0,
+                    ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
+                    int flags = 0);
   // Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
   // should be initialized prior to being activated.  Right now, the
   // only flag that is processed is <ACE_NONBLOCK>, which enabled
@@ -337,18 +338,18 @@ public:
 
   virtual int close (void);
   // Close down the Connector
-  
+
   // = Define some useful typedefs traits.
-  typedef ACE_Creation_Strategy<SVC_HANDLER> 
+  typedef ACE_Creation_Strategy<SVC_HANDLER>
           CREATION_STRATEGY;
-  typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> 
+  typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>
           CONNECT_STRATEGY;
-  typedef ACE_Concurrency_Strategy<SVC_HANDLER> 
+  typedef ACE_Concurrency_Strategy<SVC_HANDLER>
           CONCURRENCY_STRATEGY;
-  typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> 
+  typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2>
           SUPER;
 
-  // = Strategies accessors 
+  // = Strategies accessors
   virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const;
   virtual ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *connect_strategy (void) const;
   virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const;
@@ -370,12 +371,12 @@ protected:
   // else 0.
 
   virtual int connect_svc_handler (SVC_HANDLER *&sh,
-				   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-				   ACE_Time_Value *timeout,
-				   const ACE_PEER_CONNECTOR_ADDR &local_addr,
-				   int reuse_addr,
-				   int flags,
-				   int perms);
+                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   ACE_Time_Value *timeout,
+                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   int reuse_addr,
+                                   int flags,
+                                   int perms);
   // Bridge method for connecting the new connection into the
   // <SVC_HANDLER>.  The default behavior delegates to the
   // <PEER_CONNECTOR::connect> in the <Connect_Strategy>.
diff --git a/ace/Containers.h b/ace/Containers.h
index 093c98c7999..73d73c54b8f 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -20,13 +20,13 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-template <class T> 
+template <class T>
 class ACE_Double_Linked_List;
 
-template <class T> 
+template <class T>
 class ACE_Double_Linked_List_Iterator;
 
 class ACE_Export ACE_DLList_Node
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index f8ed5cef14d..ab84e75a73b 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -18,12 +18,13 @@
 #define ACE_CONTAINERS_T_H
 
 #include "ace/ACE.h"
-#include "ace/Containers.h"      /* Need ACE_DLList_Node */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Containers.h"      /* Need ACE_DLList_Node */
+
 class ACE_Allocator;
 
 template <class T>
diff --git a/ace/DEV.h b/ace/DEV.h
index 5bf209be58e..9f573163f6a 100644
--- a/ace/DEV.h
+++ b/ace/DEV.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    DEV.h
 //
 // = AUTHOR
 //    Gerhard Lenzer
-// 
+//
 // ============================================================================
 
 #ifndef ACE_DEV_H
 #define ACE_DEV_H
 
 #include "ace/IO_SAP.h"
-#include "ace/DEV_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/DEV_Addr.h"
+
 // The following is necessary since many C++ compilers don't support
 // typedef'd types inside of classes used as formal template
 // arguments... ;-(.  Luckily, using the C++ preprocessor I can hide
@@ -41,7 +42,7 @@ class ACE_Export ACE_DEV : public ACE_IO_SAP
 {
   // = TITLE
   //     Defines the member functions for the base class of the
-  //     ACE_DEV abstraction. 
+  //     ACE_DEV abstraction.
 public:
   int close (void);
   // Close down the DEVICE
@@ -59,7 +60,7 @@ public:
 
 protected:
   ACE_DEV (void);
-  // Ensure that this class is an abstract base class 
+  // Ensure that this class is an abstract base class
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h
index 2836cabc595..9f98f1a4f6d 100644
--- a/ace/DEV_Addr.h
+++ b/ace/DEV_Addr.h
@@ -5,29 +5,30 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    DEV_Addr.h
 //
 // = AUTHOR
 //    Gerhard Lenzer and Douglas C. Schmidt
-// 
+//
 // ============================================================================
 
 #ifndef ACE_DEV_ADDR_H
 #define ACE_DEV_ADDR_H
 
 #include "ace/Addr.h"
-#include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/ACE.h"
+
 class ACE_Export ACE_DEV_Addr : public ACE_Addr
 {
   // = TITLE
-  //    Defines device address family address format. 
+  //    Defines device address family address format.
 public:
   // = Initialization methods.
   ACE_DEV_Addr (void);
@@ -43,29 +44,29 @@ public:
   // Create a ACE_DEV_Addr from a device name.
 
   void set (LPCTSTR devname);
-  // Create a ACE_Addr from a ACE_DEV pathname. 
+  // Create a ACE_Addr from a ACE_DEV pathname.
 
   ACE_DEV_Addr &operator= (const ACE_DEV_Addr &);
   // Assignment operator.
 
   virtual void *get_addr (void) const;
-  // Return a pointer to the address. 
+  // Return a pointer to the address.
 
 #if defined (UNICODE)
   virtual int addr_to_string (wchar_t *addr, size_t) const;
-  // Transform the current address into string format. 
+  // Transform the current address into string format.
 #endif /* UNICODE */
 
   virtual int addr_to_string (char *addr, size_t) const;
-  // Transform the current address into string format. 
+  // Transform the current address into string format.
 
   int operator == (const ACE_DEV_Addr &SAP) const;
-  // Compare two addresses for equality. 
+  // Compare two addresses for equality.
 
   int operator != (const ACE_DEV_Addr &SAP) const;
-  // Compare two addresses for inequality. 
+  // Compare two addresses for inequality.
 
-  LPCTSTR get_path_name (void) const; 
+  LPCTSTR get_path_name (void) const;
   // Return the path name used for the rendezvous point.
 
   void dump (void) const;
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index a43b4e2ae5f..9db7328b091 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    DEV_Connector.h
 //
 // = AUTHOR
 //    Gerhard Lenzer and Douglas C. Schmidt
-// 
+//
 // ============================================================================
 
 #ifndef ACE_DEV_CONNECTOR_H
@@ -20,24 +20,24 @@
 #include "ace/DEV_IO.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_DEV_Connector : public ACE_DEV
 {
   // = TITLE
-  //     Defines an active connection factory for the ACE_DEV wrappers. 
+  //     Defines an active connection factory for the ACE_DEV wrappers.
 public:
   ACE_DEV_Connector (void);
   // Default constructor.
 
-  ACE_DEV_Connector (ACE_DEV_IO &new_io, 
-		     const ACE_DEV_Addr &remote_sap, 
-		     ACE_Time_Value *timeout = 0,
-		     const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		     int reuse_addr = 0,
-		     int flags = O_RDWR,
-		     int perms = 0);
+  ACE_DEV_Connector (ACE_DEV_IO &new_io,
+                     const ACE_DEV_Addr &remote_sap,
+                     ACE_Time_Value *timeout = 0,
+                     const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                     int reuse_addr = 0,
+                     int flags = O_RDWR,
+                     int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -54,13 +54,13 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
-  int connect (ACE_DEV_IO &new_io, 
-	       const ACE_DEV_Addr &remote_sap, 
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
-	       int flags = O_RDWR,
-	       int perms = 0);
+  int connect (ACE_DEV_IO &new_io,
+               const ACE_DEV_Addr &remote_sap,
+               ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               int reuse_addr = 0,
+               int flags = O_RDWR,
+               int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index ad82d31927f..990e1165b40 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    DEV_IO.h
 //
 // = AUTHOR
 //    Gerhard Lenzer and Douglas C. Schmidt
-// 
+//
 // ============================================================================
 
-#ifndef ACE_DEV_IO_H 
+#ifndef ACE_DEV_IO_H
 #define ACE_DEV_IO_H
 
 #include "ace/DEV.h"
-#include "ace/DEV_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/DEV_Addr.h"
+
 class ACE_Export ACE_DEV_IO : public ACE_DEV
 {
   // = TITLE
@@ -41,33 +42,33 @@ public:
   ssize_t recv (void *buf, size_t n) const;
   // Recv upto <n> bytes in <buf>.
 
-  ssize_t send_n (const void *buf, size_t n) const; 
-  // Send n bytes, keep trying until n are sent. 
+  ssize_t send_n (const void *buf, size_t n) const;
+  // Send n bytes, keep trying until n are sent.
 
-  ssize_t recv_n (void *buf, size_t n) const;	      
-  // Recv n bytes, keep trying until n are received. 
+  ssize_t recv_n (void *buf, size_t n) const;
+  // Recv n bytes, keep trying until n are received.
 
 #if defined (ACE_HAS_STREAM_PIPES)
-  ssize_t recv (ACE_Str_Buf *cntl, 
-		ACE_Str_Buf *data, 
-		int *band, 
-		int *flags) const;
+  ssize_t recv (ACE_Str_Buf *cntl,
+                ACE_Str_Buf *data,
+                int *band,
+                int *flags) const;
   // Recv bytes via STREAM pipes using "band" mode.
 
-  ssize_t send (const ACE_Str_Buf *cntl, 
-		const ACE_Str_Buf *data, 
-		int band, 
-		int flags) const;
+  ssize_t send (const ACE_Str_Buf *cntl,
+                const ACE_Str_Buf *data,
+                int band,
+                int flags) const;
   // Send bytes via STREAM pipes using "band" mode.
 
-  ssize_t recv (ACE_Str_Buf *cntl, 
-		ACE_Str_Buf *data, 
-		int *flags) const;
+  ssize_t recv (ACE_Str_Buf *cntl,
+                ACE_Str_Buf *data,
+                int *flags) const;
   // Recv <cntl> and <data> via STREAM pipes.
 
-  ssize_t send (const ACE_Str_Buf *cntl, 
-		const ACE_Str_Buf *data, 
-		int flags = 0) const;
+  ssize_t send (const ACE_Str_Buf *cntl,
+                const ACE_Str_Buf *data,
+                int flags = 0) const;
   // Send <cntl> and <data> via STREAM pipes.
 #endif /* ACE_HAS_STREAM_PIPES */
 
diff --git a/ace/Date_Time.h b/ace/Date_Time.h
index 10ebea907a2..b6a7d3b610c 100644
--- a/ace/Date_Time.h
+++ b/ace/Date_Time.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    ACE_Date_Time.h
 //
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Date_Time
@@ -30,12 +30,12 @@ class ACE_Export ACE_Date_Time
 public:
   // constructor with init values, no check for validy
   ACE_Date_Time (long day = 0,
-		 long month = 0,
-		 long year = 0,
-		 long hour = 0,
-		 long minute = 0,
-		 long second = 0,
-		 long microsec = 0);
+                 long month = 0,
+                 long year = 0,
+                 long hour = 0,
+                 long minute = 0,
+                 long second = 0,
+                 long microsec = 0);
   // Set/get portions of ACE_Date_Time, no check for validity.
 
   long day (void);
diff --git a/ace/Dirent.h b/ace/Dirent.h
index 3adda60f32b..f606c77fc1b 100644
--- a/ace/Dirent.h
+++ b/ace/Dirent.h
@@ -10,7 +10,7 @@
 //    Dirent.h
 //
 // = DESCRIPTION
-//    Define a portable directory-entry manipulation interface.    
+//    Define a portable directory-entry manipulation interface.
 //
 // = AUTHOR
 //    Douglas C. Schmidt <schmidt@cs.wustl.edu>
@@ -23,7 +23,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Dirent
diff --git a/ace/Dump.h b/ace/Dump.h
index bccc5d62eb7..2f44c2795c3 100644
--- a/ace/Dump.h
+++ b/ace/Dump.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Dump.h
 //
@@ -18,7 +18,7 @@
 // To turn on this feature simply compile with -DACE_NDEBUG
 //
 // There are several interesting aspects to this design:
-// 
+//
 // 1. It uses the External Polymorphism pattern to avoid having to
 //    derive all ACE classes from a common base class that has virtual
 //    methods (this is crucial to avoid unnecessary overhead).  In
@@ -36,16 +36,16 @@
 //    this.  Note, however, that this scheme doesn't generalize to
 //    work with multiple-inheritance or virtual base classes.
 //
-// Future work includes: 
-// 
+// Future work includes:
+//
 // 1. Using a dynamic object table rather than a static table
-// 
-// 2. Adding support to allow particular classes of objects to 
+//
+// 2. Adding support to allow particular classes of objects to
 //    be selectively dumped.
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_DUMP_H
@@ -54,7 +54,7 @@
 #include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Dumpable
@@ -80,7 +80,7 @@ private:
   // Pointer to the object that is being stored.
 };
 
-class ACE_Export ACE_Dumpable_Ptr 
+class ACE_Export ACE_Dumpable_Ptr
 {
   // = TITLE
   //    A smart pointer stored in the in-memory object database
@@ -121,7 +121,7 @@ public:
 private:
   ACE_ODB (void); // Ensure we have a Singleton...
 
-  struct Tuple 
+  struct Tuple
   {
     const void *this_;
     // Pointer to the object that is registered.
@@ -144,7 +144,7 @@ private:
   Tuple object_table_[ACE_ODB::MAX_TABLE_SIZE];
   // The current implementation is very simple-minded and will be
   // changed to be dynamic.
-  
+
   int current_size_;
   // Current size of <object_table_>.
 };
diff --git a/ace/Dump_T.h b/ace/Dump_T.h
index 857a69f1d63..ca4f5e45d7b 100644
--- a/ace/Dump_T.h
+++ b/ace/Dump_T.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Dump.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_DUMP_T_H
@@ -20,7 +20,7 @@
 #include "ace/Dump.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class Concrete>
@@ -31,7 +31,7 @@ class ACE_Dumpable_Adapter : public ACE_Dumpable
   //    class and is instantiated with the implementation of the
   //    concrete component class <class Concrete>.
   //
-  // = DESCRIPTION 
+  // = DESCRIPTION
   //    This design is similar to the Adapter and Decorator patterns
   //    from the ``Gang of Four'' book.  Note that <class Concrete>
   //    need not inherit from a common class since ACE_Dumpable
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index 1d84ecab301..23960bd3632 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -18,13 +18,14 @@
 #define ACE_DYNAMIC_H
 
 #include "ace/ACE.h"
-#include "ace/Synch_T.h"
-#include "ace/Singleton.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch_T.h"
+#include "ace/Singleton.h"
+
 class ACE_Export ACE_Dynamic
 {
   // = TITLE
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index 5f0e152f648..45caa8ef4f5 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -5,22 +5,18 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Dynamic_Service.h
 //
 // = AUTHOR
-//    Prashant Jain, Doug Schmidt 
-// 
+//    Prashant Jain, Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_DYNAMIC_SERVICE_H
 #define ACE_DYNAMIC_SERVICE_H
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 template <class SERVICE>
 class ACE_Dynamic_Service
 {
@@ -30,7 +26,7 @@ class ACE_Dynamic_Service
   //
   // = DESCRIPTION
   //     Uses "name" for lookup in the ACE service repository. Obtains
-  //	 the object and returns it as the appropriate type.
+  //     the object and returns it as the appropriate type.
 public:
   static SERVICE *instance (const char *name);
   // Return instance using <name> to search the Service_Repository.
@@ -40,11 +36,11 @@ public:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Dynamic_Service.cpp"
+# include "ace/Dynamic_Service.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Dynamic_Service.cpp")
+# pragma implementation ("Dynamic_Service.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* ACE_DYNAMIC_SERVICE_H */
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index be9ab570dfb..a8a2599caed 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -5,23 +5,23 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = DESCRIPTION
 //    Template to encapsulate getting a value from an environment variable
 //    and using a supplied default value if not in the environment.
 //
 // = AUTHOR
 //    Chris Cleeland (derived from work by Carlos O'Ryan)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_ENV_VALUE_T_H
 #define ACE_ENV_VALUE_T_H
 
-#include "ace/OS.h"		// Need to get ACE_static_cast definition
+#include "ace/OS.h"             // Need to get ACE_static_cast definition
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class T>
@@ -41,11 +41,11 @@ public:
   // Default constructor which isn't bound to a specific environment
   // variable name or a default value.  Before being useful it must
   // <open()>ed.
-  
+
   ACE_Env_Value (const char *varname,
                  const T &vardefault);
   // Constructor that calls <open>.
-  
+
   ~ACE_Env_Value (void);
   // Destroy the value.
 
@@ -65,7 +65,7 @@ private:
   // Disallow copying and assignment.
 
   void fetch_value (void);
-  
+
   const char *varname_;
   T value_;
 };
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index b8918111c12..6c818af7607 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Event_Handler.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_EVENT_HANDLER_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Forward declaration.
@@ -30,7 +30,7 @@ class ACE_Thread_Manager;
 
 typedef u_long ACE_Reactor_Mask;
 
-class ACE_Export ACE_Event_Handler 
+class ACE_Export ACE_Event_Handler
 {
   // = TITLE
   //     Provides an abstract interface for handling various types of
@@ -41,7 +41,7 @@ class ACE_Export ACE_Event_Handler
   //       handle an exception raised on an I/O descriptor, handle a
   //       timer's expiration, or handle a signal.
 public:
-  enum 
+  enum
   {
     LO_PRIORITY = 0,
     HI_PRIORITY = 10,
@@ -60,16 +60,16 @@ public:
     TIMER_MASK = (1 << 5),
     QOS_MASK = (1 << 6),
     GROUP_QOS_MASK = (1 << 7),
-    ALL_EVENTS_MASK = READ_MASK | 
-                      WRITE_MASK | 
-                      EXCEPT_MASK | 
-                      ACCEPT_MASK | 
-                      CONNECT_MASK | 
-                      TIMER_MASK | 
-                      QOS_MASK | 
+    ALL_EVENTS_MASK = READ_MASK |
+                      WRITE_MASK |
+                      EXCEPT_MASK |
+                      ACCEPT_MASK |
+                      CONNECT_MASK |
+                      TIMER_MASK |
+                      QOS_MASK |
                       GROUP_QOS_MASK,
-    RWE_MASK = READ_MASK | 
-               WRITE_MASK | 
+    RWE_MASK = READ_MASK |
+               WRITE_MASK |
                EXCEPT_MASK,
     DONT_CALL = (1 << 9)
   };
@@ -82,7 +82,7 @@ public:
   virtual void set_handle (ACE_HANDLE);
   // Set the I/O handle.
 
-  // = Get/set priority 
+  // = Get/set priority
 
   // Priorities run from MIN_PRIORITY (which is the "lowest priority")
   // to MAX_PRIORITY (which is the "highest priority").
@@ -102,11 +102,11 @@ public:
   // Called when execption events occur (e.g., SIGURG).
 
   virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg = 0);
+                              const void *arg = 0);
   // Called when timer expires.
 
   virtual int handle_close (ACE_HANDLE handle,
-			    ACE_Reactor_Mask close_mask);
+                            ACE_Reactor_Mask close_mask);
   // Called when object is removed from the ACE_Reactor
 
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
@@ -151,7 +151,7 @@ protected:
   int priority_;
   // Priority of this Event_Handler.
 
-  // = Pointers to the various event demultiplexors.  
+  // = Pointers to the various event demultiplexors.
   ACE_Reactor *reactor_;
 };
 
@@ -164,15 +164,15 @@ public:
   ACE_Notification_Buffer (void);
 
   ACE_Notification_Buffer (ACE_Event_Handler *eh,
-			   ACE_Reactor_Mask mask);
+                           ACE_Reactor_Mask mask);
 
   ~ACE_Notification_Buffer (void);
   // Default dtor.
 
   ACE_Event_Handler *eh_;
-  // Pointer to the Event_Handler that will be dispatched 
+  // Pointer to the Event_Handler that will be dispatched
   // by the main event loop.
-  
+
   ACE_Reactor_Mask mask_;
   // Mask that indicates which method to call.
 };
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 248bb62824b..f32a110d011 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -20,7 +20,7 @@
 #include "ace/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
diff --git a/ace/FIFO.h b/ace/FIFO.h
index a51b4028b4d..1e5b20392a0 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FIFO.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_FIFO_H
@@ -20,7 +20,7 @@
 #include "ace/IPC_SAP.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_FIFO : public ACE_IPC_SAP
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index b857b3e9633..c1f9d0aad9c 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FIFO_Recv.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_FIFO_RECV_H
@@ -20,30 +20,30 @@
 #include "ace/FIFO.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_FIFO_Recv : public ACE_FIFO
 {
   // = TITLE
   //    Receiver side of the bytestream C++ wrapper for UNIX
-  //    FIFOs.  
+  //    FIFOs.
 public:
   // = Initialization methods.
   ACE_FIFO_Recv (void);
   // Default constructor.
 
-  ACE_FIFO_Recv (const char *rendezvous, 
-		 int flags = O_CREAT | O_RDONLY, 
-		 int perms = ACE_DEFAULT_FILE_PERMS, 
-		 int persistent = 1,
+  ACE_FIFO_Recv (const char *rendezvous,
+                 int flags = O_CREAT | O_RDONLY,
+                 int perms = ACE_DEFAULT_FILE_PERMS,
+                 int persistent = 1,
                  LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a bytestream named pipe for reading.
 
-  int open (const char *rendezvous, 
-	    int flags = O_CREAT | O_RDONLY, 
-	    int perms = ACE_DEFAULT_FILE_PERMS, 
-	    int persistent = 1,
+  int open (const char *rendezvous,
+            int flags = O_CREAT | O_RDONLY,
+            int perms = ACE_DEFAULT_FILE_PERMS,
+            int persistent = 1,
             LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a bytestream named pipe for reading.
 
@@ -55,7 +55,7 @@ public:
 
   ssize_t recv_n (void *buf, size_t len);
   // Recv <buf> of exactly <len> bytes (block until done).
-  
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index af68b412cf2..7f5cabcfb2d 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FIFO_Recv_Msg.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_FIFO_RECV_MSG_H
@@ -20,7 +20,7 @@
 #include "ace/FIFO_Recv.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_FIFO_Recv_Msg : public ACE_FIFO_Recv
@@ -32,17 +32,17 @@ public:
   ACE_FIFO_Recv_Msg (void);
   // Default constructor.
 
-  ACE_FIFO_Recv_Msg (const char *rendezvous, 
-		     int flags = O_CREAT | O_RDONLY, 
-		     int perms = ACE_DEFAULT_FILE_PERMS, 
-		     int persistent = 1,
+  ACE_FIFO_Recv_Msg (const char *rendezvous,
+                     int flags = O_CREAT | O_RDONLY,
+                     int perms = ACE_DEFAULT_FILE_PERMS,
+                     int persistent = 1,
                      LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a record-oriented named pipe for reading.
 
-  int open (const char *rendezvous, 
-	    int flags = O_CREAT | O_RDONLY, 
-	    int perms = ACE_DEFAULT_FILE_PERMS, 
-	    int persistent = 1,
+  int open (const char *rendezvous,
+            int flags = O_CREAT | O_RDONLY,
+            int perms = ACE_DEFAULT_FILE_PERMS,
+            int persistent = 1,
             LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a record-oriented named pipe for reading.
 
@@ -53,15 +53,15 @@ public:
   // Recv <msg> as a buffer.
 
 #if defined (ACE_HAS_STREAM_PIPES)
-  ssize_t recv (ACE_Str_Buf *data, 
-		ACE_Str_Buf *cntl, 
-		int *flags);
+  ssize_t recv (ACE_Str_Buf *data,
+                ACE_Str_Buf *cntl,
+                int *flags);
   // Recv <data> and <cntl> message via Stream pipes.
 
-  ssize_t recv (int *band, 
-		ACE_Str_Buf *data, 
-		ACE_Str_Buf *cntl, 
-		int *flags);
+  ssize_t recv (int *band,
+                ACE_Str_Buf *data,
+                ACE_Str_Buf *cntl,
+                int *flags);
   // Recv <data> and <cntl> message via Stream pipes in "band" mode.
 #endif /* ACE_HAS_STREAM_PIPES */
 
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index 8e7e15633c8..65a36178071 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FIFO_Send.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_FIFO_SEND_H
@@ -20,27 +20,27 @@
 #include "ace/FIFO.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_FIFO_Send : public ACE_FIFO
 {
   // = TITLE
-  //     Sender side for the bytestream C++ wrapper for UNIX FIFOs 
+  //     Sender side for the bytestream C++ wrapper for UNIX FIFOs
 public:
   // = Initialization methods.
   ACE_FIFO_Send (void);
   // Default constructor.
 
-  ACE_FIFO_Send (const char *rendezvous, 
-		 int flags = O_WRONLY, 
-		 int perms = ACE_DEFAULT_FILE_PERMS,
+  ACE_FIFO_Send (const char *rendezvous,
+                 int flags = O_WRONLY,
+                 int perms = ACE_DEFAULT_FILE_PERMS,
                  LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a bytestream named pipe for writing.
 
-  int open (const char *rendezvous, 
-	    int flags = O_WRONLY, 
-	    int perms = ACE_DEFAULT_FILE_PERMS,
+  int open (const char *rendezvous,
+            int flags = O_WRONLY,
+            int perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a bytestream named pipe for writing.
 
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index 6e6e3373e3b..20dc659b880 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FIFO_Send_Msg.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_FIFO_SEND_MSG_H
@@ -20,28 +20,28 @@
 #include "ace/FIFO_Send.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_FIFO_Send_Msg : public ACE_FIFO_Send
 {
   // = TITLE
   //     Sender side for the Record oriented C++ wrapper for UNIX
-  //     FIFOs. 
+  //     FIFOs.
 public:
   // = Initialization methods.
   ACE_FIFO_Send_Msg (void);
   // Default constructor.
 
-  ACE_FIFO_Send_Msg (const char *rendezvous, 
-		     int flags = O_WRONLY, 
-		     int perms = ACE_DEFAULT_FILE_PERMS,
+  ACE_FIFO_Send_Msg (const char *rendezvous,
+                     int flags = O_WRONLY,
+                     int perms = ACE_DEFAULT_FILE_PERMS,
                      LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a record-oriented named pipe for writing.
 
-  int open (const char *rendezvous, 
-	    int flags = O_WRONLY, 
-	    int perms = ACE_DEFAULT_FILE_PERMS,
+  int open (const char *rendezvous,
+            int flags = O_WRONLY,
+            int perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a record-oriented named pipe for writing.
 
@@ -52,15 +52,15 @@ public:
   // Send <buf> of exactly <len> bytes (block until done).
 
 #if defined (ACE_HAS_STREAM_PIPES)
-  ssize_t send (const ACE_Str_Buf *data, 
-		const ACE_Str_Buf *cntl = 0, 
-		int flags = 0);
+  ssize_t send (const ACE_Str_Buf *data,
+                const ACE_Str_Buf *cntl = 0,
+                int flags = 0);
   // Send <data> and <cntl> message via Stream pipes.
 
-  ssize_t send (int band, 
-		const ACE_Str_Buf *data, 
-		const ACE_Str_Buf *cntl = 0, 
-		int flags = MSG_BAND);
+  ssize_t send (int band,
+                const ACE_Str_Buf *data,
+                const ACE_Str_Buf *cntl = 0,
+                int flags = MSG_BAND);
   // Send <data> and <cntl> message via Stream pipes in "band" mode.
 #endif /* ACE_HAS_STREAM_PIPES */
 
diff --git a/ace/FILE.h b/ace/FILE.h
index ec8c2cd2494..7164e81ba2c 100644
--- a/ace/FILE.h
+++ b/ace/FILE.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FILE.h
 //
 // = AUTHOR
 //    Gerhard Lenzer
-// 
+//
 // ============================================================================
 
 #ifndef ACE_FILE_H
 #define ACE_FILE_H
 
 #include "ace/IO_SAP.h"
-#include "ace/FILE_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/FILE_Addr.h"
+
 // The following is necessary since many C++ compilers don't support
 // typedef'd types inside of classes used as formal template
 // arguments... ;-(.  Luckily, using the C++ preprocessor I can hide
@@ -42,7 +43,7 @@ class ACE_Export ACE_FILE_Info
   // = TITLE
   //     Abstracts basic OS FILE information.
 public:
-  mode_t mode_;	
+  mode_t mode_;
   // mode of file
 
   nlink_t nlink_;
@@ -56,7 +57,7 @@ class ACE_Export ACE_FILE : public ACE_IO_SAP
 {
   // = TITLE
   //     Defines the member functions for the base class of the
-  //     ACE_FILE abstraction. 
+  //     ACE_FILE abstraction.
 public:
   int close (void);
   // Close down the ACE_FILE
@@ -86,7 +87,7 @@ public:
 
 protected:
   ACE_FILE (void);
-  // Ensure that this class is an abstract base class 
+  // Ensure that this class is an abstract base class
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h
index d928c8a8209..04f37a63236 100644
--- a/ace/FILE_Addr.h
+++ b/ace/FILE_Addr.h
@@ -5,29 +5,30 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FILE_Addr.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_FILE_ADDR_H
 #define ACE_FILE_ADDR_H
 
 #include "ace/Addr.h"
-#include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/ACE.h"
+
 class ACE_Export ACE_FILE_Addr : public ACE_Addr
 {
   // = TITLE
-  //    Defines the FILE address family address format. 
+  //    Defines the FILE address family address format.
 public:
   // = Initialization methods.
   ACE_FILE_Addr (void);
@@ -40,32 +41,32 @@ public:
   // Acts like a copy constructor.
 
   ACE_FILE_Addr (LPCTSTR filename);
-  // Create a ACE_FILE_Addr from a pathname. 
+  // Create a ACE_FILE_Addr from a pathname.
 
   void set (LPCTSTR filename);
-  // Create a ACE_FILE_Addr from a pathname. 
+  // Create a ACE_FILE_Addr from a pathname.
 
   ACE_FILE_Addr &operator= (const ACE_FILE_Addr &);
   // Assignment operator.
 
   virtual void *get_addr (void) const;
-  // Return a pointer to the address. 
+  // Return a pointer to the address.
 
 #if defined (UNICODE)
   virtual int addr_to_string (wchar_t *addr, size_t) const;
-  // Transform the current address into string format. 
+  // Transform the current address into string format.
 #endif /* UNICODE */
 
   virtual int addr_to_string (char *addr, size_t) const;
-  // Transform the current address into string format. 
+  // Transform the current address into string format.
 
   int operator == (const ACE_FILE_Addr &SAP) const;
-  // Compare two addresses for equality. 
+  // Compare two addresses for equality.
 
   int operator != (const ACE_FILE_Addr &SAP) const;
-  // Compare two addresses for inequality. 
+  // Compare two addresses for inequality.
 
-  LPCTSTR get_path_name (void) const; 
+  LPCTSTR get_path_name (void) const;
   // Return the path name used for the rendezvous point.
 
   void dump (void) const;
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index d144f0f27d3..3802c2dbaa0 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FILE_Connector.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_FILE_CONNECTOR_H
@@ -20,25 +20,25 @@
 #include "ace/FILE_IO.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_FILE_Connector
 {
   // = TITLE
-  //     Defines an active connection factory for the ACE_FILE wrappers. 
+  //     Defines an active connection factory for the ACE_FILE wrappers.
 public:
   // = Initialization methods.
   ACE_FILE_Connector (void);
   // Default constructor.
 
-  ACE_FILE_Connector (ACE_FILE_IO &new_io, 
-		      const ACE_FILE_Addr &remote_sap, 
-		      ACE_Time_Value *timeout = 0,
-		      const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		      int reuse_addr = 0,
-		      int flags = O_RDWR,
-		      int perms = 0);
+  ACE_FILE_Connector (ACE_FILE_IO &new_io,
+                      const ACE_FILE_Addr &remote_sap,
+                      ACE_Time_Value *timeout = 0,
+                      const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                      int reuse_addr = 0,
+                      int flags = O_RDWR,
+                      int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -55,13 +55,13 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
-  int connect (ACE_FILE_IO &new_io, 
-	       const ACE_FILE_Addr &remote_sap, 
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
-	       int flags = O_RDWR,
-	       int perms = 0);
+  int connect (ACE_FILE_IO &new_io,
+               const ACE_FILE_Addr &remote_sap,
+               ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               int reuse_addr = 0,
+               int flags = O_RDWR,
+               int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index e717783317a..25b506a93b6 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    FILE_IO.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#ifndef ACE_FILE_IO_H 
+#ifndef ACE_FILE_IO_H
 #define ACE_FILE_IO_H
 
 #include "ace/FILE.h"
-#include "ace/FILE_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/FILE_Addr.h"
+
 class ACE_Export ACE_FILE_IO : public ACE_FILE
 {
   // = TITLE
@@ -41,33 +42,33 @@ public:
   ssize_t recv (void *buf, size_t n) const;
   // Recv upto <n> bytes in <buf>.
 
-  ssize_t send_n (const void *buf, size_t n) const; 
-  // Send n bytes, keep trying until n are sent. 
+  ssize_t send_n (const void *buf, size_t n) const;
+  // Send n bytes, keep trying until n are sent.
 
-  ssize_t recv_n (void *buf, size_t n) const;	      
-  // Recv n bytes, keep trying until n are received. 
+  ssize_t recv_n (void *buf, size_t n) const;
+  // Recv n bytes, keep trying until n are received.
 
 #if defined (ACE_HAS_STREAM_PIPES)
-  ssize_t send (const ACE_Str_Buf *cntl, 
-		const ACE_Str_Buf *data, 
-		int flags = 0) const;
+  ssize_t send (const ACE_Str_Buf *cntl,
+                const ACE_Str_Buf *data,
+                int flags = 0) const;
   // Send bytes via STREAM pipes.
 
-  ssize_t recv (ACE_Str_Buf *cntl, 
-		ACE_Str_Buf *data, 
-		int *flags) const;
+  ssize_t recv (ACE_Str_Buf *cntl,
+                ACE_Str_Buf *data,
+                int *flags) const;
   // Recv bytes via STREAM pipes.
 
-  ssize_t send (const ACE_Str_Buf *cntl, 
-		const ACE_Str_Buf *data, 
-		int band, 
-		int flags) const;
+  ssize_t send (const ACE_Str_Buf *cntl,
+                const ACE_Str_Buf *data,
+                int band,
+                int flags) const;
   // Send bytes via STREAM pipes using "band" mode.
 
-  ssize_t recv (ACE_Str_Buf *cntl, 
-		ACE_Str_Buf *data, 
-		int *band, 
-		int *flags) const;
+  ssize_t recv (ACE_Str_Buf *cntl,
+                ACE_Str_Buf *data,
+                int *band,
+                int *flags) const;
   // Recv bytes via STREAM pipes using "band" mode.
 
 #endif /* ACE_HAS_STREAM_PIPES */
@@ -109,7 +110,7 @@ public:
   int get_local_addr (ACE_Addr &) const;
   // Return the local endpoint address in the referenced ACE_Addr.
   // Returns 0 if successful, else -1.
- 
+
   int get_remote_addr (ACE_Addr &) const;
   // Return the address of the remotely connected peer (if there is
   // one), in the referenced ACE_Addr. Returns 0 if successful, else
diff --git a/ace/Filecache.h b/ace/Filecache.h
index 7422f6dd243..8a392c6f290 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -19,14 +19,15 @@
 #define ACE_FILECACHE_H
 
 #include "ace/Mem_Map.h"
-#include "ace/Synch_T.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch_T.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/SString.h"
+
 enum ACE_Filecache_Flag
 {
   ACE_NOMAP = 0,
diff --git a/ace/Free_List.h b/ace/Free_List.h
index f4583c7bc47..44a9ef0e3e0 100644
--- a/ace/Free_List.h
+++ b/ace/Free_List.h
@@ -6,27 +6,28 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Free_List.h
 //
 // = AUTHOR
 //    Darrell Brunsch (brunsch@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_FREE_LIST_H
 #define ACE_FREE_LIST_H
 
 #include "ace/OS.h"
-#include "ace/Synch_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch_T.h"
+
 template <class T>
-class ACE_Free_List  
+class ACE_Free_List
 {
   // = TITLE
   //      Implements a free list.
@@ -40,11 +41,11 @@ public:
   virtual void add (T *element) = 0;
   // Inserts an element onto the free list (if it isn't past the high
   // water mark).
-  
+
   virtual T *remove (void) = 0;
   // Takes a element off the freelist and returns it.  It creates
   // <inc> new elements if the size is at or below the low water mark.
-  
+
   virtual size_t size (void) = 0;
   // Returns the current size of the free list.
 
@@ -53,7 +54,7 @@ public:
 };
 
 template <class T, class ACE_LOCK>
-class ACE_Locked_Free_List : public ACE_Free_List<T> 
+class ACE_Locked_Free_List : public ACE_Free_List<T>
 {
   // = TITLE
   //      Implements a free list.
@@ -65,9 +66,9 @@ class ACE_Locked_Free_List : public ACE_Free_List<T>
 public:
   // = Initialization and termination.
   ACE_Locked_Free_List (int mode = ACE_FREE_LIST_WITH_POOL,
-			size_t prealloc = ACE_DEFAULT_FREE_LIST_PREALLOC, 
-                        size_t lwm = ACE_DEFAULT_FREE_LIST_LWM, 
-                        size_t hwm = ACE_DEFAULT_FREE_LIST_HWM, 
+                        size_t prealloc = ACE_DEFAULT_FREE_LIST_PREALLOC,
+                        size_t lwm = ACE_DEFAULT_FREE_LIST_LWM,
+                        size_t hwm = ACE_DEFAULT_FREE_LIST_HWM,
                         size_t inc = ACE_DEFAULT_FREE_LIST_INC);
   // Constructor takes a <mode> (i.e., ACE_FREE_LIST_WITH_POOL or
   // ACE_PURE_FREE_LIST), a count of the number of nodes to
@@ -82,11 +83,11 @@ public:
   virtual void add (T *element);
   // Inserts an element onto the free list (if it isn't past the high
   // water mark).
-  
+
   virtual T *remove (void);
   // Takes a element off the freelist and returns it.  It creates
   // <inc> new elements if the size is at or below the low water mark.
-  
+
   virtual size_t size (void);
   // Returns the current size of the free list.
 
@@ -119,7 +120,7 @@ protected:
   size_t size_;
   // Keeps track of the size of the list.
 
-  ACE_LOCK mutex_; 
+  ACE_LOCK mutex_;
   // Synchronization variable for <ACE_Timer_Queue>.
 
 private:
diff --git a/ace/Functor.h b/ace/Functor.h
index c0a9ed4c6e9..8443817ed5f 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -30,7 +30,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Command_Base
diff --git a/ace/Functor_T.h b/ace/Functor_T.h
index ae596e6ff1a..471170262e4 100644
--- a/ace/Functor_T.h
+++ b/ace/Functor_T.h
@@ -30,7 +30,7 @@
 #include "ace/Functor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class RECEIVER, class ACTION>
@@ -48,7 +48,7 @@ class ACE_Command_Callback : public ACE_Command_Base
 public:
 
   ACE_Command_Callback (RECEIVER &recvr, ACTION action);
-  // Constructor: sets the <receiver_> of the Command to recvr, and the 
+  // Constructor: sets the <receiver_> of the Command to recvr, and the
   // <action_> of the Command to <action>.
 
   virtual ~ACE_Command_Callback (void) {}
diff --git a/ace/Future.h b/ace/Future.h
index 839adc35df9..36d65b46cb0 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -5,15 +5,15 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Future.h
 //
 // = AUTHOR
 //    Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt
 //    <schmidt@cs.wustl.edu>, and Per Andersson
-//    <Per.Andersson@hfera.ericsson.se>. 
-// 
+//    <Per.Andersson@hfera.ericsson.se>.
+//
 // ============================================================================
 
 #ifndef ACE_FUTURE_H
@@ -22,7 +22,7 @@
 #include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_THREADS)
@@ -37,42 +37,42 @@ class ACE_Future_Rep
   //     ACE_Future_Rep<T>
   //
   // = DESCRIPTION
-  //     An ACE_Future_Rep<T> object encapsules a pointer to an 
+  //     An ACE_Future_Rep<T> object encapsules a pointer to an
   //     object of class T which is the result of an asynchronous
   //     method invocation. It is pointed to by ACE_Future<T> object[s]
   //     and only accessible through them.
 private:
   friend class ACE_Future<T>;
-  
+
   // Create, attach, detach and assign encapsulates the reference
   // count handling and the object lifetime of ACE_Future_Rep<T>
   // instances.
-  
+
   static ACE_Future_Rep<T> *create (void);
   // Create a ACE_Future_Rep<T> and initialize the reference count
-  
+
   static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep);
   // Precondition(rep != 0)
   // Increase the reference count and return argument. Uses
   // the attribute "value_ready_mutex_" to synchronize reference
   // count updating
-  
+
   static void detach (ACE_Future_Rep<T> *&rep);
   // Precondition(rep != 0)
   // Decreases the reference count and and deletes rep if
   // there are no more references to rep.
-  
+
   static void assign (ACE_Future_Rep<T> *&rep,
-		      ACE_Future_Rep<T> *new_rep);
+                      ACE_Future_Rep<T> *new_rep);
   // Precondition(rep != 0 && new_rep != 0)
   // Decreases the rep's reference count and and deletes rep if there
   // are no more references to rep. Then assigns new_rep to rep
-  
+
   int set (const T &r);
   // Set the result value.
 
   int get (T &value,
-	   ACE_Time_Value *tv);
+           ACE_Time_Value *tv);
   // Wait up to <tv> time to get the <value>.
 
   operator T ();
@@ -109,7 +109,7 @@ private:
 };
 
 template <class T>
-class ACE_Future 
+class ACE_Future
 {
   // = TITLE
   //     This class implements a ``single write, multiple read''
@@ -138,7 +138,7 @@ public:
   int cancel (const T &r);
   // Cancel an <ACE_Future> and assign the value <r>.  It is used if a
   // client does not want to wait for <T> to be produced.
-  
+
   int cancel (void);
   // Cancel an <ACE_Future>.  Put the future into its initial
   // state. Returns 0 on succes and -1 on failure. It is now possible
@@ -159,7 +159,7 @@ public:
   // the result to all waiting clients.
 
   int get (T &value,
-	   ACE_Time_Value *tv = 0);
+           ACE_Time_Value *tv = 0);
   // Wait up to <tv> time to get the <value>.
 
   operator T ();
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index 49758895474..0b03e7458dc 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Get_Opt.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_GET_OPT_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Get_Opt
@@ -31,26 +31,26 @@ class ACE_Export ACE_Get_Opt
   // = DESCRIPTION
   //    This is a C++ wrapper for getopt(3c).
 public:
-  ACE_Get_Opt (int argc, 
-	       ASYS_TCHAR **argv, 
-	       const ASYS_TCHAR *optstring, 
-	       int skip_argv0 = 1, 
-	       int report_errors = 0);
+  ACE_Get_Opt (int argc,
+               ASYS_TCHAR **argv,
+               const ASYS_TCHAR *optstring,
+               int skip_argv0 = 1,
+               int report_errors = 0);
   // Initialize the internal data when the first call is made.  Start
   // processing options with <argv>-element 0 + <skip_argv0>; the
   // sequence of previously skipped non-option <argv>-elements is
   // empty.
-  // 
+  //
   // <optstring> is a string containing the legitimate option
   // characters.  A colon in <optstring> means that the previous
   // character is an option that wants an argument.  The argument is
   // taken from the rest of the current <argv>-element, or from the
   // following <argv>-element, and returned in <optarg>.
-  // 
+  //
   // If an option character is seen that is not listed in <optstring>,
   // return '?' after printing an error message.  If you set <opterr>
   // to zero, the error message is suppressed but we still return '?'.
-  // 
+  //
   // If a char in <optstring> is followed by a colon, that means it
   // wants an arg, so the following text in the same <argv>-element,
   // or the text of the following <argv>-element, is returned in
@@ -68,12 +68,12 @@ public:
   // element (aside from the initial '-') are option characters.  If
   // <operator()> is called repeatedly, it returns successively each
   // of the option characters from each of the option elements.
-  // 
+  //
   // If <operator()> finds another option character, it returns that
   // character, updating <optind> and <nextchar> so that the next call
   // to <operator()> can resume the scan with the following option
   // character or <argv>-element.
-  // 
+  //
   // If there are no more option characters, <operator()> returns
   // <EOF>.  Then <optind> is the index in <argv> of the first
   // <argv>-element that is not an option.  (The <argv>-elements have
@@ -85,28 +85,28 @@ public:
   // For communication from <operator()> to the caller.  When
   // <operator()> finds an option that takes an argument, the argument
   // value is returned here.
-  
+
   int optind;
   // Index in <argv> of the next element to be scanned.  This is used
   // for communication to and from the caller and for communication
   // between successive calls to <operator()>.  On entry to
   // <operator()>, zero means this is the first call; initialize.
-  //      
+  //
   // When <get_opt> returns <EOF>, this is the index of the first of
   // the non-option elements that the caller should itself scan.
-  //          
+  //
   // Otherwise, <optind> communicates from one call to the next how
   // much of <argv> has been scanned so far.
 
   int opterr;
   // Callers store zero here to inhibit the error message for
   // unrecognized options.
-  
+
   int argc_;
   // Holds the <argc> count.
 
   ASYS_TCHAR **argv_;
-  // Holds the <argv> pointer.  
+  // Holds the <argv> pointer.
 
   void dump (void) const;
   // Dump the state of an object.
@@ -115,17 +115,17 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  
+
   ASYS_TCHAR *nextchar_;
   // The next char to be scanned in the option-element in which the
   // last option character we returned was found.  This allows us to
   // pick up the scan where we left off.
-  //    
+  //
   // If this is zero, or a null string, it means resume the scan
   // by advancing to the next <argv>-element.
 
   const ASYS_TCHAR *optstring_;
-  // Holds the option string.  
+  // Holds the option string.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index 3c809e4e5e0..d46cfcd44f7 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Handle_Set.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_HANDLE_SET_H
@@ -20,19 +20,19 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ACE_Export ACE_Handle_Set 
+class ACE_Export ACE_Handle_Set
 {
   // = TITLE
   //     C++ wrapper for the socket <FD_SET> abstraction.
 public:
   friend class ACE_Handle_Set_Iterator;
 
-  // = Initialization and termination. 
+  // = Initialization and termination.
 
-  enum 
+  enum
   {
     MAXSIZE = ACE_DEFAULT_SELECT_REACTOR_SIZE
   };
@@ -128,7 +128,7 @@ private:
 class ACE_Export ACE_Handle_Set_Iterator
 {
   // = TITLE
-  //     Iterator for the <ACE_Handle_Set> abstraction. 
+  //     Iterator for the <ACE_Handle_Set> abstraction.
 public:
   ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs);
   // Constructor.
@@ -158,11 +158,11 @@ private:
   // The <Handle_Set> we are iterating through.
 
 #if defined (ACE_WIN32)
-  u_int handle_index_; 
-#elif !defined (ACE_HAS_BIG_FD_SET) 
-  int handle_index_; 
+  u_int handle_index_;
+#elif !defined (ACE_HAS_BIG_FD_SET)
+  int handle_index_;
 #elif defined (ACE_HAS_BIG_FD_SET)
-  int handle_index_; 
+  int handle_index_;
   u_long oldlsb_;
 #endif /* ACE_WIN32 */
   // Index of the bit we're examining in the current <word_num_> word.
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index 98ba6f40b20..7ef64bba8d2 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -18,12 +18,13 @@
 #define ACE_HASH_MAP_MANAGER_H
 
 #include "ace/OS.h"
-#include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch.h"
+
 class ACE_Allocator;
 
 template <class EXT_ID, class INT_ID>
@@ -34,8 +35,8 @@ class ACE_Hash_Map_Entry
 public:
   // = Initialization and termination methods.
   ACE_Hash_Map_Entry (const EXT_ID &ext_id,
-		      const INT_ID &int_id,
-		      ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0,
+                      const INT_ID &int_id,
+                      ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0,
                       ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0);
   // Constructor.
 
@@ -119,11 +120,11 @@ public:
   // Initialize a <Hash_Map_Manager> with default size.
 
   ACE_Hash_Map_Manager (size_t size,
-			ACE_Allocator *alloc = 0);
+                        ACE_Allocator *alloc = 0);
   // Initialize a <Hash_Map_Manager> with size <length>.
 
   int open (size_t size = ACE_DEFAULT_MAP_SIZE,
-	    ACE_Allocator *alloc = 0);
+            ACE_Allocator *alloc = 0);
   // Initialize a <Hash_Map_Manager> with <size> elements.
 
   int close (void);
@@ -134,7 +135,7 @@ public:
   // Initialize a <Hash_Map_Manager> with size <length>.
 
   int bind (const EXT_ID &item,
-	    const INT_ID &int_id);
+            const INT_ID &int_id);
   // Associate <ext_id> with <int_id>.  If <ext_id> is already in the
   // map then the <ACE_Hash_Map_Entry> is not changed.  Returns 0 if a
   // new entry is bound successfully, returns 1 if an attempt is made
@@ -148,7 +149,7 @@ public:
   // created entry, or the existing one.
 
   int trybind (const EXT_ID &ext_id,
-	       INT_ID &int_id);
+               INT_ID &int_id);
   // Associate <ext_id> with <int_id> if and only if <ext_id> is not
   // in the map.  If <ext_id> is already in the map then the <int_id>
   // parameter is assigned the existing value in the map.  Returns 0
@@ -156,16 +157,16 @@ public:
   // made to bind an existing entry, and returns -1 if failures occur.
 
   int trybind (const EXT_ID &ext_id,
-	       INT_ID &int_id,
+               INT_ID &int_id,
                ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
   // Same as a normal trybind, except the map entry is also passed
   // back to the caller.  The entry in this case will either be the
   // newly created entry, or the existing one.
 
   int rebind (const EXT_ID &ext_id,
-	      const INT_ID &int_id,
-	      EXT_ID &old_ext_id,
-	      INT_ID &old_int_id);
+              const INT_ID &int_id,
+              EXT_ID &old_ext_id,
+              INT_ID &old_int_id);
   // Associate <ext_id> with <int_id>.  If <ext_id> is not in the map
   // then behaves just like <bind>.  Otherwise, store the old values
   // of <ext_id> and <int_id> into the "out" parameters and rebind the
@@ -176,16 +177,16 @@ public:
   // and returns -1 if failures occur.
 
   int rebind (const EXT_ID &ext_id,
-	      const INT_ID &int_id,
-	      EXT_ID &old_ext_id,
-	      INT_ID &old_int_id,
+              const INT_ID &int_id,
+              EXT_ID &old_ext_id,
+              INT_ID &old_int_id,
               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
   // Same as a normal rebind, except the map entry is also passed back
   // to the caller.  The entry in this case will either be the newly
   // created entry, or the existing one.
 
   int find (const EXT_ID &ext_id,
-	    INT_ID &int_id);
+            INT_ID &int_id);
   // Locate <ext_id> and pass out parameter via <int_id>.  If found,
   // return 0, returns -1 if not found.
 
@@ -193,7 +194,7 @@ public:
   // Returns 0 if the <ext_id> is in the mapping, otherwise -1.
 
   int find (const EXT_ID &ext_id,
-	    ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
+            ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
   // Locate <ext_id> and pass out parameter via <entry>.  If found,
   // return 0, returns -1 if not found.
 
@@ -203,7 +204,7 @@ public:
   // <int_id>s are *not* dynamically allocated...)
 
   int unbind (const EXT_ID &ext_id,
-	      INT_ID &int_id);
+              INT_ID &int_id);
   // Break any association of <ext_id>.  Returns the value of <int_id>
   // in case the caller needs to deallocate memory.
 
@@ -270,7 +271,7 @@ protected:
 
   int rebind_i (const EXT_ID &ext_id,
                 const INT_ID &int_id,
-		EXT_ID &old_ext_id,
+                EXT_ID &old_ext_id,
                 INT_ID &old_int_id);
   // Performs rebind.  Must be called with locks held.
 
@@ -347,11 +348,11 @@ class ACE_Hash_Map_Iterator_Base
   //
   // = DESCRIPTION
   //     This class factors out common code from its templatized
-  //     subclasses.  
+  //     subclasses.
 public:
   // = Initialization method.
   ACE_Hash_Map_Iterator_Base (ACE_Hash_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> &mm,
-			      int head);
+                              int head);
   // Contructor.  If head != 0, the iterator constructed is positioned
   // at the head of the map, it is positioned at the end otherwise.
 
@@ -417,7 +418,7 @@ class ACE_Hash_Map_Iterator : public ACE_Hash_Map_Iterator_Base<EXT_ID, INT_ID,
 public:
   // = Initialization method.
   ACE_Hash_Map_Iterator (ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm,
-			 int tail = 0);
+                         int tail = 0);
 
   // = Iteration methods.
 
@@ -462,7 +463,7 @@ class ACE_Hash_Map_Reverse_Iterator : public ACE_Hash_Map_Iterator_Base<EXT_ID,
 public:
   // = Initialization method.
   ACE_Hash_Map_Reverse_Iterator (ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm,
-				 int head = 0);
+                                 int head = 0);
 
   // = Iteration methods.
 
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index c2d962b3198..ad6c72bf016 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_High_Res_Timer
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index d66b8ff515f..3f3ddf2a414 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    INET_Addr.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_INET_ADDR_H
 #define ACE_INET_ADDR_H
 
 #include "ace/ACE.h"
-#include "ace/Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Addr.h"
+
 class ACE_Export ACE_INET_Addr : public ACE_Addr
 {
   // = TITLE
@@ -35,13 +36,13 @@ public:
 
   ACE_INET_Addr (const ACE_INET_Addr &);
   // Copy constructor.
- 
+
   ACE_INET_Addr (const sockaddr_in *, int len);
   // Creates an <ACE_INET_Addr> from a sockaddr_in structure.
 
   ACE_INET_Addr (u_short port_number, const ASYS_TCHAR host_name[]);
   // Creates an <ACE_INET_Addr> from a <port_number> and the remote
-  // <host_name>. 
+  // <host_name>.
 
   ACE_INET_Addr (const ASYS_TCHAR address[]);
   // Initializes an <ACE_INET_Addr> from the <address>, which can be
@@ -72,16 +73,16 @@ public:
   int set (const ACE_INET_Addr &);
   // Initializes from another <ACE_INET_Addr>.
 
-  int set (u_short port_number, const ASYS_TCHAR host_name[], 
-	   int encode = 1);
+  int set (u_short port_number, const ASYS_TCHAR host_name[],
+           int encode = 1);
   // Initializes an <ACE_INET_Addr> from a <port_number> and the
   // remote <host_name>.  If <encode> is enabled then <port_number> is
   // converted into network byte order, otherwise it is assumed to be
   // in network byte order already and are passed straight through.
 
-  int set (u_short port_number, 
-	   ACE_UINT32 ip_addr = INADDR_ANY, 
-	   int encode = 1);
+  int set (u_short port_number,
+           ACE_UINT32 ip_addr = INADDR_ANY,
+           int encode = 1);
   // Initializes an <ACE_INET_Addr> from a <port_number> and an
   // Internet <ip_addr>.  If <encode> is enabled then <port_number>
   // and <ip_addr> are converted into network byte order, otherwise
@@ -145,7 +146,7 @@ public:
   // is non-reentrant since it returns a pointer to a static data
   // area).
 
-  const	char *get_host_addr (void) const;
+  const char *get_host_addr (void) const;
   // Return the "dotted decimal" Internet address.
 
   ACE_UINT32 get_ip_address (void) const;
@@ -160,7 +161,7 @@ public:
   // Compare two addresses for inequality.
 
   virtual u_long hash (void) const;
-  // Computes and returns hash value.  
+  // Computes and returns hash value.
 
   void dump (void) const;
   // Dump the state of an object.
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 560d5be4004..c1ecb5c9604 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -20,7 +20,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index 90229fe02e7..86e0c6bf645 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -25,7 +25,7 @@
 #include "ace/IOStream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h
index b650057588f..e9420b4048d 100644
--- a/ace/IO_Cntl_Msg.h
+++ b/ace/IO_Cntl_Msg.h
@@ -5,26 +5,22 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    IO_Cntl_Msg.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_IO_CNTL_MSG_H
 #define ACE_IO_CNTL_MSG_H
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class ACE_Export ACE_IO_Cntl_Msg
 {
   // = TITLE
-  //     Data format for IOCTL messages 
+  //     Data format for IOCTL messages
 public:
   enum ACE_IO_Cntl_Cmds
   {
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index 6704bd8f4b1..24774993885 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    IO_SAP.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_IO_SAP_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_IO_SAP
@@ -31,16 +31,16 @@ class ACE_Export ACE_IO_SAP
 public:
   enum
   {
-    INVALID_HANDLE = -1 // Be consistent with Winsock 
+    INVALID_HANDLE = -1 // Be consistent with Winsock
   };
 
   ~ACE_IO_SAP (void);
   // Default dtor.
 
   int control (int cmd, void *) const;
-  // Interface for ioctl. 
+  // Interface for ioctl.
 
-  // = Common I/O handle options related to files. 
+  // = Common I/O handle options related to files.
 
   int enable (int value) const;
   // Enable asynchronous I/O (ACE_SIGIO), urgent data (ACE_SIGURG),
@@ -53,10 +53,10 @@ public:
   // which is passed as the <value>.
 
   ACE_HANDLE get_handle (void) const;
-  // Get the underlying handle. 
+  // Get the underlying handle.
 
   void set_handle (ACE_HANDLE handle);
-  // Set the underlying handle. 
+  // Set the underlying handle.
 
   void dump (void) const;
   // Dump the state of an object.
@@ -66,14 +66,14 @@ public:
 
 protected:
   ACE_IO_SAP (void);
-  // Ensure that ACE_IO_SAP is an abstract base class. 
+  // Ensure that ACE_IO_SAP is an abstract base class.
 
 private:
   ACE_HANDLE handle_;
-  // Underlying I/O handle. 
+  // Underlying I/O handle.
 
   static pid_t pid_;
-  // Cache the process ID. 
+  // Cache the process ID.
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index c39bac13ec3..e6ee95e1d45 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    IPC_SAP.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_IPC_SAP_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_IPC_SAP
@@ -33,7 +33,7 @@ public:
   // Default dtor.
 
   int control (int cmd, void *) const;
-  // Interface for ioctl. 
+  // Interface for ioctl.
 
   // = Common I/O handle options related to sockets.
 
@@ -48,10 +48,10 @@ public:
   // which is passed as the <value>.
 
   ACE_HANDLE get_handle (void) const;
-  // Get the underlying handle. 
+  // Get the underlying handle.
 
   void set_handle (ACE_HANDLE handle);
-  // Set the underlying handle. 
+  // Set the underlying handle.
 
   void dump (void) const;
   // Dump the state of an object.
@@ -69,7 +69,7 @@ private:
   // Underlying I/O handle.
 
   static pid_t pid_;
-  // Cache the process ID. 
+  // Cache the process ID.
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h
index 6cfda36eb7c..f7838ca79dd 100644
--- a/ace/LOCK_SOCK_Acceptor.h
+++ b/ace/LOCK_SOCK_Acceptor.h
@@ -4,13 +4,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    LOCK_SOCK_Acceptor.h
 //
 // = AUTHOR
 //    James Hu and Irfan Pyarali
-// 
+//
 // ============================================================================
 
 #ifndef ACE_LOCK_SOCK_ACCEPTOR_H
@@ -19,7 +19,7 @@
 #include "ace/SOCK_Acceptor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class ACE_LOCK>
@@ -27,7 +27,7 @@ class ACE_LOCK_SOCK_Acceptor : public ACE_SOCK_Acceptor
 {
   // = TITLE
   //     Specialize <ACE_SOCK_Acceptor> to lock around <accept>;
-  // 
+  //
   // = DESCRIPTION
   //     This class is necessary since some OS platforms (e.g.,
   //     Solaris 2.5) do not allow multiple threads/processes to
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index 981d6cc0c9f..4774f1a6578 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    LSOCK.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_H
@@ -19,26 +19,26 @@
 
 #include "ace/SOCK.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
 class ACE_Export ACE_LSOCK
 {
   // = TITLE
   //     Create a Local ACE_SOCK, which is used for passing file
-  //     descriptors.  
+  //     descriptors.
 public:
 #if defined (ACE_HAS_MSG)
-  int send_handle (const ACE_HANDLE handle) const;	
-  // Send an open FD to another process. 
+  int send_handle (const ACE_HANDLE handle) const;
+  // Send an open FD to another process.
 
-  int recv_handle (ACE_HANDLE &handles, 
-		   char *pbuf = 0, 
-		   int *len = 0) const; 
-  // Recv an open FD from another process. 
+  int recv_handle (ACE_HANDLE &handles,
+                   char *pbuf = 0,
+                   int *len = 0) const;
+  // Recv an open FD from another process.
 #endif /* ACE_HAS_MSG */
 
   void dump (void) const;
@@ -48,7 +48,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
-  // = Ensure that ACE_LSOCK is an abstract base class 
+  // = Ensure that ACE_LSOCK is an abstract base class
 
   ACE_LSOCK (void);
   // Default constructor.
@@ -64,7 +64,7 @@ protected:
 
 private:
   ACE_HANDLE aux_handle_;
-  // An auxiliary handle used to avoid virtual base classes... 
+  // An auxiliary handle used to avoid virtual base classes...
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h
index df226630ee8..711e6561c5a 100644
--- a/ace/LSOCK_Acceptor.h
+++ b/ace/LSOCK_Acceptor.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    LSOCK_Aceeptor.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_ACCEPTOR_H
 #define ACE_LOCAL_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Stream.h"
 
@@ -36,24 +41,24 @@ public:
   ACE_LSOCK_Acceptor (void);
   // Default constructor.
 
-  ACE_LSOCK_Acceptor (const ACE_Addr &local_sap, 
-		      int reuse_addr = 0, 
-		      int protocol_family = PF_UNIX, 
-		      int backlog = 5, 
-		      int protocol = 0);
+  ACE_LSOCK_Acceptor (const ACE_Addr &local_sap,
+                      int reuse_addr = 0,
+                      int protocol_family = PF_UNIX,
+                      int backlog = 5,
+                      int protocol = 0);
   // Initiate a passive mode socket.
 
-  int open (const ACE_Addr &local_sap, 
-	    int reuse_addr = 0, 
-	    int protocol_family = PF_UNIX, 
-	    int backlog = 5, 
-	    int protocol = 0);
+  int open (const ACE_Addr &local_sap,
+            int reuse_addr = 0,
+            int protocol_family = PF_UNIX,
+            int backlog = 5,
+            int protocol = 0);
   // Initiate a passive mode socket.
 
-  int accept (ACE_LSOCK_Stream &new_ipc_sap, 
-	      ACE_Addr * = 0, 
-	      ACE_Time_Value *timeout = 0, 
-	      int restart = 1,
+  int accept (ACE_LSOCK_Stream &new_ipc_sap,
+              ACE_Addr * = 0,
+              ACE_Time_Value *timeout = 0,
+              int restart = 1,
               int reset_new_handle = 0) const;
   // Accept a new data transfer connection.
 
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index 81cba17ff0d..ba2baaaaa6b 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -5,26 +5,27 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    LSOCK_CODgram.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_CODGRAM_H
 #define ACE_LOCAL_SOCK_CODGRAM_H
 
 #include "ace/LSOCK.h"
-#include "ace/SOCK_CODgram.h"
-#include "ace/Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SOCK_CODgram.h"
+#include "ace/Addr.h"
+
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 class ACE_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK
@@ -37,16 +38,16 @@ public:
   ACE_LSOCK_CODgram (void);
   // Default constructor.
 
-  ACE_LSOCK_CODgram (const ACE_Addr &remote_sap, 
-		     const ACE_Addr &local_sap = ACE_Addr::sap_any, 
-		     int protocol_family = PF_UNIX, 
-		     int protocol = 0);
+  ACE_LSOCK_CODgram (const ACE_Addr &remote_sap,
+                     const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                     int protocol_family = PF_UNIX,
+                     int protocol = 0);
   // Initiate a connected-datagram.
 
-  int open (const ACE_Addr &remote_sap, 
-	    const ACE_Addr &local_sap = ACE_Addr::sap_any, 
-	    int protocol_family = PF_UNIX, 
-	    int protocol = 0);
+  int open (const ACE_Addr &remote_sap,
+            const ACE_Addr &local_sap = ACE_Addr::sap_any,
+            int protocol_family = PF_UNIX,
+            int protocol = 0);
   // Initiate a connected-datagram.
 
   ACE_HANDLE get_handle (void) const;
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index 7443dbfd67c..f3a648ffe87 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -5,26 +5,27 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    LSOCK_Connector.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_CONNECTOR_H
 #define ACE_LOCAL_SOCK_CONNECTOR_H
 
 #include "ace/SOCK_Connector.h"
-#include "ace/LSOCK_Stream.h"
-#include "ace/UNIX_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/LSOCK_Stream.h"
+#include "ace/UNIX_Addr.h"
+
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 class ACE_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector
@@ -37,15 +38,15 @@ public:
   ACE_LSOCK_Connector (void);
   // Default constructor.
 
-  ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream, 
-		       const ACE_UNIX_Addr &remote_sap, 
-		       ACE_Time_Value *timeout = 0,
-		       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		       int reuse_addr = 0,
-		       int flags = 0,
-		       int perms = 0,
-		       int protocol_family = PF_UNIX,
-		       int protocol = 0);
+  ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream,
+                       const ACE_UNIX_Addr &remote_sap,
+                       ACE_Time_Value *timeout = 0,
+                       const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                       int reuse_addr = 0,
+                       int flags = 0,
+                       int perms = 0,
+                       int protocol_family = PF_UNIX,
+                       int protocol = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -60,15 +61,15 @@ public:
   // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
-  int connect (ACE_LSOCK_Stream &new_stream, 
-	       const ACE_UNIX_Addr &remote_sap, 
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
-	       int flags = 0,
-	       int perms = 0,
-	       int protcol_family = PF_UNIX,
-	       int protocol = 0);
+  int connect (ACE_LSOCK_Stream &new_stream,
+               const ACE_UNIX_Addr &remote_sap,
+               ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               int reuse_addr = 0,
+               int flags = 0,
+               int perms = 0,
+               int protcol_family = PF_UNIX,
+               int protocol = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index c70c43971f6..5de995e2fe8 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -6,44 +6,45 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    LSOCK_Dgram.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_DGRAM_H
 #define ACE_LOCAL_SOCK_DGRAM_H
 
 #include "ace/SOCK_Dgram.h"
-#include "ace/LSOCK.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/LSOCK.h"
+
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK
 {
   // = TITLE
-  //     Create a Local ACE_SOCK datagram. 
+  //     Create a Local ACE_SOCK datagram.
 public:
   // = Initialization methods.
   ACE_LSOCK_Dgram (void);
   // Default constructor.
 
-  ACE_LSOCK_Dgram (const ACE_Addr &local, 
-		   int protocol_family = PF_UNIX, 
-		   int protocol = 0);
+  ACE_LSOCK_Dgram (const ACE_Addr &local,
+                   int protocol_family = PF_UNIX,
+                   int protocol = 0);
   // Initiate a local dgram.
 
-  int open (const ACE_Addr &local, 
-	    int protocol_family = PF_UNIX, 
-	    int protocol = 0);
+  int open (const ACE_Addr &local,
+            int protocol_family = PF_UNIX,
+            int protocol = 0);
   // Initiate a local dgram.
 
   ACE_HANDLE get_handle (void) const;
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index f690ff9cead..3381721833c 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -5,32 +5,33 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    LSOCK_Stream.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_STREAM_H
 #define ACE_LOCAL_SOCK_STREAM_H
 
 #include "ace/SOCK_Stream.h"
-#include "ace/UNIX_Addr.h"
-#include "ace/LSOCK.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/UNIX_Addr.h"
+#include "ace/LSOCK.h"
+
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK
 {
   // = TITLE
-  //     Create a Local ACE_SOCK stream. 
+  //     Create a Local ACE_SOCK stream.
 public:
   // = Send/recv methods.
   ssize_t send_msg (const iovec iov[],
@@ -46,7 +47,7 @@ public:
   ACE_HANDLE get_handle (void) const;
   // Get handle.
 
-  void set_handle (ACE_HANDLE fd); 
+  void set_handle (ACE_HANDLE fd);
   // Overrides set_handle from the base classes.
 
   // = Meta-type info
@@ -58,10 +59,10 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-  int get_local_addr (ACE_Addr &) const; 
+  int get_local_addr (ACE_Addr &) const;
   // This method simply returns the "local" addr.
 
-  int get_remote_addr (ACE_Addr &) const; 
+  int get_remote_addr (ACE_Addr &) const;
   // This method returns the "local" addr since it's the same value
   // for UNIX domain sockets.
 };
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index 5e8396998f8..09f1b6863b5 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -20,14 +20,15 @@
 #define ACE_LOCAL_NAME_SPACE_H
 
 #include "ace/SString.h"
-#include "ace/Containers.h"
-#include "ace/Malloc_T.h"
-#include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Containers.h"
+#include "ace/Malloc_T.h"
+#include "ace/Synch.h"
+
 class ACE_Export ACE_NS_String
 {
   // = TITLE
@@ -45,8 +46,8 @@ public:
   // Default "no-op" constructor.
 
   ACE_NS_String (ACE_USHORT16 *dst,
-		 const ACE_USHORT16 *src,
-		 size_t len);
+                 const ACE_USHORT16 *src,
+                 size_t len);
   // Initialization method.
 
   ACE_NS_String (const ACE_WString &);
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index 2c232c6d8c4..c061acf3781 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -20,14 +20,15 @@
 #define ACE_LOCAL_NAME_SPACE_T_H
 
 #include "ace/Name_Space.h"
-#include "ace/Naming_Context.h"
-#include "ace/SString.h"
-#include "ace/Local_Name_Space.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Naming_Context.h"
+#include "ace/SString.h"
+#include "ace/Local_Name_Space.h"
+
 // A short-hand name for our set of name/value/type tuples passed back
 // to callers.
 typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET;
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 3752ba29588..9df94d986d1 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -40,14 +40,15 @@
 #define ACE_LOCAL_MUTEX_H
 
 #include "ace/Synch_T.h"
-#include "ace/Containers.h"
-#include "ace/Synch_Options.h"
-#include "ace/Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Containers.h"
+#include "ace/Synch_Options.h"
+#include "ace/Map_Manager.h"
+
 // 1.
 class ACE_Export ACE_TOKEN_CONST
 {
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index de8676c929b..ee6bcc67f97 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -90,7 +90,7 @@
 #include "ace/Log_Record.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (__Lynx__)
@@ -151,7 +151,7 @@ public:
   static void enable_debug_messages();
   // Sets the LM_DEBUG flag in the default priority mask used to
   // initialize ACE_Log_Msg instances.
-  
+
   ACE_Log_Msg (void);
   // Initialize logger.
 
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h
index e398d0da873..3d66d35fc32 100644
--- a/ace/Log_Priority.h
+++ b/ace/Log_Priority.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Log_Priority.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_LOG_PRIORITY_H
@@ -27,38 +27,38 @@ enum ACE_Log_Priority
   //     These values are defined using powers of two so that it's
   //     possible to form a mask to turn them on or off dynamically.
 
-  // = Note, this first argument *must* start at 1! 
+  // = Note, this first argument *must* start at 1!
 
   LM_SHUTDOWN = 01,
   // Shutdown the logger (decimal 1).
 
-  LM_TRACE = 02,    
+  LM_TRACE = 02,
   // Messages indicating function-calling sequence (decimal 2).
 
-  LM_DEBUG = 04,    
+  LM_DEBUG = 04,
   // Messages that contain information normally of use only when
   // debugging a program (decimal 4).
 
-  LM_INFO = 010,	    
+  LM_INFO = 010,
   // Informational messages (decimal 8).
 
-  LM_NOTICE = 020,   
+  LM_NOTICE = 020,
   // Conditions that are not error conditions, but that may require
   // special handling (decimal 16).
 
-  LM_WARNING = 040,  
+  LM_WARNING = 040,
   // Warning messages (decimal 32).
 
-  LM_STARTUP = 0100,  
+  LM_STARTUP = 0100,
   // Initialize the logger (decimal 64).
 
-  LM_ERROR = 0200,    
+  LM_ERROR = 0200,
   // Error messages (decimal 128).
 
-  LM_CRITICAL = 0400,	    
+  LM_CRITICAL = 0400,
   // Critical conditions, such as hard device errors (decimal 256).
 
-  LM_ALERT = 01000,    
+  LM_ALERT = 01000,
   // A condition that should be corrected immediately, such as a
   // corrupted system database (decimal 512).
 
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index de38ba930e1..5cf45662344 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -17,15 +17,16 @@
 // These need to go outside of the #ifdef to avoid problems with
 // circular dependencies...
 #include "ace/ACE.h"
-#include "ace/Log_Priority.h"
 
-#ifndef ACE_LACKS_PRAGMA_ONCE
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/Log_Priority.h"
 
-#if !defined (ACE_LOG_RECORD_H)
+#ifndef ACE_LOG_RECORD_H
 #define ACE_LOG_RECORD_H
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class ACE_Export ACE_Log_Record
 {
 public:
diff --git a/ace/Malloc.h b/ace/Malloc.h
index bb78ccbf2f2..57e240da004 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -18,12 +18,13 @@
 #define ACE_MALLOC_H
 
 #include "ace/ACE.h"
-#include "ace/Malloc_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Malloc_Base.h"
+
 #if defined (ACE_HAS_MALLOC_STATS)
 #include "ace/Synch_T.h"
 #if defined (ACE_HAS_THREADS)
diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h
index 6bd7abe5cf5..ff7dac57a08 100644
--- a/ace/Malloc_Base.h
+++ b/ace/Malloc_Base.h
@@ -17,10 +17,6 @@
 #ifndef ACE_MALLOC_BASE_H
 #define ACE_MALLOC_BASE_H
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // The definition of this class is located in Malloc.cpp.
 
 class ACE_Export ACE_Allocator
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index fce3ae24943..4c49896d923 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -18,14 +18,15 @@
 #define ACE_MALLOC_T_H
 
 #include "ace/ACE.h"
-#include "ace/Synch.h"
-#include "ace/Malloc.h"
-#include "ace/Free_List.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch.h"
+#include "ace/Malloc.h"
+#include "ace/Free_List.h"
+
 template <class T>
 class ACE_Cached_Mem_Pool_Node
 {
@@ -114,8 +115,8 @@ public:
   ACE_Allocator_Adapter (LPCTSTR pool_name = 0);
 
   ACE_Allocator_Adapter (LPCTSTR pool_name,
-			 LPCTSTR lock_name,
-			 MEMORY_POOL_OPTIONS options = 0)
+                         LPCTSTR lock_name,
+                         MEMORY_POOL_OPTIONS options = 0)
       : allocator_ (pool_name, lock_name, options)
     {
       ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
@@ -264,8 +265,8 @@ public:
   // name (if necessary).
 
   ACE_Malloc (LPCTSTR pool_name,
-	      LPCTSTR lock_name,
-	      const ACE_MEM_POOL_OPTIONS *options = 0);
+              LPCTSTR lock_name,
+              const ACE_MEM_POOL_OPTIONS *options = 0);
   // Initialize ACE_Malloc.  This constructor passes <pool_name> to
   // initialize the memory pool, and uses <lock_name> to automatically
   // extract out the name used for the underlying lock name (if
@@ -274,8 +275,8 @@ public:
 
 #if !defined (ACE_HAS_TEMPLATE_TYPEDEFS)
   ACE_Malloc (LPCTSTR pool_name,
-	      LPCTSTR lock_name,
-	      const void *options = 0);
+              LPCTSTR lock_name,
+              const void *options = 0);
   // This is necessary to work around template bugs with certain C++
   // compilers.
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index 32ba8d4f20e..1eee00516c3 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -18,12 +18,13 @@
 #define ACE_MANAGED_OBJECT_H
 
 #include "ace/OS.h"
-#include "ace/Object_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Object_Manager.h"
+
 template <class TYPE>
 class ACE_Cleanup_Adapter : public ACE_Cleanup
 {
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index bb3182cb48a..4d305266dcf 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -18,12 +18,13 @@
 #define ACE_MAP_MANAGER_H
 
 #include "ace/OS.h"
-#include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch.h"
+
 // Forward declaration.
 class ACE_Allocator;
 
@@ -106,11 +107,11 @@ public:
   // Initialize a <Map_Manager> with the <ACE_DEFAULT_MAP_SIZE>.
 
   ACE_Map_Manager (size_t size,
-		   ACE_Allocator *alloc = 0);
+                   ACE_Allocator *alloc = 0);
   // Initialize a <Map_Manager> with <size> entries.
 
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-	    ACE_Allocator *alloc = 0);
+            ACE_Allocator *alloc = 0);
   // Initialize a <Map_Manager> with size <length>.
 
   int close (void);
@@ -122,7 +123,7 @@ public:
   // resources.
 
   int trybind (const EXT_ID &ext_id,
-	       INT_ID &int_id);
+               INT_ID &int_id);
   // Associate <ext_id> with <int_id> if and only if <ext_id> is not
   // in the map.  If <ext_id> is already in the map then the <int_id>
   // parameter is overwritten with the existing value in the map
@@ -131,16 +132,16 @@ public:
   // failures occur.
 
   int bind (const EXT_ID &ext_id,
-	    const INT_ID &int_id);
+            const INT_ID &int_id);
   // Associate <ext_id> with <int_id>.  If <ext_id> is already in the
   // map then the <Map_Entry> is not changed.  Returns 0 if a new
   // entry is bound successfully, returns 1 if an attempt is made to
   // bind an existing entry, and returns -1 if failures occur.
 
   int rebind (const EXT_ID &ext_id,
-	      const INT_ID &int_id,
-	      EXT_ID &old_ext_id,
-	      INT_ID &old_int_id);
+              const INT_ID &int_id,
+              EXT_ID &old_ext_id,
+              INT_ID &old_int_id);
   // Associate <ext_id> with <int_id>.  If <ext_id> is not in the
   // map then behaves just like <bind>.  Otherwise, store the old
   // values of <ext_id> and <int_id> into the "out" parameters and
@@ -217,7 +218,7 @@ protected:
   // called with locks held.
 
   int rebind_i (const EXT_ID &ext_id, const INT_ID &int_id,
-		EXT_ID &old_ext_id, INT_ID &old_int_id);
+                EXT_ID &old_ext_id, INT_ID &old_int_id);
   // Performs a rebinding of <ext_it> to <int_id>.  Must be called
   // with locks held.
 
@@ -294,7 +295,7 @@ class ACE_Map_Iterator_Base
   //
   // = DESCRIPTION
   //     This class factors out common code from its templatized
-  //     subclasses.  
+  //     subclasses.
 public:
   // = Initialization method.
   ACE_Map_Iterator_Base (ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> &mm,
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index 1f3ab930882..54daf4b0b62 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Mem_Map
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 5d25ec7666c..1c7223e4cfa 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //     ACE_Memory_Pool.h
 //
 // = AUTHOR
 //    Doug Schmidt and Prashant Jain
-// 
+//
 // ============================================================================
 
 #ifndef ACE_MEMORY_POOL_H
 #define ACE_MEMORY_POOL_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Event_Handler.h"
 #include "ace/Signal.h"
 #include "ace/Mem_Map.h"
@@ -25,10 +30,6 @@
 #include "ace/SV_Semaphore_Complex.h"
 #endif /* !ACE_WIN32 */
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (ACE_LACKS_SBRK)
 class ACE_Export ACE_Sbrk_Memory_Pool_Options
 {
@@ -36,7 +37,7 @@ class ACE_Export ACE_Sbrk_Memory_Pool_Options
   //     Helper class for constructor options.
   //
   // = DESCRIPTION
-  //     This should be a nested class, but that breaks too many 
+  //     This should be a nested class, but that breaks too many
   //     compilers.
 };
 
@@ -47,20 +48,20 @@ class ACE_Export ACE_Sbrk_Memory_Pool
 public:
   typedef ACE_Sbrk_Memory_Pool_Options OPTIONS;
 
-  ACE_Sbrk_Memory_Pool (LPCTSTR backing_store_name = 0, 
-			const OPTIONS *options = 0);
+  ACE_Sbrk_Memory_Pool (LPCTSTR backing_store_name = 0,
+                        const OPTIONS *options = 0);
   // Initialize the pool.
-  
+
   virtual ~ACE_Sbrk_Memory_Pool (void);
 
   // = Implementor operations.
-  virtual void *init_acquire (size_t nbytes, 
-			      size_t &rounded_bytes, 
-			      int &first_time);
-  // Ask system for initial chunk of local memory. 
+  virtual void *init_acquire (size_t nbytes,
+                              size_t &rounded_bytes,
+                              int &first_time);
+  // Ask system for initial chunk of local memory.
 
-  virtual void *acquire (size_t nbytes, 
-			 size_t &rounded_bytes);
+  virtual void *acquire (size_t nbytes,
+                         size_t &rounded_bytes);
   // Acquire at least NBYTES from the memory pool.  ROUNDED_BYTES is
   // the actual number of bytes allocated.
 
@@ -106,14 +107,14 @@ class ACE_Export ACE_Shared_Memory_Pool_Options
   //     Helper class for constructor options.
   //
   // = DESCRIPTION
-  //     This should be a nested class, but that breaks too many 
+  //     This should be a nested class, but that breaks too many
   //     compilers.
 public:
   // = Initialization method.
   ACE_Shared_Memory_Pool_Options (char *base_addr = ACE_DEFAULT_BASE_ADDR,
-				  size_t max_segments = ACE_DEFAULT_MAX_SEGMENTS,
-				  size_t file_perms = ACE_DEFAULT_FILE_PERMS,
-				  off_t minimum_bytes = 0);
+                                  size_t max_segments = ACE_DEFAULT_MAX_SEGMENTS,
+                                  size_t file_perms = ACE_DEFAULT_FILE_PERMS,
+                                  off_t minimum_bytes = 0);
 
   char *base_addr_;
   // Base address of the memory-mapped backing store.
@@ -138,18 +139,18 @@ public:
   typedef ACE_Shared_Memory_Pool_Options OPTIONS;
 
   ACE_Shared_Memory_Pool (LPCTSTR backing_store_name = 0,
-			  const OPTIONS *options = 0);
+                          const OPTIONS *options = 0);
   // Initialize the pool.
 
   virtual ~ACE_Shared_Memory_Pool (void);
 
-  virtual void *init_acquire (size_t nbytes, 
-			      size_t &rounded_bytes, 
-			      int &first_time);
+  virtual void *init_acquire (size_t nbytes,
+                              size_t &rounded_bytes,
+                              int &first_time);
   // Ask system for initial chunk of local memory.
 
-  virtual void *acquire (size_t nbytes, 
-			 size_t &rounded_bytes);
+  virtual void *acquire (size_t nbytes,
+                         size_t &rounded_bytes);
   // Acquire at least NBYTES from the memory pool.  ROUNDED_BYTES is
   // the actual number of bytes allocated.  Also acquires an internal
   // semaphore that ensures proper serialization of Memory_Pool
@@ -185,14 +186,14 @@ protected:
   // Implement the algorithm for rounding up the request to an
   // appropriate chunksize.
 
-  virtual int commit_backing_store_name (size_t rounded_bytes, 
-				    off_t &offset);
+  virtual int commit_backing_store_name (size_t rounded_bytes,
+                                    off_t &offset);
   // Commits a new shared memory segment if necessary after an
   // acquire() or a signal.  <offset> is set to the new offset into
   // the backing store.
 
   // = Keeps track of all the segments being used.
-  struct SHM_TABLE 
+  struct SHM_TABLE
   {
     key_t key_;
     // Shared memory segment key.
@@ -223,11 +224,11 @@ protected:
   // Base shared memory key for the segment.
 
   virtual int find_seg (const void *const searchPtr,
-                        off_t &offset, 
+                        off_t &offset,
                         size_t &counter);
   // find the segment that contains the searchPtr
 
-  virtual int in_use (off_t &offset, 
+  virtual int in_use (off_t &offset,
                       size_t &counter);
   // Determine how much memory is currently in use.
 
@@ -246,7 +247,7 @@ class ACE_Export ACE_Local_Memory_Pool_Options
   //     Helper class for constructor options.
   //
   // = DESCRIPTION
-  //     This should be a nested class, but that breaks too many 
+  //     This should be a nested class, but that breaks too many
   //     compilers.
 };
 
@@ -260,23 +261,23 @@ public:
   typedef ACE_Local_Memory_Pool_Options OPTIONS;
 
   ACE_Local_Memory_Pool (LPCTSTR backing_store_name = 0,
-			 const OPTIONS *options = 0);
+                         const OPTIONS *options = 0);
   // Initialize the pool.
-  
+
   virtual ~ACE_Local_Memory_Pool (void);
-  
-  virtual void *init_acquire (size_t nbytes, 
-			      size_t &rounded_bytes, 
-			      int &first_time);
-  // Ask system for initial chunk of local memory. 
-
-  virtual void *acquire (size_t nbytes, 
-			 size_t &rounded_bytes);
+
+  virtual void *init_acquire (size_t nbytes,
+                              size_t &rounded_bytes,
+                              int &first_time);
+  // Ask system for initial chunk of local memory.
+
+  virtual void *acquire (size_t nbytes,
+                         size_t &rounded_bytes);
   // Acquire at least NBYTES from the memory pool.  ROUNDED_BYTES is
   // the actual number of bytes allocated.
 
   virtual int release (void);
-  // Instruct the memory pool to release all of its resources. 
+  // Instruct the memory pool to release all of its resources.
 
   virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
   // Sync <len> bytes of the memory region to the backing store
@@ -318,16 +319,16 @@ class ACE_Export ACE_MMAP_Memory_Pool_Options
   //     Helper class for constructor options.
   //
   // = DESCRIPTION
-  //     This should be a nested class, but that breaks too many 
+  //     This should be a nested class, but that breaks too many
   //     compilers.
 public:
   // = Initialization method.
   ACE_MMAP_Memory_Pool_Options (void *base_addr = ACE_DEFAULT_BASE_ADDR,
-				int use_fixed_addr = 1,
-				int write_each_page = 1,
-				off_t minimum_bytes = 0,
-				u_int flags = 0,
-				int guess_on_fault = 1,
+                                int use_fixed_addr = 1,
+                                int write_each_page = 1,
+                                off_t minimum_bytes = 0,
+                                u_int flags = 0,
+                                int guess_on_fault = 1,
                                 LPSECURITY_ATTRIBUTES sa = 0);
 
   void *base_addr_;
@@ -366,25 +367,25 @@ public:
   // = Initialization and termination methods.
 
   ACE_MMAP_Memory_Pool (LPCTSTR backing_store_name = 0,
-			const OPTIONS *options = 0);
+                        const OPTIONS *options = 0);
   // Initialize the pool.
 
   virtual ~ACE_MMAP_Memory_Pool (void);
 
-  virtual void *init_acquire (size_t nbytes, 
-			      size_t &rounded_bytes, 
-			      int &first_time);
-  // Ask system for initial chunk of shared memory. 
+  virtual void *init_acquire (size_t nbytes,
+                              size_t &rounded_bytes,
+                              int &first_time);
+  // Ask system for initial chunk of shared memory.
 
-  virtual void *acquire (size_t nbytes, 
-			 size_t &rounded_bytes);
+  virtual void *acquire (size_t nbytes,
+                         size_t &rounded_bytes);
   // Acquire at least <nbytes> from the memory pool.  <rounded_bytes>
   // is the actual number of bytes allocated.  Also acquires an
   // internal semaphore that ensures proper serialization of
   // <ACE_MMAP_Memory_Pool> initialization across processes.
 
   virtual int release (void);
-  // Instruct the memory pool to release all of its resources. 
+  // Instruct the memory pool to release all of its resources.
 
   virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
   // Sync the memory region to the backing store starting at
@@ -448,7 +449,7 @@ protected:
 
   int flags_;
   // Flags passed into <ACE_OS::mmap>.
-  
+
   int write_each_page_;
   // Should we write a byte to each page to forceably allocate memory
   // for this backing store?
@@ -471,11 +472,11 @@ protected:
 class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
 {
   // = TITLE
-  //     Make a ``lighter-weight'' memory pool based <ACE_Mem_Map>.  
-  // 
+  //     Make a ``lighter-weight'' memory pool based <ACE_Mem_Map>.
+  //
   // = DESCRIPTION
   //     This implementation allows memory to be shared between
-  //     processes.  However, unlike the <ACE_MMAP_Memory_Pool> 
+  //     processes.  However, unlike the <ACE_MMAP_Memory_Pool>
   //     the sync() methods are no-ops, which means that we don't pay
   //     for the price of flushing the memory to the backing store on
   //     every update.  Naturally, this trades off increased
@@ -484,11 +485,11 @@ public:
   // = Initialization and termination methods.
 
   ACE_Lite_MMAP_Memory_Pool (LPCTSTR backing_store_name = 0,
-			     const OPTIONS *options = 0);
+                             const OPTIONS *options = 0);
   // Initialize the pool.
-  
+
   virtual ~ACE_Lite_MMAP_Memory_Pool (void);
-  
+
   virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
   // Overwrite the default sync behavior with no-op
 
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index a6b8c5a7ad9..9a10728ed9a 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -16,15 +16,15 @@
 
 #include "ace/ACE.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #ifndef ACE_MESSAGE_BLOCK_H
 #define ACE_MESSAGE_BLOCK_H
 
 #include "ace/Malloc.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Forward declaration.
 class ACE_Data_Block;
 class ACE_Lock;
@@ -122,7 +122,7 @@ public:
                      u_long priority = 0,
                      const ACE_Time_Value & execution_time = ACE_Time_Value::zero,
                      const ACE_Time_Value & deadline_time = ACE_Time_Value::max_time,
-		     ACE_Allocator *data_block_allocator = 0);
+                     ACE_Allocator *data_block_allocator = 0);
   // Create an initialized message of type <type> containing <size>
   // bytes.  The <cont> argument initializes the continuation field in
   // the <Message_Block>.  If <data> == 0 then we create and own the
@@ -153,7 +153,7 @@ public:
             u_long priority = 0,
             const ACE_Time_Value & execution_time = ACE_Time_Value::zero,
             const ACE_Time_Value & deadline_time = ACE_Time_Value::max_time,
-	    ACE_Allocator *data_block_allocator = 0);
+            ACE_Allocator *data_block_allocator = 0);
   // Create an initialized message of type <type> containing <size>
   // bytes.  The <cont> argument initializes the continuation field in
   // the <Message_Block>.  If <data> == 0 then we create and own the
@@ -352,7 +352,7 @@ private:
                      const ACE_Time_Value & execution_time,
                      const ACE_Time_Value & deadline_time,
                      ACE_Data_Block *db,
-		     ACE_Allocator *data_block_allocator);
+                     ACE_Allocator *data_block_allocator);
   // Perform the actual initialization.
 
   int release_i (ACE_Lock *lock);
@@ -370,7 +370,7 @@ private:
               const ACE_Time_Value & execution_time,
               const ACE_Time_Value & deadline_time,
               ACE_Data_Block *db,
-	      ACE_Allocator *data_block_allocator);
+              ACE_Allocator *data_block_allocator);
   // Perform the actual initialization.
 
   size_t rd_ptr_;
@@ -430,7 +430,7 @@ public:
                   ACE_Allocator *allocator_strategy,
                   ACE_Lock *locking_strategy,
                   ACE_Message_Block::Message_Flags flags,
-		  ACE_Allocator *data_block_allocator);
+                  ACE_Allocator *data_block_allocator);
   // Initialize.
 
   virtual ~ACE_Data_Block (void);
@@ -669,13 +669,13 @@ class ACE_Export ACE_Deadline_Message_Strategy : public ACE_Dynamic_Message_Stra
   //     Deadline based message priority strategy.
   //
   // = DESCRIPTION
-  //     Assigns dynamic message priority according to time to deadline.  The 
-  //     message priority is divided into high and low order bit fields.  The 
-  //     high order bit field is used for dynamic message priority, which is 
-  //     updated whenever the convert_priority (...) method is called.  The 
-  //     low order bit field is used for static message priority and is left 
-  //     unchanged.  The partitioning of the priority value into high and low 
-  //     order bit fields is done according to the arguments passed to the 
+  //     Assigns dynamic message priority according to time to deadline.  The
+  //     message priority is divided into high and low order bit fields.  The
+  //     high order bit field is used for dynamic message priority, which is
+  //     updated whenever the convert_priority (...) method is called.  The
+  //     low order bit field is used for static message priority and is left
+  //     unchanged.  The partitioning of the priority value into high and low
+  //     order bit fields is done according to the arguments passed to the
   //     strategy object's constructor.
   //
 public:
@@ -702,16 +702,16 @@ class ACE_Export ACE_Laxity_Message_Strategy : public ACE_Dynamic_Message_Strate
   //     Laxity based message priority strategy.
   //
   // = DESCRIPTION
-  //     Assigns dynamic message priority according to laxity (time to 
-  //     deadline minus worst case execution time).  The message priority is 
+  //     Assigns dynamic message priority according to laxity (time to
+  //     deadline minus worst case execution time).  The message priority is
   //     divided into high and low order bit fields.  The high order
-  //     bit field is used for dynamic message priority, which is 
-  //     updated whenever the convert_priority (...) method is called.  The 
-  //     low order bit field is used for static message priority and is left 
-  //     unchanged.  The partitioning of the priority value into high and low 
-  //     order bit fields is done according to the arguments passed to the 
+  //     bit field is used for dynamic message priority, which is
+  //     updated whenever the convert_priority (...) method is called.  The
+  //     low order bit field is used for static message priority and is left
+  //     unchanged.  The partitioning of the priority value into high and low
+  //     order bit fields is done according to the arguments passed to the
   //     strategy object's constructor.
-  //  
+  //
 public:
   ACE_Laxity_Message_Strategy (u_long static_bit_field_mask = 0x3FFUL,       // 2^(10) - 1
                                u_long static_bit_field_shift = 10,           // 10 low order bits
diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h
index e80c4c98165..330b391da47 100644
--- a/ace/Message_Block_T.h
+++ b/ace/Message_Block_T.h
@@ -20,7 +20,7 @@
 #include "ace/Message_Block.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class ACE_LOCK>
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index de665e0e2d9..e9766f1ac95 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -18,12 +18,13 @@
 #define ACE_MESSAGE_QUEUE_H
 
 #include "ace/Message_Block.h"
-#include "ace/IO_Cntl_Msg.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/IO_Cntl_Msg.h"
+
 // Forward decls.
 class ACE_Notification_Strategy;
 template <ACE_SYNCH_DECL> class ACE_Message_Queue_Iterator;
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index bab88c1d548..e5628daffce 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -20,7 +20,7 @@
 #include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (VXWORKS)
@@ -45,9 +45,9 @@ public:
   friend class ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>;
 
   // = Traits
-  typedef ACE_Message_Queue_Iterator<ACE_SYNCH_USE> 
+  typedef ACE_Message_Queue_Iterator<ACE_SYNCH_USE>
           ITERATOR;
-  typedef ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE> 
+  typedef ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>
           REVERSE_ITERATOR;
 
   // = Initialization and termination methods.
diff --git a/ace/Method_Object.h b/ace/Method_Object.h
index 0295f92d2f3..348ccdad669 100644
--- a/ace/Method_Object.h
+++ b/ace/Method_Object.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Method_Object.h
 //
@@ -15,8 +15,8 @@
 //    Please don't use it directly since it may go away at some point.
 //
 // = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu> 
-// 
+//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
+//
 // ============================================================================
 
 #ifndef ACE_METHOD_OBJECT_H
@@ -24,12 +24,12 @@
 
 #include "ace/Method_Request.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Maintain backwards compatibility so that Steve Huston doesn't go
 // postal... ;-)
 typedef ACE_Method_Request ACE_Method_Object;
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #endif /* ACE_METHOD_OBJECT_H */
diff --git a/ace/Method_Request.h b/ace/Method_Request.h
index eb4276e4368..5b9ab460f0e 100644
--- a/ace/Method_Request.h
+++ b/ace/Method_Request.h
@@ -5,14 +5,14 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Method_Request.h
 //
 // = AUTHOR
 //    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-// 
+//    <schmidt@cs.wustl.edu>
+//
 // ============================================================================
 
 #ifndef ACE_METHOD_REQUEST_H
@@ -21,10 +21,10 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ACE_Export ACE_Method_Request 
+class ACE_Export ACE_Method_Request
 {
   // = TITLE
   //     Reifies a method into a request.  Subclasses provide
diff --git a/ace/Module.h b/ace/Module.h
index 3cb5614a42c..c32d41ef5f4 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Module.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_MODULE_H
 #define ACE_MODULE_H
 
 #include "ace/ACE.h"
-#include "ace/Task_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Task_T.h"
+
 class ACE_Export ACE_Module_Base
 {
   // = TITLE
@@ -45,7 +46,7 @@ public:
     M_DELETE_WRITER = 2,
     // Indicates that close() should delete the reader Task.
 
-    M_DELETE = 3 
+    M_DELETE = 3
     // Indicates that close() deletes the Tasks.  Don't change this
     // value without updating the same enum in class ACE_Stream...
     // The <M_DELETE_READER> and <M_DELETE_WRITER> flags may be or'ed
@@ -58,7 +59,7 @@ class ACE_Module : public ACE_Module_Base
 {
   // = TITLE
   //     An abstraction for managing a bi-directional flow of messages.
-  // 
+  //
   // = DESCRIPTION
   //     This is based on the Module concept in System V Streams,
   //     which contains a pair of Tasks, one for handling upstream
@@ -72,22 +73,22 @@ public:
   ACE_Module (void);
   // Create an empty Module.
 
-  ~ACE_Module (void);		
+  ~ACE_Module (void);
   // Shutdown the Module.
 
-  ACE_Module (const ASYS_TCHAR *module_name, 
-	      ACE_Task<ACE_SYNCH_USE> *writer = 0, 
-	      ACE_Task<ACE_SYNCH_USE> *reader = 0, 
-	      void *args = 0,
-	      int flags = M_DELETE);
+  ACE_Module (const ASYS_TCHAR *module_name,
+              ACE_Task<ACE_SYNCH_USE> *writer = 0,
+              ACE_Task<ACE_SYNCH_USE> *reader = 0,
+              void *args = 0,
+              int flags = M_DELETE);
   // Create an initialized module with <module_name> as its identity
   // and <reader> and <writer> as its tasks.
 
-  int open (const ASYS_TCHAR *module_name, 
-	    ACE_Task<ACE_SYNCH_USE> *writer = 0, 
-	    ACE_Task<ACE_SYNCH_USE> *reader = 0, 
-	    void *a = 0,
-	    int flags = M_DELETE);
+  int open (const ASYS_TCHAR *module_name,
+            ACE_Task<ACE_SYNCH_USE> *writer = 0,
+            ACE_Task<ACE_SYNCH_USE> *reader = 0,
+            void *a = 0,
+            int flags = M_DELETE);
   // Create an initialized module with <module_name> as its identity
   // and <reader> and <writer> as its tasks.  Previously register
   // reader or writers or closed down and deleted according to the
@@ -100,8 +101,8 @@ public:
   // <flags> values in calls to c'tor(), open(), reader() and
   // writer().  A previous value M_DELETE[_XXX] can not be overridden.
   // Should not be called from within ACE_Task::module_closed().
-  
-  // = ACE_Task manipulation routines 
+
+  // = ACE_Task manipulation routines
   ACE_Task<ACE_SYNCH_USE> *writer (void);
   // Get the writer task.
 
@@ -122,16 +123,16 @@ public:
   // also be deleted, depending on the old flags_ value.  Should not
   // be called from within ACE_Task::module_closed()
 
-  ACE_Task<ACE_SYNCH_USE> *sibling (ACE_Task<ACE_SYNCH_USE> *orig); 
+  ACE_Task<ACE_SYNCH_USE> *sibling (ACE_Task<ACE_SYNCH_USE> *orig);
   // Set and get pointer to sibling <ACE_Task> in an <ACE_Module>
 
-  // = Identify the module 
+  // = Identify the module
   const ASYS_TCHAR *name (void) const;
   // Get the module name.
   void name (const ASYS_TCHAR *);
   // Set the module name.
 
-  // = Argument to the Tasks. 
+  // = Argument to the Tasks.
   void *arg (void) const;
   // Get the argument passed to the tasks.
 
@@ -139,7 +140,7 @@ public:
   // Set the argument passed to the tasks.
 
   void link (ACE_Module<ACE_SYNCH_USE> *m);
-  // Link to other modules in the ustream stack 
+  // Link to other modules in the ustream stack
 
   ACE_Module<ACE_SYNCH_USE> *next (void);
   // Get the next pointer to the module above in the stream.
@@ -158,7 +159,7 @@ private:
   // Implements the close operation for either the reader or the
   // writer task (depending on <which>).
 
-  ACE_Task<ACE_SYNCH_USE> *q_pair_[2];   
+  ACE_Task<ACE_SYNCH_USE> *q_pair_[2];
   // Pair of Tasks that form the "read-side" and "write-side" of the
   // ACE_Module partitioning.
 
diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h
index 53287a6e4d8..941bb3e8972 100644
--- a/ace/Msg_WFMO_Reactor.h
+++ b/ace/Msg_WFMO_Reactor.h
@@ -21,7 +21,7 @@
 #include "ace/WFMO_Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_WIN32)
@@ -100,7 +100,7 @@ protected:
   // Check for activity on remaining handles.
 
   virtual int dispatch_window_messages (void);
-  // Dispatches window messages. 
+  // Dispatches window messages.
 };
 
 #endif /* ACE_WIN32 */
diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h
index 6a77bd47d2f..081cbabb2a2 100644
--- a/ace/Multiplexor.h
+++ b/ace/Multiplexor.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Multiplexor.h
 //
@@ -15,20 +15,21 @@
 //     of need.
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_MULTIPLEXOR_H
 #define ACE_MULTIPLEXOR_H
 
 #include "ace/Module.h"
-#include "ace/Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Map_Manager.h"
+
 #if defined (ACE_HAS_THREADS)
 
 #if 0
@@ -42,7 +43,7 @@ class ACE_Export ACE_Driver
 public:
   ACE_Driver (void);
   ~ACE_Driver (void);
-  
+
   virtual int link_from_below (ACE_Module *mod);
   virtual ACE_Module *alloc_module (ACE_Driver *) = 0;
   virtual int unlink_from_below (ACE_Module *);
@@ -55,7 +56,7 @@ class ACE_Export ACE_Multiplexor
   // = DESCRIPTION
   //
 public:
-  // = Constructors and destructors 
+  // = Constructors and destructors
   ACE_Multiplexor (void);
   ~ACE_Multiplexor (void);
 
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index c1244ec9f85..280fbf9d584 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    NT_Service.h
 //
 // = AUTHOR
 //    Steve Huston
-// 
+//
 // ============================================================================
 
 #ifndef ACE_NT_SERVICE_H
@@ -20,7 +20,7 @@
 #include "ace/inc_user_config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 != 0
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index 2e442cf1a31..446afbc9cc7 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -22,16 +22,17 @@
 #define ACE_NAME_PROXY_H
 
 #include "ace/INET_Addr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Service_Config.h"
 #include "ace/Synch_Options.h"
 #include "ace/Name_Request_Reply.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler
 {
   // = TITLE
@@ -47,12 +48,12 @@ public:
 
   // = Establish a binding with the ACE_Name Server.
   ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, // Address of ACE_Name Server.
-		  ACE_Synch_Options& options =
-		  ACE_Synch_Options::defaults);
+                  ACE_Synch_Options& options =
+                  ACE_Synch_Options::defaults);
 
   int open (const ACE_INET_Addr &remote_addr,  // Address of ACE_Name Server.
-	    ACE_Synch_Options& options =
-	    ACE_Synch_Options::defaults);
+            ACE_Synch_Options& options =
+            ACE_Synch_Options::defaults);
 
   int request_reply (ACE_Name_Request &request);
   // Perform the request and wait for the reply.
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index fe43ed7ea0b..77470882185 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -22,12 +22,13 @@
 #define ACE_NAME_REQUEST_REPLY_H
 
 #include "ace/Time_Value.h"
-#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SString.h"
+
 class ACE_Export ACE_Name_Request
 {
   // = TITLE
@@ -65,13 +66,13 @@ public:
   // Default constructor.
 
   ACE_Name_Request (ACE_INT32 msg_type, // Type of request.
-		    const ACE_USHORT16 name[], //
-		    const size_t name_length,
-		    const ACE_USHORT16 value[],
-		    const size_t value_length,
-		    const char type[],
-		    const size_t type_length,
-		    ACE_Time_Value *timeout = 0); // Max time willing to wait for request.
+                    const ACE_USHORT16 name[], //
+                    const size_t name_length,
+                    const ACE_USHORT16 value[],
+                    const size_t value_length,
+                    const char type[],
+                    const size_t type_length,
+                    ACE_Time_Value *timeout = 0); // Max time willing to wait for request.
   // Create a <ACE_Name_Request> message.
 
   void init (void);
diff --git a/ace/Name_Space.h b/ace/Name_Space.h
index 553da801745..b6f627757d0 100644
--- a/ace/Name_Space.h
+++ b/ace/Name_Space.h
@@ -18,14 +18,15 @@
 #define ACE_NAME_SPACE_H
 
 #include "ace/ACE.h"
-#include "ace/SString.h"
-#include "ace/Containers.h"
-#include "ace/Name_Proxy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SString.h"
+#include "ace/Containers.h"
+#include "ace/Name_Proxy.h"
+
 typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET;
 
 class ACE_Export ACE_Name_Binding
@@ -35,8 +36,8 @@ class ACE_Export ACE_Name_Binding
 public:
   // = Initialization and termination.
   ACE_Name_Binding (const ACE_WString &n,
-		    const ACE_WString &v,
-		    const char *t);
+                    const ACE_WString &v,
+                    const char *t);
   // Main constructor that initializes all the fields.
 
   ACE_Name_Binding (void);
@@ -74,11 +75,11 @@ class ACE_Export ACE_Name_Space
 {
   // = TITLE
   //     Abstract base class that provides an abstract interface to
-  //	 the database without exposing any implemenation details.
+  //     the database without exposing any implemenation details.
   //
   // = DESCRIPTION
   //     Manages a Naming Service Name Space. Provides the basic
-  //	 methods -- bind, unbind, rebind, find, and listnames.
+  //     methods -- bind, unbind, rebind, find, and listnames.
 public:
 
   virtual ~ACE_Name_Space (void);
@@ -86,14 +87,14 @@ public:
   // called.
 
   virtual int bind (const ACE_WString &name_in,
-		    const ACE_WString &value_in,
-		    const char *type_in = "") = 0;
+                    const ACE_WString &value_in,
+                    const char *type_in = "") = 0;
   // Bind a new name to a naming context (Wide character strings).
 
 
   virtual int rebind (const ACE_WString &name_in,
-		      const ACE_WString &value_in,
-		      const char *type_in = "") = 0;
+                      const ACE_WString &value_in,
+                      const char *type_in = "") = 0;
   // Overwrite the value or type of an existing name in a
   // ACE_Name_Space or bind a new name to the context, if it didn't
   // exist yet. (Wide charcter strings interface).
@@ -103,40 +104,40 @@ public:
   // Interface).
 
   virtual int resolve (const ACE_WString &name_in,
-		       ACE_WString &value_out,
-		       char *&type_out) = 0;
+                       ACE_WString &value_out,
+                       char *&type_out) = 0;
   // Get value and type of a given name binding (Wide chars).  The
   // caller is responsible for deleting both <value_out> and <type_out>!
 
   virtual int list_names (ACE_WSTRING_SET &set_out,
-			  const ACE_WString &pattern_in) = 0;
+                          const ACE_WString &pattern_in) = 0;
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string.
 
   virtual int list_values (ACE_WSTRING_SET &set_out,
-			   const ACE_WString &pattern_in) = 0;
+                           const ACE_WString &pattern_in) = 0;
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string.
 
   virtual int list_types (ACE_WSTRING_SET &set_out,
-			  const ACE_WString &pattern_in) = 0;
+                          const ACE_WString &pattern_in) = 0;
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string.
 
   virtual int list_name_entries (ACE_BINDING_SET &set,
-				 const ACE_WString &pattern) = 0;
+                                 const ACE_WString &pattern) = 0;
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
   virtual int list_value_entries (ACE_BINDING_SET &set,
-				  const ACE_WString &pattern) = 0;
+                                  const ACE_WString &pattern) = 0;
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
   virtual int list_type_entries (ACE_BINDING_SET &set,
-				 const ACE_WString &pattern) = 0;
+                                 const ACE_WString &pattern) = 0;
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index 7ca37dd3fd1..a8b51c9c3a5 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -18,16 +18,17 @@
 #define ACE_NAMING_CONTEXT_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SString.h"
 #include "ace/Containers.h"
 #include "ace/Service_Object.h"
 #include "ace/Name_Proxy.h"
 #include "ace/Name_Space.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Forward decl
 class ACE_Name_Options;
 
diff --git a/ace/OS.h b/ace/OS.h
index 460790ce6de..64e58ae8004 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -23,7 +23,7 @@
 # include "ace/inc_user_config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Get OS.h to compile on some of the platforms without DIR info yet.
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 846cda63454..b47274e39b6 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -20,7 +20,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Forward declarations.
diff --git a/ace/Obstack.h b/ace/Obstack.h
index 7313aa2acb0..a65c4ef1a8c 100644
--- a/ace/Obstack.h
+++ b/ace/Obstack.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Obstack.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_OBSTACK_H
@@ -20,16 +20,16 @@
 #include "ace/Malloc.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Obchunk
 {
   // = TITLE
-  //     Defines the state that represents a "chunk" of memory.  
+  //     Defines the state that represents a "chunk" of memory.
 public:
   friend class ACE_Obstack;
-  
+
   ACE_Obchunk (size_t size);
   // Constructor.
 
@@ -75,7 +75,7 @@ public:
   char *copy (const char *data,
               size_t len);
   // Copy the data into the current Obchunk.
-  
+
   void release (void);
   // "Release" the entire stack of Obchunks, putting it back on the
   // free list.
diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h
index 88b7fb7aaa8..b6975d1355d 100644
--- a/ace/Parse_Node.h
+++ b/ace/Parse_Node.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Parse_Node.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_PARSE_NODE_H
@@ -20,7 +20,7 @@
 #include "ace/Service_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Parse_Node
@@ -92,7 +92,7 @@ class ACE_Export ACE_Remove_Node : public ACE_Parse_Node
 public:
   ACE_Remove_Node (const char *name);
   ~ACE_Remove_Node (void);
-  
+
   virtual void apply (void);
 
   void dump (void) const;
@@ -273,7 +273,7 @@ class ACE_Export ACE_Static_Function_Node : public ACE_Location_Node
   // = TITLE
   //     Keeps track of the symbol name for a function that is not
   //     linked in from a DLL, but is statically linked with the
-  //     application. 
+  //     application.
 public:
   ACE_Static_Function_Node (const char *func_name);
   virtual void *symbol (ACE_Service_Object_Exterminator * = 0);
diff --git a/ace/Pipe.h b/ace/Pipe.h
index d11ca761678..8fa5cd5ce47 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Pipe.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_PIPE_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Pipe
@@ -31,7 +31,7 @@ class ACE_Export ACE_Pipe
   //
   // = DESCRIPTION
   //     Uses "name" for lookup in the ACE service repository. Obtains
-  //	 the object and returns it as the appropriate type.
+  //     the object and returns it as the appropriate type.
 public:
   // = Initialization and termination.
   ACE_Pipe (void);
@@ -61,7 +61,7 @@ public:
   // This is the "read" side of the pipe.  Note, however, that
   // processes can also write to this handle as well since pipes are
   // bi-directional.
-  
+
   ACE_HANDLE write_handle (void) const;
   // This is the "write" side of the pipe.  Note, however, that
   // processes can also read to this handle as well since pipes are
diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h
index 241ebd7d419..3857a488533 100644
--- a/ace/Priority_Reactor.h
+++ b/ace/Priority_Reactor.h
@@ -18,12 +18,13 @@
 #define ACE_PRIORITY_REACTOR_H
 
 #include "ace/Containers.h"
-#include "ace/Select_Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Select_Reactor.h"
+
 class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor
 {
   // = TITLE
@@ -37,13 +38,13 @@ public:
   // = Initialization and termination methods.
 
   ACE_Priority_Reactor (ACE_Sig_Handler * = 0,
-			ACE_Timer_Queue * = 0);
+                        ACE_Timer_Queue * = 0);
   // Initialize <ACE_Priority_Reactor> with the default size.
 
   ACE_Priority_Reactor (size_t size,
-			int restart = 0,
-			ACE_Sig_Handler * = 0,
-			ACE_Timer_Queue * = 0);
+                        int restart = 0,
+                        ACE_Sig_Handler * = 0,
+                        ACE_Timer_Queue * = 0);
   // Initialize <ACE_Priority_Reactor> with size <size>.
 
   virtual ~ACE_Priority_Reactor (void);
@@ -59,11 +60,11 @@ protected:
   // = Dispatching methods.
 
   virtual int dispatch_io_set (int number_of_active_handles,
-			       int &number_dispatched,
-			       int mask,
-			       ACE_Handle_Set &dispatch_mask,
-			       ACE_Handle_Set &ready_mask,
-			       ACE_EH_PTMF callback);
+                               int &number_dispatched,
+                               int mask,
+                               ACE_Handle_Set &dispatch_mask,
+                               ACE_Handle_Set &ready_mask,
+                               ACE_EH_PTMF callback);
   // We simply override this function to implement the priority
   // dispatching.
 
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 22b4256ac15..2766a512b48 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -20,6 +20,11 @@
 #define ACE_PROACTOR_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Asynch_IO.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Event_Handler.h"
@@ -31,10 +36,6 @@
 #include "ace/Free_List.h"
 #include "ace/Pipe.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
     (defined (ACE_HAS_AIO_CALLS))
 // This only works on Win32 platforms and on Unix platforms supporting
@@ -70,13 +71,13 @@ public:
   // Constructor.
 
   int timeout (TIMER_QUEUE &timer_queue,
-	       ACE_Handler *handler,
-	       const void *arg,
-	       const ACE_Time_Value &cur_time);
+               ACE_Handler *handler,
+               const void *arg,
+               const ACE_Time_Value &cur_time);
   // This method is called when the timer expires.
 
   int cancellation (TIMER_QUEUE &timer_queue,
-		    ACE_Handler *handler);
+                    ACE_Handler *handler);
   // This method is called when the timer is canceled.
 
   int deletion (TIMER_QUEUE &timer_queue,
@@ -90,7 +91,7 @@ protected:
   // Set the proactor. This will fail, if one is already set!
 
   ACE_Proactor *proactor_;
-  // Handle to the proactor. This is needed for the completion port. 
+  // Handle to the proactor. This is needed for the completion port.
 };
 
 class ACE_Export ACE_Proactor : public ACE_Event_Handler
@@ -115,20 +116,20 @@ public:
   // <register_aio_with_proactor> call is used by
   // <ACE_Asynch_Operation> to store some information with the
   // Proactor after an <aio_> call is issued, so that the Proactor can
-  // retrive this information to do <aio_return> and <aio_error>. 
+  // retrive this information to do <aio_return> and <aio_error>.
 
 #if defined (ACE_HAS_AIO_CALLS)
   friend class ACE_Asynch_Accept_Handler;
   // For POSIX4 implementation, this class takes care of doing the
   // Asynch_Accept.
-  
+
   friend class ACE_AIO_Accept_Handler;
   // We need also this class with the Proactor to take care of
   // Asynch_Accept when we use AIO_CONTROL_BLOCKS.
 #endif /* ACE_HAS_AIO_CALLS */
 
   // = Here are the typedefs that the <ACE_Proactor> uses.
-  
+
   // @@ Can these typedefs be capitalized?
   typedef ACE_Timer_Queue_T<ACE_Handler *,
                             ACE_Proactor_Handle_Timeout_Upcall,
@@ -166,10 +167,10 @@ public:
   enum POSIX_COMPLETION_STRATEGY
   {
     // Use the real time signals and do <sigtimedwait> on the
-    // signals. 
+    // signals.
     RT_SIGNALS,
     // Store the <aio> control blocks with the <Proactor> and do
-    // <aio_suspend> on them, 
+    // <aio_suspend> on them,
     AIO_CONTROL_BLOCKS
   };
   // For Posix4-Compliat-Unix systems how the completion of the
@@ -217,14 +218,14 @@ public:
   // Close the IO completion port.
 
   virtual int register_handle (ACE_HANDLE handle,
-			       const void *completion_key);
+                               const void *completion_key);
   // This method adds the <handle> to the I/O completion port. This
   // function is a no-op function for Unix systems.
 
   // = Timer management.
   virtual long schedule_timer (ACE_Handler &handler,
-			       const void *act,
-			       const ACE_Time_Value &time);
+                               const void *act,
+                               const ACE_Time_Value &time);
   // Schedule a <handler> that will expire after <time>.  If it
   // expires then <act> is passed in as the value to the <handler>'s
   // <handle_timeout> callback method.  This method returns a
@@ -236,27 +237,27 @@ public:
   // failure (which is guaranteed never to be a valid <timer_id>.
 
   virtual long schedule_repeating_timer (ACE_Handler &handler,
-					 const void *act,
-					 const ACE_Time_Value &interval);
+                                         const void *act,
+                                         const ACE_Time_Value &interval);
 
   // Same as above except <interval> it is used to reschedule the
   // <handler> automatically.
 
   virtual long schedule_timer (ACE_Handler &handler,
-			       const void *act,
-			       const ACE_Time_Value &time,
-			       const ACE_Time_Value &interval);
+                               const void *act,
+                               const ACE_Time_Value &time,
+                               const ACE_Time_Value &interval);
   // This combines the above two methods into one. Mostly for backward
   // compatibility.
 
   virtual int cancel_timer (ACE_Handler &handler,
-			    int dont_call_handle_close = 1);
+                            int dont_call_handle_close = 1);
   // Cancel all timers associated with this <handler>.  Returns number
   // of timers cancelled.
 
   virtual int cancel_timer (long timer_id,
-			    const void **act = 0,
-			    int dont_call_handle_close = 1);
+                            const void **act = 0,
+                            int dont_call_handle_close = 1);
   // Cancel the single <ACE_Handler> that matches the <timer_id> value
   // (which was returned from the <schedule> method).  If <act> is
   // non-NULL then it will be set to point to the ``magic cookie''
@@ -291,7 +292,7 @@ public:
 
   size_t number_of_threads (void) const;
   void number_of_threads (size_t threads);
-  // Number of thread used as a parameter to CreatIoCompletionPort. 
+  // Number of thread used as a parameter to CreatIoCompletionPort.
 
   Timer_Queue *timer_queue (void) const;
   void timer_queue (Timer_Queue *);
@@ -308,11 +309,11 @@ public:
 
   POSIX_COMPLETION_STRATEGY posix_completion_strategy (void);
   // Return the completion strategy used.
-  
+
   int notify_asynch_accept (ACE_Asynch_Accept::Result* result);
   // Asynch_Accept calls this function to notify an accept to the
-  // Proactor. 
-#endif /* ACE_HAS_AIO_CALLS */  
+  // Proactor.
+#endif /* ACE_HAS_AIO_CALLS */
 
 protected:
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
@@ -320,14 +321,14 @@ protected:
   // when a Win32 object becomes signaled).
 
   virtual int handle_close (ACE_HANDLE handle,
-			    ACE_Reactor_Mask close_mask);
+                            ACE_Reactor_Mask close_mask);
   // Called when object is removed from the ACE_Reactor.
 
   void application_specific_code (ACE_Asynch_Result *asynch_result,
-				  u_long bytes_transferred,
-				  int success,
-				  const void *completion_key,
-				  u_long error);
+                                  u_long bytes_transferred,
+                                  int success,
+                                  const void *completion_key,
+                                  u_long error);
   // Protect against structured exceptions caused by user code when
   // dispatching handles.
 
@@ -351,15 +352,15 @@ protected:
       // Access needed to: convert Asynch_Timer into an OVERLAPPED
 
       Asynch_Timer (ACE_Handler &handler,
-		    const void *act,
-		    const ACE_Time_Value &tv,
-		    ACE_HANDLE event = ACE_INVALID_HANDLE);
+                    const void *act,
+                    const ACE_Time_Value &tv,
+                    ACE_HANDLE event = ACE_INVALID_HANDLE);
 
     protected:
       virtual void complete (u_long bytes_transferred,
-			     int success,
-			     const void *completion_key,
-			     u_long error = 0);
+                             int success,
+                             const void *completion_key,
+                             u_long error = 0);
       // This method calls the <handler>'s handle_timeout method
 
       ACE_Time_Value time_;
@@ -370,7 +371,7 @@ protected:
   POSIX_COMPLETION_STRATEGY posix_completion_strategy_;
   // Flag that indicates how the completion status is got from the OS
   // on the POSIX4-Compliant-Unix systems.
-  
+
   sigset_t RT_completion_signals_;
   // These signals are used for completion notification by the
   // Proactor.
@@ -380,30 +381,30 @@ protected:
   // user has specified someother signals in any of the
   // read/write/transmit operations, some other signals might also
   // have got masked.
-  
+
   ACE_AIO_Accept_Handler* aio_accept_handler_;
   // This class takes care of doing <accept> when we use
   // AIO_CONTROL_BLOCKS strategy.
-  
+
   aiocb *aiocb_list_ [ACE_RTSIG_MAX];
   // Use an array to keep track of all the aio's issued
-  // currently. We'll limit the array size to Maximum RT signals that 
+  // currently. We'll limit the array size to Maximum RT signals that
   // can be queued in a process.  This is the upper limit how many aio
   // operations can be pending at a time.
-  
+
   size_t aiocb_list_max_size_;
   // To maintain the maximum size of the array (list).
-  
+
   size_t aiocb_list_cur_size_;
   // To maintain the current size of the array (list).
 #elif defined (ACE_WIN32)
   ACE_HANDLE completion_port_;
   // Handle for the completion port. Unix doesnt have completion
   // ports.
- 
+
   size_t number_of_threads_;
   // This number is passed to the <CreatIOCompletionPort> system
-  // call. 
+  // call.
 #endif /* ACE_HAS_AIO_CALLS */
 
   Timer_Queue *timer_queue_;
@@ -447,7 +448,7 @@ class ACE_Export ACE_Proactor
 public:
   class Timer_Queue {};
   ACE_Proactor (size_t /* number_of_threads */ = 0,
-		Timer_Queue * /* tq */ = 0) {}
+                Timer_Queue * /* tq */ = 0) {}
   virtual int handle_events (void) { return -1; }
   virtual int handle_events (ACE_Time_Value &) { return -1; }
 
diff --git a/ace/Process.h b/ace/Process.h
index 3bcaa596d4a..0b0580a17df 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -20,7 +20,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Process_Options
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index 62e347b70af..f9ddd2b05f5 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    Process_Manager.h 
+//    Process_Manager.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_PROCESS_MANAGER_H
 #define ACE_PROCESS_MANAGER_H
 
 #include "ace/Synch.h"
-#include "ace/Process.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Process.h"
+
 class ACE_Export ACE_Process_Descriptor
 {
   // = TITLE
@@ -37,7 +38,7 @@ private:
 
   pid_t proc_id_;
   // Unique process ID.
-    
+
   gid_t grp_id_;
   // Unique group ID.
 
@@ -51,7 +52,7 @@ class ACE_Export ACE_Process_Manager
   //    Manages a pool of processs.
   //
   // = DESCRIPTION
-  //    This class allows operations on groups of processs atomically. 
+  //    This class allows operations on groups of processs atomically.
 public:
   friend class ACE_Process_Control;
 
@@ -64,10 +65,10 @@ public:
   ACE_Process_Manager (size_t size = ACE_Process_Manager::DEFAULT_SIZE);
   ~ACE_Process_Manager (void);
 
-  int open (size_t size = DEFAULT_SIZE); 
+  int open (size_t size = DEFAULT_SIZE);
   // Initialize the manager with room for SIZE processs.
 
-  int close (void);		
+  int close (void);
   // Release all resources.
 
   pid_t spawn (ACE_Process_Options &options);
@@ -78,11 +79,11 @@ public:
 
   int spawn_n (size_t n, ACE_Process_Options &options);
   // Create N new processs.
-  
+
   // Returns: on success a unique group id that can be used to control
   // all of the processs in the same group.  On failure, returns -1.
 
-  int wait (ACE_Time_Value *timeout = 0);	
+  int wait (ACE_Time_Value *timeout = 0);
   // Block until there are no more processs running or <timeout>
   // expires.  Returns 0 on success and -1 on failure.
 
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index 4d0bafee63f..daae4348146 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -18,13 +18,14 @@
 #define ACE_PROFILE_TIMER_H
 
 #include "ace/ACE.h"
-#include "ace/Time_Value.h"
-#include "ace/High_Res_Timer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Time_Value.h"
+#include "ace/High_Res_Timer.h"
+
 class ACE_Export ACE_Profile_Timer
 {
   // = TITLE
@@ -36,13 +37,13 @@ public:
   {
     // = TITLE
     //    Keeps track of the various user, system, and elapsed (real)
-    //    times.  
-    // 
+    //    times.
+    //
     // = DESCRIPTION
     //   If <ACE_HAS_FLOATING_POINT> is enabled these values are in
     //   microseconds, otherwise, they are in seconds.
   public:
-    ACE_timer_t real_time;    
+    ACE_timer_t real_time;
     ACE_timer_t user_time;
     ACE_timer_t system_time;
   };
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 1bb7c589beb..e7a0c2ce470 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class RB_Tree_Node_Base
@@ -221,7 +221,7 @@ public:
 
 private:
   // = Declare private and do not define.
-  
+
   // Explicitly prevent assignment and copy construction of iterators
   ACE_UNIMPLEMENTED_FUNC (RB_Tree_Iterator (const RB_Tree_Iterator<KEY, T> &))
   ACE_UNIMPLEMENTED_FUNC (void operator = (const RB_Tree_Iterator<KEY, T> &))
diff --git a/ace/Reactor.h b/ace/Reactor.h
index 6620583f63d..87e1bf8b71c 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -23,6 +23,10 @@ class ACE_Reactor_Impl;
 // programs.
 #include "ace/Handle_Set.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Timer Queue is a complicated template class. A simple forward
 // declaration will not work
 #include "ace/Timer_Queue.h"
@@ -35,10 +39,6 @@ class ACE_Reactor_Impl;
 // forward declaration will be useful here
 #include "ace/Signal.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class ACE_Export ACE_Reactor
 {
   // = TITLE
@@ -74,8 +74,8 @@ public:
   static void close_singleton (void);
   // Delete the dynamically allocated Singleton
 
-  // = Reactor event loop management methods.  
-  
+  // = Reactor event loop management methods.
+
   // Note that these method ONLY work on the "Singleton Reactor,"
   // i.e., the one returned from <ACE_Reactor::instance>.
   static int run_event_loop (void);
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index d4edb289073..e5ed3b2f18f 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -22,7 +22,7 @@
 #include "ace/Timer_Queue.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Event_Handler.h contains the definition of ACE_Reactor_Mask
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index 9ad4ad605de..14f9dd066dd 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -18,12 +18,13 @@
 #define ACE_READ_BUFFER_H
 
 #include "ace/ACE.h"
-#include "ace/Malloc.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Malloc.h"
+
 class ACE_Export ACE_Read_Buffer
 {
   // = TITLE
diff --git a/ace/Registry.h b/ace/Registry.h
index 330a0e95d62..6a24b82df84 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -20,7 +20,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_WIN32)
@@ -171,7 +171,7 @@ public:
     // Friend factory
 
     enum { MAX_OBJECT_NAME_SIZE = BUFSIZ,
-	   MAX_CONTEXT_NAME_SIZE = MAXPATHLEN + 1 };
+           MAX_CONTEXT_NAME_SIZE = MAXPATHLEN + 1 };
     // Max sizes of names
     // (Not too sure about this value)
 
@@ -188,45 +188,45 @@ public:
     // The following interfaces are for objects
 
     int bind_new (const Name &name,
-		  const Object &object);
+                  const Object &object);
     // Insert <object> with <name> into <this> context
     // This will fail if <name> already exists
     // (Name version)
 
     int bind_new (const Istring &name,
-		  const Object &object);
+                  const Object &object);
     // Insert <object> with <name> into <this> context
     // This will fail if <name> already exists
     // (String version)
 
     int bind (const Name &name,
-	      const Object &object);
+              const Object &object);
     // Insert or update <object> with <name> into <this> context
     // This will not fail if <name> already exists
     // (Name version)
 
     int bind (const Istring &name,
-	      const Object &object);
+              const Object &object);
     // Insert or update <object> with <name> into <this> context
     // This will not fail if <name> already exists
     // (String version)
 
     int rebind (const Name &name,
-		const Object &object);
+                const Object &object);
     // Update <object> with <name> in <this> context
     // (Name version)
 
     int rebind (const Istring &name,
-		const Object &object);
+                const Object &object);
     // Update <object> with <name> in <this> context
 
     int resolve (const Name &name,
-		 Object &object);
+                 Object &object);
     // Find <object> with <name> in <this> context
     // (Name version)
 
     int resolve (const Istring &name,
-		 Object &object);
+                 Object &object);
     // Find <object> with <name> in <this> context
 
     int unbind (const Name &name);
@@ -243,57 +243,57 @@ public:
     // Create new <naming_context>
 
     int bind_new_context (const Name &name,
-			  Naming_Context &naming_context,
-			  u_long persistence = REG_OPTION_NON_VOLATILE,
-			  u_long security_access = KEY_ALL_ACCESS,
-			  LPSECURITY_ATTRIBUTES security_attributes = 0);
+                          Naming_Context &naming_context,
+                          u_long persistence = REG_OPTION_NON_VOLATILE,
+                          u_long security_access = KEY_ALL_ACCESS,
+                          LPSECURITY_ATTRIBUTES security_attributes = 0);
     // Insert <naming_context> with <name> relative to <this> context
     // This will fail if <name> already exists
     // (Name version)
 
     int bind_new_context (const Istring &name,
-			  Naming_Context &naming_context,
-			  u_long persistence = REG_OPTION_NON_VOLATILE,
-			  u_long security_access = KEY_ALL_ACCESS,
-			  LPSECURITY_ATTRIBUTES security_attributes = 0);
+                          Naming_Context &naming_context,
+                          u_long persistence = REG_OPTION_NON_VOLATILE,
+                          u_long security_access = KEY_ALL_ACCESS,
+                          LPSECURITY_ATTRIBUTES security_attributes = 0);
     // Insert <naming_context> with <name> relative to <this> context
     // This will fail if <name> already exists
 
     int bind_context (const Name &name,
-		      /* const */ Naming_Context &naming_context,
-		      u_long persistence = REG_OPTION_NON_VOLATILE,
-		      u_long security_access = KEY_ALL_ACCESS,
-		      LPSECURITY_ATTRIBUTES security_attributes = 0);
+                      /* const */ Naming_Context &naming_context,
+                      u_long persistence = REG_OPTION_NON_VOLATILE,
+                      u_long security_access = KEY_ALL_ACCESS,
+                      LPSECURITY_ATTRIBUTES security_attributes = 0);
     // Insert or update <naming_context> with <name> relative to <this> context
     // This will not fail if <name> already exists
     // (Name version)
 
     int bind_context (const Istring &name,
-		      /* const */ Naming_Context &naming_context,
-		      u_long persistence = REG_OPTION_NON_VOLATILE,
-		      u_long security_access = KEY_ALL_ACCESS,
-		      LPSECURITY_ATTRIBUTES security_attributes = 0);
+                      /* const */ Naming_Context &naming_context,
+                      u_long persistence = REG_OPTION_NON_VOLATILE,
+                      u_long security_access = KEY_ALL_ACCESS,
+                      LPSECURITY_ATTRIBUTES security_attributes = 0);
     // Insert or update <naming_context> with <name> relative to <this> context
     // This will not fail if <name> already exists
 
     int rebind_context (const Name &name,
-			/* const */ Naming_Context &naming_context);
+                        /* const */ Naming_Context &naming_context);
     // Rename <naming_context> to <name>
     // (Name version)
 
     int rebind_context (const Istring &name,
-			/* const */ Naming_Context &naming_context);
+                        /* const */ Naming_Context &naming_context);
     // Rename <naming_context> to <name>
 
     int resolve_context (const Name &name,
-			 Naming_Context &naming_context,
-			 u_long security_access = KEY_ALL_ACCESS);
+                         Naming_Context &naming_context,
+                         u_long security_access = KEY_ALL_ACCESS);
     // Find <naming_context> with <name> in <this> context
     // (Name version)
 
     int resolve_context (const Istring &name,
-			 Naming_Context &naming_context,
-			 u_long security_access = KEY_ALL_ACCESS);
+                         Naming_Context &naming_context,
+                         u_long security_access = KEY_ALL_ACCESS);
     // Find <naming_context> with <name> in <this> context
 
     int unbind_context (const Name &name);
@@ -307,8 +307,8 @@ public:
     // Same as unbind_context() with <this> as naming_context
 
     int list (u_long how_many,
-	      Binding_List &list,
-	      Binding_Iterator &iterator);
+              Binding_List &list,
+              Binding_Iterator &iterator);
     // listing function: iterator creator
     // This is useful when there are many objects and contexts
     // in <this> context and you only want to look at a few entries
@@ -398,7 +398,7 @@ public:
     // Next entry
 
     int next_n (u_long how_many,
-		Binding_List &list);
+                Binding_List &list);
     // Next <how_many> entries
 
     int destroy (void);
@@ -426,51 +426,51 @@ public:
       // Base class for state
       {
       public:
-	Iteration_State (Binding_Iterator &iterator);
+        Iteration_State (Binding_Iterator &iterator);
 
-	virtual int next_n (u_long how_many,
-			    Binding_List &list) = 0;
-	// Next <how_many> entries
+        virtual int next_n (u_long how_many,
+                            Binding_List &list) = 0;
+        // Next <how_many> entries
 
-	void reset ();
-	// Reset state
+        void reset ();
+        // Reset state
 
       protected:
-	Binding_Iterator *parent_;
-	// Pointer to parent iterator
+        Binding_Iterator *parent_;
+        // Pointer to parent iterator
 
-	u_long index_;
+        u_long index_;
       };
 
   private:
     class ACE_Export Object_Iteration : public Iteration_State
       {
       public:
-	Object_Iteration (Binding_Iterator &iterator);
+        Object_Iteration (Binding_Iterator &iterator);
 
-	int next_n (u_long how_many,
-		    Binding_List &list);
-	// Next <how_many> entries
+        int next_n (u_long how_many,
+                    Binding_List &list);
+        // Next <how_many> entries
       };
 
     class ACE_Export Context_Iteration : public Iteration_State
       {
       public:
-	Context_Iteration (Binding_Iterator &iterator);
+        Context_Iteration (Binding_Iterator &iterator);
 
-	int next_n (u_long how_many,
-		    Binding_List &list);
-	// Next <how_many> entries
+        int next_n (u_long how_many,
+                    Binding_List &list);
+        // Next <how_many> entries
       };
 
     class ACE_Export Iteration_Complete : public Iteration_State
       {
       public:
-	Iteration_Complete (Binding_Iterator &iterator);
+        Iteration_Complete (Binding_Iterator &iterator);
 
-	int next_n (u_long how_many,
-		    Binding_List &list);
-	// Next <how_many> entries
+        int next_n (u_long how_many,
+                    Binding_List &list);
+        // Next <how_many> entries
       };
 
     friend class Iteration_State;
@@ -504,8 +504,8 @@ class ACE_Export ACE_Predefined_Naming_Contexts
   //     predefined registries.
 public:
   static int connect (ACE_Registry::Naming_Context &naming_context,
-		      HKEY predefined = HKEY_LOCAL_MACHINE,
-		      LPCTSTR machine_name = 0);
+                      HKEY predefined = HKEY_LOCAL_MACHINE,
+                      LPCTSTR machine_name = 0);
   // Factory method for connecting to predefined registries.  This
   // method works for both remote and local machines.  However, for
   // remote machines, HKEY_CLASSES_ROOT and HKEY_CURRENT_USER types
diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h
index 8ce4ea191e8..e84fbef7b30 100644
--- a/ace/Registry_Name_Space.h
+++ b/ace/Registry_Name_Space.h
@@ -20,7 +20,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if (defined (ACE_WIN32) && defined (UNICODE))
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index a94036d53ef..3ba0b8edce9 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -18,15 +18,16 @@
 #define ACE_REMOTE_NAME_SPACE_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SString.h"
 #include "ace/Containers.h"
 #include "ace/Name_Proxy.h"
 #include "ace/Name_Space.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET;
 
 class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index a91bba25809..f9fd4ee6664 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -5,30 +5,31 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
 //    Remote_Tokens.h
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu) and
 //    Tim Harrison (harrison@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_REMOTE_MUTEX_H
 #define ACE_REMOTE_MUTEX_H
 
 #include "ace/INET_Addr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Synch_Options.h"
 #include "ace/Local_Tokens.h"
 #include "ace/Token_Request_Reply.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy
 {
   // = TITLE
@@ -51,8 +52,8 @@ public:
   // Death.
 
   int open (const char *name,
-	    int ignore_deadlock = 0,
-	    int debug = 0);
+            int ignore_deadlock = 0,
+            int debug = 0);
   // Same as Token_Proxy. <name> is the string uniquely identifying
   // the token.  <ignore_deadlock> can be 1 to disable deadlock
   // notifications.  <debug> prints debug messages.
@@ -67,9 +68,9 @@ public:
   // remote tokens.
 
   virtual int acquire (int notify = 0,
-		       void (*sleep_hook)(void *) = 0,
-		       ACE_Synch_Options &options =
-		       ACE_Synch_Options::synch);
+                       void (*sleep_hook)(void *) = 0,
+                       ACE_Synch_Options &options =
+                       ACE_Synch_Options::synch);
   // Acquire the distributed token.  If notify is specified and the
   // token is already held, the owner is notified.  options contains
   // the timeout value for the acquire call.  The timer is kept at the
@@ -83,8 +84,8 @@ public:
   // EWOULDBLOCK if the token was already held.
 
   virtual int renew (int requeue_position = 0,
-		     ACE_Synch_Options &options =
-		     ACE_Synch_Options::synch);
+                     ACE_Synch_Options &options =
+                     ACE_Synch_Options::synch);
   // Renew the token by offering to release it if there are any other
   // waiters, otherwise get the token back immediately.  This renew
   // has the same semantics as ACE_Local_Mutex release.  It is
@@ -98,14 +99,14 @@ public:
   // the position in the waiter list.)
 
   virtual int release (ACE_Synch_Options &options =
-		       ACE_Synch_Options::synch);
+                       ACE_Synch_Options::synch);
   // Release the distributed token. Similar to ACE_Local_Mutex, if the
   // caller is not the owner, it is removed from the waiter list (if
   // applicable.) Returns 0 on success, -1 on failure with <errno> ==
   // problem.
 
   virtual int remove (ACE_Synch_Options &options =
-		      ACE_Synch_Options::synch);
+                      ACE_Synch_Options::synch);
   // Become interface compliant for ACE_Guard<>.  This has no
   // functionality.
 
@@ -130,7 +131,7 @@ protected:
   // if shadows report deadlock, go remote anyway
 
   int request_reply (ACE_Token_Request &request,
-		     ACE_Synch_Options &options);
+                     ACE_Synch_Options &options);
   // Perform the request and wait for the reply.
 };
 
@@ -153,8 +154,8 @@ public:
   // Null creation.  Remote_Token_Proxy::open must be called.
 
   ACE_Remote_Mutex (const char *token_name,
-		    int ignore_deadlock = 0,
-		    int debug = 0);
+                    int ignore_deadlock = 0,
+                    int debug = 0);
   // Calls Remote_Token_Proxy::open for you.
 
   void dump (void) const;
@@ -186,8 +187,8 @@ public:
   ACE_Remote_RLock (void);
 
   ACE_Remote_RLock (const char *token_name,
-		    int ignore_deadlock = 0,
-		    int debug = 0);
+                    int ignore_deadlock = 0,
+                    int debug = 0);
 
   ACE_Remote_RLock (const ACE_Remote_RLock &mutex);
 
@@ -222,8 +223,8 @@ public:
   ACE_Remote_WLock (void);
 
   ACE_Remote_WLock (const char *token_name,
-		    int ignore_deadlock = 0,
-		    int debug = 0);
+                    int ignore_deadlock = 0,
+                    int debug = 0);
 
   ACE_Remote_WLock (const ACE_Remote_WLock &mutex);
 
diff --git a/ace/SOCK.h b/ace/SOCK.h
index a32ee1cddbb..9edfed18905 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -5,33 +5,34 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 //============================================================================
 
 #ifndef ACE_SOCK_H
 #define ACE_SOCK_H
 
 #include "ace/ACE.h"
-#include "ace/Addr.h"
-#include "ace/IPC_SAP.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Addr.h"
+#include "ace/IPC_SAP.h"
+
 class ACE_Export ACE_SOCK : public ACE_IPC_SAP
 {
   // = TITLE
   //     An abstract class which forms the basis for more specific
   //     classes (such as ACE_SOCK_Acceptor and ACE_SOCK_Connector).
   //     Do not instantiate this class.
-  //  
+  //
   // = DESCRIPTION
   //    This class provides functions that are common to all of the
   //    SOCK-type classes. ACE_SOCK provides the ability to get and
@@ -41,15 +42,15 @@ public:
   ~ACE_SOCK (void);
   // Default ctor/dtor.
 
-  int set_option (int level, 
-                  int option, 
-                  void *optval, 
+  int set_option (int level,
+                  int option,
+                  void *optval,
                   int optlen) const;
   // Wrapper around the setsockopt() system call.
 
-  int get_option (int level, 
-                  int option, 
-                  void *optval, 
+  int get_option (int level,
+                  int option,
+                  void *optval,
                   int *optlen) const;
   // Wrapper around the getsockopt() system call.
 
@@ -70,17 +71,17 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-  int open (int type, 
-            int protocol_family, 
+  int open (int type,
+            int protocol_family,
             int protocol,
             int reuse_addr);
   // Wrapper around the <socket> system call.
 
 protected:
   ACE_SOCK (int type,
-	    int protocol_family, 
+            int protocol_family,
             int protocol = 0,
-	    int reuse_addr = 0);
+            int reuse_addr = 0);
   // Constructor with arguments to call the <socket> system call.
 
   ACE_SOCK (void);
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index a49611e64c1..381100bd9bb 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK_Acceptor.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SOCK_ACCEPTOR_H
 #define ACE_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Stream.h"
-#include "ace/Time_Value.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Time_Value.h"
+
 class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK
 {
   // = TITLE
@@ -34,28 +35,28 @@ public:
   ACE_SOCK_Acceptor (void);
   // Default constructor.
 
-  ACE_SOCK_Acceptor (const ACE_Addr &local_sap, 
-		     int reuse_addr = 0, 
-		     int protocol_family = PF_INET, 
-		     int backlog = 5, 
-		     int protocol = 0);
+  ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
+                     int reuse_addr = 0,
+                     int protocol_family = PF_INET,
+                     int backlog = 5,
+                     int protocol = 0);
     // Initiate a passive mode socket.
 
   ~ACE_SOCK_Acceptor (void);
   // Default dtor.
 
-  int open (const ACE_Addr &local_sap, 
-	    int reuse_addr = 0, 
-	    int protocol_family = PF_INET, 
-	    int backlog = 5, 
-	    int protocol = 0);
+  int open (const ACE_Addr &local_sap,
+            int reuse_addr = 0,
+            int protocol_family = PF_INET,
+            int backlog = 5,
+            int protocol = 0);
   // Initiate a passive mode socket.
-  
+
   // = Passive connection acceptance method.
-  int accept (ACE_SOCK_Stream &new_stream, 
-	      ACE_Addr *remote_addr = 0,
-	      ACE_Time_Value *timeout = 0, 
-	      int restart = 1,
+  int accept (ACE_SOCK_Stream &new_stream,
+              ACE_Addr *remote_addr = 0,
+              ACE_Time_Value *timeout = 0,
+              int restart = 1,
               int reset_new_handle = 0) const;
   // Accept a new data transfer connection.  A <timeout> of 0 means
   // block forever, a <timeout> of {0, 0} means poll.  <restart> == 1
@@ -72,15 +73,15 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
-  ACE_HANDLE shared_accept (ACE_Addr *remote_addr, 
-			    ACE_Time_Value *, 
-			    int restart,
+  ACE_HANDLE shared_accept (ACE_Addr *remote_addr,
+                            ACE_Time_Value *,
+                            int restart,
                             int reset_new_handle) const;
   // Shared by both the ACE_LSOCK_Acceptor and ACE_SOCK_Acceptor.
 
 private:
-  int get_remote_addr (ACE_Addr &) const; 
-  // Do not allow this function to percolate up to this interface... 
+  int get_remote_addr (ACE_Addr &) const;
+  // Do not allow this function to percolate up to this interface...
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h
index 623dad627ae..7eeac05577a 100644
--- a/ace/SOCK_CODgram.h
+++ b/ace/SOCK_CODgram.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK_CODgram.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SOCK_CODGRAM_H
 #define ACE_SOCK_CODGRAM_H
 
 #include "ace/SOCK_IO.h"
-#include "ace/Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Addr.h"
+
 class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO
 {
   // = TITLE
@@ -34,22 +35,22 @@ public:
   ACE_SOCK_CODgram (void);
   // Default constructor.
 
-  ACE_SOCK_CODgram (const ACE_Addr &remote_sap, 
-		    const ACE_Addr &local_sap = ACE_Addr::sap_any, 
-		    int protocol_family = PF_INET, 
-		    int protocol = 0,
-		    int reuse_addr = 0);
+  ACE_SOCK_CODgram (const ACE_Addr &remote_sap,
+                    const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                    int protocol_family = PF_INET,
+                    int protocol = 0,
+                    int reuse_addr = 0);
 
   ~ACE_SOCK_CODgram (void);
   // Default dtor.
 
   // Initiate a connected dgram.
 
-  int open (const ACE_Addr &remote_sap, 
- 	    const ACE_Addr &local_sap = ACE_Addr::sap_any, 
-	    int protocol_family = PF_INET, 
-	    int protocol = 0,
-	    int reuse_addr = 0);
+  int open (const ACE_Addr &remote_sap,
+            const ACE_Addr &local_sap = ACE_Addr::sap_any,
+            int protocol_family = PF_INET,
+            int protocol = 0,
+            int reuse_addr = 0);
   // Initiate a connected dgram.
 
   void dump (void) const;
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 175e6666d2a..57d52903f52 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    SOCK_Connector.h 
+//    SOCK_Connector.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SOCK_CONNECTOR_H
 #define ACE_SOCK_CONNECTOR_H
 
 #include "ace/SOCK_Stream.h"
-#include "ace/Time_Value.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Time_Value.h"
+
 class ACE_Export ACE_SOCK_Connector
 {
   // = TITLE
@@ -37,15 +38,15 @@ public:
   ACE_SOCK_Connector (void);
   // Default constructor.
 
-  ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, 
-		      const ACE_Addr &remote_sap,
-		      ACE_Time_Value *timeout = 0,
-		      const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		      int reuse_addr = 0,
-		      int flags = 0,
-		      int perms = 0,
-		      int protocol_family = PF_INET, 
-		      int protocol = 0);
+  ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
+                      const ACE_Addr &remote_sap,
+                      ACE_Time_Value *timeout = 0,
+                      const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                      int reuse_addr = 0,
+                      int flags = 0,
+                      int perms = 0,
+                      int protocol_family = PF_INET,
+                      int protocol = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -63,15 +64,15 @@ public:
   ~ACE_SOCK_Connector (void);
   // Default dtor.
 
-  int connect (ACE_SOCK_Stream &new_stream, 
-	       const ACE_Addr &remote_sap,
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
- 	       int flags = 0,
-	       int perms = 0,
-	       int protocol_family = PF_INET, 
-	       int protocol = 0); 
+  int connect (ACE_SOCK_Stream &new_stream,
+               const ACE_Addr &remote_sap,
+               ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               int reuse_addr = 0,
+               int flags = 0,
+               int perms = 0,
+               int protocol_family = PF_INET,
+               int protocol = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -87,9 +88,9 @@ public:
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   // = Completion routine.
-  int complete (ACE_SOCK_Stream &new_stream, 
-		ACE_Addr *remote_sap = 0,
-		ACE_Time_Value *timeout = 0);
+  int complete (ACE_SOCK_Stream &new_stream,
+                ACE_Addr *remote_sap = 0,
+                ACE_Time_Value *timeout = 0);
   // Try to complete a non-blocking connection.
   // If connection completion is successful then <new_stream> contains
   // the connected ACE_SOCK_Stream.  If <remote_sap> is non-NULL then it
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index 671ddfe6b45..edaa691a9ab 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -5,37 +5,38 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK_Dgram.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ===========================================================================
 
 #ifndef ACE_SOCK_DGRAM_H
 #define ACE_SOCK_DGRAM_H
 
 #include "ace/SOCK.h"
-#include "ace/Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Addr.h"
+
 class ACE_Export ACE_SOCK_Dgram : public ACE_SOCK
 {
   // = TITLE
   //     Defines the member functions for the ACE_SOCK datagram
-  //     abstraction. 
+  //     abstraction.
 public:
   // = Initialization routines.
   ACE_SOCK_Dgram (void);
   // Default constructor.
 
-  ACE_SOCK_Dgram (const ACE_Addr &local, 
-                  int protocol_family = PF_INET, 
+  ACE_SOCK_Dgram (const ACE_Addr &local,
+                  int protocol_family = PF_INET,
                   int protocol = 0,
                   int reuse_addr = 0);
   // Initiate a socket dgram.
@@ -43,29 +44,29 @@ public:
   ~ACE_SOCK_Dgram (void);
   // Default dtor.
 
-  int open (const ACE_Addr &local, 
-            int protocol_family = PF_INET, 
+  int open (const ACE_Addr &local,
+            int protocol_family = PF_INET,
             int protocol = 0,
             int reuse_addr = 0);
   // Initiate a socket dgram.
 
   // = Data transfer routines.
-  ssize_t send (const void *buf, 
-                size_t n, 
-                const ACE_Addr &addr, 
+  ssize_t send (const void *buf,
+                size_t n,
+                const ACE_Addr &addr,
                 int flags = 0) const;
   // Send an <n> byte <buf> to the datagram socket (uses sendto(3)).
 
-  ssize_t recv (void *buf, 
-                size_t n, 
-                ACE_Addr &addr, 
+  ssize_t recv (void *buf,
+                size_t n,
+                ACE_Addr &addr,
                 int flags = 0) const;
   // Receive an <n> byte <buf> from the datagram socket (uses
   // recvfrom(3)).
 
-  ssize_t recv (iovec *io_vec, 
-		ACE_Addr &addr, 
-		int flags = 0) const;
+  ssize_t recv (iovec *io_vec,
+                ACE_Addr &addr,
+                int flags = 0) const;
   // Allows a client to read from a socket without having to provide a
   // buffer to read.  This method determines how much data is in the
   // socket, allocates a buffer of this size, reads in the data, and
@@ -73,25 +74,25 @@ public:
   // deleting the member in the <iov_base> field of <io_vec> using the
   // ``delete []'' syntax.
 
-  ssize_t send (const iovec iov[], 
-                size_t n, 
-                const ACE_Addr &addr, 
+  ssize_t send (const iovec iov[],
+                size_t n,
+                const ACE_Addr &addr,
                 int flags = 0) const;
   // Send an <iovec> of size <n> to the datagram socket (uses
   // sendmsg(3)).
 
-  ssize_t recv (iovec iov[], 
-                size_t n, 
-                ACE_Addr &addr, 
-                int flags = 0) const;    
+  ssize_t recv (iovec iov[],
+                size_t n,
+                ACE_Addr &addr,
+                int flags = 0) const;
   // Recv an <iovec> of size <n> to the datagram socket (uses
   // recvmsg(3)).
 
-  ssize_t recv (void *buf, 
-		size_t n, 
-		ACE_Addr &addr, 
-		int flags, 
-		const ACE_Time_Value *timeout) const;
+  ssize_t recv (void *buf,
+                size_t n,
+                ACE_Addr &addr,
+                int flags,
+                const ACE_Time_Value *timeout) const;
   // Wait up to <timeout> amount of time to receive a datagram into
   // <buf>.  The <ACE_Time_Value> indicates how long to blocking
   // trying to receive.  If <timeout> == 0, the caller will block
@@ -106,13 +107,13 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-protected:  
-  int shared_open (const ACE_Addr &local, 
+protected:
+  int shared_open (const ACE_Addr &local,
                    int protocol_family);
   // Open is shared by this and by <LSOCK_Dgram>.
 
 private:
-  int  get_remote_addr (ACE_Addr &) const; 
+  int  get_remote_addr (ACE_Addr &) const;
   // Do not allow this function to percolate up to this interface...
 };
 
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index 86e9c0e234f..0faf2391775 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -4,26 +4,27 @@
 // ============================================================================
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK_Dgram_Bcast.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SOCK_DGRAM_BCAST_H
 #define ACE_SOCK_DGRAM_BCAST_H
 
 #include "ace/INET_Addr.h"
-#include "ace/SOCK_Dgram.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ACE_Export ACE_Bcast_Node 
+#include "ace/SOCK_Dgram.h"
+
+class ACE_Export ACE_Bcast_Node
 {
 public:
   ACE_Bcast_Node (ACE_INET_Addr &, ACE_Bcast_Node *);
@@ -41,14 +42,14 @@ class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram
 {
   // = TITLE
   //     Defines the member functions for the ACE_SOCK datagram
-  //     abstraction. 
+  //     abstraction.
 public:
   // = Initialization and termination methods.
   ACE_SOCK_Dgram_Bcast (void);
   // Default constructor.
 
-  ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, 
-                        int protocol_family = PF_INET, 
+  ACE_SOCK_Dgram_Bcast (const ACE_Addr &local,
+                        int protocol_family = PF_INET,
                         int protocol = 0,
                         int reuse_addr = 0,
                         const ASYS_TCHAR *host_name = 0);
@@ -58,8 +59,8 @@ public:
 
   // Initiate a connectionless datagram broadcast endpoint.
 
-  int open (const ACE_Addr &local, 
-            int protocol_family = PF_INET, 
+  int open (const ACE_Addr &local,
+            int protocol_family = PF_INET,
             int protocol = 0,
             int reuse_addr = 0,
             const ASYS_TCHAR *host_name = 0);
@@ -68,30 +69,30 @@ public:
   int close (void);
   // Close up and release dynamically allocated resources.
 
-  ssize_t send (const void *buf, 
-                size_t n, 
-                u_short portnum, 
+  ssize_t send (const void *buf,
+                size_t n,
+                u_short portnum,
                 int flags = 0) const;
   // Broadcast the datagram to every interface.  Returns the average
   // number of bytes sent.
 
-  ssize_t send (const iovec iov[], 
-                size_t n, 
-                u_short portnum, 
+  ssize_t send (const iovec iov[],
+                size_t n,
+                u_short portnum,
                 int flags = 0) const;
   // Broadcast the <iovec> datagrams to every interface.  Returns the
   // average number of bytes sent.
 
-  ssize_t send (const void *buf, 
-                size_t n, 
-                const ACE_Addr &addr, 
+  ssize_t send (const void *buf,
+                size_t n,
+                const ACE_Addr &addr,
                 int flags = 0) const;
   // Broadcast an N byte datagram to ADDR (note that addr must be
   // preassigned to the broadcast address of the subnet...).
 
-  ssize_t send (const iovec iov[], 
-                size_t n, 
-                const ACE_Addr &addr, 
+  ssize_t send (const iovec iov[],
+                size_t n,
+                const ACE_Addr &addr,
                 int flags = 0) const;
   // Broadcast an <iovec> of size <n> to <addr> as a datagram (note
   // that addr must be preassigned to the broadcast address of the
@@ -110,7 +111,7 @@ private:
   ACE_Bcast_Node *if_list_;
   // Points to the head of the list of broadcast interfaces.
 
-  int get_remote_addr (ACE_Addr &) const; 
+  int get_remote_addr (ACE_Addr &) const;
   // Do not allow this function to percolate up to this interface...
 };
 
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index 9209902f557..a5640829f7e 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -5,31 +5,32 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK_Dgram_Mcast.h
 //
 // = AUTHORS
 //    Irfan Pyrali (ip1@cs.wustl.edu)
 //    Tim Harrison (harrison@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_SOCK_DGRAM_MCAST_H
 #define ACE_SOCK_DGRAM_MCAST_H
 
 #include "ace/SOCK_Dgram.h"
-#include "ace/INET_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/INET_Addr.h"
+
 class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram
 {
   // = TITLE
   //     Defines the member functions for the ACE SOCK wrapper
-  //     multicast abstraction. 
+  //     multicast abstraction.
 public:
   // = Initialization routine.
   ACE_SOCK_Dgram_Mcast (void);
@@ -44,19 +45,19 @@ public:
   // = Multicast group management routines.
 
   int subscribe (const ACE_INET_Addr &mcast_addr,
-		 int reuse_addr = 1,
+                 int reuse_addr = 1,
 #if defined (ACE_PSOS)
                  // pSOS supports numbers, not names for network interfaces
-		 long net_if = 0,
+                 long net_if = 0,
 #else
-		 const ASYS_TCHAR *net_if = 0,
+                 const ASYS_TCHAR *net_if = 0,
 #endif /* defined (ACE_PSOS) */
-		 int protocol_family = PF_INET,
-		 int protocol = 0);
+                 int protocol_family = PF_INET,
+                 int protocol = 0);
   // Join a multicast group by telling the network interface device
   // driver to accept datagrams with ACE_INET_Addr &mcast_addr
   // multicast addresses.
-  // 
+  //
   // If you have called open already, subscribe closes the socket and
   // opens a new socket bound to the mcast_addr.
   //
@@ -67,15 +68,15 @@ public:
 
   int unsubscribe (const ACE_INET_Addr &mcast_addr,
 #if defined (ACE_PSOS)
-		   // pSOS supports numbers, not names for network interfaces
-		   long net_if = 0,
+                   // pSOS supports numbers, not names for network interfaces
+                   long net_if = 0,
 #else
-		   const ASYS_TCHAR *net_if = 0,
+                   const ASYS_TCHAR *net_if = 0,
 #endif /* defined (ACE_PSOS) */
-		   int protocol_family = PF_INET,
-		   int protocol = 0);
+                   int protocol_family = PF_INET,
+                   int protocol = 0);
   // Leave a multicast group.
-  // 
+  //
   // Interface is hardware specific. use netstat -i to find whether
   // your interface is, say, le0 or something else.  If net_if == 0,
   // subscribe uses the default mcast interface.
@@ -86,14 +87,14 @@ public:
   // failure.
 
   // = Data transfer routines.
-  ssize_t send (const void *buf, 
-                size_t n, 
+  ssize_t send (const void *buf,
+                size_t n,
                 int flags = 0) const;
   // Send <n> bytes in <buf>.
 
   ssize_t send (const iovec iov[],
-		size_t n,
-		int flags = 0) const;
+                size_t n,
+                int flags = 0) const;
   // Send <n> <iovecs>.
 
   // = Options.
@@ -110,43 +111,43 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  ACE_HANDLE open (const ACE_Addr &local, 
-		   int protocol_family = PF_INET, 
-		   int protocol = 0);
+  ACE_HANDLE open (const ACE_Addr &local,
+                   int protocol_family = PF_INET,
+                   int protocol = 0);
   // disable public use of ACE_SOCK_Dgram::open ()
 
   // = Disable public use of ACE_SOCK_Dgram::sends and force
   // ACE_SOCK_Dgram_Mcast::sends inline
-  ssize_t send (const void *buf, 
-		size_t n, 
-		const ACE_Addr &addr, 
-		int flags = 0) const;
-  ssize_t send (const iovec iov[], 
-		size_t n, 
-		const ACE_Addr &addr, 
-		int flags = 0) const;
+  ssize_t send (const void *buf,
+                size_t n,
+                const ACE_Addr &addr,
+                int flags = 0) const;
+  ssize_t send (const iovec iov[],
+                size_t n,
+                const ACE_Addr &addr,
+                int flags = 0) const;
 
   int make_multicast_address (const ACE_INET_Addr &mcast_addr,
 #if defined (ACE_PSOS)
                               // pSOS supports numbers, not
                               // names for network interfaces
-			      long net_if = 0
+                              long net_if = 0
 #else
-			      const ASYS_TCHAR *net_if = ASYS_TEXT ("le0")
+                              const ASYS_TCHAR *net_if = ASYS_TEXT ("le0")
 #endif /* defined (ACE_PSOS) */
                              );
   // Initialize the <multicast_addres_ field>
 
   int make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
-				ip_mreq& multicast_address,
+                                ip_mreq& multicast_address,
 #if defined (ACE_PSOS)
-				// pSOS supports numbers, not
-				// names for network interfaces
-				long net_if = 0
+                                // pSOS supports numbers, not
+                                // names for network interfaces
+                                long net_if = 0
 #else
-				const ASYS_TCHAR *net_if = ASYS_TEXT ("le0")
+                                const ASYS_TCHAR *net_if = ASYS_TEXT ("le0")
 #endif /* defined (ACE_PSOS) */
-				);
+                                );
   // Initialize a multicast address.
 
   ACE_INET_Addr mcast_addr_;
@@ -154,7 +155,7 @@ private:
 
   ip_mreq multicast_address_;
   // IP address.
-}; 
+};
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Dgram_Mcast.i"
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index 0a7592fe5d1..c6eaa4dbc8e 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK_IO.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SOCK_IO_H
@@ -20,7 +20,7 @@
 #include "ace/SOCK.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_SOCK_IO : public ACE_SOCK
@@ -68,9 +68,9 @@ public:
   // Recv a vector of an <n> byte messages to the connected socket.
 
   ssize_t send (const void *buf,
-                size_t n, 
+                size_t n,
                 int flags,
-		const ACE_Time_Value *timeout);
+                const ACE_Time_Value *timeout);
   // Wait to to <timeout> amount of time to send up to <n> bytes into
   // <buf> from <handle> (uses the <send> call).  If <send> times out
   // a -1 is returned with <errno == ETIME>.  If it succeeds the
@@ -78,16 +78,16 @@ public:
 
   ssize_t recv (void *buf,
                 size_t n,
-                int flags, 
-		const ACE_Time_Value *timeout);
+                int flags,
+                const ACE_Time_Value *timeout);
   // Wait up to <timeout> amount of time to receive up to <n> bytes
   // into <buf> from <handle> (uses the <recv> call).  If <recv> times
   // out a -1 is returned with <errno == ETIME>.  If it succeeds the
   // number of bytes received is returned.
 
   ssize_t send (const void *buf,
-                size_t n, 
-		const ACE_Time_Value *timeout);
+                size_t n,
+                const ACE_Time_Value *timeout);
   // Wait to to <timeout> amount of time to send up to <n> bytes into
   // <buf> from <handle> (uses the <send> call).  If <send> times out
   // a -1 is returned with <errno == ETIME>.  If it succeeds the
@@ -95,7 +95,7 @@ public:
 
   ssize_t recv (void *buf,
                 size_t n,
-		const ACE_Time_Value *timeout);
+                const ACE_Time_Value *timeout);
   // Wait up to <timeout> amount of time to receive up to <n> bytes
   // into <buf> from <handle> (uses the <recv> call).  If <recv> times
   // out a -1 is returned with <errno == ETIME>.  If it succeeds the
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index 862d46d2bc8..1eb5fd3a3bd 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -5,30 +5,31 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SOCK_Stream.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SOCK_STREAM_H
 #define ACE_SOCK_STREAM_H
 
 #include "ace/SOCK_IO.h"
-#include "ace/INET_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/INET_Addr.h"
+
 class ACE_Export ACE_SOCK_Stream : public ACE_SOCK_IO
 {
   // = TITLE
   //     Defines the methods in the <ACE_SOCK_Stream> abstraction.
-  //     
+  //
   // = DESCRIPTION
   //     This adds additional wrapper methods atop the <ACE_SOCK_IO>
   //     class.
@@ -40,29 +41,29 @@ public:
   //= The following two methods use write and read system calls.
   ssize_t send_n (const void *buf, int n) const;
   // Send n bytes, keep trying until n are sent.
-  ssize_t recv_n (void *buf, int n) const;	      
+  ssize_t recv_n (void *buf, int n) const;
   // Recv n bytes, keep trying until n are received.
 
   // = The following two methods use the send and recv system calls.
   ssize_t send_n (const void *buf, int n, int flags) const;
   // Send n bytes, keep trying until n are sent.
-  ssize_t recv_n (void *buf, int n, int flags) const;	      
+  ssize_t recv_n (void *buf, int n, int flags) const;
   // Recv n bytes, keep trying until n are received.
 
-  ssize_t send_n (const void *buf, 
-		  size_t len, 
-		  int flags,
-		  const ACE_Time_Value *timeout);
+  ssize_t send_n (const void *buf,
+                  size_t len,
+                  int flags,
+                  const ACE_Time_Value *timeout);
   // Try to send exactly <len> bytes into <buf> from <handle> (uses
   // the <send> call).  If <send> blocks for longer than <timeout> the
   // number of bytes actually sent is returned with <errno == ETIME>.
   // If a timeout does not occur, <send_n> return <len> (i.e., the
   // number of bytes requested to be sent).
 
-  ssize_t recv_n (void *buf, 
-		  size_t len, 
-		  int flags, 
-		  const ACE_Time_Value *timeout);
+  ssize_t recv_n (void *buf,
+                  size_t len,
+                  int flags,
+                  const ACE_Time_Value *timeout);
   // Try to recv exactly <len> bytes into <buf> from <handle> (uses
   // the <ACE::recv_n> call).  The <ACE_Time_Value> indicates how long
   // to blocking trying to receive.  If <timeout> == 0, the caller
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index ebfa0e63c2c..1d7cac465dc 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -5,30 +5,31 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SPIPE.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SPIPE_H
 #define ACE_SPIPE_H
 
 #include "ace/IPC_SAP.h"
-#include "ace/SPIPE_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SPIPE_Addr.h"
+
 class ACE_Export ACE_SPIPE : public ACE_IPC_SAP
 {
   // = TITLE
   //     Defines the member functions for the base class of the
-  //     ACE_SPIPE abstraction. 
+  //     ACE_SPIPE abstraction.
 public:
   int close (void);
   // Close down the STREAM pipe without removing the rendezvous point.
@@ -53,7 +54,7 @@ public:
 
 protected:
   ACE_SPIPE (void);
-  // Ensure that this class is an abstract base class 
+  // Ensure that this class is an abstract base class
 
   ACE_SPIPE_Addr local_addr_;
   // Our local address.
diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h
index cfcc88028ff..031ec388c76 100644
--- a/ace/SPIPE_Acceptor.h
+++ b/ace/SPIPE_Acceptor.h
@@ -5,45 +5,46 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SPIPE_Acceptor.h
 //
 // = AUTHOR
 //    Doug Schmidt and Prashant Jain
-// 
+//
 // ============================================================================
 
-#ifndef ACE_SPIPE_ACCEPTOR_H 
+#ifndef ACE_SPIPE_ACCEPTOR_H
 #define ACE_SPIPE_ACCEPTOR_H
 
 #include "ace/SPIPE_Stream.h"
-#if defined (ACE_WIN32)
-#include "ace/Synch.h"
-#endif /* ACE_WIN32 */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_WIN32)
+#include "ace/Synch.h"
+#endif /* ACE_WIN32 */
+
 class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE
 {
   // = TITLE
   //     Defines the format and interface for the listener side of the
-  //     ACE_SPIPE_Stream. 
+  //     ACE_SPIPE_Stream.
 public:
   // = Initialization and termination methods.
   ACE_SPIPE_Acceptor (void);
   // Default constructor.
 
-  ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, 
-		      int reuse_addr = 1,
-		      int perms = ACE_DEFAULT_FILE_PERMS);
+  ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap,
+                      int reuse_addr = 1,
+                      int perms = ACE_DEFAULT_FILE_PERMS);
   // Initiate a passive-mode STREAM pipe listener.
 
   int open (const ACE_SPIPE_Addr &local_sap,
-	    int reuse_addr = 1,
-	    int perms = ACE_DEFAULT_FILE_PERMS);
+            int reuse_addr = 1,
+            int perms = ACE_DEFAULT_FILE_PERMS);
   // Initiate a passive-mode STREAM pipe listener.
 
   int close (void);
@@ -53,10 +54,10 @@ public:
   // Remove the underlying mounted pipe from the file system.
 
   // = Passive connection acceptance method.
-  int accept (ACE_SPIPE_Stream &ipc_sap_spipe, 
-	      ACE_SPIPE_Addr *remote_addr = 0,
-	      ACE_Time_Value *timeout = 0,
-	      int restart = 1,
+  int accept (ACE_SPIPE_Stream &ipc_sap_spipe,
+              ACE_SPIPE_Addr *remote_addr = 0,
+              ACE_Time_Value *timeout = 0,
+              int restart = 1,
               int reset_new_handle = 0);
   // Accept a new data transfer connection.  A <timeout> of 0 means
   // block forever, a <timeout> of {0, 0} means poll.  <restart> == 1
@@ -77,9 +78,9 @@ private:
   // Create a new instance of an SPIPE.
 
 #if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
-  ACE_OVERLAPPED	overlapped_;
-  ACE_Manual_Event	event_;
-  char			already_connected_;
+  ACE_OVERLAPPED        overlapped_;
+  ACE_Manual_Event      event_;
+  char                  already_connected_;
 #endif /* ACE_WIN32 */
 
 };
diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h
index 04190b91cac..e35e6d85785 100644
--- a/ace/SPIPE_Addr.h
+++ b/ace/SPIPE_Addr.h
@@ -5,29 +5,30 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SPIPE_Addr.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SPIPE_ADDR_H
 #define ACE_SPIPE_ADDR_H
 
 #include "ace/Addr.h"
-#include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/ACE.h"
+
 class ACE_Export ACE_SPIPE_Addr : public ACE_Addr
 {
   // = TITLE
-  //    Defines the SVR4 STREAM pipe address family address format. 
+  //    Defines the SVR4 STREAM pipe address family address format.
 public:
   // = Initialization methods.
   ACE_SPIPE_Addr (void);
@@ -53,14 +54,14 @@ public:
 
 #if defined (UNICODE)
   virtual int addr_to_string (wchar_t *addr, size_t) const;
-  // Transform the current address into string format. 
+  // Transform the current address into string format.
 
   virtual int string_to_addr (const wchar_t *addr);
   // Transform the string into the current addressing format.
 #endif /* UNICODE */
 
   virtual int addr_to_string (char *addr, size_t) const;
-  // Transform the current address into string format. 
+  // Transform the current address into string format.
 
   virtual int string_to_addr (const char *addr);
   // Transform the string into the current addressing format.
@@ -73,7 +74,7 @@ public:
   // Check for inequality
 
   // = SPIPE-specific address operations
-  LPCTSTR get_path_name (void) const; 
+  LPCTSTR get_path_name (void) const;
   // Pathname of rendezvous point in file system.
 
   uid_t user_id (void) const;
@@ -94,7 +95,7 @@ public:
 
 private:
   // = This struct contains security attributes.
-  struct 
+  struct
   {
     gid_t gid_;
     // Group id.
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 34d5df2b01d..06761c4f30c 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SPIPE_Connector.h
 //
 // = AUTHOR
 //    Doug Schmidt and Prashant Jain
-// 
+//
 // ============================================================================
 
 #ifndef ACE_SPIPE_CONNECTOR_H
@@ -21,26 +21,26 @@
 #include "ace/SPIPE_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_SPIPE_Connector : public ACE_SPIPE
 {
   // = TITLE
   //     Defines an active connection factory for the STREAM pipe
-  //     wrappers. 
+  //     wrappers.
 public:
   // = Initialization method.
   ACE_SPIPE_Connector (void);
   // Default constructor.
 
-  ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, 
-		       const ACE_SPIPE_Addr &remote_sap, 
-		       ACE_Time_Value *timeout = 0,
-		       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		       int reuse_addr = 0,
-		       int flags = O_RDWR,
-		       int perms = 0);
+  ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
+                       const ACE_SPIPE_Addr &remote_sap,
+                       ACE_Time_Value *timeout = 0,
+                       const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                       int reuse_addr = 0,
+                       int flags = O_RDWR,
+                       int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -57,13 +57,13 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
-  int connect (ACE_SPIPE_Stream &new_io, 
-	       const ACE_SPIPE_Addr &remote_sap, 
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
-	       int flags = O_RDWR,
-	       int perms = 0);
+  int connect (ACE_SPIPE_Stream &new_io,
+               const ACE_SPIPE_Addr &remote_sap,
+               ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               int reuse_addr = 0,
+               int flags = O_RDWR,
+               int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index 91cb117c903..f21e17ed423 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SPIPE_Stream.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SPIPE_STREAM_H
 #define ACE_SPIPE_STREAM_H
 
 #include "ace/SPIPE.h"
-#include "ace/SPIPE_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SPIPE_Addr.h"
+
 class ACE_Export ACE_SPIPE_Stream : public ACE_SPIPE
 {
   // = TITLE
@@ -39,20 +40,20 @@ public:
   int get_remote_addr (ACE_SPIPE_Addr &remote_sap) const;
   // Obtain the address of whom we are connected with.
 
-  int send_handle (ACE_HANDLE handle) const;	 
-  // Send an open FD to another process. 
+  int send_handle (ACE_HANDLE handle) const;
+  // Send an open FD to another process.
 
-  int recv_handle (ACE_HANDLE &handle) const;		 
-  // Recv an open FD from another process. 
+  int recv_handle (ACE_HANDLE &handle) const;
+  // Recv an open FD from another process.
 
-  int recv_handle (strrecvfd &recvfd) const; 
-  // Recv an open FD from another process. 
+  int recv_handle (strrecvfd &recvfd) const;
+  // Recv an open FD from another process.
 
-  ssize_t send_n (const void *buf, size_t n) const; 
-  // Send n bytes, keep trying until n are sent. 
+  ssize_t send_n (const void *buf, size_t n) const;
+  // Send n bytes, keep trying until n are sent.
 
-  ssize_t recv_n (void *buf, size_t n) const;	      
-  // Recv n bytes, keep trying until n are received. 
+  ssize_t recv_n (void *buf, size_t n) const;
+  // Recv n bytes, keep trying until n are received.
 
   ssize_t send (const void *buf, size_t n) const;
   // Send bytes via STREAM pipes using "band" mode.
@@ -60,26 +61,26 @@ public:
   ssize_t recv (void *buf, size_t n) const;
   // Recv bytes via STREAM pipes using "band" mode.
 
-  ssize_t send (const ACE_Str_Buf *cntl, 
-		const ACE_Str_Buf *data, 
-		int flags = 0) const;
+  ssize_t send (const ACE_Str_Buf *cntl,
+                const ACE_Str_Buf *data,
+                int flags = 0) const;
   // Send <cntl> and <data> via STREAM pipes.
 
-  ssize_t recv (ACE_Str_Buf *cntl, 
-		ACE_Str_Buf *data, 
-		int *flags) const;
+  ssize_t recv (ACE_Str_Buf *cntl,
+                ACE_Str_Buf *data,
+                int *flags) const;
   // Recv <cntl> and <data> via STREAM pipes.
 
-  ssize_t send (const ACE_Str_Buf *cntl, 
-		const ACE_Str_Buf *data,
-		int band, 
-		int flags) const;
+  ssize_t send (const ACE_Str_Buf *cntl,
+                const ACE_Str_Buf *data,
+                int band,
+                int flags) const;
   // Send bytes via STREAM pipes using "band" mode.
 
-  ssize_t recv (ACE_Str_Buf *cntl, 
-		ACE_Str_Buf *data, 
-		int *band, 
-		int *flags) const;
+  ssize_t recv (ACE_Str_Buf *cntl,
+                ACE_Str_Buf *data,
+                int *band,
+                int *flags) const;
   // Recv bytes via STREAM pipes using "band" mode.
 
   ssize_t send (const iovec iov[], size_t n) const;
diff --git a/ace/SString.h b/ace/SString.h
index 6283d79587f..685d2ad465e 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Forward decl.
diff --git a/ace/SV_Message.h b/ace/SV_Message.h
index e28b25ff501..77b9a2c5c71 100644
--- a/ace/SV_Message.h
+++ b/ace/SV_Message.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SV_Message.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SV_MESSAGE_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_SV_Message
diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h
index 9e3a35ee7f7..fb86c9719e2 100644
--- a/ace/SV_Message_Queue.h
+++ b/ace/SV_Message_Queue.h
@@ -5,47 +5,48 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SV_Message_Queue.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_MESSAGE_QUEUE_H
 #define ACE_MESSAGE_QUEUE_H
 
 #include "ace/ACE.h"
-#include "ace/SV_Message.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SV_Message.h"
+
 class ACE_Export ACE_SV_Message_Queue
 {
   // = TITLE
   //     Defines the header file for the C++ wrapper for System V IPC
-  //     message queues.  
-public: 
+  //     message queues.
+public:
   // = Useful symbolic constants.
-  enum 
+  enum
   {
-    ACE_CREATE = IPC_CREAT, 
-    ACE_OPEN   = 0, 
+    ACE_CREATE = IPC_CREAT,
+    ACE_OPEN   = 0,
     ACE_NOWAIT = IPC_NOWAIT
   };
 
   // = Initialization and termination methods.
   ACE_SV_Message_Queue (void);
-  ACE_SV_Message_Queue (key_t external_id, 
-			int create = ACE_SV_Message_Queue::ACE_OPEN,
-			int perms = ACE_DEFAULT_FILE_PERMS);
-  int open (key_t external_id, 
-	    int create = ACE_SV_Message_Queue::ACE_OPEN,
-	    int perms = ACE_DEFAULT_FILE_PERMS);
+  ACE_SV_Message_Queue (key_t external_id,
+                        int create = ACE_SV_Message_Queue::ACE_OPEN,
+                        int perms = ACE_DEFAULT_FILE_PERMS);
+  int open (key_t external_id,
+            int create = ACE_SV_Message_Queue::ACE_OPEN,
+            int perms = ACE_DEFAULT_FILE_PERMS);
    // Open a message queue using the <external_id>.
 
   ~ACE_SV_Message_Queue (void);
@@ -59,14 +60,14 @@ public:
 
 
   // = Message transfer methods.
-  int recv (ACE_SV_Message &mb, 
-	    int length, 
-	    long mtype = 0, 
-	    int mflags = 0);
-
-  int send (const ACE_SV_Message &mb, 
-	    int length, 
-	    int mflags = 0);
+  int recv (ACE_SV_Message &mb,
+            int length,
+            long mtype = 0,
+            int mflags = 0);
+
+  int send (const ACE_SV_Message &mb,
+            int length,
+            int mflags = 0);
 
   int control (int option, void *arg = 0);
   // Access the underlying control operations.
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index 11b9d4ecbb6..4f904e56468 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //     ACE_SV_Semaphore_Complex.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SV_SEMAPHORE_COMPLEX_H
@@ -20,7 +20,7 @@
 #include "ace/SV_Semaphore_Simple.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple
@@ -55,39 +55,39 @@ class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple
   //      the array of SV_Semaphores (which may be sized by the user
   //      in the constructor).
 public:
-  enum 
+  enum
   {
-    ACE_CREATE = IPC_CREAT, 
+    ACE_CREATE = IPC_CREAT,
     ACE_OPEN   = 0
   };
 
   // = Initialization and termination methods.
   ACE_SV_Semaphore_Complex (void);
   ACE_SV_Semaphore_Complex (key_t key,
-			    int create = ACE_SV_Semaphore_Complex::ACE_CREATE,
-			    int initial_value = 1, 
-			    u_short nsems = 1, 
-			    int perms = ACE_DEFAULT_FILE_PERMS);
-  ACE_SV_Semaphore_Complex (const char *name, 
-			    int create = ACE_SV_Semaphore_Complex::ACE_CREATE, 
-			    int initial_value = 1, 
-			    u_short nsems = 1, 
-			    int perms = ACE_DEFAULT_FILE_PERMS);
+                            int create = ACE_SV_Semaphore_Complex::ACE_CREATE,
+                            int initial_value = 1,
+                            u_short nsems = 1,
+                            int perms = ACE_DEFAULT_FILE_PERMS);
+  ACE_SV_Semaphore_Complex (const char *name,
+                            int create = ACE_SV_Semaphore_Complex::ACE_CREATE,
+                            int initial_value = 1,
+                            u_short nsems = 1,
+                            int perms = ACE_DEFAULT_FILE_PERMS);
   ~ACE_SV_Semaphore_Complex (void);
 
-  int open (const char *name, 
-	    int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, 
-	    int initial_value = 1, 
-	    u_short nsems = 1, 
-	    int perms = ACE_DEFAULT_FILE_PERMS);
+  int open (const char *name,
+            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            int initial_value = 1,
+            u_short nsems = 1,
+            int perms = ACE_DEFAULT_FILE_PERMS);
   // Open or create an array of SV_Semaphores.  We return 0 if all is
   // OK, else -1.
 
-  int open (key_t key, 
-	    int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, 
-	    int initial_value = 1, 
-	    u_short nsems = 1, 
-	    int perms = ACE_DEFAULT_FILE_PERMS);
+  int open (key_t key,
+            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            int initial_value = 1,
+            u_short nsems = 1,
+            int perms = ACE_DEFAULT_FILE_PERMS);
   // Open or create an array of SV_Semaphores.  We return 0 if all is
   // OK, else -1.
 
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index 88997030e56..c904b07820e 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SV_Semaphore_Simple.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SV_SEMAPHORE_SIMPLE_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_SV_Semaphore_Simple
@@ -30,41 +30,41 @@ class ACE_Export ACE_SV_Semaphore_Simple
   //     no race conditions for initialization (i.e., the order of
   //     process startup must be well defined).
 public:
-  enum 
+  enum
   {
-    ACE_CREATE = IPC_CREAT, 
+    ACE_CREATE = IPC_CREAT,
     ACE_EXCL = IPC_EXCL,
     ACE_OPEN = 0
   };
 
   // = Initialization and termination methods.
   ACE_SV_Semaphore_Simple (void);
-  ACE_SV_Semaphore_Simple (key_t key, 
-			   int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
-			   int initial_value = 1,
-			   u_short nsems = 1, 
-			   int perms = ACE_DEFAULT_FILE_PERMS);
-  ACE_SV_Semaphore_Simple (const char *name, 
-			   int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, 
-			   int initial_value = 1, 
-			   u_short nsems = 1, 
-			   int perms = ACE_DEFAULT_FILE_PERMS);
+  ACE_SV_Semaphore_Simple (key_t key,
+                           int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+                           int initial_value = 1,
+                           u_short nsems = 1,
+                           int perms = ACE_DEFAULT_FILE_PERMS);
+  ACE_SV_Semaphore_Simple (const char *name,
+                           int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+                           int initial_value = 1,
+                           u_short nsems = 1,
+                           int perms = ACE_DEFAULT_FILE_PERMS);
   ~ACE_SV_Semaphore_Simple (void);
 
-  int open (const char *name, 
-	    int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, 
-	    int initial_value = 1, 
-	    u_short nsems = 1, 
-	    int perms = ACE_DEFAULT_FILE_PERMS);
-
-  int open (key_t key, 
-	    int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, 
-	    int initial_value = 1, 
-	    u_short nsems = 1, 
-	    int perms = ACE_DEFAULT_FILE_PERMS);
+  int open (const char *name,
+            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            int initial_value = 1,
+            u_short nsems = 1,
+            int perms = ACE_DEFAULT_FILE_PERMS);
+
+  int open (key_t key,
+            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            int initial_value = 1,
+            u_short nsems = 1,
+            int perms = ACE_DEFAULT_FILE_PERMS);
   // Open or create one or more SV_Semaphores.  We return 0 if all is
   // OK, else -1.
- 
+
   int close (void);
   // Close a ACE_SV_Semaphore, marking it as invalid for subsequent
   // operations...
@@ -104,7 +104,7 @@ public:
   // = Semaphore operation methods.
   int op (int val, u_short semnum = 0, int flags = SEM_UNDO) const;
   // General ACE_SV_Semaphore operation. Increment or decrement by a
-  // specific amount (positive or negative; amount can`t be zero). 
+  // specific amount (positive or negative; amount can`t be zero).
 
   int op (sembuf op_vec[], u_short nsems) const;
   // General ACE_SV_Semaphore operation on an array of SV_Semaphores.
diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h
index e1ff26755e0..4ebd960f1c0 100644
--- a/ace/SV_Shared_Memory.h
+++ b/ace/SV_Shared_Memory.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    SV_Shared_Memory.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SV_SHARED_MEMORY_H
@@ -21,7 +21,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_SV_Shared_Memory
@@ -29,38 +29,38 @@ class ACE_Export ACE_SV_Shared_Memory
   // = TITLE
   //     This is a wrapper for System V shared memory.
 public:
-  enum 
+  enum
   {
-    ACE_CREATE = IPC_CREAT, 
+    ACE_CREATE = IPC_CREAT,
     ACE_OPEN   = 0
   };
 
   // = Initialization and termination methods.
   ACE_SV_Shared_Memory (void);
-  ACE_SV_Shared_Memory (key_t external_id, 
-			size_t size, 
-			int create,
-			int perms = ACE_DEFAULT_FILE_PERMS, 
-			void *virtual_addr = 0, 
-			int flags = 0);
+  ACE_SV_Shared_Memory (key_t external_id,
+                        size_t size,
+                        int create,
+                        int perms = ACE_DEFAULT_FILE_PERMS,
+                        void *virtual_addr = 0,
+                        int flags = 0);
 
   ACE_SV_Shared_Memory (ACE_HANDLE internal_id,
-			int flags = 0);
-
-  int  open (key_t external_id, 
-	     size_t size,
-	     int create = ACE_SV_Shared_Memory::ACE_OPEN,
-	     int perms = ACE_DEFAULT_FILE_PERMS);
-
-  int  open_and_attach (key_t external_id, 
-			size_t size, 
-			int create = ACE_SV_Shared_Memory::ACE_OPEN,
-			int perms = ACE_DEFAULT_FILE_PERMS, 
-			void *virtual_addr = 0, 
-			int flags = 0);
-
-  int  attach (void *virtual_addr = 0, 
-	       int flags =0);
+                        int flags = 0);
+
+  int  open (key_t external_id,
+             size_t size,
+             int create = ACE_SV_Shared_Memory::ACE_OPEN,
+             int perms = ACE_DEFAULT_FILE_PERMS);
+
+  int  open_and_attach (key_t external_id,
+                        size_t size,
+                        int create = ACE_SV_Shared_Memory::ACE_OPEN,
+                        int perms = ACE_DEFAULT_FILE_PERMS,
+                        void *virtual_addr = 0,
+                        int flags = 0);
+
+  int  attach (void *virtual_addr = 0,
+               int flags =0);
   // Attach this shared memory segment.
 
   int  detach (void);
@@ -88,7 +88,7 @@ public:
 protected:
   enum
   {
-    ALIGN_WORDB = 8   // Most restrictive alignment. 
+    ALIGN_WORDB = 8   // Most restrictive alignment.
   };
 
   ACE_HANDLE internal_id_;
@@ -96,7 +96,7 @@ protected:
 
   int size_;
   // Size of the mapped segment.
-  
+
   void *segment_ptr_;
   // Pointer to the beginning of the segment.
 
diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h
index 06f4fc1dd8c..6817fd677d7 100644
--- a/ace/Sched_Params.h
+++ b/ace/Sched_Params.h
@@ -23,7 +23,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Sched_Params
@@ -172,7 +172,7 @@ class ACE_Export ACE_Sched_Priority_Iterator
 {
 public:
   ACE_Sched_Priority_Iterator (const ACE_Sched_Params::Policy &policy,
-			       int scope = ACE_SCOPE_THREAD);
+                               int scope = ACE_SCOPE_THREAD);
   // Initialize the iterator, the arguments define the scheduling
   // policy and scope for the priorities (see ACE_Sched_Param).
 
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index 42dad6db900..cff77d9225d 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -20,7 +20,7 @@
 #include "ace/Select_Reactor_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index bbf8d84c683..739c50e3dd7 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -18,6 +18,11 @@
 #define ACE_SELECT_REACTOR_BASE_H
 
 #include "ace/Signal.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Timer_Queue.h"
 #include "ace/Event_Handler.h"
 #include "ace/Handle_Set.h"
@@ -25,10 +30,6 @@
 #include "ace/Pipe.h"
 #include "ace/Reactor_Impl.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Add useful typedefs to simplify the following code.
 typedef void (ACE_Handle_Set::*ACE_FDS_PTMF) (ACE_HANDLE);
 typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE);
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index 6c8f1d20e2c..0c85859f460 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -20,7 +20,7 @@
 #include "ace/Select_Reactor_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class ACE_SELECT_REACTOR_MUTEX>
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 9d0725c75b9..b9238c199ee 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -18,14 +18,15 @@
 #define ACE_SERVICE_CONFIG_H
 
 #include "ace/Service_Object.h"
-#include "ace/Signal.h"
-#include "ace/Containers.h"
-#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Signal.h"
+#include "ace/Containers.h"
+#include "ace/SString.h"
+
 // Forward decl.
 class ACE_Service_Repository;
 class ACE_Service_Type;
@@ -71,9 +72,9 @@ public:
 };
 
 // Maintain a set of the statically linked service descriptors.
-typedef ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *> 
+typedef ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>
         ACE_STATIC_SVCS;
-typedef ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *> 
+typedef ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>
         ACE_STATIC_SVCS_ITERATOR;
 
 // Maintain a queue of services to be configured from the
@@ -106,7 +107,7 @@ public:
                       int signum = SIGHUP);
   // Initialize the Service Repository.
 
-  ACE_Service_Config (const ASYS_TCHAR program_name[], 
+  ACE_Service_Config (const ASYS_TCHAR program_name[],
                       LPCTSTR logger_key = ACE_DEFAULT_LOGGER_KEY);
   // Performs an open without parsing command-line arguments.
 
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index 9ea7876fef6..cf75238b1c0 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -6,27 +6,28 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Service_Manager.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SERVICE_MANAGER_H
 #define ACE_SERVICE_MANAGER_H
 
 #include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SOCK_Acceptor.h"
+#include "ace/INET_Addr.h"
+#include "ace/Service_Object.h"
+
 class ACE_Export ACE_Service_Manager : public ACE_Service_Object
 {
   // = TITLE
@@ -34,7 +35,7 @@ class ACE_Export ACE_Service_Manager : public ACE_Service_Object
   //     configured in an <ACE_Service_Repository>.
   //
   // = DESCRIPTION
-  //     This 
+  //     This
 public:
   // = Initialization and termination hooks.
   ACE_Service_Manager (void);
@@ -59,7 +60,7 @@ protected:
 
   // = Scheduling hooks.
   virtual int suspend (void);
-  virtual int resume (void);  
+  virtual int resume (void);
 
   void dump (void) const;
   // Dump the state of an object.
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index 144a5e04368..48d8ed8c318 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -5,30 +5,31 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Service_Object.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SERVICE_OBJECT_H
 #define ACE_SERVICE_OBJECT_H
 
 #include "ace/Shared_Object.h"
-#include "ace/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Event_Handler.h"
+
 class ACE_Export ACE_Service_Object : public ACE_Event_Handler, public ACE_Shared_Object
 {
   // = TITLE
   //     Provide the abstract base class common to all service
-  //     implementations.  
+  //     implementations.
   //
   // = DESCRIPTION
   //     Classes that inherit from <ACE_Service_Objects> are capable
@@ -54,34 +55,34 @@ class ACE_Export ACE_Service_Type
 {
   // = TITLE
   //      Keeps track of information related to the various
-  //      <ACE_Service_Type_Impl> subclasses.  
+  //      <ACE_Service_Type_Impl> subclasses.
   //
   // = DESCRIPTION
   //      This class acts as the interface of the "Bridge" pattern.
 public:
   enum
   {
-    DELETE_OBJ = 1, 
+    DELETE_OBJ = 1,
     // Delete the payload object.
 
-    DELETE_THIS = 2 
+    DELETE_THIS = 2
     // Delete the enclosing object.
   };
 
   // = Initialization and termination methods.
-  ACE_Service_Type (const ASYS_TCHAR *n, 
-                    ACE_Service_Type_Impl *o, 
-                    const ACE_SHLIB_HANDLE handle, 
+  ACE_Service_Type (const ASYS_TCHAR *n,
+                    ACE_Service_Type_Impl *o,
+                    const ACE_SHLIB_HANDLE handle,
                     int active);
   ~ACE_Service_Type (void);
-			 
+
   const ASYS_TCHAR *name (void) const;
   void name (const ASYS_TCHAR *);
   const char *chname (void) const;
 
   const ACE_Service_Type_Impl *type (void) const;
-  void type (const ACE_Service_Type_Impl *, 
-	     int active = 1);
+  void type (const ACE_Service_Type_Impl *,
+             int active = 1);
 
   ACE_SHLIB_HANDLE handle (void) const;
   void handle (const ACE_SHLIB_HANDLE);
@@ -101,7 +102,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  const ASYS_TCHAR *name_;   
+  const ASYS_TCHAR *name_;
   // Humanly readible name of svc.
 
 #if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
@@ -113,19 +114,19 @@ private:
   const ACE_Service_Type_Impl *type_;
   // Pointer to C++ object that implements the svc.
 
-  ACE_SHLIB_HANDLE handle_; 
+  ACE_SHLIB_HANDLE handle_;
   // Handle to shared object file (non-zero if dynamically linked).
 
-  int active_;  
+  int active_;
   // 1 if svc is currently active, otherwise 0.
 
-  int fini_already_called_;  
+  int fini_already_called_;
   // 1 if fini() on <type_> has already been called, otherwise 0.
 };
 
 class ACE_Export ACE_Service_Object_Ptr
 {
-  // = TITLE 
+  // = TITLE
   //     This is a smart pointer that holds onto the associated
   //     <ACE_Service_Object> * until the current scope is left, at
   //     which point the object's <fini> hook is called and the
@@ -135,7 +136,7 @@ class ACE_Export ACE_Service_Object_Ptr
   //     This class is similar to the Standard C++ Library class
   //     <auto_ptr>.  It is used in conjunction with statically linked
   //     <ACE_Service_Objects>, as shown in the
-  //     ./netsvcs/server/main.cpp example.  
+  //     ./netsvcs/server/main.cpp example.
 public:
   // = Initialization and termination methods.
   ACE_Service_Object_Ptr (ACE_Service_Object *so);
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index ca75e8b8777..572d8007bee 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Service_Repository.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SERVICE_REPOSITORY_H
@@ -20,7 +20,7 @@
 #include "ace/Service_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Service_Repository
@@ -41,7 +41,7 @@ class ACE_Export ACE_Service_Repository
 public:
   friend class ACE_Service_Repository_Iterator;
 
-  enum 
+  enum
   {
     DEFAULT_SIZE = 50
   };
@@ -78,14 +78,14 @@ public:
   static void close_singleton (void);
   // Delete the dynamically allocated Singleton.
 
-  // = Search structure operations (all acquire locks as necessary). 
+  // = Search structure operations (all acquire locks as necessary).
 
   int insert (const ACE_Service_Type *);
   // Insert a new service record.
 
-  int find (const ASYS_TCHAR name[], 
-	    const ACE_Service_Type **srp = 0, 
-	    int ignore_suspended = 1);
+  int find (const ASYS_TCHAR name[],
+            const ACE_Service_Type **srp = 0,
+            int ignore_suspended = 1);
   // Locate an entry with <name> in the table.  If <ignore_suspended>
   // is set then only consider services marked as resumed.  If the
   // caller wants the located entry, pass back a pointer to the
@@ -117,8 +117,8 @@ public:
 
 private:
   int find_i (const ASYS_TCHAR service_name[],
-	      const ACE_Service_Type ** = 0, 
-	      int ignore_suspended = 1);
+              const ACE_Service_Type ** = 0,
+              int ignore_suspended = 1);
   // Locates <service_name>.  Must be called without locks being
   // held...
 
@@ -138,8 +138,8 @@ private:
   // Must delete the <svc_rep_> if non-0.
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Thread_Mutex lock_; 
-  // Synchronization variable for the MT_SAFE Repository 
+  ACE_Thread_Mutex lock_;
+  // Synchronization variable for the MT_SAFE Repository
 #endif /* ACE_MT_SAFE */
 };
 
@@ -153,8 +153,8 @@ class ACE_Export ACE_Service_Repository_Iterator
   //     since this class is not designed as a "robust" iterator.
 public:
   // = Initialization and termination methods.
-  ACE_Service_Repository_Iterator (ACE_Service_Repository &sr, 
-				   int ignored_suspended = 1);
+  ACE_Service_Repository_Iterator (ACE_Service_Repository &sr,
+                                   int ignored_suspended = 1);
   // Constructor.
 
   ~ACE_Service_Repository_Iterator (void);
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index d4e2dde4fec..459419091bf 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Service_Types.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SERVICE_TYPE_H
 #define ACE_SERVICE_TYPE_H
 
 #include "ace/Service_Object.h"
-#include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch.h"
+
 class ACE_Export ACE_Service_Type_Impl
 {
   // = TITLE
@@ -39,9 +40,9 @@ class ACE_Export ACE_Service_Type_Impl
   //     <ACE_Service_Object>, <ACE_Module>, or <ACE_Stream>.
 public:
   // = Initialization and termination methods.
-  ACE_Service_Type_Impl (void *object, 
-			 const ASYS_TCHAR *s_name, 
-			 u_int flags = 0,
+  ACE_Service_Type_Impl (void *object,
+                         const ASYS_TCHAR *s_name,
+                         u_int flags = 0,
                          ACE_Service_Object_Exterminator gobbler = 0);
   virtual ~ACE_Service_Type_Impl (void);
 
@@ -76,7 +77,7 @@ protected:
   // points to an <ACE_Service_Object>, <ACE_Module>, or <ACE_Stream>.
 
   ACE_Service_Object_Exterminator gobbler_;
-  // Destroy function to deallocate obj_.  
+  // Destroy function to deallocate obj_.
 
   u_int flags_;
   // Flags that control serivce behavior (particularly deletion).
@@ -86,12 +87,12 @@ class ACE_Export ACE_Service_Object_Type : public ACE_Service_Type_Impl
 {
   // = TITLE
   //     Define the methods for handling the configuration of
-  //     <ACE_Service_Objects>. 
+  //     <ACE_Service_Objects>.
 public:
   // = Initialization method.
   ACE_Service_Object_Type (void *so,
-			   const ASYS_TCHAR *name, 
-			   u_int flags = 0,
+                           const ASYS_TCHAR *name,
+                           u_int flags = 0,
                            ACE_Service_Object_Exterminator gobbler = 0);
 
   ~ACE_Service_Object_Type (void);
@@ -108,12 +109,12 @@ class ACE_Export ACE_Module_Type : public ACE_Service_Type_Impl
 {
   // = TITLE
   //     Define the methods for handling the configuration of
-  //     <ACE_Modules>. 
+  //     <ACE_Modules>.
 public:
   // = Initialization method.
   ACE_Module_Type (void *m, // Really an <ACE_Module> *.
-		   const ASYS_TCHAR *identifier, 
-		   u_int flags = 0);
+                   const ASYS_TCHAR *identifier,
+                   u_int flags = 0);
 
   ~ACE_Module_Type (void);
 
@@ -135,7 +136,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  ACE_Module_Type *link_; 
+  ACE_Module_Type *link_;
   // Pointer to the next <ACE_Module_Type> in an <ACE_Stream_Type>.
 };
 
@@ -143,12 +144,12 @@ class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl
 {
   // = TITLE
   //     Define the methods for handling the configuration of
-  //     <ACE_Streams>. 
+  //     <ACE_Streams>.
 public:
   // = Initialization method.
   ACE_Stream_Type (void *s, // Really an <ACE_Stream> *.
-		   const ASYS_TCHAR *identifier, 
-		   u_int flags = 0);
+                   const ASYS_TCHAR *identifier,
+                   u_int flags = 0);
 
   ~ACE_Stream_Type (void);
 
diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h
index abf5c3aff50..c62e5fbd07e 100644
--- a/ace/Shared_Memory.h
+++ b/ace/Shared_Memory.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Shared_Memory.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SHARED_MEMORY_H
@@ -21,7 +21,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Shared_Memory
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index 59d0d457650..43d43d7cf04 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -18,12 +18,13 @@
 #define ACE_SHARED_MALLOC_MM_H
 
 #include "ace/Shared_Memory.h"
-#include "ace/Mem_Map.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Mem_Map.h"
+
 class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory
 {
   // = TITLE
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index a27ab8c6274..6c8a11ca409 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -6,51 +6,52 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Shared_Memory_SV.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SHARED_MALLOC_SV_H
 #define ACE_SHARED_MALLOC_SV_H
 
 #include "ace/Shared_Memory.h"
-#include "ace/SV_Shared_Memory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SV_Shared_Memory.h"
+
 class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory
 {
   // = TITLE
   //     Shared memory wrapper based on System V shared memory.
 public:
-  enum 
+  enum
     {
-      ACE_CREATE = IPC_CREAT, 
+      ACE_CREATE = IPC_CREAT,
       ACE_OPEN = 0
     };
 
   // = Initialization and termination methods.
   ACE_Shared_Memory_SV (void);
   ACE_Shared_Memory_SV (key_t id,
-			int length, 
-			int create = ACE_Shared_Memory_SV::ACE_OPEN,
-			int perms = ACE_DEFAULT_FILE_PERMS, 
-			void *addr = 0, 
-			int flags = 0);
+                        int length,
+                        int create = ACE_Shared_Memory_SV::ACE_OPEN,
+                        int perms = ACE_DEFAULT_FILE_PERMS,
+                        void *addr = 0,
+                        int flags = 0);
 
   int open (key_t id,
-	    int length, 
-	    int create = ACE_Shared_Memory_SV::ACE_OPEN, 
-	    int perms = ACE_DEFAULT_FILE_PERMS, 
-	    void *addr = 0, 
-	    int flags = 0);
+            int length,
+            int create = ACE_Shared_Memory_SV::ACE_OPEN,
+            int perms = ACE_DEFAULT_FILE_PERMS,
+            void *addr = 0,
+            int flags = 0);
 
   virtual int  close (void);
   // Close down the shared memory segment.
diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h
index c41c398484f..a73a83e8e63 100644
--- a/ace/Shared_Object.h
+++ b/ace/Shared_Object.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Shared_Object.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SHARED_OBJECT_H
@@ -21,7 +21,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Shared_Object
diff --git a/ace/Signal.h b/ace/Signal.h
index 8cd768cd72c..dc92c572b80 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -18,12 +18,13 @@
 #define ACE_SIGNAL_HANDLER_H
 
 #include "ace/Synch.h"
-#include "ace/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Event_Handler.h"
+
 // This worksaround a horrible bug with HP/UX C++...
 typedef struct sigaction ACE_SIGACTION;
 
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 419af5bac9c..14bb6461ccb 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -23,7 +23,7 @@
 #include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class TYPE, class ACE_LOCK>
@@ -51,9 +51,9 @@ class ACE_Singleton : public ACE_Cleanup
   //
   //     (a) Make the constructor of <T> private (or protected)
   //     (b) Make Singleton a friend of <T>
-  // 
+  //
   //     Here is an example:
-  // 
+  //
   //     class foo
   //     {
   //       friend class ACE_Singleton<foo, ACE_Null_Mutex>;
diff --git a/ace/Stats.h b/ace/Stats.h
index bb898833d4e..df4ae1eedbb 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -18,12 +18,13 @@
 #define ACE_STATS_H
 
 #include "ace/ACE.h"
-#include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Containers.h"
+
 class ACE_Export ACE_Stats_Value
 {
   // = TITLE
diff --git a/ace/Strategies.h b/ace/Strategies.h
index e06bd9a6963..8e8407b3a6e 100644
--- a/ace/Strategies.h
+++ b/ace/Strategies.h
@@ -20,7 +20,7 @@
 #include "ace/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Forward decls.
@@ -37,12 +37,12 @@ class ACE_Export ACE_Notification_Strategy
   //     the Bridge/Strategy patterns.
 public:
   ACE_Notification_Strategy (ACE_Event_Handler *eh,
-			     ACE_Reactor_Mask mask);
+                             ACE_Reactor_Mask mask);
   virtual ~ACE_Notification_Strategy (void);
 
   virtual int notify (void) = 0;
   virtual int notify (ACE_Event_Handler *,
-		      ACE_Reactor_Mask mask) = 0;
+                      ACE_Reactor_Mask mask) = 0;
 
   // Get/Set the event handler
   ACE_Event_Handler *event_handler (void);
@@ -67,8 +67,8 @@ class ACE_Export ACE_Reactor_Notification_Strategy : public ACE_Notification_Str
   //     ACE_Reactor::notify() method.
 public:
   ACE_Reactor_Notification_Strategy (ACE_Reactor *reactor,
-				     ACE_Event_Handler *eh,
-				     ACE_Reactor_Mask mask);
+                                     ACE_Event_Handler *eh,
+                                     ACE_Reactor_Mask mask);
 
   ~ACE_Reactor_Notification_Strategy (void);
   // Default dtor.
@@ -76,7 +76,7 @@ public:
   virtual int notify (void);
 
   virtual int notify (ACE_Event_Handler *,
-		      ACE_Reactor_Mask mask);
+                      ACE_Reactor_Mask mask);
 
   // Get/Set the reactor
   ACE_Reactor *reactor (void);
@@ -114,7 +114,7 @@ protected:
 class ACE_Export ACE_Recyclable
 {
 public:
-  enum State 
+  enum State
   {
     IDLE,
     BUSY,
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index fea23d00ce0..cdca19b3608 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -18,16 +18,17 @@
 #define ACE_STRATEGIES_T_H
 
 #include "ace/Strategies.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Config.h"
 #include "ace/Reactor.h"
 #include "ace/Synch_Options.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Hash_Map_Manager.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 template<class SVC_HANDLER>
 class ACE_Recycling_Strategy
 {
@@ -109,9 +110,9 @@ class ACE_Singleton_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
 public:
   // = Initialization and termination methods.
   ACE_Singleton_Strategy (SVC_HANDLER * = 0,
-			  ACE_Thread_Manager * = 0);
+                          ACE_Thread_Manager * = 0);
   int open (SVC_HANDLER *,
-	    ACE_Thread_Manager * = 0);
+            ACE_Thread_Manager * = 0);
   virtual ~ACE_Singleton_Strategy (void);
 
   // = Factory method.
@@ -143,18 +144,18 @@ public:
   // "Do-nothing" constructor.
 
   ACE_DLL_Strategy (const char dll_name[],
-		    const char factory_function[],
-		    const char svc_name[],
-		    ACE_Service_Repository *,
-		    ACE_Thread_Manager * = 0);
+                    const char factory_function[],
+                    const char svc_name[],
+                    ACE_Service_Repository *,
+                    ACE_Thread_Manager * = 0);
   // Initialize the DLL strategy based upon the service's DLL
   // information contained in the <svc_dll_info> string.
 
   int open (const char dll_name[],
-	    const char factory_function[],
-	    const char svc_name[],
-	    ACE_Service_Repository *,
-	    ACE_Thread_Manager * = 0);
+            const char factory_function[],
+            const char svc_name[],
+            ACE_Service_Repository *,
+            ACE_Thread_Manager * = 0);
   // Initialize the DLL strategy based upon the service's DLL
   // information contained in the <svc_dll_info> string.
 
@@ -206,7 +207,7 @@ public:
 
   // = Factory method.
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler,
-				    void *arg = 0);
+                                    void *arg = 0);
   // Activate the <svc_handler> with an appropriate concurrency
   // strategy.  The default behavior of this method is to activate the
   // SVC_HANDLER by calling its open() method (which allows the
@@ -243,13 +244,13 @@ public:
   // "Do-nothing constructor"
 
   ACE_Reactive_Strategy (ACE_Reactor *reactor,
-			 ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK,
-			 int flags = 0);
+                         ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK,
+                         int flags = 0);
   // Initialize the strategy.
 
   virtual int open (ACE_Reactor *reactor,
-		    ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK,
-		    int flags = 0);
+                    ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK,
+                    int flags = 0);
   // Initialize the strategy.
 
   virtual ~ACE_Reactive_Strategy (void);
@@ -257,7 +258,7 @@ public:
 
   // = Factory method.
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler,
-				    void *arg = 0);
+                                    void *arg = 0);
   // Activate the <svc_handler> by registering it with the <Reactor>
   // and then calling it's <open> hook.
 
@@ -297,14 +298,14 @@ public:
   // "Do-nothing constructor"
 
   ACE_Thread_Strategy (ACE_Thread_Manager *tm,
-		       long thr_flags,
-		       size_t n_threads = 1,
+                       long thr_flags,
+                       size_t n_threads = 1,
                        int flags = 0);
   // Initialize the strategy.
 
   virtual int open (ACE_Thread_Manager *tm,
-		    long thr_flags,
-		    size_t n_threads = 1,
+                    long thr_flags,
+                    size_t n_threads = 1,
                     int flags = 0);
   // Initialize the strategy.
 
@@ -312,7 +313,7 @@ public:
 
   // = Factory method.
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler,
-				    void *arg = 0);
+                                    void *arg = 0);
   // Activate the <svc_handler> with an appropriate concurrency
   // strategy.  This method activates the SVC_HANDLER by first calling
   // its open() method and then calling its activate() method to turn
@@ -354,14 +355,14 @@ public:
   // = Intialization and termination methods.
 
   ACE_Process_Strategy (size_t n_processes = 1,
-			ACE_Event_Handler *acceptor = 0,
-			ACE_Reactor * = 0,
+                        ACE_Event_Handler *acceptor = 0,
+                        ACE_Reactor * = 0,
                         int flags = 0);
   // Initialize the strategy.
 
   virtual int open (size_t n_processes = 1,
-		    ACE_Event_Handler *acceptor = 0,
-		    ACE_Reactor * = 0,
+                    ACE_Event_Handler *acceptor = 0,
+                    ACE_Reactor * = 0,
                     int flag = 0);
   // Initialize the strategy.
 
@@ -369,7 +370,7 @@ public:
 
   // = Factory method.
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler,
-				    void *arg = 0);
+                                    void *arg = 0);
   // Activate the <svc_handler> with an appropriate concurrency
   // strategy.  This method activates the SVC_HANDLER by first forking
   // and then calling the open() method of the SVC_HANDLER in the
@@ -414,12 +415,12 @@ public:
   // Default constructor.
 
   ACE_Accept_Strategy (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-		       int restart = 0,
+                       int restart = 0,
                        ACE_Reactor *reactor = ACE_Reactor::instance ());
   // Initialize the <peer_acceptor_> with <local_addr>.
 
   virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-		    int restart = 0);
+                    int restart = 0);
   // Initialize the <peer_acceptor_> with <local_addr>.
 
   virtual ACE_HANDLE get_handle (void) const;
@@ -471,12 +472,12 @@ public:
 
   // = Factory method.
   virtual int connect_svc_handler (SVC_HANDLER *&sh,
-				   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-				   ACE_Time_Value *timeout,
-				   const ACE_PEER_CONNECTOR_ADDR &local_addr,
-				   int reuse_addr,
-				   int flags,
-				   int perms);
+                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   ACE_Time_Value *timeout,
+                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   int reuse_addr,
+                                   int flags,
+                                   int perms);
   // The default behavior delegates to the <connect> method of the
   // <PEER_CONNECTOR::connect>.
 
@@ -619,7 +620,7 @@ class ACE_NOOP_Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLE
 public:
   // = Factory method.
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler,
-				    void *arg = 0);
+                                    void *arg = 0);
   // This is a no-op.
 };
 
@@ -757,12 +758,12 @@ public:
   // Template method for preparing the svc_handler for recycling.
 
   virtual int connect_svc_handler (SVC_HANDLER *&sh,
-				   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-				   ACE_Time_Value *timeout,
-				   const ACE_PEER_CONNECTOR_ADDR &local_addr,
-				   int reuse_addr,
-				   int flags,
-				   int perms);
+                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   ACE_Time_Value *timeout,
+                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   int reuse_addr,
+                                   int flags,
+                                   int perms);
   // Checks to see if there is already a <SVC_HANDLER> in the cache
   // connected to the <remote_addr>.  If so, we return this pointer.
   // Otherwise we establish the connection, put it into the cache, and
diff --git a/ace/Stream.h b/ace/Stream.h
index 096172b6d3d..203086c4816 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -5,28 +5,29 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Stream.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_STREAM_H
 #define ACE_STREAM_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/IO_Cntl_Msg.h"
 #include "ace/Message_Block.h"
 #include "ace/Time_Value.h"
 #include "ace/Module.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Forward decls.
 template<ACE_SYNCH_DECL> class ACE_Stream_Iterator;
 //template<ACE_SYNCH_DECL> class ACE_Module;
@@ -52,17 +53,17 @@ public:
   };
 
   // = Initializatation and termination methods.
-  ACE_Stream (void *arg = 0, 
-	      ACE_Module<ACE_SYNCH_USE> *head = 0, 
-	      ACE_Module<ACE_SYNCH_USE> *tail = 0);
+  ACE_Stream (void *arg = 0,
+              ACE_Module<ACE_SYNCH_USE> *head = 0,
+              ACE_Module<ACE_SYNCH_USE> *tail = 0);
   // Create a Stream consisting of <head> and <tail> as the Stream
   // head and Stream tail, respectively.  If these are 0 then the
   // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively.
   // <arg> is the value past in to the open() methods of the tasks.
 
   int open (void *arg,
-	    ACE_Module<ACE_SYNCH_USE> *head = 0, 
-	    ACE_Module<ACE_SYNCH_USE> *tail = 0);
+            ACE_Module<ACE_SYNCH_USE> *head = 0,
+            ACE_Module<ACE_SYNCH_USE> *tail = 0);
   // Create a Stream consisting of <head> and <tail> as the Stream
   // head and Stream tail, respectively.  If these are 0 then the
   // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively.
@@ -70,11 +71,11 @@ public:
 
   int close (int flags = M_DELETE);
   // Close down the stream and release all the resources.
-  
+
   ~ACE_Stream (void);
   // Close down the stream and release all the resources.
 
-  // = ACE_Stream plumbing operations 
+  // = ACE_Stream plumbing operations
 
   int push (ACE_Module<ACE_SYNCH_USE> *mod);
   // Add a new module <mod> right below the Stream head.
@@ -90,13 +91,13 @@ public:
   // Remove the named module <mod> from the stream.  This bypasses the
   // strict LIFO ordering of push() and pop().
 
-  ACE_Module<ACE_SYNCH_USE> *head (void);	
+  ACE_Module<ACE_SYNCH_USE> *head (void);
   // Return current stream head.
 
-  ACE_Module<ACE_SYNCH_USE> *tail (void);	
+  ACE_Module<ACE_SYNCH_USE> *tail (void);
   // Return current stream tail.
 
-  ACE_Module<ACE_SYNCH_USE> *find (const ASYS_TCHAR *mod); 
+  ACE_Module<ACE_SYNCH_USE> *find (const ASYS_TCHAR *mod);
   // Find a particular ACE_Module.
 
   int link (ACE_Stream<ACE_SYNCH_USE> &);
@@ -105,7 +106,7 @@ public:
   int unlink (void);
   // Remove a pipe formed between two Streams.
 
-  // = Blocking data transfer operations 
+  // = Blocking data transfer operations
   int put (ACE_Message_Block *mb,
            ACE_Time_Value *timeout = 0);
   // Send the message <mb> down the stream, starting at the Module
@@ -119,11 +120,11 @@ public:
   // Wait for upto <timeout> amount of time for the operation to
   // complete (or block forever if <timeout> == 0).
 
-  int control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, 
-	       void *args);
+  int control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
+               void *args);
   // Send control message down the stream.
 
-  int wait (void);		
+  int wait (void);
   // Synchronize with the final close of the stream.
 
   void dump (void) const;
@@ -135,15 +136,15 @@ public:
 private:
   int unlink_i (void);
   // Actually perform the unlinking of two Streams (must be called
-  // with locks held). 
+  // with locks held).
 
   int link_i (ACE_Stream<ACE_SYNCH_USE> &);
   // Actually perform the linking of two Streams (must be called with
   // locks held).
 
   int push_module (ACE_Module<ACE_SYNCH_USE> *,
-		   ACE_Module<ACE_SYNCH_USE> * = 0, 
-		   ACE_Module<ACE_SYNCH_USE> * = 0);
+                   ACE_Module<ACE_SYNCH_USE> * = 0,
+                   ACE_Module<ACE_SYNCH_USE> * = 0);
   // Must a new module onto the Stream.
 
   ACE_Module<ACE_SYNCH_USE> *stream_head_;
@@ -158,7 +159,7 @@ private:
   // = Synchronization objects used for thread-safe streams.
   ACE_SYNCH_MUTEX_T lock_;
   // Protect the stream against race conditions.
-  
+
   ACE_SYNCH_CONDITION_T final_close_;
   // Use to tell all threads waiting on the close that we are done.
 };
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index 904413ef405..733f8efd614 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -5,20 +5,20 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Stream_Modules.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 // This needs to go outside of the #if !defined() block.  Don't ask...
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #ifndef ACE_STREAM_MODULES
@@ -31,7 +31,7 @@ class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_USE>
   //    Standard module that acts as the head of a ustream.
 public:
   ACE_Stream_Head (void);
-  // Construction 
+  // Construction
 
   ~ACE_Stream_Head (void);
   // Destruction
@@ -42,7 +42,7 @@ public:
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
   virtual int svc (void);
 
-  // = Dynamic linking hooks 
+  // = Dynamic linking hooks
   virtual int init (int argc, ASYS_TCHAR *argv[]);
   virtual int info (ASYS_TCHAR **info_string, size_t length) const;
   virtual int fini (void);
@@ -66,7 +66,7 @@ class ACE_Stream_Tail : public ACE_Task<ACE_SYNCH_USE>
   //    Standard module that acts as the head of a ustream.
 public:
   ACE_Stream_Tail (void);
-  // Construction 
+  // Construction
 
   ~ACE_Stream_Tail (void);
   // Destruction
@@ -77,7 +77,7 @@ public:
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
   virtual int svc (void);
 
-  // = Dynamic linking hooks 
+  // = Dynamic linking hooks
   virtual int init (int argc, ASYS_TCHAR *argv[]);
   virtual int info (ASYS_TCHAR **info_string, size_t length) const;
   virtual int fini (void);
@@ -102,7 +102,7 @@ class ACE_Thru_Task : public ACE_Task<ACE_SYNCH_USE>
   //    data to its adjacent neighbor.
 public:
   ACE_Thru_Task (void);
-  // Construction 
+  // Construction
 
   ~ACE_Thru_Task (void);
   // Destruction
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index f7fe6a3ee5d..78cabe6d039 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Svc_Conf.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SVC_CONF_H
@@ -21,13 +21,14 @@
 // Service Configurator utility.
 
 #include "ace/Obstack.h"
-#include "ace/Service_Config.h"
-#include "ace/Parse_Node.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-   
+
+#include "ace/Service_Config.h"
+#include "ace/Parse_Node.h"
+
 #if defined (DEBUGGING)
 #if defined (ACE_YY_DECL)
 #undef ACE_YY_DECL
@@ -38,16 +39,16 @@
 #endif /* DEBUGGING */
 
 void ace_yyrestart (FILE *);
-// Restart input file parsing 
+// Restart input file parsing
 
 int ace_yyparse (void);
-// Performs the parsing 
+// Performs the parsing
 
 ACE_YY_DECL;
-// Performs the lexical analysis 
+// Performs the lexical analysis
 
 extern FILE *ace_yyin;
-// Name of input stream 
+// Name of input stream
 
 #define ACE_YY_INPUT(buf,result,max_size) \
   if (ace_yydirective != 0) \
@@ -67,40 +68,40 @@ extern FILE *ace_yyin;
     ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
 
 void ace_yyerror (const char *);
-// Error handling routine required by YACC or BISON 
+// Error handling routine required by YACC or BISON
 
 extern int ace_yylineno;
-// Keeps track of the current line number for error-handling routine 
+// Keeps track of the current line number for error-handling routine
 
 extern int ace_yyerrno;
-// Keeps track of the number of errors encountered so far 
+// Keeps track of the number of errors encountered so far
 
 extern const ASYS_TCHAR *ace_yydirective;
 // Used to parse service configurator directives from a string rather
 // than from a svc.conf file.
 
 extern char *ace_yytext;
-// Holds the lexeme for the current token 
+// Holds the lexeme for the current token
 
 extern int ace_yyleng;
-// Holds the length of the lexeme for the current token 
+// Holds the length of the lexeme for the current token
 
 extern ACE_Obstack *ace_obstack;
-// Efficient memory allocation technique 
+// Efficient memory allocation technique
 
 ACE_Service_Type_Impl *ace_create_service_type (const ASYS_TCHAR *, int,
                                                 void *, unsigned int,
                                                 ACE_Service_Object_Exterminator = 0);
-// Factory that creates a new ACE_Service_Type_Impl. 
+// Factory that creates a new ACE_Service_Type_Impl.
 
-typedef union 
+typedef union
 {
   int type_;
   ACE_Location_Node *location_node_;
   ACE_Parse_Node *parse_node_;
   ACE_Static_Node *static_node_;
   ACE_Service_Type *svc_record_;
-  char *ident_; 
+  char *ident_;
 } ACE_YYSTYPE;
 extern ACE_YYSTYPE ace_yylval;
 #endif /* ACE_SVC_CONF_H */
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index 85eda573095..b84b825be42 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//   Svc_Handler.h 
+//   Svc_Handler.h
 //
 // = AUTHOR
 //    Doug Schmidt and Irfan Pyrarli.
-// 
+//
 // ============================================================================
 
 #ifndef ACE_SVC_HANDLER_H
@@ -21,13 +21,14 @@
 class ACE_Connection_Recycling_Strategy;
 
 #include "ace/Synch_Options.h"
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Task.h"
+#include "ace/Service_Config.h"
+
 template <ACE_PEER_STREAM_1, ACE_SYNCH_DECL>
 class ACE_Svc_Handler : public ACE_Task<ACE_SYNCH_USE>
 {
@@ -47,11 +48,11 @@ class ACE_Svc_Handler : public ACE_Task<ACE_SYNCH_USE>
   //     ACE_Svc_Handler and the peer it is connected with.
 public:
   // = Initialization and termination methods.
-  ACE_Svc_Handler (ACE_Thread_Manager * = 0, 
+  ACE_Svc_Handler (ACE_Thread_Manager * = 0,
                    ACE_Message_Queue<ACE_SYNCH_USE> * = 0,
                    ACE_Reactor * = ACE_Reactor::instance ());
 
-  virtual ~ACE_Svc_Handler (void); 
+  virtual ~ACE_Svc_Handler (void);
 
   virtual int open (void * = 0);
   // Activate the client handler (called by the ACE_Acceptor or
@@ -99,7 +100,7 @@ public:
   virtual ACE_HANDLE get_handle (void) const;
   // Get the underlying handle associated with the <peer_>.
 
-  virtual void set_handle (ACE_HANDLE); 
+  virtual void set_handle (ACE_HANDLE);
   // Set the underlying handle associated with the <peer_>.
 
   ACE_PEER_STREAM &peer (void) const;
@@ -137,26 +138,26 @@ public:
   // to be public.
 
   // = Accessors to set/get the connection recycler.
-  
-  virtual void recycler (ACE_Connection_Recycling_Strategy *recycler, 
+
+  virtual void recycler (ACE_Connection_Recycling_Strategy *recycler,
                          const void *recycling_act);
   // Set the recycler and the <recycling_act> that is used during
   // purging and caching.
 
   virtual ACE_Connection_Recycling_Strategy *recycler (void) const;
   // Get the recycler.
-  
+
   virtual const void *recycling_act (void) const;
   // Get the recycling act.
-  
+
   virtual int recycle (void * = 0);
   // Upcall made by the recycler when it is about to recycle the
   // connection.  This gives the object a chance to prepare itself for
   // recycling.  Return 0 if the object is ready for recycling, -1 on
   // failures.
 
-private:  
-  ACE_PEER_STREAM peer_; 
+private:
+  ACE_PEER_STREAM peer_;
   // Maintain connection with client.
 
   int dynamic_;
diff --git a/ace/Synch.h b/ace/Synch.h
index d4739123c3c..b5bfc0a87af 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -23,7 +23,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !(defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM))
@@ -520,7 +520,7 @@ public:
   ACE_mutex_t *process_lock_;
   // This lock resides in shared memory.
 
-  LPCTSTR lockname_; 
+  LPCTSTR lockname_;
   // Remember the name of the mutex if we created it so we can unlink
   // it when we go away (only the actor that initialized the memory
   // can destroy it).
diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h
index b9fab9a7a6e..2b40bf5d9e3 100644
--- a/ace/Synch_Options.h
+++ b/ace/Synch_Options.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//   ACE_Synch_Options.h 
+//   ACE_Synch_Options.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SYNCH_OPTIONS_H
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Synch_Options
@@ -29,34 +29,34 @@ class ACE_Export ACE_Synch_Options
   //     Contains the values of options used to determine the
   //     synchronous and asynchronous behavior.
   //
-  // = DESCRIPTION 
-  //     Values support the following behavior (TV == "timeout" 
+  // = DESCRIPTION
+  //     Values support the following behavior (TV == "timeout"
   //     and UR == "use ACE_Reactor"):
   //
   // = BEGIN<CODE>
-  //          Parameters      | Description                   
-  //                          |                             
-  //          TV   |  UR      |                             
+  //          Parameters      | Description
+  //                          |
+  //          TV   |  UR      |
   //          -----|----------|-------------------------------
-  //               |	      |
+  //               |          |
   //          NULL | yes      | infinite timeout (using ACE_Reactor)
   //               |          |
-  //          time | yes      | try asynch transaction for    
+  //          time | yes      | try asynch transaction for
   //               |          | the specified time (using ACE_Reactor)
   //               |          |
-  //          0,0  | yes      | poll; try, if EWOULDBLOCK,    
+  //          0,0  | yes      | poll; try, if EWOULDBLOCK,
   //               |          |       then return immediately
   //               |          |       (using ACE_Reactor)
   //               |          |
   //          NULL | no       | block forever (don't use ACE_Reactor)
-  //               |          |                               
-  //          time | no       | do a blocking transaction     
+  //               |          |
+  //          time | no       | do a blocking transaction
   //               |          | for the specified time
-  //               |          | (don't use ACE_Reactor)                 
-  //               |          |                               
+  //               |          | (don't use ACE_Reactor)
+  //               |          |
   //          0,0  | no       | poll; but do not initiate a
   //               |          | nonblocking transaction
-  //               |          | (don't use ACE_Reactor)    
+  //               |          | (don't use ACE_Reactor)
   // = END<CODE>
 public:
   // = Options flags for controlling synchronization.  Note that these
@@ -72,16 +72,16 @@ public:
 
   // = Initialization methods.
   ACE_Synch_Options (u_long options = 0,
-		     const ACE_Time_Value &timeout = ACE_Time_Value::zero,
-		     const void *arg = 0);
+                     const ACE_Time_Value &timeout = ACE_Time_Value::zero,
+                     const void *arg = 0);
   // Initialize the Synch_Options based on parameters.
 
   ~ACE_Synch_Options (void);
   // Default dtor.
 
   void set (u_long options = 0,
-	    const ACE_Time_Value &timeout = ACE_Time_Value::zero,
-	    const void *arg = 0);
+            const ACE_Time_Value &timeout = ACE_Time_Value::zero,
+            const void *arg = 0);
   // Initialize the Synch_Options based on parameters.
 
   int operator[] (u_long option) const;
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 3e470689865..456070cca9b 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -17,11 +17,12 @@
 #ifndef ACE_SYNCH_T_H
 #define ACE_SYNCH_T_H
 
+#include "ace/Event_Handler.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Event_Handler.h"
 #include "ace/Synch.h"
 
 // Forward decl
@@ -794,7 +795,7 @@ protected:
   ACE_cond_t *process_cond_;
   // This condition resides in shared memory.
 
-  LPCTSTR condname_; 
+  LPCTSTR condname_;
   // Remember the name of the condition if we created it so we can
   // unlink it when we go away (only the actor that initialized the
   // memory can destroy it).
diff --git a/ace/System_Time.h b/ace/System_Time.h
index b05bc7aac98..a213c8c24d3 100644
--- a/ace/System_Time.h
+++ b/ace/System_Time.h
@@ -6,12 +6,12 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    System_Time.h
 //
 // = AUTHOR
-//    Prashant Jain, Tim H. Harrison and Douglas C. Schmidt    
+//    Prashant Jain, Tim H. Harrison and Douglas C. Schmidt
 //
 // ============================================================================
 
@@ -19,13 +19,14 @@
 #define ACE_SYSTEM_TIME_H
 
 #include "ace/OS.h"
-#include "ace/Memory_Pool.h"
-#include "ace/Malloc_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Memory_Pool.h"
+#include "ace/Malloc_T.h"
+
 class ACE_Export ACE_Date_Time
 {
   // = TITLE
diff --git a/ace/TLI.h b/ace/TLI.h
index 85991e53de0..b9163d34ac5 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -6,25 +6,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    TLI.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TLI_H
 #define ACE_TLI_H
 
 #include "ace/IPC_SAP.h"
-#include "ace/Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Addr.h"
+
 #if defined (ACE_HAS_TLI)
 
 // There's not a universal device name for TLI devices.  If the platform
@@ -38,12 +39,12 @@ class ACE_Export ACE_TLI : public ACE_IPC_SAP
 {
   // = TITLE
   //     Defines the member functions for the base class of the
-  //     ACE_TLI  abstraction. 
+  //     ACE_TLI  abstraction.
 public:
   // = Initialization and termination methods.
-  ACE_HANDLE open (const char device[], 
-		   int oflag = O_RDWR, 
-		   struct t_info *info = 0);
+  ACE_HANDLE open (const char device[],
+                   int oflag = O_RDWR,
+                   struct t_info *info = 0);
   // Initialize a TLI endpoint.
 
   int close (void);
@@ -61,7 +62,7 @@ public:
   int snddis (struct t_call * = 0) const;
   int sndrel (void) const;
   int rcvrel (void) const;
- 
+
   int get_local_addr (ACE_Addr &) const;
   // Return our local endpoint address.
 
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 041f8ad6645..4525daf1dcb 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -6,26 +6,27 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    TLI_Acceptor.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TLI_ACCEPTOR_H
 #define ACE_TLI_ACCEPTOR_H
 
 #include "ace/TLI.h"
-#include "ace/Time_Value.h"
-#include "ace/TLI_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Time_Value.h"
+#include "ace/TLI_Stream.h"
+
 #if defined (ACE_HAS_TLI)
 
 // Forward reference...
@@ -34,8 +35,8 @@ class ACE_TLI_Request_Queue;
 class ACE_Export ACE_TLI_Acceptor : public ACE_TLI
 {
   // = TITLE
-  //     Defines the member functions for ACE_TLI_Acceptor abstraction. 
-  // 
+  //     Defines the member functions for ACE_TLI_Acceptor abstraction.
+  //
   // = DESCRIPTION
   //     This class implements the algorithm described in Steve Rago's
   //     book on System V UNIX network programming.  It basically
@@ -49,19 +50,19 @@ public:
   // Default constructor.
 
   ACE_TLI_Acceptor (const ACE_Addr &remote_sap,
-		    int reuse_addr = 0,
-		    int oflag = O_RDWR, 
-		    struct t_info *info = 0, 
-		    int backlog = 5,
-		    const char device[] = ACE_TLI_TCP_DEVICE);
+                    int reuse_addr = 0,
+                    int oflag = O_RDWR,
+                    struct t_info *info = 0,
+                    int backlog = 5,
+                    const char device[] = ACE_TLI_TCP_DEVICE);
   // Initiate a passive mode socket.
 
-  ACE_HANDLE open (const ACE_Addr &remote_sap, 
-		   int reuse_addr = 0, 
-		   int oflag = O_RDWR, 
-		   struct t_info *info = 0, 
-		   int backlog = 5,
-		   const char device[] = ACE_TLI_TCP_DEVICE);
+  ACE_HANDLE open (const ACE_Addr &remote_sap,
+                   int reuse_addr = 0,
+                   int oflag = O_RDWR,
+                   struct t_info *info = 0,
+                   int backlog = 5,
+                   const char device[] = ACE_TLI_TCP_DEVICE);
   // Initiate a passive mode socket.
 
   int close (void);
@@ -69,14 +70,14 @@ public:
 
   // = Passive connection acceptance method.
 
-  int accept (ACE_TLI_Stream &new_tli_sap, 
-	      ACE_Addr *remote_addr = 0, 
-	      ACE_Time_Value *timeout = 0, 
-	      int restart = 1, 
+  int accept (ACE_TLI_Stream &new_tli_sap,
+              ACE_Addr *remote_addr = 0,
+              ACE_Time_Value *timeout = 0,
+              int restart = 1,
               int reset_new_handle = 0,
-	      int rwflag = 1,
-	      netbuf *udata = 0,
-	      netbuf *opt = 0);
+              int rwflag = 1,
+              netbuf *udata = 0,
+              netbuf *opt = 0);
   // Accept a new data transfer connection.  A <timeout> of 0 means
   // block forever, a <timeout> of {0, 0} means poll.  <restart> == 1
   // means "restart if interrupted."
@@ -97,18 +98,18 @@ private:
 
   int backlog_;
   // Number of connections to queue.
-  
+
   int rwflag_;
   // Are we using "tirdwr" mod?
-  
+
   int handle_async_event (int restart, int rwflag);
   // Handle TLI accept insanity...
 
   ACE_TLI_Request_Queue *queue_;
   // Used for queueing up pending requests.
-  
-  struct t_discon *disp_; 
-  // Used for handling disconnects 
+
+  struct t_discon *disp_;
+  // Used for handling disconnects
 };
 
 #include "ace/TLI_Acceptor.i"
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index 360baabb65e..1a34bef0e71 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    TLI_Connector.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TLI_CONNECTOR_H
@@ -20,7 +20,7 @@
 #include "ace/TLI_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_TLI)
@@ -35,18 +35,18 @@ public:
   ACE_TLI_Connector (void);
   // Default constructor.
 
-  ACE_TLI_Connector (ACE_TLI_Stream &new_stream, 
-		     const ACE_Addr &remote_sap, 
-		     ACE_Time_Value *timeout = 0,
-		     const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		     int reuse_addr = 0,
-		     int flags = O_RDWR, 
-		     int perms = 0,
-		     const char device[] = ACE_TLI_TCP_DEVICE, 
-		     struct t_info *info = 0, 
-		     int rw_flag = 1,
-		     struct netbuf *udata = 0,
-		     struct netbuf *opt = 0);
+  ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
+                     const ACE_Addr &remote_sap,
+                     ACE_Time_Value *timeout = 0,
+                     const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                     int reuse_addr = 0,
+                     int flags = O_RDWR,
+                     int perms = 0,
+                     const char device[] = ACE_TLI_TCP_DEVICE,
+                     struct t_info *info = 0,
+                     int rw_flag = 1,
+                     struct netbuf *udata = 0,
+                     struct netbuf *opt = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -61,18 +61,18 @@ public:
   // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
-  int connect (ACE_TLI_Stream &new_stream, 
-	       const ACE_Addr &remote_sap,  
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
-	       int flags = O_RDWR, 
-	       int perms = 0,
-	       const char device[] = ACE_TLI_TCP_DEVICE, 
-	       struct t_info *info = 0, 
-	       int rw_flag = 1,
-	       struct netbuf *udata = 0,
-	       struct netbuf *opt = 0);
+  int connect (ACE_TLI_Stream &new_stream,
+               const ACE_Addr &remote_sap,
+               ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               int reuse_addr = 0,
+               int flags = O_RDWR,
+               int perms = 0,
+               const char device[] = ACE_TLI_TCP_DEVICE,
+               struct t_info *info = 0,
+               int rw_flag = 1,
+               struct netbuf *udata = 0,
+               struct netbuf *opt = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -87,9 +87,9 @@ public:
   // the OS do the binding.  If <reuse_addr> == 1 then the
   // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
-  int complete (ACE_TLI_Stream &new_stream, 
-		ACE_Addr *remote_sap,
-		ACE_Time_Value *tv);
+  int complete (ACE_TLI_Stream &new_stream,
+                ACE_Addr *remote_sap,
+                ACE_Time_Value *tv);
   // Try to complete a non-blocking connection.
   // If connection completion is successful then <new_stream> contains
   // the connected ACE_SOCK_Stream.  If <remote_sap> is non-NULL then it
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index 3c38f8db9d5..95cb544a6f8 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -6,31 +6,32 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    TLI_Stream.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TLI_STREAM_H
 #define ACE_TLI_STREAM_H
 
 #include "ace/TLI.h"
-#include "ace/INET_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/INET_Addr.h"
+
 #if defined (ACE_HAS_TLI)
 
 class ACE_Export ACE_TLI_Stream : public ACE_TLI
 {
   // = TITLE
-  //     Defines the member functions for ACE_TLI_Stream abstraction. 
+  //     Defines the member functions for ACE_TLI_Stream abstraction.
 public:
   friend class ACE_TLI_Acceptor;
   friend class ACE_TLI_Connector;
@@ -53,7 +54,7 @@ public:
   int get_remote_addr (ACE_Addr &) const;
   // Return address of remotely connected peer.
 
-  // =  timod bindings 
+  // =  timod bindings
   ssize_t send (const void *buf, size_t n, int flags) const;
   // Send an n byte buffer to the connected socket (uses t_snd(3)).
   ssize_t recv (void *buf, size_t n, int *flags) const;
@@ -64,9 +65,9 @@ public:
   ssize_t recv_n (void *buf, size_t n, int *flags) const;
   // Recv exactly n bytes from the connected socket (uses t_rcv(3)).
 
-  // = tirdwr bindings 
+  // = tirdwr bindings
   ssize_t send (const void *buf, size_t n) const;
-  // Send an n byte buffer to the connected socket (uses write(2)).  
+  // Send an n byte buffer to the connected socket (uses write(2)).
 
   ssize_t recv (void *buf, size_t n) const;
   // Recv an n byte buffer from the connected socket (uses read(2)).
@@ -87,8 +88,8 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  int rwflag_; 
-  // Indicates whether the tirdwr module should be pushed   
+  int rwflag_;
+  // Indicates whether the tirdwr module should be pushed
 
   // = Get/set rwflag
   int  get_rwflag (void);
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index b53ee3b74af..12307f21d8e 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -20,7 +20,7 @@
 #include "ace/Select_Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_EH_Dispatch_Info
diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h
index ad0d8903108..82d1d25abb5 100644
--- a/ace/TTY_IO.h
+++ b/ace/TTY_IO.h
@@ -5,34 +5,35 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    TTY_IO.h
 //
 // = DESCRIPTION
 //
 // = AUTHOR
-//    Douglas C. Schmidt 
-// 
+//    Douglas C. Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TTY_IO_H
 #define ACE_TTY_IO_H
 
 #include "ace/OS.h"
-#include "ace/DEV_Addr.h"
-#include "ace/DEV_Connector.h"
-#include "ace/DEV_IO.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/DEV_Addr.h"
+#include "ace/DEV_Connector.h"
+#include "ace/DEV_IO.h"
+
 class ACE_Export ACE_TTY_IO : public ACE_DEV_IO
 {
   // = TITLE
   //     Class definitions for platform specific TTY features.
-  //   
+  //
   // = DESCRIPTION
   //     This class represents an example interface for a specific
   //     device (a serial line) It extends the capability of the
@@ -43,7 +44,7 @@ class ACE_Export ACE_TTY_IO : public ACE_DEV_IO
 public:
   enum Control_Mode
   {
-    SETPARAMS,	// Set control parameters.
+    SETPARAMS,  // Set control parameters.
     GETPARAMS   // Get control parameters.
   };
 
diff --git a/ace/Task.h b/ace/Task.h
index 35125b68f25..e2b052f4f29 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -18,12 +18,13 @@
 #define ACE_TASK_H
 
 #include "ace/Service_Object.h"
-#include "ace/Thread_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Thread_Manager.h"
+
 class ACE_Export ACE_Task_Flags
 {
 public:
diff --git a/ace/Task_T.h b/ace/Task_T.h
index 1ecbd85fb99..856e47778a5 100644
--- a/ace/Task_T.h
+++ b/ace/Task_T.h
@@ -18,13 +18,14 @@
 #define ACE_TASK_T_H
 
 #include "ace/Message_Queue.h"
-#include "ace/Synch_T.h"
-#include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch_T.h"
+#include "ace/Task.h"
+
 // Forward decls...
 template <ACE_SYNCH_DECL> class ACE_Module;
 
@@ -44,7 +45,7 @@ public:
 
   // = Initialization/termination methods.
   ACE_Task (ACE_Thread_Manager *thr_mgr = 0,
-	    ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0);
+            ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0);
   // Initialize a Task, supplying a thread manager and a message
   // queue.  If the user doesn't supply a ACE_Message_Queue pointer
   // then we'll allocate one dynamically.  Otherwise, we'll use the
diff --git a/ace/Thread.h b/ace/Thread.h
index bdeb8148a05..06e91173c67 100644
--- a/ace/Thread.h
+++ b/ace/Thread.h
@@ -20,7 +20,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ACE_Export ACE_Thread
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index b5d58bccb1f..a5871d822dc 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -18,14 +18,15 @@
 #define ACE_THREAD_MANAGER_H
 
 #include "ace/Thread.h"
-#include "ace/Synch.h"
-#include "ace/Containers.h"
-#include "ace/Free_List.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch.h"
+#include "ace/Containers.h"
+#include "ace/Free_List.h"
+
 // The following macros control how a Thread Manager manages a pool of
 // Thread_Descriptor.  Currently, the default behavior is not to
 // preallocate any thread descriptor and never (well, almost never)
diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h
index d92faa0f9ee..90e3f3b3e10 100644
--- a/ace/Time_Request_Reply.h
+++ b/ace/Time_Request_Reply.h
@@ -6,36 +6,37 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
 //    ACE_Time_Request_Reply.h
 //
-// = DESCRIPTION 
-//     Define the format used to exchange messages between the 
+// = DESCRIPTION
+//     Define the format used to exchange messages between the
 //     ACE_Time_Server and clerks.
 //
 // = AUTHOR
 //     Prashant Jain
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TIME_REQUEST_REPLY_H
 #define ACE_TIME_REQUEST_REPLY_H
 
 #include "ace/Time_Value.h"
-#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SString.h"
+
 class ACE_Export ACE_Time_Request
 {
   // = TITLE
   //   Message format for delivering requests to the ACE_Time Server.
   //
   // = DESCRIPTION
-  //   This class is implemented to minimize data copying.  
+  //   This class is implemented to minimize data copying.
   //   In particular, all marshaling is done in situ...
 public:
   enum Constants
@@ -51,9 +52,9 @@ public:
   // Default constructor.
 
   ACE_Time_Request (ACE_INT32 msg_type, // Type of request.
-		    const ACE_UINT32 time,
-		    ACE_Time_Value *timeout = 0); // Max time waiting for request.
-  // Create a <ACE_Time_Request> message.  
+                    const ACE_UINT32 time,
+                    ACE_Time_Value *timeout = 0); // Max time waiting for request.
+  // Create a <ACE_Time_Request> message.
 
   void init (void);
   // Initialize length_ in order to ensure correct byte ordering
@@ -61,7 +62,7 @@ public:
 
   // Get the fixed size of message
   ssize_t size (void) const;
-  
+
   // = Set/get the type of the message.
   ACE_INT32 msg_type (void) const;
   void msg_type (ACE_INT32);
@@ -88,7 +89,7 @@ public:
   // Print out the values of the message for debugging purposes.
 
 private:
-  // = The 5 fields in the <Transfer> struct are transmitted to the server.  
+  // = The 5 fields in the <Transfer> struct are transmitted to the server.
   // The remaining 2 fields are not tranferred -- they are used only on
   // the server-side to simplify lookups.
 
@@ -98,7 +99,7 @@ private:
     // Type of the request (i.e., <TIME_UPDATE>)
 
     ACE_UINT32 block_forever_;
-    // Indicates if we should block forever.  If 0, then <secTimeout_> 
+    // Indicates if we should block forever.  If 0, then <secTimeout_>
     // and <usecTimeout_> indicates how long we should wait.
 
     ACE_UINT32 sec_timeout_;
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index d3fa1094fef..5f085c020c0 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Time_Value.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TIME_VALUE_H
@@ -23,7 +23,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #endif /* ACE_TIME_VALUE */
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index be8b6153254..88417c4a264 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -7,7 +7,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_ENABLE_TIMEPROBES)
@@ -19,7 +19,7 @@
 #if defined (ACE_COMPILE_TIMEPROBES)
 
 class ACE_Export ACE_Event_Descriptions
-{  
+{
   // = TITLE
   // Event Descriptions.
 public:
@@ -82,7 +82,7 @@ typedef ACE_SYNCH_MUTEX ACE_TIMEPROBE_MUTEX;
 typedef ACE_SYNCH_NULL_MUTEX ACE_TIMEPROBE_MUTEX;
 #  endif /* ACE_MT_TIMEPROBES */
 
-typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX> 
+typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX>
         ACE_TIMEPROBE_WITH_LOCKING;
 
 // If ACE_TSS_TIMEPROBES is defined, store the ACE_Timeprobe singleton
@@ -91,26 +91,26 @@ typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX>
 // other.
 #  if defined (ACE_TSS_TIMEPROBES)
 #define ACE_TIMEPROBE_SINGLETON_DEFINE \
-        ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>; 
+        ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>;
 typedef ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>
         ACE_TIMEPROBE_SINGLETON;
 #  else /* ACE_TSS_TIMEPROBES */
 #define ACE_TIMEPROBE_SINGLETON_DEFINE \
         ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>;
-typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX> 
+typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>
         ACE_TIMEPROBE_SINGLETON;
 #  endif /* ACE_TSS_TIMEPROBES */
 
 #if defined (_MSC_VER)
 // Disable warning of using Microsoft Extension.
-#pragma warning(disable:4231) 
+#pragma warning(disable:4231)
 #endif /* _MSC_VER */
 
 ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON_DEFINE);
 
 #if defined (_MSC_VER)
 // Default back the warning of using Microsoft Extension.
-#pragma warning(default:4231) 
+#pragma warning(default:4231)
 #endif /* _MSC_VER */
 
 #endif /* ACE_COMPILE_TIMEPROBES */
@@ -133,7 +133,7 @@ ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON_DEFINE);
 #  define ACE_TIMEPROBE(id)
 #  define ACE_TIMEPROBE_PRINT
 #  define ACE_TIMEPROBE_PRINT_ABSOLUTE
-#  define ACE_TIMEPROBE_EVENT_DESCRIPTIONS(descriptions, minimum_id) 
+#  define ACE_TIMEPROBE_EVENT_DESCRIPTIONS(descriptions, minimum_id)
 #  define ACE_FUNCTION_TIMEPROBE(X)
 
 #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index 6fe1bd79502..a95617ab891 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -7,7 +7,7 @@
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_COMPILE_TIMEPROBES)
@@ -31,7 +31,7 @@ class ACE_Timeprobe
   //     event description can either be an unsigned long or a string
   //     (char *). If string are used, care must be taken cause only
   //     pointer copies are done and the string data is *not* copied.
-  //     
+  //
   //     The recorded time probes can then be printed by calling
   //     print_times().  If you have used unsigned longs as event
   //     descriptions in any of your time probes, you must have
@@ -71,10 +71,10 @@ public:
   // Record event descriptions.
 
   void print_times (void);
-  // Print the time probes. 
+  // Print the time probes.
 
   void print_absolute_times (void);
-  // Print the time probes. 
+  // Print the time probes.
 
   void reset (void);
   // Reset the slots.  All old time probes will be lost.
@@ -83,11 +83,11 @@ public:
   // Not implemented (stupid MSVC won't let it be protected).
 
 protected:
-  typedef ACE_Timeprobe<ACE_LOCK> 
+  typedef ACE_Timeprobe<ACE_LOCK>
           SELF;
   // Self
 
-  typedef ACE_Unbounded_Set<ACE_Event_Descriptions> 
+  typedef ACE_Unbounded_Set<ACE_Event_Descriptions>
           EVENT_DESCRIPTIONS;
   // We can hold multiple event description tables.
 
@@ -120,14 +120,14 @@ protected:
   // Current size of timestamp table
 };
 
-template <class Timeprobe> 
-class ACE_Function_Timeprobe 
+template <class Timeprobe>
+class ACE_Function_Timeprobe
 {
   // = TITLE
   //     Auto pointer like time probes. It will record <event> on
   //     construction and <event + 1> on destruction.
 public:
-  ACE_Function_Timeprobe (Timeprobe &timeprobe, 
+  ACE_Function_Timeprobe (Timeprobe &timeprobe,
                           u_long event);
   // Constructor.
 
diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h
index 2fbe0f80428..6d9b73740ca 100644
--- a/ace/Timer_Hash.h
+++ b/ace/Timer_Hash.h
@@ -5,67 +5,68 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Hash.h
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_HASH_H
 #define ACE_TIMER_HASH_H
 
 #include "ace/Timer_Hash_T.h"
-#include "ace/Timer_Heap_T.h"
-#include "ace/Timer_List_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// The following typedef are here for ease of use 
+#include "ace/Timer_Heap_T.h"
+#include "ace/Timer_List_T.h"
 
-typedef ACE_Timer_Hash_Upcall <ACE_Event_Handler *, 
+// The following typedef are here for ease of use
+
+typedef ACE_Timer_Hash_Upcall <ACE_Event_Handler *,
                                ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
                                ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Hash_Upcall;
 
-typedef ACE_Timer_List_T <ACE_Event_Handler *, 
+typedef ACE_Timer_List_T <ACE_Event_Handler *,
                           ACE_Hash_Upcall,
                           ACE_Null_Mutex>
         ACE_Hash_Timer_List;
 
-typedef ACE_Timer_Heap_T <ACE_Event_Handler *, 
+typedef ACE_Timer_Heap_T <ACE_Event_Handler *,
                           ACE_Hash_Upcall,
                           ACE_Null_Mutex>
         ACE_Hash_Timer_Heap;
 
 
-typedef ACE_Timer_Hash_T<ACE_Event_Handler *, 
-                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
+typedef ACE_Timer_Hash_T<ACE_Event_Handler *,
+                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
                         ACE_SYNCH_RECURSIVE_MUTEX,
                         ACE_Hash_Timer_List>
-                        
-	ACE_Timer_Hash;
 
-typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, 
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
+        ACE_Timer_Hash;
+
+typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *,
+                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
                                   ACE_SYNCH_RECURSIVE_MUTEX,
                                   ACE_Hash_Timer_List>
-	ACE_Timer_Hash_Iterator;
+        ACE_Timer_Hash_Iterator;
 
-typedef ACE_Timer_Hash_T<ACE_Event_Handler *, 
-                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
+typedef ACE_Timer_Hash_T<ACE_Event_Handler *,
+                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
                         ACE_SYNCH_RECURSIVE_MUTEX,
                         ACE_Hash_Timer_Heap>
-	ACE_Timer_Hash_Heap;
+        ACE_Timer_Hash_Heap;
 
-typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, 
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
+typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *,
+                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
                                   ACE_SYNCH_RECURSIVE_MUTEX,
                                   ACE_Hash_Timer_Heap>
-	ACE_Timer_Hash_Heap_Iterator;
+        ACE_Timer_Hash_Heap_Iterator;
 
 #endif /* ACE_TIMER_HASH_H */
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 24b37a908b8..da22bbdd28a 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -5,25 +5,26 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Hash_T.h
 //
 // = AUTHOR
-//    Darrell Brunsch <brunsch@cs.wustl.edu> 
-// 
+//    Darrell Brunsch <brunsch@cs.wustl.edu>
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_HASH_T_H
 #define ACE_TIMER_HASH_T_H
 
 #include "ace/Timer_Queue_T.h"
-#include "ace/Free_List.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Free_List.h"
+
 // Forward declaration.
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET>
 class ACE_Timer_Hash_T;
@@ -31,18 +32,18 @@ class ACE_Timer_Hash_T;
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_Hash_Upcall
 {
-  // = TITLE 
+  // = TITLE
   //      Functor for Timer_Hash
   //
   // = DESCRIPTION
-  //      This class calls up to the Timer Hash's functor from the 
+  //      This class calls up to the Timer Hash's functor from the
   //      timer queues in the hash table
 public:
-  typedef ACE_Timer_Queue_T<ACE_Event_Handler *, 
-                            ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, 
+  typedef ACE_Timer_Queue_T<ACE_Event_Handler *,
+                            ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
                             ACE_Null_Mutex>
           TIMER_QUEUE;
-  
+
   ACE_Timer_Hash_Upcall (void);
   // Default constructor (creates an invalid object, but needs to be here
   // so timer queues using this functor can be constructed)
@@ -51,13 +52,13 @@ public:
   // Constructor that specifies a Timer_Hash to call up to
 
   int timeout (TIMER_QUEUE &timer_queue,
-	       ACE_Event_Handler *handler,
-	       const void *arg,
-	       const ACE_Time_Value &cur_time);
+               ACE_Event_Handler *handler,
+               const void *arg,
+               const ACE_Time_Value &cur_time);
   // This method is called when the timer expires
-  
+
   int cancellation (TIMER_QUEUE &timer_queue,
-		    ACE_Event_Handler *handler);
+                    ACE_Event_Handler *handler);
   // This method is called when the timer is canceled
 
   int deletion (TIMER_QUEUE &timer_queue,
@@ -84,7 +85,7 @@ class ACE_Timer_Hash_Iterator_T : public ACE_Timer_Queue_Iterator_T <TYPE, FUNCT
   // = DESCRIPTION
   //     This is a generic iterator that can be used to visit every
   //     node of a timer queue.  Be aware that it doesn't transverse
-  //     in the order of timeout values.  
+  //     in the order of timeout values.
 public:
   ACE_Timer_Hash_Iterator_T (ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &);
   // Constructor.
@@ -115,16 +116,16 @@ protected:
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET>
 class ACE_Timer_Hash_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>
 {
-  // = TITLE 
+  // = TITLE
   //      Provides a hash table of <BUCKET>s as an implementation for
   //      a timer queue.
   //
   // = DESCRIPTION
-  //      This implementation uses a hash table of BUCKETs.  The hash 
-  //      is based on the time_value of the event.  Unlike other Timer 
-  //      Queues, ACE_Timer_Hash does not expire events in order.  
-public: 
-  typedef ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> 
+  //      This implementation uses a hash table of BUCKETs.  The hash
+  //      is based on the time_value of the event.  Unlike other Timer
+  //      Queues, ACE_Timer_Hash does not expire events in order.
+public:
+  typedef ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>
           HASH_ITERATOR;
   // Type of iterator
 
@@ -132,15 +133,15 @@ public:
   // Iterator is a friend
 
   typedef ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> INHERITED;
-  // Type inherited from 
+  // Type inherited from
 
   // = Initialization and termination methods.
   ACE_Timer_Hash_T (size_t table_size,
                     FUNCTOR *upcall_functor = 0,
                     ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
   // Default constructor. <table_size> determines the size of the
-  // hash table.  <upcall_functor> is the instance of the FUNCTOR 
-  // to be used by the buckets. If <upcall_functor> is 0, a default 
+  // hash table.  <upcall_functor> is the instance of the FUNCTOR
+  // to be used by the buckets. If <upcall_functor> is 0, a default
   // FUNCTOR will be created.
 
   ACE_Timer_Hash_T (FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
@@ -159,27 +160,27 @@ public:
   virtual const ACE_Time_Value &earliest_time (void) const;
   // Returns the time of the earlier node in the <ACE_Timer_Hash>.
 
-  virtual long schedule (const TYPE &type, 
-			 const void *act, 
-			 const ACE_Time_Value &delay,
-			 const ACE_Time_Value &interval = ACE_Time_Value::zero);
+  virtual long schedule (const TYPE &type,
+                         const void *act,
+                         const ACE_Time_Value &delay,
+                         const ACE_Time_Value &interval = ACE_Time_Value::zero);
   // Schedule <type> that will expire after <delay> amount of time.
   // If it expires then <act> is passed in as the value to the
   // <functor>.  If <interval> is != to <ACE_Time_Value::zero> then it
   // is used to reschedule the <type> automatically.  This method
-  // returns a <timer_id> that is a pointer to a token which stores 
+  // returns a <timer_id> that is a pointer to a token which stores
   // information about the event. This <timer_id> can be used to cancel
   // the timer before it expires.  Returns -1 on failure.
 
   virtual int cancel (const TYPE &type,
-		      int dont_call_handle_close = 1);
+                      int dont_call_handle_close = 1);
   // Cancel all timer associated with <type>.  If <dont_call> is 0
   // then the <functor> will be invoked.  Returns number of timers
   // cancelled.
 
   virtual int cancel (long timer_id,
-		      const void **act = 0,
-		      int dont_call_handle_close = 1);
+                      const void **act = 0,
+                      int dont_call_handle_close = 1);
   // Cancel the single timer that matches the <timer_id> value (which
   // was returned from the <schedule> method).  If act is non-NULL
   // then it will be set to point to the ``magic cookie'' argument
@@ -219,7 +220,7 @@ private:
 
   size_t size_;
   // Keeps track of the size of the queue
-  
+
   BUCKET **table_;
   // Table of BUCKETS
 
@@ -228,7 +229,7 @@ private:
 
   ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK> table_functor_;
   // Functor used for the table's timer queues
-  
+
   size_t earliest_position_;
   // Index to the position with the earliest entry
 
diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h
index d23033a726a..2e37725a6cb 100644
--- a/ace/Timer_Heap.h
+++ b/ace/Timer_Heap.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Heap.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_HEAP_H
@@ -20,20 +20,20 @@
 #include "ace/Timer_Heap_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // The following typedef are here for ease of use and backward
 // compatibility.
 
-typedef ACE_Timer_Heap_T<ACE_Event_Handler *, 
-                         ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                         ACE_SYNCH_RECURSIVE_MUTEX>  
-	ACE_Timer_Heap;
+typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
+                         ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                         ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_Heap;
 
-typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, 
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                                  ACE_SYNCH_RECURSIVE_MUTEX>   
-	ACE_Timer_Heap_Iterator;
+typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
+                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                                  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_Heap_Iterator;
 
 #endif /* ACE_TIMER_HEAP_H */
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index b959230f01f..784e57acfbc 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -5,32 +5,33 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Heap_T.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_HEAP_T_H
 #define ACE_TIMER_HEAP_T_H
 
 #include "ace/Timer_Queue_T.h"
-#include "ace/Free_List.h"
-#include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Free_List.h"
+#include "ace/Containers.h"
+
 // Forward declaration
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_Heap_T;
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
-class ACE_Timer_Heap_Iterator_T : public ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> 
+class ACE_Timer_Heap_Iterator_T : public ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>
 {
   // = TITLE
   //     Iterates over an <ACE_Timer_Heap_T>.
@@ -38,7 +39,7 @@ class ACE_Timer_Heap_Iterator_T : public ACE_Timer_Queue_Iterator_T<TYPE, FUNCTO
   // = DESCRIPTION
   //     This is a generic iterator that can be used to visit every
   //     node of a timer queue.  Be aware that it doesn't transverse
-  //     in the order of timeout values.  
+  //     in the order of timeout values.
 public:
   ACE_Timer_Heap_Iterator_T (ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &);
   // Constructor.
@@ -69,7 +70,7 @@ protected:
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_Heap_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>
 {
-  // = TITLE 
+  // = TITLE
   //      Provides a very fast and predictable timer implementation.
   //
   // = DESCRIPTION
@@ -89,8 +90,8 @@ public:
 
   // = Initialization and termination methods.
   ACE_Timer_Heap_T (size_t size,
-		    int preallocated = 0,
-		    FUNCTOR *upcall_functor = 0,
+                    int preallocated = 0,
+                    FUNCTOR *upcall_functor = 0,
                     ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
   // The Constructor creates a heap with <size> elements.  If
   // <preallocated> is non-0 then we'll pre-allocate all the memory
@@ -115,10 +116,10 @@ public:
   virtual const ACE_Time_Value &earliest_time (void) const;
   // Returns the time of the earlier node in the Timer_Queue.
 
-  virtual long schedule (const TYPE &type, 
-			 const void *act, 
-			 const ACE_Time_Value &delay,
-			 const ACE_Time_Value &interval = ACE_Time_Value::zero);
+  virtual long schedule (const TYPE &type,
+                         const void *act,
+                         const ACE_Time_Value &delay,
+                         const ACE_Time_Value &interval = ACE_Time_Value::zero);
   // Schedule <type> that will expire after <delay> amount of time.
   // If it expires then <act> is passed in as the value to the
   // <functor>.  If <interval> is != to <ACE_Time_Value::zero> then it
@@ -133,14 +134,14 @@ public:
   // valid <timer_id>).
 
   virtual int cancel (const TYPE &type,
-		      int dont_call_handle_close = 1);
+                      int dont_call_handle_close = 1);
   // Cancel all timer associated with <type>.  If <dont_call> is 0
   // then the <functor> will be invoked.  Returns number of timers
   // cancelled.
 
-  virtual int cancel (long timer_id, 
-		      const void **act = 0,
-		      int dont_call_handle_close = 1);
+  virtual int cancel (long timer_id,
+                      const void **act = 0,
+                      int dont_call_handle_close = 1);
   // Cancel the single timer that matches the <timer_id> value (which
   // was returned from the <schedule> method).  If act is non-NULL
   // then it will be set to point to the ``magic cookie'' argument
@@ -184,17 +185,17 @@ private:
 
   void grow_heap (void);
   // Doubles the size of the heap and the corresponding timer_ids array.
-  // If preallocation is used, will also double the size of the 
+  // If preallocation is used, will also double the size of the
   // preallocated array of ACE_Timer_Nodes.
 
-  void reheap_up (ACE_Timer_Node_T<TYPE> *new_node, 
-		  size_t index,
-		  size_t parent);
+  void reheap_up (ACE_Timer_Node_T<TYPE> *new_node,
+                  size_t index,
+                  size_t parent);
   // Restore the heap property, starting at <index>.
 
-  void reheap_down (ACE_Timer_Node_T<TYPE> *moved_node, 
-		    size_t index, 
-		    size_t child);
+  void reheap_down (ACE_Timer_Node_T<TYPE> *moved_node,
+                    size_t index,
+                    size_t child);
   // Restore the heap property, starting at <index>.
 
   void copy (int index, ACE_Timer_Node_T<TYPE> *moved_node);
@@ -218,7 +219,7 @@ private:
 
   size_t cur_size_;
   // Current size of the heap.
-  
+
   HEAP_ITERATOR *iterator_;
   // Iterator used to expire timers.
 
@@ -245,7 +246,7 @@ private:
   ACE_Timer_Node_T<TYPE> *preallocated_nodes_;
   // If this is non-0, then we preallocate <max_size_> number of
   // <ACE_Timer_Node> objects in order to reduce dynamic allocation
-  // costs.  In auto-growing implementation, this points to the 
+  // costs.  In auto-growing implementation, this points to the
   // last array of nodes allocated.
 
   ACE_Timer_Node_T<TYPE> *preallocated_nodes_freelist_;
diff --git a/ace/Timer_List.h b/ace/Timer_List.h
index a25f7bbab05..570b1a8834c 100644
--- a/ace/Timer_List.h
+++ b/ace/Timer_List.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_List.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_LIST_H
@@ -20,20 +20,20 @@
 #include "ace/Timer_List_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // The following typedef are here for ease of use and backward
 // compatibility.
 
-typedef ACE_Timer_List_T<ACE_Event_Handler *, 
-                         ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                         ACE_SYNCH_RECURSIVE_MUTEX> 
-	ACE_Timer_List;
+typedef ACE_Timer_List_T<ACE_Event_Handler *,
+                         ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                         ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_List;
 
-typedef ACE_Timer_List_Iterator_T<ACE_Event_Handler *, 
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                                  ACE_SYNCH_RECURSIVE_MUTEX>  
-	ACE_Timer_List_Iterator;
+typedef ACE_Timer_List_Iterator_T<ACE_Event_Handler *,
+                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                                  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_List_Iterator;
 
 #endif /* ACE_TIMER_LIST_H */
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index c77ea71d7be..191803fd228 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_List_T.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_LIST_T_H
@@ -20,7 +20,7 @@
 #include "ace/Timer_Queue_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Forward declaration.
@@ -35,7 +35,7 @@ class ACE_Timer_List_Iterator_T : public ACE_Timer_Queue_Iterator_T <TYPE, FUNCT
   //
   // = DESCRIPTION
   //     This is a generic iterator that can be used to visit every
-  //     node of a timer queue.  
+  //     node of a timer queue.
 public:
   ACE_Timer_List_Iterator_T (ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &);
   // Constructor.
@@ -65,7 +65,7 @@ protected:
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_List_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>
 {
-  // = TITLE 
+  // = TITLE
   //      Provides a simple implementation of timers.
   //
   // = DESCRIPTION
@@ -81,7 +81,7 @@ class ACE_Timer_List_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>
   //      heap-based callout queue.  For most applications, the
   //      <ACE_Timer_Heap> will perform substantially faster than the
   //      <ACE_Timer_List>.
-public: 
+public:
   typedef ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> LIST_ITERATOR;
   // Type of iterator
 
@@ -89,10 +89,10 @@ public:
   // Iterator is a friend
 
   typedef ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> INHERITED;
-  // Type inherited from 
+  // Type inherited from
 
   // = Initialization and termination methods.
-  ACE_Timer_List_T (FUNCTOR *upcall_functor = 0, 
+  ACE_Timer_List_T (FUNCTOR *upcall_functor = 0,
                     ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
   // Default constructor. <upcall_functor> is the instance of the
   // FUNCTOR to be used by the list. If <upcall_functor> is 0, a
@@ -108,10 +108,10 @@ public:
   virtual const ACE_Time_Value &earliest_time (void) const;
   // Returns the time of the earlier node in the <ACE_Timer_List>.
 
-  virtual long schedule (const TYPE &type, 
-			 const void *act, 
-			 const ACE_Time_Value &delay,
-			 const ACE_Time_Value &interval = ACE_Time_Value::zero);
+  virtual long schedule (const TYPE &type,
+                         const void *act,
+                         const ACE_Time_Value &delay,
+                         const ACE_Time_Value &interval = ACE_Time_Value::zero);
   // Schedule <type> that will expire after <delay> amount of time.
   // If it expires then <act> is passed in as the value to the
   // <functor>.  If <interval> is != to <ACE_Time_Value::zero> then it
@@ -126,14 +126,14 @@ public:
   // valid <timer_id>).
 
   virtual int cancel (const TYPE &type,
-		      int dont_call_handle_close = 1);
+                      int dont_call_handle_close = 1);
   // Cancel all timer associated with <type>.  If <dont_call> is 0
   // then the <functor> will be invoked.  Returns number of timers
   // cancelled.
 
   virtual int cancel (long timer_id,
-		      const void **act = 0,
-		      int dont_call_handle_close = 1);
+                      const void **act = 0,
+                      int dont_call_handle_close = 1);
   // Cancel the single timer that matches the <timer_id> value (which
   // was returned from the <schedule> method).  If act is non-NULL
   // then it will be set to point to the ``magic cookie'' argument
@@ -152,7 +152,7 @@ public:
   // Dump the state of an object.
 
   virtual void reschedule (ACE_Timer_Node_T<TYPE> *);
-  // Reschedule an "interval" <ACE_Timer_Node>.  This should be private 
+  // Reschedule an "interval" <ACE_Timer_Node>.  This should be private
   // but for now it needs to be public for <ACE_Timer_Hash_T>
 
   virtual ACE_Timer_Node_T<TYPE> *get_first (void);
@@ -167,7 +167,7 @@ protected:
   // operator delete).
 */
 private:
-  ACE_Timer_Node_T<TYPE> *head_; 
+  ACE_Timer_Node_T<TYPE> *head_;
   // Pointer to linked list of <ACE_Timer_Handles>.
 
   LIST_ITERATOR *iterator_;
diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h
index 0b35da4b98f..e7ee550300d 100644
--- a/ace/Timer_Queue.h
+++ b/ace/Timer_Queue.h
@@ -5,39 +5,40 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Queue.h
 //
 // = AUTHOR
 //    Doug Schmidt and Irfan Pyarali
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_QUEUE_H
 #define ACE_TIMER_QUEUE_H
 
 #include "ace/Synch.h"
-#include "ace/Timer_Queue_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Timer_Queue_T.h"
+
 // The following typedef are here for ease of use and backward
 // compatibility.
 
 typedef ACE_Timer_Node_T<ACE_Event_Handler *>
-	ACE_Timer_Node;
+        ACE_Timer_Node;
 
-typedef ACE_Timer_Queue_T<ACE_Event_Handler *, 
-	                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                          ACE_SYNCH_RECURSIVE_MUTEX> 
-	ACE_Timer_Queue;
+typedef ACE_Timer_Queue_T<ACE_Event_Handler *,
+                          ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                          ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_Queue;
 
-typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, 
-                                   ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                                   ACE_SYNCH_RECURSIVE_MUTEX> 
-	ACE_Timer_Queue_Iterator;
+typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *,
+                                   ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                                   ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_Queue_Iterator;
 
 #endif /* ACE_TIMER_QUEUE_H */
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index 74df493dd75..c19081646f3 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -18,12 +18,13 @@
 # define ACE_TIMER_QUEUE_ADAPTERS_H
 
 # include "ace/Task.h"
-# include "ace/Signal.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+# include "ace/Signal.h"
+
 template <class TQ>
 class ACE_Export ACE_Async_Timer_Queue_Adapter : public ACE_Event_Handler
 {
@@ -152,11 +153,11 @@ public:
 
 # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
 
-  int enqueue_command (ACE_Command_Base *command_, 
+  int enqueue_command (ACE_Command_Base *command_,
                        COMMAND_ENQUEUE_POSITION pos = TAIL);
   // Enqueues a command object for execution just before waiting on the next
   // timer event. This allows deferred execution of commands that cannot
-  // be performed in the timer event handler context, such as registering 
+  // be performed in the timer event handler context, such as registering
   // or cancelling timers on platforms where the timer queue mutex is not
   // recursive.
 
@@ -167,7 +168,7 @@ private:
 # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
 
   int dispatch_commands (void);
-  // Dispatches all command objects enqueued in the most 
+  // Dispatches all command objects enqueued in the most
   // recent event handler context.
 
   ACE_Unbounded_Queue<ACE_Command_Base *> command_queue_;
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index fc12b857aba..2f60778cc3f 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Queue_T.h
 //
 // = AUTHOR
 //    Doug Schmidt, Irfan Pyarali, and Darrell Brunsch
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_QUEUE_T_H
@@ -21,7 +21,7 @@
 #include "ace/Free_List.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class TYPE>
@@ -36,28 +36,28 @@ public:
   ~ACE_Timer_Node_T (void);
   // Dtor.
 
-  void set (const TYPE &type, 
-            const void *a, 
-            const ACE_Time_Value &t, 
-            const ACE_Time_Value &i, 
-            ACE_Timer_Node_T<TYPE> *n, 
+  void set (const TYPE &type,
+            const void *a,
+            const ACE_Time_Value &t,
+            const ACE_Time_Value &i,
+            ACE_Timer_Node_T<TYPE> *n,
             long timer_id);
-  // singly linked list 
+  // singly linked list
 
-  void set (const TYPE &type, 
-            const void *a, 
-            const ACE_Time_Value &t, 
-            const ACE_Time_Value &i, 
+  void set (const TYPE &type,
+            const void *a,
+            const ACE_Time_Value &t,
+            const ACE_Time_Value &i,
             ACE_Timer_Node_T<TYPE> *p,
-            ACE_Timer_Node_T<TYPE> *n, 
+            ACE_Timer_Node_T<TYPE> *n,
             long timer_id);
   // doubly linked list version
 
-  // = Accessors 
-  
+  // = Accessors
+
   TYPE &get_type (void);
   // Get the type.
-  
+
   void set_type (TYPE &type);
   // Set the type.
 
@@ -90,7 +90,7 @@ public:
 
   void set_next (ACE_Timer_Node_T<TYPE> *next);
   // set the next pointer.
-  
+
   long get_timer_id (void);
   // get the timer_id.
 
@@ -103,13 +103,13 @@ public:
 private:
   TYPE type_;
   // Type of object stored in the Queue
-  
+
   const void *act_;
   // Asynchronous completion token associated with the timer.
-  
+
   ACE_Time_Value timer_value_;
   // Time until the timer expires.
-  
+
   ACE_Time_Value interval_;
   // If this is a periodic timer this holds the time until the next
   // timeout.
@@ -119,7 +119,7 @@ private:
 
   ACE_Timer_Node_T<TYPE> *next_;
   // Pointer to next timer.
-  
+
   long timer_id_;
   // Id of this timer (used to cancel timers before they expire).
 };
@@ -159,19 +159,19 @@ public:
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_Queue_T
 {
-  // = TITLE 
+  // = TITLE
   //      Provides an interface to timers.
   //
   // = DESCRIPTION
   //      This is an abstract base class that provides hook for
   //      implementing specialized policies such as <ACE_Timer_List>
   //      and <ACE_Timer_Heap>.
-public: 
+public:
   typedef ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> ITERATOR;
   // Type of Iterator.
 
   // = Initialization and termination methods.
-  ACE_Timer_Queue_T (FUNCTOR *upcall_functor = 0, 
+  ACE_Timer_Queue_T (FUNCTOR *upcall_functor = 0,
                      ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
   // Default constructor. <upcall_functor> is the instance of the
   // FUNCTOR to be used by the queue. If <upcall_functor> is 0, Timer
@@ -188,10 +188,10 @@ public:
   virtual const ACE_Time_Value &earliest_time (void) const = 0;
   // Returns the time of the earlier node in the Timer_Queue.
 
-  virtual long schedule (const TYPE &type, 
-			 const void *act, 
-			 const ACE_Time_Value &delay,
-			 const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0;
+  virtual long schedule (const TYPE &type,
+                         const void *act,
+                         const ACE_Time_Value &delay,
+                         const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0;
   // Schedule <type> that will expire after <delay> amount of time.
   // If it expires then <act> is passed in as the value to the
   // <functor>.  If <interval> is != to <ACE_Time_Value::zero> then it
@@ -206,15 +206,15 @@ public:
   // valid <timer_id>).
 
   virtual int cancel (const TYPE &type,
-		      int dont_call_handle_close = 1) = 0;
+                      int dont_call_handle_close = 1) = 0;
   // Cancel all timer associated with <type>.  If
   // <dont_call_handle_close> is 0 then the <functor> will be invoked,
   // which typically invokes the <handle_close> hook.  Returns number
   // of timers cancelled.
 
-  virtual int cancel (long timer_id, 
-		      const void **act = 0,
-		      int dont_call_handle_close = 1) = 0;
+  virtual int cancel (long timer_id,
+                      const void **act = 0,
+                      int dont_call_handle_close = 1) = 0;
   // Cancel the single timer that matches the <timer_id> value (which
   // was returned from the <schedule> method).  If act is non-NULL
   // then it will be set to point to the ``magic cookie'' argument
@@ -248,7 +248,7 @@ public:
   // no pending timers or if all pending timers are longer than max.
 
   virtual ACE_Time_Value *calculate_timeout (ACE_Time_Value *max,
-					     ACE_Time_Value *the_timeout);
+                                             ACE_Time_Value *the_timeout);
   // Determine the next event to timeout.  Returns <max> if there are
   // no pending timers or if all pending timers are longer than max.
   // <the_timeout> should be a pointer to storage for the timeout value,
@@ -258,7 +258,7 @@ public:
   void timer_skew (const ACE_Time_Value &skew);
   const ACE_Time_Value &timer_skew (void) const;
 
-  ACE_LOCK &mutex (void); 
+  ACE_LOCK &mutex (void);
   // Synchronization variable used by the queue
 
   FUNCTOR &upcall_functor (void);
@@ -282,8 +282,8 @@ public:
 
 protected:
   virtual void upcall (TYPE &type,
-		       const void *act,
-		       const ACE_Time_Value &cur_time);
+                       const void *act,
+                       const ACE_Time_Value &cur_time);
   // This method will call the <functor> with the <type>, <act> and
   // <time>
 
@@ -316,7 +316,7 @@ protected:
   // Flag to delete only if the class created the <free_list_>
 
 private:
-  
+
   ACE_Time_Value timeout_;
   // Returned by <calculate_timeout>.
 
@@ -331,18 +331,18 @@ private:
 template <class ACE_LOCK>
 class ACE_Event_Handler_Handle_Timeout_Upcall
 {
-  // = TITLE 
+  // = TITLE
   //      Functor for Timer_Queues.
   //
   // = DESCRIPTION
   //      This class implements the functor required by the Timer
   //      Queue to call <handle_timeout> on ACE_Event_Handlers.
 public:
-  typedef ACE_Timer_Queue_T<ACE_Event_Handler *, 
-                            ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>, 
+  typedef ACE_Timer_Queue_T<ACE_Event_Handler *,
+                            ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>,
                             ACE_LOCK>
           TIMER_QUEUE;
-  
+
   // = Initialization and termination methods.
   ACE_Event_Handler_Handle_Timeout_Upcall (void);
   // Constructor.
@@ -351,13 +351,13 @@ public:
   // Destructor.
 
   int timeout (TIMER_QUEUE &timer_queue,
-	       ACE_Event_Handler *handler,
-	       const void *arg,
-	       const ACE_Time_Value &cur_time);
+               ACE_Event_Handler *handler,
+               const void *arg,
+               const ACE_Time_Value &cur_time);
   // This method is called when the timer expires
-  
+
   int cancellation (TIMER_QUEUE &timer_queue,
-		    ACE_Event_Handler *handler);
+                    ACE_Event_Handler *handler);
   // This method is called when the timer is canceled
 
   int deletion (TIMER_QUEUE &timer_queue,
diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h
index b21bd64fa33..dc5bae5829e 100644
--- a/ace/Timer_Wheel.h
+++ b/ace/Timer_Wheel.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Wheel.h
 //
 // = AUTHOR
 //    Darrell Brunsch (brunsch@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_WHEEL_H
@@ -21,20 +21,20 @@
 #include "ace/Timer_Wheel_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // The following typedef are here for ease of use and backward
 // compatibility.
 
-typedef ACE_Timer_Wheel_T<ACE_Event_Handler *, 
-                         ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                         ACE_SYNCH_RECURSIVE_MUTEX> 
-	ACE_Timer_Wheel;
+typedef ACE_Timer_Wheel_T<ACE_Event_Handler *,
+                         ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                         ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_Wheel;
 
-typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, 
-                                   ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, 
-                                   ACE_SYNCH_RECURSIVE_MUTEX>  
-	ACE_Timer_Wheel_Iterator;
+typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *,
+                                   ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
+                                   ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Timer_Wheel_Iterator;
 
 #endif /* ACE_TIMER_WHEEL_H */
diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h
index b8995cf3bb2..2c8976fca7d 100644
--- a/ace/Timer_Wheel_T.h
+++ b/ace/Timer_Wheel_T.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Timer_Wheel.h
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TIMER_WHEEL_T_H
@@ -21,7 +21,7 @@
 #include "ace/Timer_Queue_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Forward declaration
@@ -37,7 +37,7 @@ class ACE_Timer_Wheel_Iterator_T : public ACE_Timer_Queue_Iterator_T <TYPE, FUNC
   // = DESCRIPTION
   //     This is a generic iterator that can be used to visit every
   //     node of a timer queue.  Be aware that it doesn't transverse
-  //     in the order of timeout values.  
+  //     in the order of timeout values.
 public:
   ACE_Timer_Wheel_Iterator_T (ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &);
   // Constructor
@@ -61,30 +61,30 @@ protected:
   ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &timer_wheel_;
   // Pointer to the <ACE_Timer_List> that we are iterating over.
 
-  size_t pos_;  
+  size_t pos_;
   // Current position in the timing wheel
-  
-  ACE_Timer_Node_T<TYPE> *list_item_; 
+
+  ACE_Timer_Node_T<TYPE> *list_item_;
   // Pointer to the position in the the <pos_>th list
 };
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_Wheel_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>
 {
-  // = TITLE 
+  // = TITLE
   //      Provides a Timing Wheel version of Timer Queue
   //
   // = DESCRIPTION
   //      This implementation uses a hash table of ordered doubly-
-  //      linked lists of absolute times.  The other enhancements 
+  //      linked lists of absolute times.  The other enhancements
   //      to Timer List include using the pointer to the node as the
-  //      timer id (to speed up removing), adding a free list and 
+  //      timer id (to speed up removing), adding a free list and
   //      the ability to preallocate nodes.  Timer Wheel is based on
   //      the timing wheel implementation used in Adam M. Costello and
   //      George Varghese's paper "Redesigning the BSD Callout and
-  //      Timer Facilities" 
+  //      Timer Facilities"
   //      (http://dworkin.wustl.edu/~varghese/PAPERS/newbsd.ps.Z)
-public: 
+public:
   typedef ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> WHEEL_ITERATOR;
   // Type of iterator
 
@@ -96,19 +96,19 @@ public:
 
   // = Initialization and termination methods
 
-  ACE_Timer_Wheel_T (size_t wheelsize, 
-                     size_t resolution, 
+  ACE_Timer_Wheel_T (size_t wheelsize,
+                     size_t resolution,
                      size_t prealloc = 0,
                      FUNCTOR *upcall_functor = 0,
                      ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
-  // Constructor that takes in <wheelsize> - size of the timing wheel, 
+  // Constructor that takes in <wheelsize> - size of the timing wheel,
   // <resolution> - resolution of time values the hashing function uses,
   // and <upcall_functor> - a functor that will be used instead of creating
   // a default functor.  Also, when the freelist is created, <prealloc> nodes
-  // will be allocated. This can also take in a upcall functor and freelist 
+  // will be allocated. This can also take in a upcall functor and freelist
   // (if 0, then defaults will be created)
 
-  ACE_Timer_Wheel_T (FUNCTOR *upcall_functor = 0, 
+  ACE_Timer_Wheel_T (FUNCTOR *upcall_functor = 0,
                      ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
   // Default constructor. <upcall_functor> is the instance of the
   // FUNCTOR to be used by the queue. If <upcall_functor> is 0, Timer
@@ -127,27 +127,27 @@ public:
   virtual const ACE_Time_Value &earliest_time (void) const;
   // Returns the time of the earlier node in the <ACE_Timer_Wheel>.
 
-  virtual long schedule (const TYPE &type, 
-			 const void *act, 
-			 const ACE_Time_Value &delay,
-			 const ACE_Time_Value &interval = ACE_Time_Value::zero);
+  virtual long schedule (const TYPE &type,
+                         const void *act,
+                         const ACE_Time_Value &delay,
+                         const ACE_Time_Value &interval = ACE_Time_Value::zero);
   // Schedule <type> that will expire after <delay> amount of time.
   // If it expires then <act> is passed in as the value to the
   // <functor>.  If <interval> is != to <ACE_Time_Value::zero> then it
   // is used to reschedule the <type> automatically.  This method
   // returns a <timer_id> that uniquely identifies the the timer.
-  // This <timer_id> can be used to cancel the timer before it expires.  
+  // This <timer_id> can be used to cancel the timer before it expires.
   // Returns -1 on failure.
 
   virtual int cancel (const TYPE &type,
-		      int dont_call_handle_close = 1);
+                      int dont_call_handle_close = 1);
   // Cancel all timer associated with <type>.  If <dont_call> is 0
   // then the <functor> will be invoked.  Returns number of timers
   // cancelled.
 
-  virtual int cancel (long timer_id, 
-		      const void **act = 0,
-		      int dont_call_handle_close = 1);
+  virtual int cancel (long timer_id,
+                      const void **act = 0,
+                      int dont_call_handle_close = 1);
   // Cancel the single timer that matches the <timer_id> value (which
   // was returned from the <schedule> method).  If act is non-NULL
   // then it will be set to point to the ``magic cookie'' argument
diff --git a/ace/Token.h b/ace/Token.h
index 49d53db1dc4..acade74ee1b 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -5,14 +5,14 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Token.h
 //
 // = AUTHOR
 //    Original author -- Karl-Heinz Dorn (kdorn@erlh.siemens.de)
 //    Ported to ACE by Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TOKEN_H
@@ -21,7 +21,7 @@
 #include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_THREADS)
@@ -37,13 +37,13 @@ class ACE_Export ACE_Token
   //    Class that acquires, renews, and releases a synchronization
   //    token that is serviced in strict FIFO ordering.
   //
-  // = DESCRIPTION 
+  // = DESCRIPTION
   //    This class is a more general-purpose synchronization mechanism
   //    than SunOS 5.x mutexes.  For example, it implements "recursive
   //    mutex" semantics, where a thread that owns the token can
   //    reacquire it without deadlocking.  In addition, threads that are
   //    blocked awaiting the token are serviced in strict FIFO order as
-  //    other threads release the token (Solaris and Pthread mutexes don't 
+  //    other threads release the token (Solaris and Pthread mutexes don't
   //    strictly enforce an acquisition order).
   //    There are two FIFO lists within the class.  Write acquires always
   //    have higher priority over read acquires.  Which means, if you use
@@ -65,15 +65,15 @@ public:
   // = Synchronization operations.
 
   int acquire (void (*sleep_hook)(void *),
-	       void *arg = 0, 
-	       ACE_Time_Value *timeout = 0);
+               void *arg = 0,
+               ACE_Time_Value *timeout = 0);
   // Acquire the token, sleeping until it is obtained or until
   // <timeout> expires.  If some other thread currently holds the
   // token then <sleep_hook> is called before our thread goes to
   // sleep.  This <sleep_hook> can be used by the requesting thread to
   // unblock a token-holder that is sleeping, e.g., by means of
   // writing to a pipe (the ACE ACE_Reactor uses this functionality).
-  // Return values: 
+  // Return values:
   // 0 if acquires without calling <sleep_hook>
   // 1 if <sleep_hook> is called.
   // 2 if the token is signaled.
@@ -85,9 +85,9 @@ public:
   // This behaves just like the previous <acquire> method, except
   // that it invokes the virtual function called <sleep_hook>
   // that can be overridden by a subclass of ACE_Token.
-  
+
   virtual void sleep_hook (void);
-  // This should be overridden by a subclass to define 
+  // This should be overridden by a subclass to define
   // the appropriate behavior before <acquire> goes to sleep.
   // By default, this is a no-op...
 
@@ -106,7 +106,7 @@ public:
   // nesting_level_ > 1.  I'm not sure if this is really the right
   // thing to do (since it makes it possible for shared data to be
   // changed unexpectedly) so use with caution...
-  // This method maintians the original token priority.  
+  // This method maintians the original token priority.
 
   int tryacquire (void);
   // Become interface-compliant with other lock mechanisms (implements
@@ -124,16 +124,16 @@ public:
   // be called acquire_yield.
 
   int acquire_read (void (*sleep_hook)(void *),
-	       void *arg = 0, 
-	       ACE_Time_Value *timeout = 0);
+               void *arg = 0,
+               ACE_Time_Value *timeout = 0);
   // More sophisticate version of acquire_read.
 
   int acquire_write (void);
   // Just calls <acquire>.
 
   int acquire_write (void (*sleep_hook)(void *),
-	       void *arg = 0, 
-	       ACE_Time_Value *timeout = 0);
+               void *arg = 0,
+               ACE_Time_Value *timeout = 0);
   // More sophisticate version of acquire_write.
 
   int tryacquire_read (void);
@@ -171,7 +171,7 @@ public:
   // = The following structure implements a ACE_FIFO of waiter threads
   // that are asleep waiting to obtain the token.
 
-  struct ACE_Token_Queue_Entry 
+  struct ACE_Token_Queue_Entry
   {
     ACE_Token_Queue_Entry (ACE_Thread_Mutex &m, ACE_thread_t t_id);
 
@@ -209,7 +209,7 @@ private:
   struct ACE_Token_Queue
   {
     ACE_Token_Queue (void);
-    
+
     void remove_entry (ACE_Token_Queue_Entry *);
     // Remove a waiter from the queue (used when a timeout occurs).
 
@@ -220,9 +220,9 @@ private:
     // Tail of the list of waiting threads.
   };
 
-  int shared_acquire (void (*sleep_hook_func)(void *), 
-		      void *arg,
-		      ACE_Time_Value *timeout,
+  int shared_acquire (void (*sleep_hook_func)(void *),
+                      void *arg,
+                      ACE_Time_Value *timeout,
                       ACE_Token_Op_Type op_type);
   // Implements the <acquire> and <tryacquire> methods above.
 
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 404d3bcc148..ecc02f2231b 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -28,13 +28,14 @@
 #define ACE_TOKEN_COLLECTION_H
 
 #include "ace/Map_Manager.h"
-#include "ace/Local_Tokens.h"
-#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Local_Tokens.h"
+#include "ace/SString.h"
+
 class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy
 {
   // = TITLE
@@ -58,7 +59,7 @@ class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy
   //   returns zero for now.
 public:
   ACE_Token_Collection (int debug = 0,
-			const char *name = 0);
+                        const char *name = 0);
   // <debug> print out verbose debugging messages. <name> will give a
   // name to the collection.  Collections don't really need names, but
   // are sometimes useful for debugging.
@@ -107,9 +108,9 @@ public:
 //   renew, or release).
 
   virtual int acquire (int notify = 0,
-		       void (*sleep_hook)(void *) = 0,
-		       ACE_Synch_Options &options =
-		       ACE_Synch_Options::defaults);
+                       void (*sleep_hook)(void *) = 0,
+                       ACE_Synch_Options &options =
+                       ACE_Synch_Options::defaults);
   // Acquire "atomically" all resources in the collection.  This is
   // only successfull if all tokens in the collection could be
   // acquired.  options contains the blocking semantics, timeout
@@ -124,10 +125,10 @@ public:
   // hands.
 
   virtual int acquire (const char *token_name,
-		       int notify = 0,
-		       void (*sleep_hook)(void *) = 0,
-		       ACE_Synch_Options &options =
-		       ACE_Synch_Options::defaults);
+                       int notify = 0,
+                       void (*sleep_hook)(void *) = 0,
+                       ACE_Synch_Options &options =
+                       ACE_Synch_Options::defaults);
   // Acquire the token corresponding to <token_name>.  The other
   // parameters are passed to <token>::acquire.
 
@@ -135,12 +136,12 @@ public:
   // Try to acquire all tokens in collection.
 
   virtual int tryacquire (const char *token_name,
-			  void (*sleep_hook)(void *) = 0);
+                          void (*sleep_hook)(void *) = 0);
   // Try to acquire <token_name>.
 
   virtual int renew (int requeue_position = 0,
-		     ACE_Synch_Options &options =
-		     ACE_Synch_Options::defaults);
+                     ACE_Synch_Options &options =
+                     ACE_Synch_Options::defaults);
   // Renews "atomically" all resources in the collection.  This is
   // only successfull if all tokens in the collection could be
   // renewed.  options contains the blocking semantics, timeout
@@ -149,14 +150,14 @@ public:
 
 
   virtual int renew (const char *token_name,
-		     int requeue_position = 0,
-		     ACE_Synch_Options &options =
-		     ACE_Synch_Options::defaults);
+                     int requeue_position = 0,
+                     ACE_Synch_Options &options =
+                     ACE_Synch_Options::defaults);
   // Renew the token corresponding to <token_name>.  The other
   // parameters are passed to <token>::renew.
 
   virtual int release (ACE_Synch_Options &options =
-		       ACE_Synch_Options::defaults);
+                       ACE_Synch_Options::defaults);
   // Releases "atomically" all resources in the collection.  This is
   // only successfull if all tokens in the collection could be
   // released.  options contains the blocking semantics, timeout
@@ -165,8 +166,8 @@ public:
 
 
   virtual int release (const char *token_name,
-		       ACE_Synch_Options &options =
-		       ACE_Synch_Options::defaults);
+                       ACE_Synch_Options &options =
+                       ACE_Synch_Options::defaults);
   // Release the token corresponding to <token_name>.  The other
   // parameters are passed to <token>::release.
 
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index fa0d83048a7..8dc667a9d47 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -23,13 +23,14 @@
 #define ACE_TOKEN_INVARIANTS_H
 
 #include "ace/Synch.h"
-#include "ace/Map_Manager.h"
-#include "ace/Local_Tokens.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Map_Manager.h"
+#include "ace/Local_Tokens.h"
+
 class ACE_Export ACE_Mutex_Invariants
 {
   // = TITLE
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index 9fadea24b74..31a49a39453 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -18,13 +18,14 @@
 #define ACE_TOKEN_MANAGER_H
 
 #include "ace/Synch.h"
-#include "ace/Map_Manager.h"
-#include "ace/Local_Tokens.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Map_Manager.h"
+#include "ace/Local_Tokens.h"
+
 class ACE_Local_Mutex;
 class ACE_Mutex_Token;
 
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index 6c46c1f970c..072842c23cf 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -5,37 +5,38 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
 //    Token_Request_Reply.h
 //
-// = DESCRIPTION 
-//     Define the format used to exchange messages between the 
+// = DESCRIPTION
+//     Define the format used to exchange messages between the
 //     ACE_Token Server and its clients.
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
 //    Tim Harrison (harrison@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #ifndef ACE_TOKEN_REQUEST_REPLY_H
 #define ACE_TOKEN_REQUEST_REPLY_H
 
 #include "ace/Local_Tokens.h"
-#include "ace/Time_Value.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Time_Value.h"
+
 class ACE_Export ACE_Token_Request
 {
   // = TITLE
   //   Message format for delivering requests to the ACE_Token Server.
   //
   // = DESCRIPTION
-  //   This class is implemented to minimize data copying.  
+  //   This class is implemented to minimize data copying.
   //   In particular, all marshaling is done in situ...
 public:
   enum OPERATION
@@ -52,11 +53,11 @@ public:
   // Default constructor.
 
   ACE_Token_Request (int token_type,
-		     int proxy_type,
-		     ACE_UINT32 operation,
-		     const char token_name[],
-		     const char client_id[],
-		     const ACE_Synch_Options &options);
+                     int proxy_type,
+                     ACE_UINT32 operation,
+                     const char token_name[],
+                     const char client_id[],
+                     const ACE_Synch_Options &options);
   // token_type - MUTEX, RWLOCK
   // proxy_type - MUTEX, RLOCK, WLOCK (acquires mean different things)
   // operation - method
@@ -111,7 +112,7 @@ public:
   // Print out the values of the message for debugging purposes.
 
 private:
-  // = The 5 fields in the <Transfer> struct are transmitted to the server.  
+  // = The 5 fields in the <Transfer> struct are transmitted to the server.
   // The remaining 2 fields are not tranferred -- they are used only on
   // the server-side to simplify lookups.
 
@@ -155,7 +156,7 @@ private:
     // The data portion contains the <tokenName_> followed by a ':'
     // followed by the <clientId_>.
   } transfer_;
-    
+
   char *token_name_;
   // Pointer to the beginning of the token name in this->data_.
 
@@ -172,7 +173,7 @@ class ACE_Export ACE_Token_Reply
   //     Message format for delivering replies from the ACE_Token Server.
   //
   // = DESCRIPTION
-  //   This class is implemented to minimize data copying.  
+  //   This class is implemented to minimize data copying.
   //   In particular, all marshaling is done in situ...
 public:
   ACE_Token_Reply (void);
diff --git a/ace/Trace.h b/ace/Trace.h
index bce87e6abb8..e0f52b6d2df 100644
--- a/ace/Trace.h
+++ b/ace/Trace.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Trace.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TRACE_H
@@ -48,10 +48,10 @@ public:
   // Enable the tracing facility.
 
   static void stop_tracing (void);
-  // Disable the tracing facility. 
+  // Disable the tracing facility.
 
   static void set_nesting_indent (int indent);
-  // Change the nesting indentation level. 
+  // Change the nesting indentation level.
 
   void dump (void) const;
   // Dump the state of an object.
@@ -66,12 +66,12 @@ private:
 
   static int nesting_indent_;
   // Keeps track of how far to indent per trace call.
-  
+
   static int enable_tracing_;
   // Is tracing enabled?
 
   // Default values.
-  enum 
+  enum
   {
     DEFAULT_INDENT  = 3,
     DEFAULT_TRACING = 1
diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h
index 37c9c9fcc74..5929b7e7a11 100644
--- a/ace/Typed_SV_Message.h
+++ b/ace/Typed_SV_Message.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Typed_SV_Message.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TYPED_SV_MESSAGE_H
@@ -21,7 +21,7 @@
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class T>
@@ -32,18 +32,18 @@ class ACE_Typed_SV_Message
   //     message queues.
 public:
   // = Initialization and termination methods.
-  ACE_Typed_SV_Message (long type = 0, 
-			int length = sizeof (T), 
-			int max_size = sizeof (T));
-  ACE_Typed_SV_Message (const T &data, 
-			long type = 0, 
-			int length = sizeof (T), 
-			int max_size = sizeof (T));
+  ACE_Typed_SV_Message (long type = 0,
+                        int length = sizeof (T),
+                        int max_size = sizeof (T));
+  ACE_Typed_SV_Message (const T &data,
+                        long type = 0,
+                        int length = sizeof (T),
+                        int max_size = sizeof (T));
   ~ACE_Typed_SV_Message (void);
 
   // = Get/set the type of the message.
   long type (void) const;
-  void type (long type); 
+  void type (long type);
 
   // = Get/set the length of the message.
   int length (void) const;
diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h
index d2c93f06639..cd791c1f119 100644
--- a/ace/Typed_SV_Message_Queue.h
+++ b/ace/Typed_SV_Message_Queue.h
@@ -6,46 +6,47 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Typed_SV_Message_Queue.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_TYPED_MESSAGE_QUEUE_H
 #define ACE_TYPED_MESSAGE_QUEUE_H
 
 #include "ace/SV_Message_Queue.h"
-#include "ace/Typed_SV_Message.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Typed_SV_Message.h"
+
 template <class T>
-class ACE_Typed_SV_Message_Queue 
+class ACE_Typed_SV_Message_Queue
 {
   // = TITLE
   //    Defines the header file for the C++ wrapper for message queues.
-public: 
-  enum 
+public:
+  enum
   {
-    ACE_CREATE = IPC_CREAT, 
-    ACE_OPEN = 0, 
+    ACE_CREATE = IPC_CREAT,
+    ACE_OPEN = 0,
     ACE_NOWAIT = IPC_NOWAIT
   };
 
   // = Initialization and termination operations.
   ACE_Typed_SV_Message_Queue (void);
-  ACE_Typed_SV_Message_Queue (key_t external_id, 
-			      int create = ACE_OPEN,
-			      int perms = ACE_DEFAULT_FILE_PERMS);
-  int open (key_t external_id, 
-	    int create = ACE_OPEN,
-	    int perms = ACE_DEFAULT_FILE_PERMS);
+  ACE_Typed_SV_Message_Queue (key_t external_id,
+                              int create = ACE_OPEN,
+                              int perms = ACE_DEFAULT_FILE_PERMS);
+  int open (key_t external_id,
+            int create = ACE_OPEN,
+            int perms = ACE_DEFAULT_FILE_PERMS);
   int close (void);
   int remove (void);
   ~ACE_Typed_SV_Message_Queue (void);
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index 54c1eabc19a..b198b13da25 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    UNIX_Addr.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_UNIX_ADDR_H
@@ -20,7 +20,7 @@
 #include "ace/Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
@@ -28,7 +28,7 @@
 class ACE_Export ACE_UNIX_Addr : public ACE_Addr
 {
   // = TITLE
-  //    Defines the ``UNIX domain address family'' address format. 
+  //    Defines the ``UNIX domain address family'' address format.
 public:
   // = Initialization methods.
   ACE_UNIX_Addr (void);
@@ -70,7 +70,7 @@ public:
   int  operator != (const ACE_UNIX_Addr &SAP) const;
   // Compare two addresses for inequality.
 
-  const char *get_path_name (void) const; 
+  const char *get_path_name (void) const;
   // Return the path name of the underlying rendezvous point.
 
   void dump (void) const;
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index 342211444bc..c1fbdb318d1 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -6,27 +6,28 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    UPIPE_Acceptor.h
 //
 // = AUTHOR
 //    Gerhard Lenzer and Douglas C. Schmidt
-// 
+//
 // ============================================================================
 
-#ifndef ACE_UPIPE_ACCEPTOR_H 
+#ifndef ACE_UPIPE_ACCEPTOR_H
 #define ACE_UPIPE_ACCEPTOR_H
 
 #include "ace/UPIPE_Stream.h"
-#include "ace/Synch.h"
-#include "ace/SPIPE_Acceptor.h"
-#include "ace/Thread_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch.h"
+#include "ace/SPIPE_Acceptor.h"
+#include "ace/Thread_Manager.h"
+
 #if defined (ACE_HAS_THREADS)
 
 class ACE_Export ACE_UPIPE_Acceptor : public ACE_SPIPE_Acceptor
@@ -39,12 +40,12 @@ public:
   ACE_UPIPE_Acceptor (void);
   // Default constructor.
 
-  ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_sap, 
-		      int reuse_addr = 0);
+  ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_sap,
+                      int reuse_addr = 0);
   // Initialize passive endpoint.
-  
-  int open (const ACE_UPIPE_Addr &local_sap, 
-	    int reuse_addr = 0);
+
+  int open (const ACE_UPIPE_Addr &local_sap,
+            int reuse_addr = 0);
   // Initialize passive endpoint.
 
   ~ACE_UPIPE_Acceptor (void);
@@ -55,18 +56,18 @@ public:
 
   int remove (void);
   // Close down and release resources and remove the underlying SPIPE
-  // rendezvous point. 
+  // rendezvous point.
 
   // = Passive connection acceptance method.
-  int accept (ACE_UPIPE_Stream &server_stream, 
-	      ACE_UPIPE_Addr *remote_addr = 0,
-	      ACE_Time_Value *timeout = 0, 
-	      int restart = 1,
+  int accept (ACE_UPIPE_Stream &server_stream,
+              ACE_UPIPE_Addr *remote_addr = 0,
+              ACE_Time_Value *timeout = 0,
+              int restart = 1,
               int reset_new_handle = 0);
   // Accept a new data transfer connection.  A <timeout> of 0 means
   // block forever, a <timeout> of {0, 0} means poll.  <restart> == 1
   // means "restart if interrupted."
-  
+
   void dump (void) const;
   // Dump the state of an object.
 
@@ -77,7 +78,7 @@ private:
   ACE_Thread_Manager tm;
   // Manage threads.
 
-  ACE_Message_Block mb_;    
+  ACE_Message_Block mb_;
   // To confirm connection establishment.
 };
 
diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h
index ae1162d101d..82c118480a7 100644
--- a/ace/UPIPE_Addr.h
+++ b/ace/UPIPE_Addr.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    UPIPE_Addr.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_UPIPE_ADDR_H
@@ -21,7 +21,7 @@
 #include "ace/SPIPE_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 typedef ACE_SPIPE_Addr ACE_UPIPE_Addr;
@@ -32,7 +32,7 @@ typedef ACE_SPIPE_Addr ACE_UPIPE_Addr;
 class ACE_Export ACE_UPIPE_Addr
 {
   // = TITLE
-  //    Defines the ACE "user pipe" address family address format. 
+  //    Defines the ACE "user pipe" address family address format.
   //
   // = DESCRIPTION
   //    This class has an identical interface to the <ACE_SPIPE_Addr>
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index 905da37b07e..5d605801c20 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -5,26 +5,27 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    UPIPE_Connector.h
 //
 // = AUTHOR
 //    Gerhard Lenzer and Douglas C. Schmidt
-// 
+//
 // ============================================================================
 
 #ifndef ACE_UPIPE_CONNECTOR_H
 #define ACE_UPIPE_CONNECTOR_H
 
 #include "ace/UPIPE_Stream.h"
-#include "ace/Synch.h"
-#include "ace/SPIPE_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch.h"
+#include "ace/SPIPE_Stream.h"
+
 #if defined (ACE_HAS_THREADS)
 
 class ACE_Export ACE_UPIPE_Connector : public ACE_SPIPE
@@ -37,13 +38,13 @@ public:
   ACE_UPIPE_Connector (void);
   // Default constructor.
 
-  ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, 
-		       const ACE_UPIPE_Addr &addr, 
-		       ACE_Time_Value *timeout = 0,
-		       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-		       int reuse_addr = 0,
-		       int flags = O_RDWR,
-		       int perms = 0);
+  ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
+                       const ACE_UPIPE_Addr &addr,
+                       ACE_Time_Value *timeout = 0,
+                       const ACE_Addr &local_sap = ACE_Addr::sap_any,
+                       int reuse_addr = 0,
+                       int flags = O_RDWR,
+                       int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
@@ -60,13 +61,13 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
-  int connect (ACE_UPIPE_Stream &new_stream, 
-	       const ACE_UPIPE_Addr &addr, 
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
-	       int flags = O_RDWR,
-	       int perms = 0);
+  int connect (ACE_UPIPE_Stream &new_stream,
+               const ACE_UPIPE_Addr &addr,
+               ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               int reuse_addr = 0,
+               int flags = O_RDWR,
+               int perms = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <timeout> is the amount of time to wait to connect.
diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h
index 62b3022910a..61618371e46 100644
--- a/ace/UPIPE_Stream.h
+++ b/ace/UPIPE_Stream.h
@@ -5,28 +5,29 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    UPIPE_Stream.h
 //
 // = AUTHOR
 //    Gerhard Lenzer and Douglas C. Schmidt
-// 
+//
 // ============================================================================
 
 #ifndef ACE_UPIPE_STREAM_H
 #define ACE_UPIPE_STREAM_H
 
 #include "ace/Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "ace/SPIPE.h"
 #include "ace/Message_Queue.h"
 #include "ace/UPIPE_Addr.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if defined (ACE_HAS_THREADS)
 
 // Use a typedef to make life easier later on.
@@ -53,38 +54,38 @@ public:
   // Return the underlying I/O handle.
 
   // = Send/recv ACE Message_Blocks.
-  int send (ACE_Message_Block *mb_p, 
-	    ACE_Time_Value *timeout  = 0);
+  int send (ACE_Message_Block *mb_p,
+            ACE_Time_Value *timeout  = 0);
   // Send a message through the message queue.  Returns -1 on error,
   // else 0.
 
-  int recv (ACE_Message_Block *&mb_p, 
-	    ACE_Time_Value *timeout  = 0);
+  int recv (ACE_Message_Block *&mb_p,
+            ACE_Time_Value *timeout  = 0);
   // Recv a message from the message queue.  Returns -1 on error, else
   // 0.
 
   // = Send/recv char buffers.
-  int send (const char *buffer, 
-	    size_t n, 
-	    ACE_Time_Value *timeout = 0);
+  int send (const char *buffer,
+            size_t n,
+            ACE_Time_Value *timeout = 0);
   // Send a buffer of <n> bytes through the message queue.  Returns -1
   // on error, else number of bytes sent.
 
-  int recv (char *buffer, 
-	    size_t n, 
-	    ACE_Time_Value *timeout = 0);
+  int recv (char *buffer,
+            size_t n,
+            ACE_Time_Value *timeout = 0);
   // Recv a buffer of upto <n> bytes from the message queue.  Returns
   // -1 on error, else number of bytes read.
 
-  int send_n (const char *buffer, 
-	      size_t n,
-	      ACE_Time_Value *timeout = 0);
+  int send_n (const char *buffer,
+              size_t n,
+              ACE_Time_Value *timeout = 0);
   // Send a buffer of exactly <n> bytes to the message queue.  Returns
   // -1 on error, else number of bytes written (which should == n).
 
-  int recv_n (char *buffer, 
-	      size_t n, 
-	      ACE_Time_Value *timeout = 0);
+  int recv_n (char *buffer,
+              size_t n,
+              ACE_Time_Value *timeout = 0);
   // Recv a buffer of exactly <n> bytes from the message queue.
   // Returns -1 on error, else the number of bytes read.
 
@@ -105,7 +106,7 @@ private:
   // To hold the last ACE_Message_Block read out of the stream. Thus
   // allowing subsequent reads from one ACE_Message_Block
 
-  size_t remaining_;            
+  size_t remaining_;
   // Holds the number of bytes that are still available in mb_last_.
 
   ACE_UPIPE_Addr remote_addr_;
@@ -125,7 +126,7 @@ private:
 #endif /* ACE_MT_SAFE */
 };
 
-#if defined (__ACE_INLINE__) 
+#if defined (__ACE_INLINE__)
 #include "ace/UPIPE_Stream.i"
 #endif /* __ACE_INLINE__ */
 
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index cdf95dff8a0..7bb17b85eb2 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -18,16 +18,17 @@
 #define ACE_WFMO_REACTOR_H
 
 #include "ace/Signal.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Timer_Queue.h"
 #include "ace/Event_Handler.h"
 #include "ace/Synch.h"
 #include "ace/Reactor_Impl.h"
 #include "ace/Message_Queue.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Forward decl.
 class ACE_WFMO_Reactor;
 class ACE_Handle_Set;
@@ -102,10 +103,10 @@ public:
     // Reset the state of the structure
 
     void set (int io_entry,
-	      ACE_Event_Handler *event_handler,
-	      ACE_HANDLE io_handle,
-	      long network_events,
-	      int delete_event,
+              ACE_Event_Handler *event_handler,
+              ACE_HANDLE io_handle,
+              long network_events,
+              int delete_event,
               int delete_entry,
               ACE_Reactor_Mask close_masks);
     // Set the structure to these new values
@@ -135,17 +136,17 @@ public:
     // Reset the state of the structure
 
     void set (int io_entry,
-	      ACE_Event_Handler *event_handler,
-	      ACE_HANDLE io_handle,
-	      long network_events,
-	      int delete_event,
-	      int delete_entry = 0,
-	      ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK,
+              ACE_Event_Handler *event_handler,
+              ACE_HANDLE io_handle,
+              long network_events,
+              int delete_event,
+              int delete_entry = 0,
+              ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK,
               int suspend_entry = 0);
     // Set the structure to these new values
 
     void set (Common_Info &common_info,
-	      int suspend_entry = 0);
+              int suspend_entry = 0);
     // Set the structure to these new values
 
     void dump (ACE_HANDLE event_handle) const;
@@ -173,19 +174,19 @@ public:
     // Reset the state of the structure
 
     void set (ACE_HANDLE event_handle,
-	      int io_entry,
-	      ACE_Event_Handler *event_handler,
-	      ACE_HANDLE io_handle,
-	      long network_events,
-	      int delete_event,
+              int io_entry,
+              ACE_Event_Handler *event_handler,
+              ACE_HANDLE io_handle,
+              long network_events,
+              int delete_event,
               int delete_entry = 0,
               ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK,
               int suspend_entry = 0);
     // Set the structure to these new values
 
     void set (ACE_HANDLE event_handle,
-	      Common_Info &common_info,
-	      int suspend_entry = 0);
+              Common_Info &common_info,
+              int suspend_entry = 0);
     // Set the structure to these new values
 
     void dump (void) const;
@@ -213,19 +214,19 @@ public:
     // Reset the state of the structure
 
     void set (ACE_HANDLE event_handle,
-	      int io_entry,
-	      ACE_Event_Handler *event_handler,
-	      ACE_HANDLE io_handle,
-	      long network_events,
-	      int delete_event,
-	      int delete_entry = 0,
-	      ACE_Reactor_Mask close_masks = 0,
-	      int resume_entry = 0);
+              int io_entry,
+              ACE_Event_Handler *event_handler,
+              ACE_HANDLE io_handle,
+              long network_events,
+              int delete_event,
+              int delete_entry = 0,
+              ACE_Reactor_Mask close_masks = 0,
+              int resume_entry = 0);
     // Set the structure to these new values
 
     void set (ACE_HANDLE event_handle,
-	      Common_Info &common_info,
-	      int resume_entry = 0);
+              Common_Info &common_info,
+              int resume_entry = 0);
     // Set the structure to these new values
 
     void dump (void) const;
@@ -251,11 +252,11 @@ public:
   // the simple event entry.
 
   int bind_i (int io_entry,
-	      ACE_Event_Handler *event_handler,
-	      long network_events,
-	      ACE_HANDLE io_handle,
-	      ACE_HANDLE event_handle,
-	      int delete_event);
+              ACE_Event_Handler *event_handler,
+              long network_events,
+              ACE_HANDLE io_handle,
+              ACE_HANDLE event_handle,
+              int delete_event);
   // Insert I/O <Event_Handler> entry into the system. This method
   // assumes that the lock are head *before* this method is invoked.
 
@@ -295,26 +296,26 @@ public:
   // Check to see if <index> has been scheduled for deletion
 
   int add_network_events_i (ACE_Reactor_Mask mask,
-			    ACE_HANDLE io_handle,
-			    long &new_mask,
-			    ACE_HANDLE &event_handle,
-			    int &delete_event);
+                            ACE_HANDLE io_handle,
+                            long &new_mask,
+                            ACE_HANDLE &event_handle,
+                            int &delete_event);
   // This method is used to calculate the network mask after a
   // register request to <WFMO_Reactor>. Note that because the
   // <Event_Handler> may already be in the handler repository, we may
   // have to find the old event and the old network events
 
   void remove_network_events_i (long &existing_masks,
-				ACE_Reactor_Mask to_be_removed_masks);
+                                ACE_Reactor_Mask to_be_removed_masks);
   // This method is used to change the network mask left (if any)
   // after a remove request to <WFMO_Reactor>
 
   int suspend_handler_i (ACE_HANDLE handle,
-			 int &changes_required);
+                         int &changes_required);
   // Temporarily suspend entry
 
   int resume_handler_i (ACE_HANDLE handle,
-			int &changes_required);
+                        int &changes_required);
   // Resume suspended entry
 
   int make_changes_in_current_infos (void);
@@ -328,11 +329,11 @@ public:
   // current_suspended_info_ from to_be_added_info_
 
   int remove_handler_i (size_t index,
-			ACE_Reactor_Mask mask);
+                        ACE_Reactor_Mask mask);
   // Removes the <ACE_Event_Handler> at <index> from the table.
 
   int remove_suspended_handler_i (size_t index,
-				  ACE_Reactor_Mask mask);
+                                  ACE_Reactor_Mask mask);
   // Removes the <ACE_Event_Handler> at <index> from the table.
 
   int remove_to_be_added_handler_i (size_t index,
@@ -522,22 +523,22 @@ public:
   // = Initialization and termination methods.
 
   ACE_WFMO_Reactor (ACE_Sig_Handler * = 0,
-		    ACE_Timer_Queue * = 0);
+                    ACE_Timer_Queue * = 0);
   // Initialize <ACE_WFMO_Reactor> with the default size.
 
   ACE_WFMO_Reactor (size_t size,
-		    int unused = 0,
-		    ACE_Sig_Handler * = 0,
-		    ACE_Timer_Queue * = 0);
+                    int unused = 0,
+                    ACE_Sig_Handler * = 0,
+                    ACE_Timer_Queue * = 0);
   // Initialize <ACE_WFMO_Reactor> with size <size>.  <size> should
   // not exceed <ACE_WFMO_Reactor::DEFAULT_SIZE>. Two slots will be
   // added to the <size> parameter which will store handles used for
   // internal management purposes.
 
   virtual int open (size_t size = ACE_WFMO_Reactor::DEFAULT_SIZE,
-		    int restart = 0,
-		    ACE_Sig_Handler * = 0,
-		    ACE_Timer_Queue * = 0,
+                    int restart = 0,
+                    ACE_Sig_Handler * = 0,
+                    ACE_Timer_Queue * = 0,
                     int disable_notify_pipe = 0,
                     ACE_Reactor_Notify * = 0);
   // Initialize <ACE_WFMO_Reactor> with size <size>.  <size> should
@@ -600,7 +601,7 @@ public:
   // = Register and remove Handlers.
 
   virtual int register_handler (ACE_Event_Handler *event_handler,
-				ACE_HANDLE event_handle = ACE_INVALID_HANDLE);
+                                ACE_HANDLE event_handle = ACE_INVALID_HANDLE);
   // Register an <ACE_Event_Handler> <event_handler>.  Since no Event
   // Mask is passed through this interface, it is assumed that the
   // <handle> being passed in is an event handle and when the event
@@ -610,9 +611,9 @@ public:
   // <event_handler> to extract the underlying event handle.
 
   virtual int register_handler (ACE_HANDLE event_handle,
-				ACE_HANDLE io_handle,
-				ACE_Event_Handler *event_handler,
-				ACE_Reactor_Mask mask);
+                                ACE_HANDLE io_handle,
+                                ACE_Event_Handler *event_handler,
+                                ACE_Reactor_Mask mask);
   // Register an <ACE_Event_Handler> <event_handle>.  <mask> specifies
   // the network events that the <event_handler> is interested in.  If
   // <io_handle> == <ACE_INVALID_HANDLE> the <ACE_WFMO_Reactor> will
@@ -624,42 +625,42 @@ public:
   // the <Event_Handler>
 
   virtual int register_handler (ACE_HANDLE io_handle,
-				ACE_Event_Handler *event_handler,
-				ACE_Reactor_Mask mask);
+                                ACE_Event_Handler *event_handler,
+                                ACE_Reactor_Mask mask);
   // This is a simple version of the above <register_handler> method
   // where the I/O handle is passed in and the event handle will
   // always be created by <WFMO_Reactor>
 
   virtual int register_handler (ACE_Event_Handler *event_handler,
-				ACE_Reactor_Mask mask);
+                                ACE_Reactor_Mask mask);
   // This is a simple version of the above <register_handler> method
   // where the I/O handle will always come from <get_handle> on the
   // <Event_Handler> and the event handle will always be created by
   // <WFMO_Reactor>
 
   virtual int register_handler (const ACE_Handle_Set &handles,
-				ACE_Event_Handler *event_handler,
-				ACE_Reactor_Mask mask);
+                                ACE_Event_Handler *event_handler,
+                                ACE_Reactor_Mask mask);
   // Register <event_handler> with all the <handles> in the
   // <Handle_Set>.
 
   virtual int register_handler (int signum,
-				ACE_Event_Handler *new_sh,
-				ACE_Sig_Action *new_disp = 0,
-				ACE_Event_Handler **old_sh = 0,
-				ACE_Sig_Action *old_disp = 0);
+                                ACE_Event_Handler *new_sh,
+                                ACE_Sig_Action *new_disp = 0,
+                                ACE_Event_Handler **old_sh = 0,
+                                ACE_Sig_Action *old_disp = 0);
   // Register <new_sh> to handle the signal <signum> using the
   // <new_disp>.  Returns the <old_sh> that was previously registered
   // (if any), along with the <old_disp> of the signal handler.
 
   virtual int register_handler (const ACE_Sig_Set &sigset,
-				ACE_Event_Handler *new_sh,
-				ACE_Sig_Action *new_disp = 0);
+                                ACE_Event_Handler *new_sh,
+                                ACE_Sig_Action *new_disp = 0);
   // Registers <new_sh> to handle a set of signals <sigset> using the
   // <new_disp>.
 
   virtual int remove_handler (ACE_Event_Handler *event_handler,
-			      ACE_Reactor_Mask mask);
+                              ACE_Reactor_Mask mask);
   // Removes <event_handler> from the <ACE_WFMO_Reactor>.  Note that
   // the <ACE_WFMO_Reactor> will call the <get_handle> method of
   // <event_handler> to extract the underlying handle.  If <mask> ==
@@ -668,7 +669,7 @@ public:
   // either be the <event_handle> or the <io_handle>
 
   virtual int remove_handler (ACE_HANDLE handle,
-			      ACE_Reactor_Mask mask);
+                              ACE_Reactor_Mask mask);
   // Removes <handle> from the <ACE_WFMO_Reactor>.  If <mask> ==
   // <ACE_Event_Handler::DONT_CALL> then the <handle_close> method of
   // the <event_handler> is not invoked. Note that the <handle> can
@@ -682,15 +683,15 @@ public:
   // <WFMO_Reactor>
 
   virtual int remove_handler (const ACE_Handle_Set &handle_set,
-			      ACE_Reactor_Mask);
+                              ACE_Reactor_Mask);
   // Removes all the <mask> bindings for handles in the <handle_set>
   // bind of <Event_Handler>.  If there are no more bindings for any
   // of these handles then they are removed from WFMO_Reactor.
 
   virtual int remove_handler (int signum,
-			      ACE_Sig_Action *new_disp,
-			      ACE_Sig_Action *old_disp = 0,
-			      int sigkey = -1);
+                              ACE_Sig_Action *new_disp,
+                              ACE_Sig_Action *old_disp = 0,
+                              int sigkey = -1);
   // Remove the ACE_Event_Handler currently associated with <signum>.
   // <sigkey> is ignored in this implementation since there is only
   // one instance of a signal handler.  Install the new disposition
@@ -737,9 +738,9 @@ public:
   // Timer management.
 
   virtual long schedule_timer (ACE_Event_Handler *event_handler,
-			       const void *arg,
-			       const ACE_Time_Value &delta,
-			       const ACE_Time_Value &interval = ACE_Time_Value::zero);
+                               const void *arg,
+                               const ACE_Time_Value &delta,
+                               const ACE_Time_Value &interval = ACE_Time_Value::zero);
   // Schedule an <event_handler> that will expire after <delay> amount
   // of time.  If it expires then <arg> is passed in as the value to
   // the <event_handler>'s <handle_timeout> callback method.  If
@@ -755,13 +756,13 @@ public:
   // valid <timer_id>.
 
   virtual int cancel_timer (ACE_Event_Handler *event_handler,
-			    int dont_call_handle_close = 1);
+                            int dont_call_handle_close = 1);
   // Cancel all Event_Handlers that match the address of
   // <event_handler>.  Returns number of handler's cancelled.
 
   virtual int cancel_timer (long timer_id,
-			    const void **arg = 0,
-			    int dont_call_handle_close = 1);
+                            const void **arg = 0,
+                            int dont_call_handle_close = 1);
   // Cancel the single Event_Handler that matches the <timer_id> value
   // (which was returned from the schedule method).  If arg is
   // non-NULL then it will be set to point to the ``magic cookie''
@@ -773,31 +774,31 @@ public:
   // = High-level Event_Handler scheduling operations
 
   virtual int schedule_wakeup (ACE_Event_Handler *event_handler,
-			       ACE_Reactor_Mask masks_to_be_added);
+                               ACE_Reactor_Mask masks_to_be_added);
   // Add <masks_to_be_added> to the <event_handler>'s entry in
   // WFMO_Reactor.  <event_handler> must already have been registered
   // with WFMO_Reactor.
 
   virtual int schedule_wakeup (ACE_HANDLE handle,
-			       ACE_Reactor_Mask masks_to_be_added);
+                               ACE_Reactor_Mask masks_to_be_added);
   // Add <masks_to_be_added> to the <handle>'s entry in WFMO_Reactor.
   // The Event_Handler associated with <handle> must already have been
   // registered with WFMO_Reactor.
 
   virtual int cancel_wakeup (ACE_Event_Handler *event_handler,
-			     ACE_Reactor_Mask mask);
+                             ACE_Reactor_Mask mask);
   // This method is identical to the <remove_handler> method.
 
   virtual int cancel_wakeup (ACE_HANDLE handle,
-			     ACE_Reactor_Mask mask);
+                             ACE_Reactor_Mask mask);
   // This method is identical to the <remove_handler> method.
 
 
   // = Notification methods.
 
   virtual int notify (ACE_Event_Handler * = 0,
-		      ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
-		      ACE_Time_Value * = 0);
+                      ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
+                      ACE_Time_Value * = 0);
   // Wakeup one <ACE_WFMO_Reactor> thread if it is currently blocked
   // in <WaitForMultipleObjects>.  The <ACE_Time_Value> indicates how
   // long to blocking trying to notify the <WFMO_Reactor>.  If
@@ -824,12 +825,12 @@ public:
   // <ACE_Message_Queue::dequeue> loop.
 
   virtual int handler (ACE_HANDLE handle,
-		       ACE_Reactor_Mask mask,
-		       ACE_Event_Handler **event_handler = 0);
+                       ACE_Reactor_Mask mask,
+                       ACE_Event_Handler **event_handler = 0);
   // Not implemented
 
   virtual int handler (int signum,
-		       ACE_Event_Handler ** = 0);
+                       ACE_Event_Handler ** = 0);
   // Check to see if <signum> is associated with a valid Event_Handler
   // bound to a signal.  Return the <event_handler> associated with
   // this <handler> if <event_handler> != 0.
@@ -866,25 +867,25 @@ public:
   // = Low-level wait_set mask manipulation methods.
 
   virtual int mask_ops (ACE_Event_Handler *event_handler,
-			ACE_Reactor_Mask mask,
-			int ops);
+                        ACE_Reactor_Mask mask,
+                        int ops);
   // Not implemented
 
   virtual int mask_ops (ACE_HANDLE handle,
-			ACE_Reactor_Mask mask,
-			int ops);
+                        ACE_Reactor_Mask mask,
+                        int ops);
   // Not implemented
 
   // = Low-level ready_set mask manipulation methods.
 
   virtual int ready_ops (ACE_Event_Handler *event_handler,
-			 ACE_Reactor_Mask mask,
-			 int ops);
+                         ACE_Reactor_Mask mask,
+                         int ops);
   // Not implemented
 
   virtual int ready_ops (ACE_HANDLE handle,
-			 ACE_Reactor_Mask,
-			 int ops);
+                         ACE_Reactor_Mask,
+                         int ops);
   // Not implemented
 
   ACE_ALLOC_HOOK_DECLARE;
@@ -895,24 +896,24 @@ public:
 
 protected:
   virtual int schedule_wakeup_i (ACE_HANDLE handle,
-				 ACE_Reactor_Mask masks_to_be_added);
+                                 ACE_Reactor_Mask masks_to_be_added);
   // Scheduling workhorse
 
   virtual int register_handler_i (ACE_HANDLE event_handle,
-				  ACE_HANDLE io_handle,
-				  ACE_Event_Handler *event_handler,
-				  ACE_Reactor_Mask mask);
+                                  ACE_HANDLE io_handle,
+                                  ACE_Event_Handler *event_handler,
+                                  ACE_Reactor_Mask mask);
   // Registration workhorse
 
   virtual int event_handling (ACE_Time_Value *max_wait_time = 0,
-			      int alertable = 0);
+                              int alertable = 0);
   // Event handling workhorse
 
   virtual ACE_thread_t owner_i (void);
   // Return the ID of the "owner" thread. Does not do any locking.
 
   virtual int ok_to_wait (ACE_Time_Value *max_wait_time,
-			  int alertable);
+                          int alertable);
   // Check to see if it is ok to enter ::WaitForMultipleObjects().
 
   virtual int wait_for_multiple_events (int timeout,
@@ -944,12 +945,12 @@ protected:
   // handler was removed.
 
   virtual int simple_dispatch_handler (int index,
-				       ACE_HANDLE event_handle);
+                                       ACE_HANDLE event_handle);
   // Dispatches a single handler.  Returns 0 on success, -1 if the
   // handler was removed.
 
   virtual int complex_dispatch_handler (int index,
-					ACE_HANDLE event_handle);
+                                        ACE_HANDLE event_handle);
   // Dispatches a single handler.  Returns 0 on success, -1 if the
   // handler was removed.
 
@@ -1087,12 +1088,12 @@ typedef struct _WSANETWORKEVENTS
 } WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
 
 int WSAEventSelect (SOCKET s,
-		    WSAEVENT hEventObject,
-		    long lNetworkEvents);
+                    WSAEVENT hEventObject,
+                    long lNetworkEvents);
 
 int WSAEnumNetworkEvents (SOCKET s,
-			  WSAEVENT hEventObject,
-			  LPWSANETWORKEVENTS lpNetworkEvents);
+                          WSAEVENT hEventObject,
+                          LPWSANETWORKEVENTS lpNetworkEvents);
 
 #endif /* !defined ACE_HAS_WINSOCK2 */
 
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index 7cf4f9fe0dd..b2f86dc5d1f 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -22,7 +22,7 @@
 #include "ace/Select_Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_XT)
@@ -55,9 +55,9 @@ class ACE_Export ACE_XtReactor : public ACE_Select_Reactor
 public:
   // = Initialization and termination methods.
   ACE_XtReactor (XtAppContext context = 0,
-		 size_t size = DEFAULT_SIZE,
-		 int restart = 0,
-		 ACE_Sig_Handler * = 0);
+                 size_t size = DEFAULT_SIZE,
+                 int restart = 0,
+                 ACE_Sig_Handler * = 0);
   virtual ~ACE_XtReactor (void);
 
   XtAppContext context (void) const;
@@ -65,31 +65,31 @@ public:
 
   // = Timer operations.
   virtual long schedule_timer (ACE_Event_Handler *handler,
-			       const void *arg,
-			       const ACE_Time_Value &delta_time,
-			       const ACE_Time_Value &interval);
+                               const void *arg,
+                               const ACE_Time_Value &delta_time,
+                               const ACE_Time_Value &interval);
 
   virtual int cancel_timer (ACE_Event_Handler *handler,
-			    int dont_call_handle_close = 1);
+                            int dont_call_handle_close = 1);
 
   virtual int cancel_timer (long timer_id,
-			    const void **arg = 0,
-			    int dont_call_handle_close = 1);
+                            const void **arg = 0,
+                            int dont_call_handle_close = 1);
 
 protected:
   // = Register timers/handles with Xt.
   virtual int register_handler_i (ACE_HANDLE handle,
-				  ACE_Event_Handler *handler,
-				  ACE_Reactor_Mask mask);
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
   // Register a single <handler>.
 
   virtual int register_handler_i (const ACE_Handle_Set &handles,
-				  ACE_Event_Handler *handler,
-				  ACE_Reactor_Mask mask);
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
   // Register a set of <handlers>.
 
   virtual int remove_handler_i (ACE_HANDLE handle,
-				ACE_Reactor_Mask mask);
+                                ACE_Reactor_Mask mask);
   // Remove the <handler> associated with this <handle>.
 
   virtual int remove_handler_i (const ACE_Handle_Set &handles,
@@ -97,12 +97,12 @@ protected:
   // Remove a set of <handles>.
 
   virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-					ACE_Time_Value *);
+                                        ACE_Time_Value *);
   // Wait for events to occur.
 
   virtual int XtWaitForMultipleEvents (int,
-				       ACE_Select_Reactor_Handle_Set &,
-				       ACE_Time_Value *);
+                                       ACE_Select_Reactor_Handle_Set &,
+                                       ACE_Time_Value *);
   //Wait for Xt events to occur.
 
   XtAppContext context_;
diff --git a/ace/inc_user_config.h b/ace/inc_user_config.h
index dcc36f3e6d2..e2aee93274f 100644
--- a/ace/inc_user_config.h
+++ b/ace/inc_user_config.h
@@ -10,7 +10,7 @@
 #include "ace/config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // By default, DO include RCS Id strings in object code.
diff --git a/ace/iosfwd.h b/ace/iosfwd.h
index 4d52b28e4ba..a1e8054affa 100644
--- a/ace/iosfwd.h
+++ b/ace/iosfwd.h
@@ -30,7 +30,7 @@
 #include "ace/inc_user_config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
diff --git a/ace/streams.h b/ace/streams.h
index da1fab22001..56130bec6f7 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -27,7 +27,7 @@
 #include "ace/inc_user_config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
diff --git a/ace/ws2tcpip.h b/ace/ws2tcpip.h
index 45ecd2e6bf5..796047f77c7 100644
--- a/ace/ws2tcpip.h
+++ b/ace/ws2tcpip.h
@@ -1,16 +1,16 @@
-/*	
-**	WS2TCPIP.H - WinSock2 Extension for TCP/IP protocols
+/*
+**      WS2TCPIP.H - WinSock2 Extension for TCP/IP protocols
 **
-**	This file contains TCP/IP specific information for use 
-**	by WinSock2 compatible applications. 
+**      This file contains TCP/IP specific information for use
+**      by WinSock2 compatible applications.
 **
-**	To provide the backward compatibility, all the TCP/IP  
-**	specific definitions that were included in the WINSOCK.H
-**	 file are now included in WINSOCK2.H file. WS2TCPIP.H 
-**	file includes only the definitions  introduced in the 
-**	"WinSock 2 Protocol-Specific Annex" document.
+**      To provide the backward compatibility, all the TCP/IP
+**      specific definitions that were included in the WINSOCK.H
+**       file are now included in WINSOCK2.H file. WS2TCPIP.H
+**      file includes only the definitions  introduced in the
+**      "WinSock 2 Protocol-Specific Annex" document.
 **
-**	Rev 0.3	Nov 13, 1995
+**      Rev 0.3 Nov 13, 1995
 */
 
 #ifndef _WS2TCPIP_H_
@@ -20,67 +20,67 @@
 
 typedef struct _INTERFACE_INFO
 {
-	u_long		iiFlags;		/* Interface flags */
-	struct sockaddr	iiAddress;		/* Interface address */
-	struct sockaddr	iiBroadcastAddress; 	/* Broadcast address */
-	struct sockaddr	iiNetmask;		/* Network mask */
+        u_long          iiFlags;                /* Interface flags */
+        struct sockaddr iiAddress;              /* Interface address */
+        struct sockaddr iiBroadcastAddress;     /* Broadcast address */
+        struct sockaddr iiNetmask;              /* Network mask */
 } INTERFACE_INFO;
 
-/* Possible flags for the  iiFlags - bitmask  */ 
+/* Possible flags for the  iiFlags - bitmask  */
 
-#define IFF_UP		0x00000001 /* Interface is up */
-#define IFF_BROADCAST	0x00000002 /* Broadcast is  supported */
-#define IFF_LOOPBACK	0x00000004 /* this is loopback interface */
-#define IFF_POINTTOPOINT 0x00000008 /*this is point-to-point 
+#define IFF_UP          0x00000001 /* Interface is up */
+#define IFF_BROADCAST   0x00000002 /* Broadcast is  supported */
+#define IFF_LOOPBACK    0x00000004 /* this is loopback interface */
+#define IFF_POINTTOPOINT 0x00000008 /*this is point-to-point
 interface*/
-#define IFF_MULTICAST	0x00000010 /* multicast is supported */
+#define IFF_MULTICAST   0x00000010 /* multicast is supported */
 
 /* Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP */
 
 struct ip_mreq {
-	struct in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct in_addr imr_interface;	/* local IP address of interface */
+        struct in_addr imr_multiaddr;   /* IP multicast address of group */
+        struct in_addr imr_interface;   /* local IP address of interface */
 };
 
 /* TCP/IP specific Ioctl codes */
 
-#define SIO_GET_INTERFACE_LIST 	<TBD>
+#define SIO_GET_INTERFACE_LIST  <TBD>
 
 /* Option to use with [gs]etsockopt at the IPPROTO_IP level */
 
-#define	IP_OPTIONS			1 /* set/get IP options */
-#define	IP_HDRINCL			2 /* header is included with data */
-#define	IP_TOS			3 /* IP type of service and preced*/
-#define	IP_TTL			4 /* IP time to live */
-#define	IP_MULTICAST_IF		9 /* set/get IP multicast i/f  */
-#define	IP_MULTICAST_TTL	     10 /* set/get IP multicast ttl */
-#define	IP_MULTICAST_LOOP	     11 /*set/get IP multicast loopback */
-#define	IP_ADD_MEMBERSHIP	     12 /* add an IP group membership */
-#define	IP_DROP_MEMBERSHIP     13/* drop an IP group membership */
+#define IP_OPTIONS                      1 /* set/get IP options */
+#define IP_HDRINCL                      2 /* header is included with data */
+#define IP_TOS                  3 /* IP type of service and preced*/
+#define IP_TTL                  4 /* IP time to live */
+#define IP_MULTICAST_IF         9 /* set/get IP multicast i/f  */
+#define IP_MULTICAST_TTL             10 /* set/get IP multicast ttl */
+#define IP_MULTICAST_LOOP            11 /*set/get IP multicast loopback */
+#define IP_ADD_MEMBERSHIP            12 /* add an IP group membership */
+#define IP_DROP_MEMBERSHIP     13/* drop an IP group membership */
 
 
 /* Option to use with [gs]etsockopt at the IPPROTO_UDP level */
 
-#define UDP_NOCHECKSUM	1
+#define UDP_NOCHECKSUM  1
 
 /* Option to use with [gs]etsockopt at the IPPROTO_TCP level */
 
-#define  TCP_EXPEDITED_1122	0x0002
+#define  TCP_EXPEDITED_1122     0x0002
 
 
 /* IPv6 definitions */
 
 struct in_addr6 {
-		u_char	s6_addr[16];	/* IPv6 address */
+                u_char  s6_addr[16];    /* IPv6 address */
 };
 
 struct sockaddr_in6 {
-		short		sin6_family;   /* AF_INET6 */
-		u_short   	sin6_port;	   /* Transport level port numb
+                short           sin6_family;   /* AF_INET6 */
+                u_short         sin6_port;         /* Transport level port numb
 er */
-		u_long	sin6_flowinfo; /* IPv6 flow information */
-		struct in_addr6 	sin6_addr; /* IPv6 address */
+                u_long  sin6_flowinfo; /* IPv6 flow information */
+                struct in_addr6         sin6_addr; /* IPv6 address */
 };
 
 
-#endif	/* _WS2TCPIP_H_ */
+#endif  /* _WS2TCPIP_H_ */
diff --git a/apps/Gateway/Gateway/Concrete_Connection_Handlers.h b/apps/Gateway/Gateway/Concrete_Connection_Handlers.h
index ca36e3f517e..b149856de05 100644
--- a/apps/Gateway/Gateway/Concrete_Connection_Handlers.h
+++ b/apps/Gateway/Gateway/Concrete_Connection_Handlers.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Concrete_Connection_Handlers.h
 //
@@ -14,11 +14,11 @@
 //    appropriate threaded/reactive Consumer/Supplier behavior.
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (CONCRETE_CONNECTION_HANDLER)
+#ifndef CONCRETE_CONNECTION_HANDLER
 #define CONCRETE_CONNECTION_HANDLER
 
 #include "Connection_Handler.h"
@@ -69,8 +69,8 @@ public:
   // = Initialization method.
   Consumer_Handler (const Connection_Config_Info &);
 
-  virtual int put (ACE_Message_Block *event, 
-		   ACE_Time_Value * = 0);
+  virtual int put (ACE_Message_Block *event,
+                   ACE_Time_Value * = 0);
   // Send an event to a Consumer (may be queued if necessary).
 
 protected:
diff --git a/apps/Gateway/Gateway/Config_Files.h b/apps/Gateway/Gateway/Config_Files.h
index 1e23006ddbd..9fd96b687f6 100644
--- a/apps/Gateway/Gateway/Config_Files.h
+++ b/apps/Gateway/Gateway/Config_Files.h
@@ -5,16 +5,16 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Config_Files.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_CONFIG_FILES)
+#ifndef _CONFIG_FILES
 #define _CONFIG_FILES
 
 #include "File_Parser.h"
@@ -42,7 +42,7 @@ public:
 
   ACE_INT32 max_retry_timeout_;
   // Maximum amount of time to wait for reconnecting.
-  
+
   u_short local_port_;
   // Our local port number.
 
@@ -80,10 +80,10 @@ public:
   ACE_INT32 consumers_[MAX_CONSUMERS];
   // Connection ids for consumers that will be routed information
   // containing this <connection_id_>
-  
+
   ACE_INT32 total_consumers_;
   // Total number of these consumers.
-};  
+};
 
 class Consumer_Config_File_Parser : public File_Parser<Consumer_Config_Info>
   // = TITLE
diff --git a/apps/Gateway/Gateway/Connection_Handler.h b/apps/Gateway/Gateway/Connection_Handler.h
index 876f69d97f4..3003a81874e 100644
--- a/apps/Gateway/Gateway/Connection_Handler.h
+++ b/apps/Gateway/Gateway/Connection_Handler.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Connection_Handler.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_CONNECTION_HANDLER)
+#ifndef _CONNECTION_HANDLER
 #define _CONNECTION_HANDLER
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Connector.h"
 #include "ace/Svc_Handler.h"
 #include "Config_Files.h"
@@ -54,7 +59,7 @@ public:
     CONNECTING,    // During connection establishment.
     ESTABLISHED,   // Connection_Handler is established and active.
     DISCONNECTING, // Connection_Handler is in the process of connecting.
-    FAILED	   // Connection_Handler has failed.
+    FAILED         // Connection_Handler has failed.
   };
 
   // = Set/get the current state.
@@ -86,7 +91,7 @@ public:
   void connection_role (char);
   char connection_role (void) const;
 
-  // = Set/get the <Event_Channel> *. 
+  // = Set/get the <Event_Channel> *.
   void event_channel (Event_Channel *);
   Event_Channel *event_channel (void) const;
 
@@ -100,7 +105,7 @@ public:
   // Perform timer-based Connection_Handler reconnection.
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
   // Perform Connection_Handler termination.
 
 protected:
@@ -110,7 +115,7 @@ protected:
   ACE_INET_Addr local_addr_;
   // Address of us.
 
-  CONNECTION_ID connection_id_;  
+  CONNECTION_ID connection_id_;
   // The assigned connection ID of this entry.
 
   size_t total_bytes_;
diff --git a/apps/Gateway/Gateway/Connection_Handler_Acceptor.h b/apps/Gateway/Gateway/Connection_Handler_Acceptor.h
index fb8d84ad667..777f58c4a5b 100644
--- a/apps/Gateway/Gateway/Connection_Handler_Acceptor.h
+++ b/apps/Gateway/Gateway/Connection_Handler_Acceptor.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Connection_Handler_acceptor.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_CONNECTION_HANDLER_ACCEPTOR)
+#ifndef _CONNECTION_HANDLER_ACCEPTOR
 #define _CONNECTION_HANDLER_ACCEPTOR
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Acceptor.h"
 #include "Connection_Handler.h"
 
@@ -31,7 +36,7 @@ class Connection_Handler_Acceptor : public ACE_Acceptor<Connection_Handler, ACE_
   //     and produces a new Connection_Handler object to do the dirty
   //     work...
 public:
-  Connection_Handler_Acceptor (Event_Channel &, 
+  Connection_Handler_Acceptor (Event_Channel &,
                                char connection_role);
   // Constructor.
 
@@ -42,14 +47,14 @@ public:
   // Hook method for accepting a connection into the
   // <Connection_Handler>.
 
-protected:  
+protected:
   typedef ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
           inherited;
   // Make life easier later on.
 
   Event_Channel &event_channel_;
   // Reference to the event channel.
-  
+
   Connection_Config_Info connection_config_info_;
   // Keeps track of what type of proxy we need to create.
 
diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.h b/apps/Gateway/Gateway/Connection_Handler_Connector.h
index e81d66d9694..f4e7d7d06a1 100644
--- a/apps/Gateway/Gateway/Connection_Handler_Connector.h
+++ b/apps/Gateway/Gateway/Connection_Handler_Connector.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Connection_Handler_Connector.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_IO_HANDLER_CONNECTOR)
+#ifndef _IO_HANDLER_CONNECTOR
 #define _IO_HANDLER_CONNECTOR
 
 #include "ace/Connector.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Connector.h"
 #include "Connection_Handler.h"
 
@@ -31,8 +36,8 @@ public:
   Connection_Handler_Connector (void);
 
   // Initiate (or reinitiate) a connection on the Connection_Handler.
-  int initiate_connection (Connection_Handler *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
+  int initiate_connection (Connection_Handler *,
+                           ACE_Synch_Options & = ACE_Synch_Options::synch);
 
 };
 
diff --git a/apps/Gateway/Gateway/Consumer_Dispatch_Set.h b/apps/Gateway/Gateway/Consumer_Dispatch_Set.h
index 2f89143460d..3a5d0cf3e25 100644
--- a/apps/Gateway/Gateway/Consumer_Dispatch_Set.h
+++ b/apps/Gateway/Gateway/Consumer_Dispatch_Set.h
@@ -5,20 +5,24 @@
 //
 // = LIBRARY
 //    apps
-// 
+//
 // = FILENAME
 //    Consumer_Dispatch_Set.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (CONSUMER_DISPATCH_SET)
+#ifndef CONSUMER_DISPATCH_SET
 #define CONSUMER_DISPATCH_SET
 
 #include "ace/Containers.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Forward reference.
 class Connection_Handler;
 
diff --git a/apps/Gateway/Gateway/Event.h b/apps/Gateway/Gateway/Event.h
index 2221f63916a..80413bb5a75 100644
--- a/apps/Gateway/Gateway/Event.h
+++ b/apps/Gateway/Gateway/Event.h
@@ -5,20 +5,24 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Event.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (EVENT_H)
+#ifndef EVENT_H
 #define EVENT_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // = The following #defines should really be in a separate include
 // file that is shared with the ../Peer/ directory.  For now, we'll
 // keep them here to simplify the sharing between the two directories.
@@ -45,7 +49,7 @@
 #endif /* DEFAULT_PEER_SUPPLIER_PORT */
 
 #if !defined (MAX_CONSUMERS)
-#define MAX_CONSUMERS 1000 
+#define MAX_CONSUMERS 1000
 #endif /* MAX_CONSUMERS */
 
 // This is the unique supplier identifier that denotes a particular
@@ -76,10 +80,10 @@ class Event_Key
   //     <connection_id_> and <type_> fields are copied from the
   //     <Event_Header> class below.
 public:
-  Event_Key (CONNECTION_ID cid = -1, 
+  Event_Key (CONNECTION_ID cid = -1,
              ACE_INT32 type = 0,
              ACE_INT32 priority = 0)
-    : connection_id_ (cid), 
+    : connection_id_ (cid),
       type_ (type),
       priority_ (priority)
   {
@@ -87,7 +91,7 @@ public:
 
   int operator== (const Event_Key &event_addr) const
   {
-    return this->connection_id_ == event_addr.connection_id_ 
+    return this->connection_id_ == event_addr.connection_id_
       && this->type_ == event_addr.type_;
   }
 
@@ -187,7 +191,7 @@ public:
 
       for (ACE_INT32 i = 0; i < this->total_consumers_; i++)
         this->consumers_[i] = ntohl (this->consumers_[i]);
-        
+
       this->total_consumers_ = ntohl (this->total_consumers_);
     }
   // Decode from network byte order to host byte order.
@@ -198,7 +202,7 @@ public:
 
       for (ACE_INT32 i = 0; i < this->total_consumers_; i++)
         this->consumers_[i] = htonl (this->consumers_[i]);
-        
+
       this->total_consumers_ = htonl (this->total_consumers_);
     }
   // Encode from host byte order to network byte order.
@@ -209,7 +213,7 @@ public:
   ACE_INT32 consumers_[MAX_CONSUMERS];
   // Connection ids for consumers that will be routed information
   // containing this <connection_id_>
-  
+
   ACE_INT32 total_consumers_;
   // Total number of these consumers.
 };
diff --git a/apps/Gateway/Gateway/Event_Channel.h b/apps/Gateway/Gateway/Event_Channel.h
index dfe5faa6fd4..4dcb86d24d3 100644
--- a/apps/Gateway/Gateway/Event_Channel.h
+++ b/apps/Gateway/Gateway/Event_Channel.h
@@ -5,16 +5,16 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Event_Channel.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (ACE_EVENT_CHANNEL)
+#ifndef ACE_EVENT_CHANNEL
 #define ACE_EVENT_CHANNEL
 
 #include "Connection_Handler_Connector.h"
@@ -64,8 +64,8 @@ public:
                   Connection_Handler *&);
   // Locate the <Connection_Handler> with <connection_id>.
 
-  int subscribe (const Event_Key &event_addr, 
-		 Consumer_Dispatch_Set *cds);
+  int subscribe (const Event_Key &event_addr,
+                 Consumer_Dispatch_Set *cds);
   // Subscribe the <Consumer_Dispatch_Set> to receive events that
   // match <Event_Key>.
 
@@ -97,8 +97,8 @@ private:
   int compute_performance_statistics (void);
   // Perform timer-based performance profiling.
 
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
+  virtual int handle_timeout (const ACE_Time_Value &,
+                              const void *arg);
   // Periodically callback to perform timer-based performance
   // profiling.
 
@@ -112,11 +112,11 @@ private:
   // Used to establish connections passively and create Consumers.
 
   // = Make life easier by defining typedefs.
-  typedef ACE_Map_Manager<CONNECTION_ID, Connection_Handler *, MAP_MUTEX> 
+  typedef ACE_Map_Manager<CONNECTION_ID, Connection_Handler *, MAP_MUTEX>
   CONNECTION_MAP;
-  typedef ACE_Map_Iterator<CONNECTION_ID, Connection_Handler *, MAP_MUTEX> 
+  typedef ACE_Map_Iterator<CONNECTION_ID, Connection_Handler *, MAP_MUTEX>
   CONNECTION_MAP_ITERATOR;
-  typedef ACE_Map_Entry<CONNECTION_ID, Connection_Handler *> 
+  typedef ACE_Map_Entry<CONNECTION_ID, Connection_Handler *>
   CONNECTION_MAP_ENTRY;
 
   CONNECTION_MAP connection_map_;
diff --git a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
index 09b62d007d0..10bc4409589 100644
--- a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
+++ b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Event_Forwarding_Discriminator.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_CONSUMER_MAP_H)
+#ifndef _CONSUMER_MAP_H
 #define _CONSUMER_MAP_H
 
 #include "ace/Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "Event.h"
 #include "Consumer_Dispatch_Set.h"
diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h
index e32d0948621..a91a8f75827 100644
--- a/apps/Gateway/Gateway/File_Parser.h
+++ b/apps/Gateway/Gateway/File_Parser.h
@@ -5,31 +5,35 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    File_Parser.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_FILE_PARSER)
+#ifndef _FILE_PARSER
 #define _FILE_PARSER
 
 #include "ace/OS.h"
 
-class FP 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class FP
 {
   // = TITLE
   //     This class serves as a namespace for the <Return_Type>.
 public:
-  enum Return_Type 
-  { 
+  enum Return_Type
+  {
     EOLINE,
     EOFILE,
-    SUCCESS, 
-    COMMENT, 
+    SUCCESS,
+    COMMENT,
     DEFAULT,
     PARSE_ERROR
   };
@@ -59,7 +63,7 @@ protected:
   // Read the next integer.
 
   FP::Return_Type readword (char buf[]);
-  // Read the next "word," which is demarcated by <delimiter>s.  
+  // Read the next "word," which is demarcated by <delimiter>s.
   //
   // @@ This function is inherently flawed since it doesn't take a
   // count of the size of <buf>...
diff --git a/apps/Gateway/Gateway/Gateway.h b/apps/Gateway/Gateway/Gateway.h
index 5c85f6e696c..56f68644c39 100644
--- a/apps/Gateway/Gateway/Gateway.h
+++ b/apps/Gateway/Gateway/Gateway.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    gateway
-// 
+//
 // = FILENAME
 //    Gateway.h
 //
@@ -14,15 +14,19 @@
 //    the entry point into the Service Configurator framework.
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (ACE_GATEWAY)
+#ifndef ACE_GATEWAY
 #define ACE_GATEWAY
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 ACE_SVC_FACTORY_DECLARE (Gateway)
 
 #endif /* ACE_GATEWAY */
diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h
index da61b8202c3..b3da9174a9b 100644
--- a/apps/Gateway/Gateway/Options.h
+++ b/apps/Gateway/Gateway/Options.h
@@ -14,11 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (OPTIONS_H)
+#ifndef OPTIONS_H
 #define OPTIONS_H
 
 #include "ace/Synch.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class ACE_Svc_Export Options
 {
   // = TITLE
diff --git a/apps/Gateway/Peer/Options.h b/apps/Gateway/Peer/Options.h
index c957e1a295e..dc3daf5ce4b 100644
--- a/apps/Gateway/Peer/Options.h
+++ b/apps/Gateway/Peer/Options.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (OPTIONS_H)
+#ifndef OPTIONS_H
 #define OPTIONS_H
 
 #include "../Gateway/Event.h"
diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h
index 2c67bc1f39d..8a48de1c9a7 100644
--- a/apps/Gateway/Peer/Peer.h
+++ b/apps/Gateway/Peer/Peer.h
@@ -45,10 +45,15 @@
 //
 // ============================================================================
 
-#if !defined (PEER_H)
+#ifndef PEER_H
 #define PEER_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/Connector.h"
 #include "ace/SOCK_Acceptor.h"
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_base.h b/apps/JAWS/PROTOTYPE/HTTPU/http_base.h
index 8b939043cee..5f5486f888d 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_base.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_base.h
@@ -1,10 +1,14 @@
 // $Id$
 
-#if !defined (HTTPU_HTTP_BASE_H)
+#ifndef HTTPU_HTTP_BASE_H
 #define HTTPU_HTTP_BASE_H
 
 #include "ace/Message_Block.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "JAWS/Parse_Headers.h"
 #include "HTTPU/http_export.h"
 #include "HTTPU/http_status.h"
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_export.h b/apps/JAWS/PROTOTYPE/HTTPU/http_export.h
index 2a4bc285735..84a819c8932 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_export.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_export.h
@@ -4,11 +4,15 @@
 // This file is generated automatically by
 // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
 // ------------------------------
-#if !defined (HTTPU_EXPORT_H)
+#ifndef HTTPU_EXPORT_H
 #define HTTPU_EXPORT_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (HTTPU_HAS_DLL)
 #  if (HTTPU_HAS_DLL == 1)
 #    if defined (HTTPU_BUILD_DLL)
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h
index 9dea72d399c..62bf936005a 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h
@@ -3,10 +3,15 @@
 // by James Hu
 // Borrowed from HTTP_Headers.*, which appears to be irrelevent now anyway.
 
-#if !defined (HTTPU_HTTP_HEADERS_H)
+#ifndef HTTPU_HTTP_HEADERS_H
 #define HTTPU_HTTP_HEADERS_H
 
 #include "ace/RB_Tree.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Singleton.h"
 
 #include "JAWS/Parse_Headers.h"
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_request.h b/apps/JAWS/PROTOTYPE/HTTPU/http_request.h
index a6934f82b47..c04d08dabf6 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_request.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_request.h
@@ -4,11 +4,15 @@
 // One is the kind you have to read in from the HTTP client.
 // The other is the kind you issue to the server.
 
-#if !defined (HTTPU_HTTP_REQUEST_HPP)
+#ifndef HTTPU_HTTP_REQUEST_HPP
 #define HTTPU_HTTP_REQUEST_HPP
 
 #include "ace/Message_Block.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "JAWS/Parse_Headers.h"
 #include "HTTPU/http_export.h"
 #include "HTTPU/http_base.h"
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_response.h b/apps/JAWS/PROTOTYPE/HTTPU/http_response.h
index d22f736e4e2..71b6cae2fae 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_response.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_response.h
@@ -4,10 +4,15 @@
 // One is the kind you have to read in from the HTTP server.
 // The other is the kind you issue to the HTTP client.
 
-#if !defined (HTTPU_HTTP_RESPONSE_HPP)
+#ifndef HTTPU_HTTP_RESPONSE_HPP
 #define HTTPU_HTTP_RESPONSE_HPP
 
 #include "ace/Message_Block.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "JAWS/Parse_Headers.h"
 
 #include "HTTPU/http_export.h"
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.h b/apps/JAWS/PROTOTYPE/HTTPU/http_status.h
index 47f791675f5..c4d90657b15 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.h
@@ -5,6 +5,10 @@
 
 #include "ace/Singleton.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "HTTPU/http_export.h"
 
 class HTTP_SCode_Base;
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h
index 0f19d9a4919..26c83348e37 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h
@@ -1,9 +1,14 @@
 // $Id$
 
-#if !defined (HTTPU_PARSE_HTTP_REQUEST_H)
+#ifndef HTTPU_PARSE_HTTP_REQUEST_H
 #define HTTPU_PARSE_HTTP_REQUEST_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "HTTPU/http_headers.h"
 
 class HTTPU_Export Parse_HTTP_Request : public HTTP_HCodes
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h
index a4cbc4490ce..42fd5a31afe 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h
@@ -1,9 +1,14 @@
 // $Id$
 
-#if !defined (HTTPU_PARSE_HTTP_RESPONSE_H)
+#ifndef HTTPU_PARSE_HTTP_RESPONSE_H
 #define HTTPU_PARSE_HTTP_RESPONSE_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "HTTPU/http_export.h"
 
 class HTTPU_Export Parse_HTTP_Response
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h
index 66dd4804341..64260edd2a8 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (HTTPU_HTTP_PARSE_H)
+#ifndef HTTPU_HTTP_PARSE_H
 #define HTTPU_HTTP_PARSE_H
 
 #include "HTTPU/http_export.h"
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10.h b/apps/JAWS/PROTOTYPE/HTTP_10.h
index 8280eb8a744..5e4055281b1 100644
--- a/apps/JAWS/PROTOTYPE/HTTP_10.h
+++ b/apps/JAWS/PROTOTYPE/HTTP_10.h
@@ -1,11 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_HTTP_10_H)
+#ifndef JAWS_HTTP_10_H
 #define JAWS_HTTP_10_H
 
 #include "ace/RB_Tree.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "JAWS/Pipeline_Tasks.h"
 
 // Forward declaration
diff --git a/apps/JAWS/PROTOTYPE/HTTP_Policy.h b/apps/JAWS/PROTOTYPE/HTTP_Policy.h
index 5963d191d36..873b30f5070 100644
--- a/apps/JAWS/PROTOTYPE/HTTP_Policy.h
+++ b/apps/JAWS/PROTOTYPE/HTTP_Policy.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (HTTP_POLICY_H)
+#ifndef HTTP_POLICY_H
 #define HTTP_POLICY_H
 
 #include "JAWS/Concurrency.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h b/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h
index 4e44efdb71e..8245cd67028 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_ASSOC_ARRAY_H)
+#ifndef JAWS_ASSOC_ARRAY_H
 #define JAWS_ASSOC_ARRAY_H
 
 template <class KEY, class DATA> class JAWS_Assoc_Array_Iterator;
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h b/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h
index a1ff3be7c5d..0b7019fe581 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h
@@ -1,10 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_CONCURRENCY_H)
+#ifndef JAWS_CONCURRENCY_H
 #define JAWS_CONCURRENCY_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "ace/Task.h"
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h b/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h
index 8d05ee8003e..94afaa93586 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h
@@ -1,11 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_DATA_BLOCK_H)
+#ifndef JAWS_DATA_BLOCK_H
 #define JAWS_DATA_BLOCK_H
 
 #include "ace/Message_Block.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "JAWS/Export.h"
 #include "JAWS/Pipeline.h"
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Export.h b/apps/JAWS/PROTOTYPE/JAWS/Export.h
index b6be46cac93..f06afcdb767 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Export.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Export.h
@@ -4,11 +4,15 @@
 // This file is generated automatically by
 // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
 // ------------------------------
-#if !defined (JAWS_EXPORT_H)
+#ifndef JAWS_EXPORT_H
 #define JAWS_EXPORT_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (JAWS_HAS_DLL)
 #  if (JAWS_HAS_DLL == 1)
 #    if defined (JAWS_BUILD_DLL)
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Headers.h b/apps/JAWS/PROTOTYPE/JAWS/Headers.h
index 56e8ad3f748..f16db921915 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Headers.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Headers.h
@@ -1,12 +1,16 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_HEADERS_H)
+#ifndef JAWS_HEADERS_H
 #define JAWS_HEADERS_H
 
 #include "JAWS/Export.h"
 #include "ace/Containers.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Use scenario --
 
 // Parse_Headers will parse out a header name and then will want to
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.h b/apps/JAWS/PROTOTYPE/JAWS/IO.h
index 967bbe8c542..b2dfac81b98 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (JAWS_IO_H)
+#ifndef JAWS_IO_H
 #define JAWS_IO_H
 
 class ACE_Message_Block;
@@ -23,6 +23,11 @@ class JAWS_IO_Handler;
 class JAWS_IO_Acceptor;
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Asynch_IO.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Singleton.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h
index 4cc006d9033..78e861ec12e 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h
@@ -1,13 +1,18 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_IO_ACCEPTOR_H)
+#ifndef JAWS_IO_ACCEPTOR_H
 #define JAWS_IO_ACCEPTOR_H
 
 // Use the Adapter pattern to encapsulate either a LOCK_SOCK_Acceptor or
 // an ACE_Asynch_Acceptor
 
 #include "ace/Asynch_Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/LOCK_SOCK_Acceptor.h"
 #include "ace/Singleton.h"
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
index b474ac6d0bf..7d49dbe3f06 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
@@ -15,10 +15,15 @@
 //
 // ============================================================================
 
-#if !defined (JAWS_IO_HANDLER_H)
+#ifndef JAWS_IO_HANDLER_H
 #define JAWS_IO_HANDLER_H
 
 #include "ace/Asynch_IO.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Singleton.h"
 
 #include "JAWS/Export.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/JAWS.h b/apps/JAWS/PROTOTYPE/JAWS/JAWS.h
index 72dcfc56401..27572fc3b07 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/JAWS.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/JAWS.h
@@ -8,7 +8,7 @@
                                        ASYS_TEXT (__FILE__))
 #endif /* JAWS_NTRACE */
 
-#if !defined (JAWS_JAWS_H)
+#ifndef JAWS_JAWS_H
 #define JAWS_JAWS_H
 
 #endif /* JAWS_JAWS_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h b/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h
index beddd94a0d2..24bdc0d2462 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h
@@ -1,11 +1,16 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_PARSE_HEADERS_H)
+#ifndef JAWS_PARSE_HEADERS_H
 #define JAWS_PARSE_HEADERS_H
 
 #include "JAWS/Export.h"
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Message_Block.h"
 
 #include "Headers.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
index efd21bc556f..ff04b4fb61f 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
@@ -1,10 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_PIPELINE_H)
+#ifndef JAWS_PIPELINE_H
 #define JAWS_PIPELINE_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Config.h"
 #include "ace/Stream.h"
 #include "ace/Module.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h
index 86bbe3930ed..7d95294bf03 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_PIPELINE_HANDLER_H)
+#ifndef JAWS_PIPELINE_HANDLER_H
 #define JAWS_PIPELINE_HANDLER_H
 
 #include "JAWS/Export.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
index 0877a40aaf2..4506885b0a2 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
@@ -1,11 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_PIPELINE_TASKS_H)
+#ifndef JAWS_PIPELINE_TASKS_H
 #define JAWS_PIPELINE_TASKS_H
 
 #include "ace/Singleton.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "JAWS/Export.h"
 #include "JAWS/Pipeline.h"
 #include "JAWS/Data_Block.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Policy.h b/apps/JAWS/PROTOTYPE/JAWS/Policy.h
index d916998bb92..9255594c056 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Policy.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Policy.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_POLICY_H)
+#ifndef JAWS_POLICY_H
 #define JAWS_POLICY_H
 
 #include "JAWS/Export.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Reaper.h b/apps/JAWS/PROTOTYPE/JAWS/Reaper.h
index 444083498ce..e23193441c7 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Reaper.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Reaper.h
@@ -1,10 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_REAPER_H)
+#ifndef JAWS_REAPER_H
 #define JAWS_REAPER_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "ace/Task.h"
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Server.h b/apps/JAWS/PROTOTYPE/JAWS/Server.h
index 8fea040e47d..0cac8f17ae0 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Server.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Server.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_SERVER_H)
+#ifndef JAWS_SERVER_H
 #define JAWS_SERVER_H
 
 #include "JAWS/Export.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Waiter.h b/apps/JAWS/PROTOTYPE/JAWS/Waiter.h
index da2535deabf..57bd35086b0 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Waiter.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Waiter.h
@@ -1,11 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_WAITER_H)
+#ifndef JAWS_WAITER_H
 #define JAWS_WAITER_H
 
 #include "ace/Singleton.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "JAWS/Assoc_Array.h"
 #include "JAWS/Export.h"
 
diff --git a/apps/JAWS/clients/Blobby/Blob.h b/apps/JAWS/clients/Blobby/Blob.h
index 7f7c79076ec..293e530e696 100644
--- a/apps/JAWS/clients/Blobby/Blob.h
+++ b/apps/JAWS/clients/Blobby/Blob.h
@@ -5,23 +5,28 @@
 //
 // = LIBRARY
 //    JAWS
-// 
+//
 // = FILENAME
 //    Blob.h
 //
 // = DESCRIPTION
 //     This is the ACE_Blob class, which is the API for doing file
-//     uploads/downloads. 
+//     uploads/downloads.
 //
 // = AUTHOR
 //    Prashant Jain and Sumedh Mungee
-// 
+//
 //============================================================================
 
-#if !defined (ACE_BLOB_H)
+#ifndef ACE_BLOB_H
 #define ACE_BLOB_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Connector.h"
 #include "ace/INET_Addr.h"
 #include "ace/Svc_Handler.h"
@@ -29,12 +34,12 @@
 #include "ace/Message_Block.h"
 #include "Blob_Handler.h"
 
-class ACE_Blob 
+class ACE_Blob
   // = TITLE
   //     Blob is intended to provide application API to
   //     classes that wish to do network i/o at a very
   //     high level of abstraction.
-  //    
+  //
   // = This class provides the ability to retrieve data from
   //   the network, of specified length and offset, and potentially
   //   use any protocol "under the hood" to do so. It currently
@@ -44,38 +49,38 @@ public:
   ACE_Blob (void);
   ~ACE_Blob (void);
 
-  int open (char *filename, 
-            char *hostname =  ACE_DEFAULT_SERVER_HOST , 
+  int open (char *filename,
+            char *hostname =  ACE_DEFAULT_SERVER_HOST ,
             u_short port = 80);
   // initializes the class with the given filename, hostname and port.
-  // it should be called with the filename, before any read/write calls 
+  // it should be called with the filename, before any read/write calls
 
 
   int read (ACE_Message_Block *mb, size_t length, size_t offset);
   // starts a connection, and reads a file from the server,
   //   of length and offset as specified, into Message_Block mb
   //   The message block should have capacity to hold length number
-  //   of bytes 
+  //   of bytes
 
   int write (ACE_Message_Block *mb, size_t length, size_t offset);
   // starts a connection, and writes a file to the server,
   //   of length and offset as specified, from Message_Block mb
   //   thus the message block should contain atleast length + offset
-  //   bytes of data 
-     
+  //   bytes of data
+
 
   int close ();
   // Frees memory allocated for filename.
 
 private:
   ACE_INET_Addr inet_addr_;
-  // store the internet address of the server 
+  // store the internet address of the server
 
   char *filename_;
-  // The filename 
+  // The filename
 
   ACE_Connector<ACE_Blob_Handler, ACE_SOCK_CONNECTOR> connector_;
-  // The connector endpoint to initiate the client connection 
+  // The connector endpoint to initiate the client connection
 
 };
 
diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.h b/apps/JAWS/clients/Blobby/Blob_Handler.h
index d58202afe5a..a55e0b68ee2 100644
--- a/apps/JAWS/clients/Blobby/Blob_Handler.h
+++ b/apps/JAWS/clients/Blobby/Blob_Handler.h
@@ -5,24 +5,29 @@
 //
 // = LIBRARY
 //    JAWS
-// 
+//
 // = FILENAME
 //    Blob.h
 //
 // = DESCRIPTION
 //     ACE_Blob_Handler is a base class for ACE_Blob_Reader and
 //     ACE_Blob_Writer which are created in response to calls to
-//     read/write, as appropriate 
+//     read/write, as appropriate
 //
 // = AUTHOR
 //    Prashant Jain and Sumedh Mungee
-// 
+//
 //============================================================================
 
-#if !defined (ACE_BLOB_HANDLER_H)
+#ifndef ACE_BLOB_HANDLER_H
 #define ACE_BLOB_HANDLER_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 #include "ace/Message_Block.h"
@@ -32,7 +37,7 @@ class ACE_Blob_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH
   //     Blob is intended to provide application API to
   //     classes that wish to do network i/o at a very
   //     high level of abstraction.
-  //    
+  //
   // = This class provides the ability to retrieve data from
   //   the network, of specified length and offset, and potentially
   //   use any protocol "under the hood" to do so. It currently
@@ -53,7 +58,7 @@ public:
 
   virtual int close (u_long flags = 0);
   // Close down the Blob
-  
+
   ~ACE_Blob_Handler (void);
 
 protected:
@@ -65,7 +70,7 @@ protected:
   size_t offset_;
   char *filename_;
   int bytecount_;
-  enum 
+  enum
   {
     MAX_HEADER_SIZE = 2048
     // The handler assumes that the first 2048 bytes of a server response
@@ -76,10 +81,10 @@ protected:
 class ACE_Blob_Reader : public ACE_Blob_Handler
 {
 public:
-  ACE_Blob_Reader (ACE_Message_Block *mb, 
-                   size_t length, 
-                   size_t offset, 
-                   char *filename, 
+  ACE_Blob_Reader (ACE_Message_Block *mb,
+                   size_t length,
+                   size_t offset,
+                   char *filename,
                    char *request_prefix = "GET",
                    char *request_suffix = "HTTP/1.0\r\n\r\n");
 
@@ -93,9 +98,9 @@ private:
 class ACE_Blob_Writer : public ACE_Blob_Handler
 {
 public:
-  ACE_Blob_Writer (ACE_Message_Block *mb, 
-                   size_t length, 
-                   size_t offset, 
+  ACE_Blob_Writer (ACE_Message_Block *mb,
+                   size_t length,
+                   size_t offset,
                    char *filename,
                    char *request_prefix = "PUT",
                    char *request_suffix = "HTTP/1.0\nContent-length:");
diff --git a/apps/JAWS/clients/Blobby/Options.h b/apps/JAWS/clients/Blobby/Options.h
index 086fa003a37..5fe61c55cfa 100644
--- a/apps/JAWS/clients/Blobby/Options.h
+++ b/apps/JAWS/clients/Blobby/Options.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    JAWS
-// 
+//
 // = FILENAME
 //    Options.h
 //
@@ -14,18 +14,23 @@
 //
 // = AUTHOR
 //    Prashant Jain and Sumedh Mungee
-// 
+//
 //============================================================================
 
-#if !defined (ACE_BLOBBY_OPTIONS_H)
+#ifndef ACE_BLOBBY_OPTIONS_H
 #define ACE_BLOBBY_OPTIONS_H
 
 #include "Blob.h"
 #include "Blob_Handler.h"
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/ARGV.h"
 
-class Options 
+class Options
 {
 public:
   static Options *instance (void);
@@ -38,7 +43,7 @@ public:
   // Hostname to connect to
 
   u_short port_;
-  // Port number to use 
+  // Port number to use
 
   char *filename_;
   // Filename to upload/download
diff --git a/apps/JAWS/clients/Caching/ID_Generator.h b/apps/JAWS/clients/Caching/ID_Generator.h
index 0d73f72625c..3c02779f36e 100644
--- a/apps/JAWS/clients/Caching/ID_Generator.h
+++ b/apps/JAWS/clients/Caching/ID_Generator.h
@@ -15,16 +15,20 @@
 //
 // ============================================================================
 
-#if !defined (ACE_ID_GENERATOR_H)
+#ifndef ACE_ID_GENERATOR_H
 #define ACE_ID_GENERATOR_h
 
 #include "ace/Synch.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #define ACE_OFFER_ID_LENGTH 21
 
 class ACE_ID_Generator
   // = TITLE
-  //     An unique ID generator.  
+  //     An unique ID generator.
   //
   // = DESCRIPTION
 
@@ -43,12 +47,12 @@ private:
 
   static ACE_SYNCH_MUTEX *get_lock (void);
   // Get the lock instance.
-  
+
   static time_t last_time_;
   // Record the time last offer ID generated.
 
   static size_t last_number_;
-  // Record serial number of last offer ID with same 
+  // Record serial number of last offer ID with same
   // generation time.
 
   static ACE_SYNCH_MUTEX *lock_;
diff --git a/apps/JAWS/clients/Caching/Local_Locator.h b/apps/JAWS/clients/Caching/Local_Locator.h
index aa6c73decf6..a88463b11fc 100644
--- a/apps/JAWS/clients/Caching/Local_Locator.h
+++ b/apps/JAWS/clients/Caching/Local_Locator.h
@@ -15,11 +15,16 @@
 //
 // ============================================================================
 
-#if !defined (ACE_LOCAL_LOCATOR_H)
+#ifndef ACE_LOCAL_LOCATOR_H
 #define ACE_LOCAL_LOCATOR_H
 
 #include "URL_Locator.h"
 #include "ace/Containers.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ID_Generator.h"
 
 class ACE_SVC_Export ACE_URL_Record
@@ -76,30 +81,30 @@ class ACE_SVC_Export ACE_URL_Local_Locator
   // Default destructor.
 
   virtual int url_query (const ACE_URL_Locator::ACE_Selection_Criteria how,
-			 const ACE_URL_Property_Seq *pseq,
-			 const size_t how_many,
-			 size_t &num_query,
-			 ACE_URL_Offer_Seq *offer);
+                         const ACE_URL_Property_Seq *pseq,
+                         const size_t how_many,
+                         size_t &num_query,
+                         ACE_URL_Offer_Seq *offer);
   // Query the locator for HTTP with designate properties (none, some,
   // or all).  The locator being queried will return a sequence of
   // offers with <how_many> offers in it.  This interface allocates
   // <offer> so users must deallocate it after use.
 
   virtual int export_offer (ACE_URL_Offer *offer,
-			    ACE_WString &offer_id);
+                            ACE_WString &offer_id);
   // Export an offer to the locator.
 
   virtual int withdraw_offer (const ACE_WString &offer_id);
   // Withdraw an offer.  return 0 if succeed, -1 otherwise.
 
   virtual int describe_offer (const ACE_WString &offer_id,
-			      ACE_URL_Offer *offer);
+                              ACE_URL_Offer *offer);
   // Query a specific offer.
 
   virtual int modify_offer (const ACE_WString &offer_id,
-			    const ACE_WString *url = 0,
-			    const ACE_URL_Property_Seq *del = 0,
-			    const ACE_URL_Property_Seq *modify = 0);
+                            const ACE_WString *url = 0,
+                            const ACE_URL_Property_Seq *del = 0,
+                            const ACE_URL_Property_Seq *modify = 0);
   // Modify a previously registered offer.
 
 protected:
diff --git a/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/apps/JAWS/clients/Caching/Locator_Request_Reply.h
index 579ad82a5cd..85dd7a182a6 100644
--- a/apps/JAWS/clients/Caching/Locator_Request_Reply.h
+++ b/apps/JAWS/clients/Caching/Locator_Request_Reply.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_LOCATOR_REQUEST_REPLY_H)
+#ifndef ACE_LOCATOR_REQUEST_REPLY_H
 #define ACE_LOCATOR_REQUEST_REPLY_H
 
 #include "URL_Properties.h"
@@ -26,8 +26,8 @@ class ACE_SVC_Export ACE_URL_Locator_Request
   //
   // = DESCRIPTION
   //     This class defines a URL request data.  It is used
-  //     to transform requests to an object so that we can 
-  //     ship them across network.  
+  //     to transform requests to an object so that we can
+  //     ship them across network.
 {
 public:
   ACE_URL_Locator_Request (void);
@@ -37,8 +37,8 @@ public:
   // Default dtor.
 
   int url_query (const int how,
-		 const ACE_URL_Property_Seq &pseq,
-		 const int how_many);
+                 const ACE_URL_Property_Seq &pseq,
+                 const int how_many);
   // Query the locator for HTTP with designate properties (none, some,
   // or all).  The locator being queried will return a sequence of
   // offers with <how_many> offers in it.  This interface allocates
@@ -54,15 +54,15 @@ public:
   // Query a specific offer.
 
   int modify_offer (const ACE_WString &offer_id,
-		    const char *url = 0,
-		    const ACE_URL_Property_Seq &del = 0,
-		    const ACE_URL_Property_Seq &modify = 0);
+                    const char *url = 0,
+                    const ACE_URL_Property_Seq &del = 0,
+                    const ACE_URL_Property_Seq &modify = 0);
   // Modify a previously registered offer.
 
   int modify_offer (const ACE_WString &offer_id,
-		    const ACE_WString *url = 0,
-		    const ACE_URL_Property_Seq &del = 0,
-		    const ACE_URL_Property_Seq &modify = 0);
+                    const ACE_WString *url = 0,
+                    const ACE_URL_Property_Seq &del = 0,
+                    const ACE_URL_Property_Seq &modify = 0);
   // Modify a previously registered offer.
 
   size_t encode (void);
@@ -101,7 +101,7 @@ protected:
     VALID_OFFER = 0X4
   };
   // These constants used to indicate which pointers are valid.
-  
+
   u_int code_;
   // Request type code.
 
@@ -128,9 +128,9 @@ protected:
 
   ACE_WString url_;
   // URL of this offer.
-  
+
   char *buffer_;
-  // Buffer to store encoded data. 
+  // Buffer to store encoded data.
 };
 
 class ACE_SVC_Export ACE_URL_Locator_Reply
@@ -139,8 +139,8 @@ class ACE_SVC_Export ACE_URL_Locator_Reply
   //
   // = DESCRIPTION
   //     This class defines a URL reply data.  It is used
-  //     to transform reply messages to an object so that we can 
-  //     ship them across network.  
+  //     to transform reply messages to an object so that we can
+  //     ship them across network.
 {
 public:
   ACE_URL_Locator_Reply (void);
@@ -153,11 +153,11 @@ public:
   // Setup a reply message for EXPORT, WITHDRAW, or MODIFY operations.
 
   int query_reply (int result, size_t num,
-		   const ACE_URL_Offer_Seq &offers);
+                   const ACE_URL_Offer_Seq &offers);
   // Setup a reply for QUERY operation.
 
   int describe_reply (int result,
-		      const ACE_URL_Offer &offer);
+                      const ACE_URL_Offer &offer);
   // Construct a reply for DESCRIBE operation.
 
   size_t encode (void);
@@ -191,7 +191,7 @@ protected:
     VALID_OFFERS = 0x2
   };
   // Valid pointer masks.
-  
+
   u_int code_;
   // Holds the original op code.
 
diff --git a/apps/JAWS/clients/Caching/URL_Array_Helper.h b/apps/JAWS/clients/Caching/URL_Array_Helper.h
index 08a261138fc..f38f9ebf5dd 100644
--- a/apps/JAWS/clients/Caching/URL_Array_Helper.h
+++ b/apps/JAWS/clients/Caching/URL_Array_Helper.h
@@ -5,16 +5,16 @@
 //
 // = LIBRARY
 //    none
-// 
+//
 // = FILENAME
 //    URL_Array_Helper.h
 //
 // = AUTHOR
 //    Nanbor Wang
-// 
+//
 // ============================================================================
 
-#if !defined (ACE_URL_ARRAY_HELPER_H)
+#ifndef ACE_URL_ARRAY_HELPER_H
 #define ACE_URL_ARRAY_HELPER_H
 
 // ### These template functions are probably named improperly.
diff --git a/apps/JAWS/clients/Caching/URL_Locator.h b/apps/JAWS/clients/Caching/URL_Locator.h
index 2b41cd5ed50..75ef5623b4e 100644
--- a/apps/JAWS/clients/Caching/URL_Locator.h
+++ b/apps/JAWS/clients/Caching/URL_Locator.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_URL_LOCATOR_H)
+#ifndef ACE_URL_LOCATOR_H
 #define ACE_URL_LOCATOR_H
 
 #include "URL_Properties.h"
@@ -29,7 +29,7 @@ class ACE_SVC_Export ACE_URL_Locator
   //     This class defines the basic URL_Locator APIs.
   //     An URL locator provides services for URL clients to
   //     query specific URL location that has certain properties
-  //     and URL providers to export their services and a set of 
+  //     and URL providers to export their services and a set of
   //     APIs to maintain their offers.
 {
 public:
@@ -41,19 +41,19 @@ public:
     WITHDRAW,
     DESCRIBE,
     MODIFY,
-    INVALID_OPERATION		// LAST
+    INVALID_OPERATION           // LAST
   };
 
   static const char * const opname[];
   // Human Readable operation name.
-  
+
   // = Specify how to select offers.
   enum ACE_Selection_Criteria
-  { 
-    NONE = 0,			// URL that contains none of the properties.
-    SOME,			// URL that contains some of the properties.
-    ALL,			// URL that contains all of the properties.
-    INVALID_SELECTION		// Invalid.
+  {
+    NONE = 0,                   // URL that contains none of the properties.
+    SOME,                       // URL that contains some of the properties.
+    ALL,                        // URL that contains all of the properties.
+    INVALID_SELECTION           // Invalid.
   };
 
   static const char * const selection_name[];
@@ -61,13 +61,13 @@ public:
   enum ACE_URL_Locator_Error
     // errno will set to one of these value.
   {
-    OK,				// Everything is fine.
-    OFFER_EXIST,		// trying to register an offer.
-				// that is already exist in repository.
-    NO_SUCH_OFFER,		// No such offer in the repository.
-    INVALID_ARGUMENT,		// Invalid argument encountered.
-    UNIMPLEMENTED,		// function not implemented.
-    UNKNOWN,			// Unknown error.
+    OK,                         // Everything is fine.
+    OFFER_EXIST,                // trying to register an offer.
+                                // that is already exist in repository.
+    NO_SUCH_OFFER,              // No such offer in the repository.
+    INVALID_ARGUMENT,           // Invalid argument encountered.
+    UNIMPLEMENTED,              // function not implemented.
+    UNKNOWN,                    // Unknown error.
     MAX_URL_ERROR
   };
   // Possible error code of URL_Locator.
@@ -79,30 +79,30 @@ public:
   // Default destructor.
 
   virtual int url_query (const ACE_Selection_Criteria how,
-			 const ACE_URL_Property_Seq *pseq,
-			 const size_t how_many,
-			 size_t &num_query,
-			 ACE_URL_Offer_Seq *offer) = 0;
+                         const ACE_URL_Property_Seq *pseq,
+                         const size_t how_many,
+                         size_t &num_query,
+                         ACE_URL_Offer_Seq *offer) = 0;
   // Query the locator for HTTP with designate properties (none, some,
   // or all).  The locator being queried will return a sequence of
   // offers with <how_many> offers in it.  This interface allocates
   // <offer> so users must deallocate it after use.
 
   virtual int export_offer (ACE_URL_Offer *offer,
-			    ACE_WString &offer_id) = 0;
+                            ACE_WString &offer_id) = 0;
   // Export an offer to the locator.
 
   virtual int withdraw_offer (const ACE_WString &offer_id) = 0;
   // Withdraw an offer.  return 0 if succeed, -1 otherwise.
 
   virtual int describe_offer (const ACE_WString &offer_id,
-			      ACE_URL_Offer *offer) = 0;
+                              ACE_URL_Offer *offer) = 0;
   // Query a specific offer.
 
   virtual int modify_offer (const ACE_WString &offer_id,
-			    const ACE_WString *url = 0,
-			    const ACE_URL_Property_Seq *del = 0,
-			    const ACE_URL_Property_Seq *modify = 0) = 0;
+                            const ACE_WString *url = 0,
+                            const ACE_URL_Property_Seq *del = 0,
+                            const ACE_URL_Property_Seq *modify = 0) = 0;
   // Modify a previously registered offer.
 
   virtual const char *error_status (void);
diff --git a/apps/JAWS/clients/Caching/URL_Properties.h b/apps/JAWS/clients/Caching/URL_Properties.h
index 18ae4bc6b2f..86cd5ff76b7 100644
--- a/apps/JAWS/clients/Caching/URL_Properties.h
+++ b/apps/JAWS/clients/Caching/URL_Properties.h
@@ -15,10 +15,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_URL_PROPERTIES_H)
+#ifndef ACE_URL_PROPERTIES_H
 #define ACE_URL_PROPERTIES_H
 
 #include "ace/SString.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Containers.h"
 
 class ACE_SVC_Export ACE_WString_Helper
@@ -56,17 +61,17 @@ class ACE_SVC_Export ACE_URL_Property
 {
 public:
   ACE_URL_Property (const char *name = 0,
-		    const char *value=0);
+                    const char *value=0);
   // Create a new property.
 
   ACE_URL_Property (const ACE_USHORT16 *name,
-		    const ACE_USHORT16 *value);
+                    const ACE_USHORT16 *value);
   // Create a new property using wchar strings.  This is mostly used
   // to support DBCS or UNICODE.
 
   ACE_URL_Property (const ACE_URL_Property &p);
   // Copy constructor.
-  
+
   ~ACE_URL_Property (void);
   // Destructor.
 
@@ -91,7 +96,7 @@ public:
   ACE_WString &value_rep (void);
   const ACE_WString &value (void) const;
 
-  // = Set property value. 
+  // = Set property value.
   void value (const ACE_USHORT16 *v);
   void value (const char *v);
 
@@ -104,15 +109,15 @@ public:
 
   size_t decode (void *buf);
   // Decodes buf and modifies this object, you should
-  // probably create this with default ctor.  
+  // probably create this with default ctor.
 
   void dump (void) const;
   // Dump out this object for debug.
-  
+
 protected:
   ACE_WString name_;
   // Property name pointer.
-  
+
   ACE_WString value_;
   // Property value.
 } ;
@@ -159,7 +164,7 @@ public:
 
   ACE_URL_Property_Seq &url_properties (void);
   // Get properties of this offer.
-  
+
   void url_properties (const ACE_URL_Property_Seq &prop);
   // Set properties of this offer.  This operation virtually get a
   // copy of the passed in prop.
diff --git a/apps/JAWS/clients/Caching/http_handler.h b/apps/JAWS/clients/Caching/http_handler.h
index 85a1b9338fe..ec736312c0e 100644
--- a/apps/JAWS/clients/Caching/http_handler.h
+++ b/apps/JAWS/clients/Caching/http_handler.h
@@ -6,22 +6,27 @@
 //
 // = LIBRARY
 //    apps/JAWS/clients/Caching
-// 
+//
 // = FILENAME
 //    http_handler.h
 //
 // = AUTHOR
 //    James Hu
-// 
+//
 // ============================================================================
 
 #include "ace/Connector.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Connector.h"
 
 class HTTP_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
   // = TITLE
   //     A simple HTTP protocol handler for clients.
-  // 
+  //
   // = DESCRIPTION
   //     Checks to see if the requested file is already cached.  If
   //     so, it says so.  If not, the request is issued to the
@@ -52,7 +57,7 @@ private:
 class HTTP_Connector
   // = TITLE
   //     A simple HTTP connector.
-  // 
+  //
   // = DESCRIPTION
   //     Creates an HTTP Handler based on the URL, and then delegates
   //     to to the SOCK_CONNECTOR.  Adapter pattern.
@@ -63,9 +68,9 @@ public:
 
 private:
   int parseurl (const char *url,
-		char *host,
-		u_short *port,
-		char *path);
+                char *host,
+                u_short *port,
+                char *path);
   // Helper function.
 
 private:
diff --git a/apps/JAWS/clients/WebSTONE/src/acconfig.h b/apps/JAWS/clients/WebSTONE/src/acconfig.h
index ea85c00c0ba..7878554b6b8 100644
--- a/apps/JAWS/clients/WebSTONE/src/acconfig.h
+++ b/apps/JAWS/clients/WebSTONE/src/acconfig.h
@@ -1,5 +1,5 @@
-/* Special definitions for autoheader 
-	Copyright (C) 1995 Silicon Graphics, Inc.
+/* Special definitions for autoheader
+        Copyright (C) 1995 Silicon Graphics, Inc.
 $Header$
 */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/bench.h b/apps/JAWS/clients/WebSTONE/src/bench.h
index 069bf3c1694..cc196ef09ac 100644
--- a/apps/JAWS/clients/WebSTONE/src/bench.h
+++ b/apps/JAWS/clients/WebSTONE/src/bench.h
@@ -1,14 +1,14 @@
 /**************************************************************************
- *									  *
- * 		 Copyright (C) 1995 Silicon Graphics, Inc.		  *
- *									  *
- *  These coded instructions, statements, and computer programs were	  *
+ *                                                                        *
+ *               Copyright (C) 1995 Silicon Graphics, Inc.                *
+ *                                                                        *
+ *  These coded instructions, statements, and computer programs were      *
  *  developed by SGI for public use.  If any changes are made to this code*
  *  please try to get the changes back to the author.  Feel free to make  *
- *  modifications and changes to the code and release it.		  *
- *									  *
+ *  modifications and changes to the code and release it.                 *
+ *                                                                        *
  **************************************************************************/
-#ifndef __BENCH_H__ 
+#ifndef __BENCH_H__
 #define __BENCH_H__
 #include <stdio.h>
 #include <stdarg.h>
@@ -16,82 +16,82 @@
 #include <sys/time.h>
 #endif /* WIN32 */
 
-#define USECINSEC	    1000000
-#define MSECINSEC	    1000
-#define MAX_ACCEPT_SECS	    180		/* maximum time master will wait for listen() */
+#define USECINSEC           1000000
+#define MSECINSEC           1000
+#define MAX_ACCEPT_SECS     180         /* maximum time master will wait for listen() */
 
-#define NCCARGS		    4096
-#define MAXCLIENTS	    1024
-#define MAXUSERNAME	    25
-#define MAXPASSWD	    20
-#define BUFSIZE		    4096
+#define NCCARGS             4096
+#define MAXCLIENTS          1024
+#define MAXUSERNAME         25
+#define MAXPASSWD           20
+#define BUFSIZE             4096
 
-#define MAXTOTALPROCS	    MAXCLIENTS		/* overall max # of procs */
-#define MAXPROCSPERNODE	    MAXCLIENTS		/* max # of procs/node */
+#define MAXTOTALPROCS       MAXCLIENTS          /* overall max # of procs */
+#define MAXPROCSPERNODE     MAXCLIENTS          /* max # of procs/node */
 
 
-#define CONTENT_LENGTH_STRING	"CONTENT-LENGTH:"
-#define OKSTR		    "OK"
-#define OKSTRLEN	    ((int)strlen(OKSTR))
-#define GOSTR		    "GO"
-#define GOSTRLEN	    ((int)strlen(GOSTR))
-#define READYSTR	    "READY"
-#define READYSTRLEN	    ((int)strlen(READYSTR))
-#define ABORTSTR	    "ABORT"
-#define ABORTSTRLEN	    ((int)strlen(ABORTSTR))
+#define CONTENT_LENGTH_STRING   "CONTENT-LENGTH:"
+#define OKSTR               "OK"
+#define OKSTRLEN            ((int)strlen(OKSTR))
+#define GOSTR               "GO"
+#define GOSTRLEN            ((int)strlen(GOSTR))
+#define READYSTR            "READY"
+#define READYSTRLEN         ((int)strlen(READYSTR))
+#define ABORTSTR            "ABORT"
+#define ABORTSTRLEN         ((int)strlen(ABORTSTR))
 
 
-#define MAXNUMOFFILES 1	    /* max # of files per page */
-#define URL_SIZE	    1024
-#define MAXNUMOFPAGES	    100
+#define MAXNUMOFFILES 1     /* max # of files per page */
+#define URL_SIZE            1024
+#define MAXNUMOFPAGES       100
 #define SIZEOF_TIMEVALTEXT  18
 #define SIZEOF_DOUBLETEXT   18
 #define SIZEOF_RQSTSTATSTEXT ((7 *  SIZEOF_TIMEVALTEXT) + \
-			      (12 * SIZEOF_DOUBLETEXT) + 1)
+                              (12 * SIZEOF_DOUBLETEXT) + 1)
 #define SIZEOF_STATSTEXTBASE    (SIZEOF_RQSTSTATSTEXT + \
-			     (3 * SIZEOF_TIMEVALTEXT) + \
-			     (2 * SIZEOF_DOUBLETEXT) + 1)
+                             (3 * SIZEOF_TIMEVALTEXT) + \
+                             (2 * SIZEOF_DOUBLETEXT) + 1)
 #define SIZEOF_STATSTEXT   (SIZEOF_STATSTEXTBASE + MAXNUMOFPAGES * SIZEOF_DOUBLETEXT)
 #define SIZEOF_PAGESTATSTEXT (SIZEOF_RQSTSTATSTEXT + \
-			      (0 * SIZEOF_TIMEVALTEXT) + \
-			      (3 * SIZEOF_DOUBLETEXT) + 1)
+                              (0 * SIZEOF_TIMEVALTEXT) + \
+                              (3 * SIZEOF_DOUBLETEXT) + 1)
 
 #define D_PRINTF  debug && d_printf
 
 #ifdef USE_TIMEZONE
 typedef struct rqst_timer {
-    struct timeval	entertime;
-    struct timezone	entertimezone;
-    struct timeval	beforeconnect;
-    struct timezone	beforeconnectzone;
-    struct timeval	afterconnect;
-    struct timezone	afterconnectzone;
-    struct timeval	beforeheader;
-    struct timezone	beforeheaderzone;
-    struct timeval	afterheader;
-    struct timezone	afterheaderzone;
-    struct timeval	afterbody;
-    struct timezone	afterbodyzone;
-    struct timeval	exittime;
-    struct timezone	exittimezone;
-    long unsigned int	totalbytes;
-    long unsigned int	bodybytes;
-    int			valid;
-    long unsigned int 	page_number;
+    struct timeval      entertime;
+    struct timezone     entertimezone;
+    struct timeval      beforeconnect;
+    struct timezone     beforeconnectzone;
+    struct timeval      afterconnect;
+    struct timezone     afterconnectzone;
+    struct timeval      beforeheader;
+    struct timezone     beforeheaderzone;
+    struct timeval      afterheader;
+    struct timezone     afterheaderzone;
+    struct timeval      afterbody;
+    struct timezone     afterbodyzone;
+    struct timeval      exittime;
+    struct timezone     exittimezone;
+    long unsigned int   totalbytes;
+    long unsigned int   bodybytes;
+    int                 valid;
+    long unsigned int   page_number;
 } rqst_timer_t;
 #else
 typedef struct rqst_timer {
-    struct timeval	entertime;
-    struct timeval	beforeconnect;
-    struct timeval	afterconnect;
-    struct timeval	beforeheader;
-    struct timeval	afterheader;
-    struct timeval	afterbody;
-    struct timeval	exittime;
-    long unsigned int	totalbytes;
-    long unsigned int	bodybytes;
-    int			valid;
-    long unsigned int 	page_number;
+    struct timeval      entertime;
+    struct timeval      beforeconnect;
+    struct timeval      afterconnect;
+    struct timeval      beforeheader;
+    struct timeval      afterheader;
+    struct timeval      afterbody;
+    struct timeval      exittime;
+    long unsigned int   totalbytes;
+    long unsigned int   bodybytes;
+    int                 valid;
+    long unsigned int   page_number;
 } rqst_timer_t;
 #endif /* USE_TIMEZONE */
 
@@ -101,52 +101,52 @@ extern void rqtimer_init(rqst_timer_t *);
 typedef struct rqst_stats {
     struct timeval      totalresponsetime;
     struct timezone      totalresponsetimezone;
-    double		totalresponsetimesq;
+    double              totalresponsetimesq;
     struct timeval      minresponsetime;
     struct timezone      minresponsetimezone;
     struct timeval      maxresponsetime;
     struct timezone      maxresponsetimezone;
     struct timeval      totalconnecttime;
     struct timezone      totalconnecttimezone;
-    double		totalconnecttimesq;
+    double              totalconnecttimesq;
     struct timeval      minconnecttime;
     struct timezone      minconnecttimezone;
     struct timeval      maxconnecttime;
     struct timezone      maxconnecttimezone;
-    long unsigned int  	totalconnects;
-    long unsigned int  	totalerrs;
-    struct timeval	totalerrortime;
-    struct timezone	totalerrortimezone;
-    double        	totalbytes;
-    double        	totalbytessq;
-    double        	minbytes;
-    double        	maxbytes;
-    double       	totalbody;
-    double       	totalbodysq;
-    double        	minbody;
-    double        	maxbody;
+    long unsigned int   totalconnects;
+    long unsigned int   totalerrs;
+    struct timeval      totalerrortime;
+    struct timezone     totalerrortimezone;
+    double              totalbytes;
+    double              totalbytessq;
+    double              minbytes;
+    double              maxbytes;
+    double              totalbody;
+    double              totalbodysq;
+    double              minbody;
+    double              maxbody;
 } rqst_stats_t;
 #else
 typedef struct rqst_stats {
     struct timeval      totalresponsetime;
-    double		totalresponsetimesq;
+    double              totalresponsetimesq;
     struct timeval      minresponsetime;
     struct timeval      maxresponsetime;
     struct timeval      totalconnecttime;
-    double		totalconnecttimesq;
+    double              totalconnecttimesq;
     struct timeval      minconnecttime;
     struct timeval      maxconnecttime;
-    long unsigned int  	totalconnects;
-    long unsigned int  	totalerrs;
-    struct timeval	totalerrortime;
-    double        	totalbytes;
-    double        	totalbytessq;
-    double        	minbytes;
-    double        	maxbytes;
-    double       	totalbody;
-    double       	totalbodysq;
-    double        	minbody;
-    double        	maxbody;
+    long unsigned int   totalconnects;
+    long unsigned int   totalerrs;
+    struct timeval      totalerrortime;
+    double              totalbytes;
+    double              totalbytessq;
+    double              minbytes;
+    double              maxbytes;
+    double              totalbody;
+    double              totalbodysq;
+    double              minbody;
+    double              maxbody;
 } rqst_stats_t;
 #endif /* USE_TIMEZONE */
 
@@ -158,28 +158,28 @@ extern void rqstat_times(rqst_stats_t *, rqst_timer_t *);
 
 #ifdef USE_TIMEZONE
 typedef struct stats {
-    /* char        	hostname[MAXHOSTNAMELEN]; */
-    rqst_stats_t	rs;
+    /* char             hostname[MAXHOSTNAMELEN]; */
+    rqst_stats_t        rs;
     struct timeval      starttime;
     struct timezone      starttimezone;
     struct timeval      endtime;
     struct timezone      endtimezone;
-    struct timeval	datatime;
-    struct timezone	datatimezone;
-    long unsigned int	totalpages;
-    unsigned int	total_num_of_files;
-    unsigned int	page_numbers[MAXNUMOFPAGES];
+    struct timeval      datatime;
+    struct timezone     datatimezone;
+    long unsigned int   totalpages;
+    unsigned int        total_num_of_files;
+    unsigned int        page_numbers[MAXNUMOFPAGES];
 } stats_t;
 #else
 typedef struct stats {
-    /* char        	hostname[MAXHOSTNAMELEN]; */
-    rqst_stats_t	rs;
+    /* char             hostname[MAXHOSTNAMELEN]; */
+    rqst_stats_t        rs;
     struct timeval      starttime;
     struct timeval      endtime;
-    struct timeval	datatime;
-    long unsigned int	totalpages;
-    unsigned int	total_num_of_files;
-    unsigned int	page_numbers[MAXNUMOFPAGES];
+    struct timeval      datatime;
+    long unsigned int   totalpages;
+    unsigned int        total_num_of_files;
+    unsigned int        page_numbers[MAXNUMOFPAGES];
 } stats_t;
 #endif /* USE_TIMEZONE */
 
@@ -188,10 +188,10 @@ extern stats_t * text_to_stats(char *);
 extern char * stats_to_text(const stats_t *);
 
 typedef struct page_stats {
-    rqst_stats_t	rs; 
-    long unsigned int	totalpages;
-    unsigned int	page_size;
-    int			page_valid;
+    rqst_stats_t        rs;
+    long unsigned int   totalpages;
+    unsigned int        page_size;
+    int                 page_valid;
 } page_stats_t;
 
 extern void page_stats_init(page_stats_t *);
@@ -200,11 +200,11 @@ extern char * page_stats_to_text(const page_stats_t *);
 
 /* THIS STRUCTURE DEFINES A PAGE. */
 typedef struct page_list {
-    int 		load_num;
-    int 		num_of_files;
-    char		*(filename[MAXNUMOFFILES]);
-    char		*(servername[MAXNUMOFFILES]);
-    int			port_number[MAXNUMOFFILES];
+    int                 load_num;
+    int                 num_of_files;
+    char                *(filename[MAXNUMOFFILES]);
+    char                *(servername[MAXNUMOFFILES]);
+    int                 port_number[MAXNUMOFFILES];
 }page_list_t;
 
 
@@ -213,8 +213,8 @@ typedef struct page_list {
 extern THREAD FILE *debugfile;
 extern int debug;
 
-extern int	savefile;
-extern int	timeexpired;
+extern int      savefile;
+extern int      timeexpired;
 extern long int number_of_pages;
 
 /* routines in bench.c */
@@ -239,32 +239,32 @@ extern int  get(char *loc, NETPORT port, char *url, rqst_timer_t *timer);
 /* routines in parse_file_list.c */
 
 extern int count_file_list(const char *url_list_file);
-extern void parse_file_list (const char *url_list_file, page_list_t *page_list, 
-		 long int *num_of_pages, long int *num_of_files);
+extern void parse_file_list (const char *url_list_file, page_list_t *page_list,
+                 long int *num_of_pages, long int *num_of_files);
 extern long int load_percent(page_list_t *page_list, long int number_of_pages);
 
 /* routines in statistics.c (formerly statistics.h) */
 
-extern double	mean(const double, const int);
-extern double	variance(const double, const double, const int);
-extern double	stddev(const double, const double, const int);
+extern double   mean(const double, const int);
+extern double   variance(const double, const double, const int);
+extern double   stddev(const double, const double, const int);
 
 /* routines in timefunc.c (formerly timefunc.h) */
 
-extern double	timevaldouble(struct timeval *);
-extern void	doubletimeval(const double, struct timeval *);
+extern double   timevaldouble(struct timeval *);
+extern void     doubletimeval(const double, struct timeval *);
 
-extern void	addtime(struct timeval *, struct timeval *);
-extern void	compdifftime(struct timeval *, struct timeval *, struct timeval *);
-extern void	mintime(struct timeval *, struct timeval *);
-extern void	maxtime(struct timeval *, struct timeval *);
-extern void	avgtime(struct timeval *, int, struct timeval *);
-extern void	variancetime(struct timeval *, double, int, struct timeval *);
-extern void	stddevtime(struct timeval *, double, int, struct timeval *);
+extern void     addtime(struct timeval *, struct timeval *);
+extern void     compdifftime(struct timeval *, struct timeval *, struct timeval *);
+extern void     mintime(struct timeval *, struct timeval *);
+extern void     maxtime(struct timeval *, struct timeval *);
+extern void     avgtime(struct timeval *, int, struct timeval *);
+extern void     variancetime(struct timeval *, double, int, struct timeval *);
+extern void     stddevtime(struct timeval *, double, int, struct timeval *);
 
-extern void	sqtime(struct timeval *, struct timeval *);
+extern void     sqtime(struct timeval *, struct timeval *);
 
-extern double	thruputpersec(const double, struct timeval *);
+extern double   thruputpersec(const double, struct timeval *);
 
 /* routines in webclient.c */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/get.h b/apps/JAWS/clients/WebSTONE/src/get.h
index 3f9fb7a1e76..0b254d1519a 100644
--- a/apps/JAWS/clients/WebSTONE/src/get.h
+++ b/apps/JAWS/clients/WebSTONE/src/get.h
@@ -2,15 +2,15 @@
 #define __GET_H__
 /**************************************************************************
  $Header$
- * 		 Copyright (C) 1995 Silicon Graphics, Inc.		  *
- *									  *
- *  These coded instructions, statements, and computer programs  where	  *
+ *               Copyright (C) 1995 Silicon Graphics, Inc.                *
+ *                                                                        *
+ *  These coded instructions, statements, and computer programs  where    *
  *  deveolped by SGI for public use.  If anychanges are made to this code *
  *  please try to get the changes back to the author.  Feel free to make  *
- *  modfications and changes to the code and release it.		  *
- *									  *
+ *  modfications and changes to the code and release it.                  *
+ *                                                                        *
  **************************************************************************/
- 
-extern int	get(char *loc, int port, char *url, rqst_timer_t *timer);
+
+extern int      get(char *loc, int port, char *url, rqst_timer_t *timer);
 
 #endif /* !__GET_H__ */
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h
index 0ceb060d766..8f368ed1525 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,24 +13,24 @@
 
 /*
  * buffer.h: For performing buffered I/O on a file or socket descriptor.
- * 
+ *
  * This is an abstraction to allow I/O to be performed regardless of the
- * current system. That way, an integer file descriptor can be used under 
+ * current system. That way, an integer file descriptor can be used under
  * UNIX but a stdio FILE structure could be used on systems which don't
  * support that or don't support it as efficiently.
- * 
+ *
  * Two abstractions are defined: A file buffer, and a network buffer. A
  * distinction is made so that mmap() can be used on files (but is not
- * required). Also, the file buffer takes a file name as the object to 
+ * required). Also, the file buffer takes a file name as the object to
  * open instead of a file descriptor. A lot of the network buffering
  * is almost an exact duplicate of the non-mmap file buffering.
- * 
+ *
  * If an error occurs, system-independent means to obtain an error string
  * are also provided. However, if the underlying system is UNIX the error
  * may not be accurate in a threaded environment.
- * 
+ *
  * Rob McCool
- * 
+ *
  */
 
 
@@ -50,7 +50,7 @@
 #include "net.h"
 
 /*
- * Requires that the macro MALLOC be set to a "safe" malloc that will 
+ * Requires that the macro MALLOC be set to a "safe" malloc that will
  * exit if no memory is available. If not under MCC httpd, define MALLOC
  * to be the real malloc and play with fire, or make your own function.
  */
@@ -102,9 +102,9 @@ typedef struct {
 
 
 /*
- * netbuf_getc gets a character from the given network buffer and returns 
+ * netbuf_getc gets a character from the given network buffer and returns
  * it. (as an integer).
- * 
+ *
  * It will return (int) IO_ERROR for an error and (int) IO_EOF for
  * an error condition or EOF respectively.
  */
@@ -128,7 +128,7 @@ typedef struct {
 #define buffer_error(b) ((b)->errmsg)
 
 /*
- * buffer_flush flushes any data after the current pos to the file 
+ * buffer_flush flushes any data after the current pos to the file
  * descriptor fd. Regardless of buffer type.
  */
 
@@ -144,7 +144,7 @@ typedef struct {
  * buffer of size sz, and returns a new buffer structure which will hold
  * the data.
  *
- * If FILE_UNIX_MMAP is defined, this may return NULL. If it does, check 
+ * If FILE_UNIX_MMAP is defined, this may return NULL. If it does, check
  * system_errmsg to get a message about the error.
  */
 
@@ -181,12 +181,12 @@ void filebuf_close(filebuf *buf);
 void netbuf_close(netbuf *buf);
 
 /*
- * buffer_grab will set the buffer's inbuf array to an array of sz bytes 
- * from the buffer's associated object. It returns the number of bytes 
+ * buffer_grab will set the buffer's inbuf array to an array of sz bytes
+ * from the buffer's associated object. It returns the number of bytes
  * actually read (between 1 and sz). It returns IO_EOF upon EOF or IO_ERROR
  * upon error. The cursize entry of the structure will reflect the size
  * of the iobuf array.
- * 
+ *
  * The buffer will take care of allocation and deallocation of this array.
  */
 
@@ -204,7 +204,7 @@ int netbuf_grab(netbuf *buf, int sz);
 int netbuf_buf2sd(netbuf *buf, SYS_NETFD sd, int len);
 
 /*
- * filebuf_buf2sd assumes that nothing has been read from the filebuf, 
+ * filebuf_buf2sd assumes that nothing has been read from the filebuf,
  * and just sends the file out to the given socket. Returns IO_ERROR on error
  * and the number of bytes sent otherwise.
  *
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h
index 543147104a2..6cfdbd6c2c6 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,9 +13,9 @@
 
 /*
  * cinfo.h: Content Information for a file, i.e. its type, etc.
- * 
- * See cinfo.c for dependency information. 
- * 
+ *
+ * See cinfo.c for dependency information.
+ *
  * Rob McCool
  */
 
@@ -62,9 +62,9 @@
 
 /*
  * The ContentInfo structure.
- * 
+ *
  * Currently, we support the following attributes:
- * 
+ *
  * 1. Type: This identifies what kind of data is in the file.
  * 2. Encoding: Identifies any compression or otherwise content-independent
  *    transformation which has been applied to the file (uuencode, etc.)
@@ -72,7 +72,7 @@
  * 4. Description: A text string describing the file.
  * 5. Viewer: The program to use to view the file.
  *
- * Multiple items are separated with a comma, e.g. 
+ * Multiple items are separated with a comma, e.g.
  * encoding="x-gzip, x-uuencode"
  */
 
@@ -87,7 +87,7 @@ typedef struct {
 
 
 /*
- * cinfo_init initializes the content info system. Call this before 
+ * cinfo_init initializes the content info system. Call this before
  * cinfo_merge.
  */
 
@@ -100,7 +100,7 @@ void cinfo_init(void);
 void cinfo_terminate(void);
 
 /*
- * cinfo_merge merges the contents of the given filename with the current 
+ * cinfo_merge merges the contents of the given filename with the current
  * cinfo database. It returns NULL upon success and a string (which you
  * must deallocate) upon error.
  */
@@ -114,7 +114,7 @@ char *cinfo_merge(char *fn);
  * separated by CINFO_SEPARATOR. You may pass in a filename instead of uri.
  *
  * Returns a newly allocated cinfo structure with the information it
- * finds. The elements of this structure are coming right out of the types 
+ * finds. The elements of this structure are coming right out of the types
  * database and so if you change it or want to keep it around for long you
  * should strdup it. You should free only the structure itself when finished
  * with it.
@@ -127,7 +127,7 @@ char *cinfo_merge(char *fn);
 cinfo *cinfo_find(char *uri);
 
 /*
- * cinfo_lookup finds the information about the given content-type, and 
+ * cinfo_lookup finds the information about the given content-type, and
  * returns a cinfo structure so you can look up description and icon.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h
index 04954857c0c..5ed576edb57 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -15,9 +15,9 @@
  * crit.h: Critical section abstraction. Used in threaded servers to protect
  *         areas where two threads can interfere with each other.
  *
- *         Condvars are condition variables that are used for thread-thread 
+ *         Condvars are condition variables that are used for thread-thread
  *         synchronization.
- * 
+ *
  * Rob McCool
  */
 
@@ -33,7 +33,7 @@ typedef void *CRITICAL;
 #endif
 
 /*
- * crit_init creates and returns a new critical section variable. At the 
+ * crit_init creates and returns a new critical section variable. At the
  * time of creation no one has entered it.
  */
 #ifdef USE_NSPR
@@ -79,8 +79,8 @@ typedef void* CONDVAR;
 #endif
 
 /*
- * condvar_init initializes and returns a new condition variable. You 
- * must provide a critical section to be associated with this condition 
+ * condvar_init initializes and returns a new condition variable. You
+ * must provide a critical section to be associated with this condition
  * variable.
  */
 #ifdef USE_NSPR
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
index 24b44ad0cd0..d3846b6de8b 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * daemon.h: Things related to the accepting connections
- * 
+ *
  * Rob McCool
  */
 
@@ -76,10 +76,10 @@ extern int child_serial;
 
 /*
  * daemon_run accepts whether or not it should detach from its parent process,
- * and a daemon structure as its arguments. The daemon structure contains 
- * a port number, a root directory to chroot to (can be NULL), a filename to 
+ * and a daemon structure as its arguments. The daemon structure contains
+ * a port number, a root directory to chroot to (can be NULL), a filename to
  * log the daemon pid to (can be NULL). daemon_run never returns.
- * 
+ *
  * child_callback is a function which will be called every time a new
  * connection is recieved. Session is a new session ID.
  *
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h
index 0a3edb0633e..65ba77dd0e7 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * dll.h: Handle dynamically linked libraries
- * 
+ *
  * Rob McCool
  */
 
@@ -66,7 +66,7 @@ DLHANDLE dll_open(char *libfn);
 
 
 /*
- * dll_findsym looks for a symbol with the given name in the library 
+ * dll_findsym looks for a symbol with the given name in the library
  * pointed to by the given handle. Returns a pointer to the named function.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h
index c10c6ab86b5..8fe585f9e00 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * ereport.h: Records transactions, reports errors to administrators, etc.
- * 
+ *
  * Rob McCool
  */
 
@@ -40,13 +40,13 @@
 /* A warning is a minor mishap, such as a 404 being issued. */
 #define LOG_WARN 0
 
-/* 
+/*
  * A misconfig is when there is a syntax error or permission violation in
  * a config. file.
  */
 #define LOG_MISCONFIG 1
 
-/* 
+/*
  * Security warnings are issued when authentication fails, or a host is
  * given a 403 return code.
  */
@@ -54,14 +54,14 @@
 
 /*
  * A failure is when a request could not be fulfilled due to an internal
- * problem, such as a CGI script exiting prematurely, or a filesystem 
+ * problem, such as a CGI script exiting prematurely, or a filesystem
  * permissions problem.
  */
 #define LOG_FAILURE 3
 
 /*
  * A catastrophe is a fatal server error such as running out of
- * memory or processes, or a system call failing, or even a server crash. 
+ * memory or processes, or a system call failing, or even a server crash.
  * The server child cannot recover from a catastrophe.
  */
 #define LOG_CATASTROPHE 4
@@ -88,8 +88,8 @@
 
 
 /*
- * ereport logs an error of the given degree and formats the arguments with 
- * the printf() style fmt. Returns whether the log was successful. Records 
+ * ereport logs an error of the given degree and formats the arguments with
+ * the printf() style fmt. Returns whether the log was successful. Records
  * the current date.
  */
 
@@ -99,7 +99,7 @@ int ereport(int degree, char *fmt, ...);
  * ereport_init initializes the error logging subsystem and opens the static
  * file descriptors. It returns NULL upon success and an error string upon
  * error. If a userpw is given, the logs will be chowned to that user.
- * 
+ *
  * email is the address of a person to mail upon catastrophic error. It
  * can be NULL if no e-mail is desired. ereport_init will not duplicate
  * its own copy of this string; you must make sure it stays around and free
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h
index 8218f875075..ce78bab46be 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -29,18 +29,18 @@ VOID TerminateHttpdLogging();
 VOID TerminateHttpsLogging();
 
 VOID LogErrorEvent(PCHAR ServiceName, WORD fwEventType, WORD fwCategory, DWORD IDEvent,
-	LPTSTR chMsg, LPTSTR lpszMsg);
+        LPTSTR chMsg, LPTSTR lpszMsg);
 
 // Functions in error.c
 
 VOID ReportError(PCHAR ErrorMsg);
 
 BOOL CALLBACK ErrorDialogProc(
-	HWND hDlg,
-	UINT message,
-	WPARAM wParam,
-	LPARAM lParam
-	);
+        HWND hDlg,
+        UINT message,
+        WPARAM wParam,
+        LPARAM lParam
+        );
 
 
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h
index f0efb1ee582..fc4d26b32ec 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * file.h: system specific functions for reading/writing files
- * 
+ *
  * Rob McCool
  */
 
@@ -86,7 +86,7 @@ typedef int SYS_FILE;
 
 /*
  * system_fread reads sz bytes from fd into to buf, return number of bytes
- * read, or IO_EOF if EOF, or IO_ERROR if error. 
+ * read, or IO_EOF if EOF, or IO_ERROR if error.
  */
 
 #if defined(FILE_STDIO)
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h
index 1a00323cecc..4eb09688d4c 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h
index 0454ac69c84..349018ba048 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * net.h: system specific networking definitions
- * 
+ *
  * Rob McCool
  */
 
@@ -161,7 +161,7 @@ char *net_find_fqdn(struct hostent *p);
  * net_ip2host transforms the given textual IP number into a FQDN. If it
  * can't find a FQDN, it will return what it can get. Otherwise, NULL.
  *
- * verify is whether or not the function should verify the hostname it 
+ * verify is whether or not the function should verify the hostname it
  * gets. This takes an extra query but is safer for use in access control.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h
index c69c553a2a4..e0672366a2a 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -11,14 +11,14 @@
 /* ------------------------------------------------------------------------ */
 
 
-/* 
+/*
  * nodelock.h:  licensing stuff
  */
 
 #ifndef _NODELOCK_H
 #define _NODELOCK_H
 
-/* 
+/*
  * Do the initial IP address check and expiration date check.  Reads a file
  * from admin/config, as #define'd.
  *
@@ -37,7 +37,7 @@ int node_check(void);
 
 /*
  * So how we doin, license
- * 
+ *
  * Returns 1 on error, 0 on AOK
  */
 int node_status(void);
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h
index 7c85116faee..d83a3caaf6e 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -14,9 +14,9 @@
 /* DO NOT EDIT THIS FILE - it is automatically generated */
 
 struct _NtError {
-	int ErrorNumber;
-	char *ErrorString;
-	struct _NtError *next;
+        int ErrorNumber;
+        char *ErrorString;
+        struct _NtError *next;
 } ;
 
 typedef struct _NtError NtError;
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h
index 7fb14eecf06..09573ffeb03 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -15,7 +15,7 @@
 #define __objndx_h
 
 /* Define maximum length of object name strings */
-#define OBJNDXNAMLEN	16
+#define OBJNDXNAMLEN    16
 
 /* Functions in objndx.c */
 extern void * objndx_create(int size, void (*freefunc)(void *));
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h
index e2d3642a611..dc0c8de76e4 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,33 +13,33 @@
 
 /*
  * pblock.h: Header for Parameter Block handling functions
- * 
  *
- * A parameter block is a set of name=value pairs which are generally used 
- * as parameters, but can be anything. They are kept in a hash table for 
+ *
+ * A parameter block is a set of name=value pairs which are generally used
+ * as parameters, but can be anything. They are kept in a hash table for
  * reasonable speed, but if you are doing any intensive modification or
  * access of them you should probably make a local copy of each parameter
  * while working.
  *
  * When creating a pblock, you specify the hash table size for that pblock.
- * You should set this size larger if you know that many items will be in 
+ * You should set this size larger if you know that many items will be in
  * that pblock, and smaller if only a few will be used or if speed is not
  * a concern.
  *
- * The hashing function is very simple right now, and only looks at the 
+ * The hashing function is very simple right now, and only looks at the
  * first character of name.
  *
  * Rob McCool
- * 
+ *
  */
 
 #ifndef PBLOCK_H
 #define PBLOCK_H
 
 /*
- * Requires that the macros MALLOC and STRDUP be set to "safe" versions that 
- * will exit if no memory is available. If not under MCC httpd, define 
- * them to be the real functions and play with fire, or make your own 
+ * Requires that the macros MALLOC and STRDUP be set to "safe" versions that
+ * will exit if no memory is available. If not under MCC httpd, define
+ * them to be the real functions and play with fire, or make your own
  * function.
  */
 
@@ -82,15 +82,15 @@ pb_param *param_create(char *name, char *value);
 /*
  * param_free frees a given parameter if it's non-NULL, and returns 1 if
  * p was non-NULL, and 0 if p was NULL.
- * 
+ *
  * Useful for error checking pblock_remove.
  */
 
 int param_free(pb_param *pp);
 
-/* 
+/*
  * pblock_create creates a new pblock with hash table size n.
- * 
+ *
  * It returns the newly allocated pblock.
  */
 
@@ -98,14 +98,14 @@ pblock *pblock_create(int n);
 
 /*
  * pblock_free frees the given pblock and any entries inside it.
- * 
- * If you want to save anything in a pblock, remove its entities with 
+ *
+ * If you want to save anything in a pblock, remove its entities with
  * pblock_remove first and save the pointers you get.
  */
 
 void pblock_free(pblock *pb);
 
-/* 
+/*
  * pblock_find finds the entry with the given name in pblock pb.
  *
  * If it is successful, it returns the param block. If not, it returns NULL.
@@ -130,7 +130,7 @@ char *pblock_findval(char *name, pblock *pb);
 /*
  * pblock_nvinsert creates a new parameter with the given name and value
  * and inserts it into pblock pb. The name and value in the parameter are
- * also newly allocated. Returns the pb_param it allocated (in case you 
+ * also newly allocated. Returns the pb_param it allocated (in case you
  * need it).
  *
  * pblock_nninsert inserts a numerical value.
@@ -147,18 +147,18 @@ void pblock_pinsert(pb_param *pp, pblock *pb);
 
 /*
  * pblock_str2pblock scans the given string str for parameter pairs
- * name=value, or name="value". Any \ must be followed by a literal 
+ * name=value, or name="value". Any \ must be followed by a literal
  * character. If a string value is found, with no unescaped = signs, it
  * will be added with the name 1, 2, 3, etc. depending on whether it was
  * first, second, third, etc. in the stream (zero doesn't count).
- * 
+ *
  * Returns the number of parameters added to the table, or -1 upon error.
  */
 
 int pblock_str2pblock(char *str, pblock *pb);
 
 /*
- * pblock_pblock2str places all of the parameters in the given pblock 
+ * pblock_pblock2str places all of the parameters in the given pblock
  * into the given string (NULL if it needs creation). It will re-allocate
  * more space for the string. Each parameter is separated by a space and of
  * the form name="value"
@@ -167,7 +167,7 @@ int pblock_str2pblock(char *str, pblock *pb);
 char *pblock_pblock2str(pblock *pb, char *str);
 
 /*
- * pblock_copy copies the entries in the given source pblock to the 
+ * pblock_copy copies the entries in the given source pblock to the
  * destination one. The entries are newly allocated so that the original
  * pblock may be freed or the new one changed without affecting the other.
  */
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h
index c6ea65b834b..a6d061b1a5b 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * sem.h: Attempt to provide multi-process semaphores across platforms
- * 
+ *
  * Rob McCool
  */
 
@@ -37,8 +37,8 @@ typedef int SEMAPHORE;
 #endif /* SEM_WIN32 */
 
 /*
- * sem_init creates a semaphore using the given name and unique 
- * identification number. filename should be a file accessible to the 
+ * sem_init creates a semaphore using the given name and unique
+ * identification number. filename should be a file accessible to the
  * process. Returns SEM_ERROR on error.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h
index c404dfa5a8c..4531a34e966 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -72,8 +72,8 @@ void session_free(Session *sn);
 #define session_dns(sn) session_dns_lookup(sn, 0)
 
 /*
- * session_maxdns looks up a hostname from an IP address, and then verifies 
- * that the host is really who they claim to be. 
+ * session_maxdns looks up a hostname from an IP address, and then verifies
+ * that the host is really who they claim to be.
  */
 
 #define session_maxdns(sn) session_dns_lookup(sn, 1)
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h
index 38b7e4982aa..d7a49a65aaf 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,11 +13,11 @@
 
 /*
  * shexp.h: Defines and prototypes for shell exp. match routines
- * 
+ *
  *
  * This routine will match a string with a shell expression. The expressions
  * accepted are based loosely on the expressions accepted by zsh.
- * 
+ *
  * o * matches anything
  * o ? matches one character
  * o \ will escape a special character
@@ -30,18 +30,18 @@
  *     matching the shell expression from the match list
  * o (foo|bar) will match either the substring foo, or the substring bar.
  *             These can be shell expressions as well.
- * 
+ *
  * The public interface to these routines is documented below.
- * 
+ *
  * Rob McCool
- * 
+ *
  */
 
 #ifndef SHEXP_H
 #define SHEXP_H
 
 /*
- * Requires that the macro MALLOC be set to a "safe" malloc that will 
+ * Requires that the macro MALLOC be set to a "safe" malloc that will
  * exit if no memory is available. If not under MCC httpd, define MALLOC
  * to be the real malloc and play with fire, or make your own function.
  */
@@ -58,7 +58,7 @@
 
 /*
  * shexp_valid takes a shell expression exp as input. It returns:
- * 
+ *
  *  NON_SXP      if exp is a standard string
  *  INVALID_SXP  if exp is a shell expression, but invalid
  *  VALID_SXP    if exp is a valid shell expression
@@ -71,8 +71,8 @@
 int shexp_valid(char *exp);
 
 /*
- * shexp_match 
- * 
+ * shexp_match
+ *
  * Takes a prevalidated shell expression exp, and a string str.
  *
  * Returns 0 on match and 1 on non-match.
@@ -83,9 +83,9 @@ int shexp_match(char *str, char *exp);
 
 /*
  * shexp_cmp
- * 
+ *
  * Same as above, but validates the exp first. 0 on match, 1 on non-match,
- * -1 on invalid exp. shexp_casecmp does the same thing but is case 
+ * -1 on invalid exp. shexp_casecmp does the same thing but is case
  * insensitive.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h
index ec536cf4d9c..345efe9ad2f 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * shmem.h: Portable abstraction for memory shared among a server's workers
- * 
+ *
  * Rob McCool
  */
 
@@ -49,8 +49,8 @@ typedef struct {
 /*
  * shmem_alloc allocates a region of shared memory of the given size, using
  * the given name to avoid conflicts between multiple regions within the
- * program. The region will not be automatically grown if its boundaries 
- * are over-run, use shmem_realloc for that. 
+ * program. The region will not be automatically grown if its boundaries
+ * are over-run, use shmem_realloc for that.
  *
  * If expose is non-zero and the underlying system supports it, the
  * file used to create the shared region will be visible to other processes
@@ -59,7 +59,7 @@ typedef struct {
  * name should be unique to the program which calls this routine, otherwise
  * conflicts will arise.
  *
- * Returns a new shared memory region, with the data element being a 
+ * Returns a new shared memory region, with the data element being a
  * pointer to the shared memory. This function must be called before any
  * daemon workers are spawned, in order for the handle to the shared region
  * to be inherited by the children.
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h
index b54f085e6a9..5635625e2bb 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,8 +13,8 @@
 
 /*
  * systems.h: Lists of defines for systems
- * 
- * This sets what general flavor the system is (UNIX, etc.), 
+ *
+ * This sets what general flavor the system is (UNIX, etc.),
  * and defines what extra functions your particular system needs.
  */
 
@@ -209,12 +209,12 @@ typedef void* PASSWD;
 
 /* The stat call under NT doesn't define these macros */
 #define S_ISDIR(mode)   ((mode&S_IFMT) == S_IFDIR)
-#define S_ISREG(mode)   ((mode&S_IFMT) == S_IFREG)                             
+#define S_ISREG(mode)   ((mode&S_IFMT) == S_IFREG)
 
 #define strcasecmp util_strcasecmp
 #define strncasecmp util_strncasecmp
 int util_strcasecmp(const char *s1, const char *s2);
 int util_strncasecmp(const char *s1, const char *s2, int n);
-#endif	/* Windows NT */
+#endif  /* Windows NT */
 
 #endif
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h
index 81e101076f9..f359b8b9a64 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * systhr.h: Abstracted threading mechanisms
- * 
+ *
  * Rob McCool
  */
 
@@ -46,14 +46,14 @@ typedef sys_thread_s *SYS_THREAD;
 /*
  * systhread_start creates a thread with the given priority, will allocate
  * a stack of stksz bytes, and calls fn with arg as its argument. stksz
- * of zero will allocate a default stack size. 
- * 
+ * of zero will allocate a default stack size.
+ *
  * XXX Priorities are system dependent
  */
 
 SYS_THREAD systhread_start(int prio, int stksz, void (*fn)(void *), void *arg);
 
-/* 
+/*
  * systhread_current returns a pointer to the current thread.
  */
 #ifdef USE_NSPR
@@ -69,7 +69,7 @@ SYS_THREAD systhread_start(int prio, int stksz, void (*fn)(void *), void *arg);
 
 SYS_THREAD systhread_attach();
 
-/* 
+/*
  * systhread_terminate terminates the thread that is passed in.
  */
 void systhread_terminate(SYS_THREAD thr);
@@ -105,7 +105,7 @@ void systhread_init(char *name);
 
 /*
  * newkey allocates a new integer id for thread-private data. Use this
- * key to identify a variable which you want to appear differently 
+ * key to identify a variable which you want to appear differently
  * between threads, and then use setdata to associate a value with this
  * key for each thread.
  */
@@ -113,7 +113,7 @@ int systhread_newkey(void);
 
 /*
  * Get data that has been previously associated with key in this thread.
- * Returns NULL if setkey has not been called with this key by this 
+ * Returns NULL if setkey has not been called with this key by this
  * thread previously, or the data that was previously used with setkey
  * by this thread with this key.
  */
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h
index cf2f1c0764d..17972cb518a 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -12,9 +12,9 @@
 
 
 /*
- * util.h: A hodge podge of utility functions and standard functions which 
+ * util.h: A hodge podge of utility functions and standard functions which
  *         are unavailable on certain systems
- * 
+ *
  * Rob McCool
  */
 
@@ -33,7 +33,7 @@
 /*
  * getline scans in buf until it finds a LF or CRLF, storing the string in
  * l. It will terminate the string and return:
- * 
+ *
  *  0 when done, with the scanned line (minus CR or LF) in l
  *  1 upon EOF, with the scanned line (minus CR or LF) in l
  * -1 on error with the error description in l (uses lineno for information)
@@ -43,7 +43,7 @@ int util_getline(filebuf *buf, int lineno, int maxlen, char *l);
 
 
 /*
- * can_exec returns 1 if you can execute the file described by finfo, and 
+ * can_exec returns 1 if you can execute the file described by finfo, and
  * 0 if you can't.
  */
 
@@ -58,7 +58,7 @@ int util_can_exec(struct stat *finfo, uid_t uid, gid_t gid);
  * env_create creates a new environment with the given env, with n new
  * entries, and places the current position that you should add your
  * entries with at pos.
- * 
+ *
  * If env is NULL, it will allocate a new one. If not, it will reallocate
  * that one.
  */
@@ -73,7 +73,7 @@ char **util_env_create(char **env, int n, int *pos);
 char *util_env_str(char *name, char *value);
 
 /*
- * env_replace replaces the occurrence of the given variable with the 
+ * env_replace replaces the occurrence of the given variable with the
  * value you give.
  */
 
@@ -110,25 +110,25 @@ int util_chdir2path(char *path);
 
 /*
  * is_mozilla checks if the given user-agent is mozilla, of at least
- * the given major and minor revisions. These are strings to avoid 
+ * the given major and minor revisions. These are strings to avoid
  * ambiguities like 1.56 > 1.5
  */
 
 int util_is_mozilla(char *ua, char *major, char *minor);
 
 /*
- * is_url will return 1 if the given string seems to be a URL, or will 
- * return 0 otherwise. 
- * 
- * Because of stupid news URLs, this will return 1 if the string has 
- * all alphabetic characters up to the first colon and will not check for 
+ * is_url will return 1 if the given string seems to be a URL, or will
+ * return 0 otherwise.
+ *
+ * Because of stupid news URLs, this will return 1 if the string has
+ * all alphabetic characters up to the first colon and will not check for
  * the double slash.
  */
 
 int util_is_url(char *url);
 
 /*
- * util_later_than checks the date in the string ims, and if that date is 
+ * util_later_than checks the date in the string ims, and if that date is
  * later than or equal to the one in the tm struct lms, then it returns 1.
  *
  * Handles RFC 822, 850, and ctime formats.
@@ -144,7 +144,7 @@ int util_uri_is_evil(char *t);
 
 /*
  * util_uri_parse gets rid of /../, /./, and //.
- * 
+ *
  * Assumes that either the string starts with a /, or the string will
  * not .. right off of its beginning.  As such, ../foo.gif will
  * not be changed, although /../foo.gif will become /foo.gif.
@@ -163,7 +163,7 @@ void util_uri_unescape(char *s);
  * If d is NULL, it will allocate and return a properly sized string.
  * Warning: does not check bounds on a given d.
  *
- * util_url_escape does the same thing but does it for a url, i.e. ?:+ is 
+ * util_url_escape does the same thing but does it for a url, i.e. ?:+ is
  * not escaped.
  */
 
@@ -184,9 +184,9 @@ char *util_sh_escape(char *s);
 int util_itoa(int i, char *a);
 
 /*
- * util_vsprintf and util_sprintf are simplified clones of the System V 
+ * util_vsprintf and util_sprintf are simplified clones of the System V
  * vsprintf and sprintf routines.
- * 
+ *
  * Returns the number of characters printed. Only handles %d and %s,
  * does not handle any width or precision.
  */
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h
index ec632f2d84b..79a8b84dbbc 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,12 +13,12 @@
 
 /*
  * conf.h: Deals with the server configuration file.
- * 
+ *
  * Object configuration is an entirely different matter. This deals with
  * things like what port the server runs on, how many children it spawns,
  * and other server-related issues. Information related configuration is
  * handled by the object conf.
- * 
+ *
  * Rob McCool
  */
 
@@ -67,7 +67,7 @@
 
 /*
  * These server parameters are made global because they really don't
- * belong anywhere else. 
+ * belong anywhere else.
  */
 
 #if defined(DAEMON_ANY)
@@ -145,7 +145,7 @@ void conf_terminate(void);
 
 
 /*
- * conf_vars2daemon transfers these globals to a daemon structure 
+ * conf_vars2daemon transfers these globals to a daemon structure
  */
 void conf_vars2daemon(daemon_s *d);
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h
index 3904af7b37c..63545df5ad1 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -15,22 +15,22 @@
 #define __dnfilter_h
 
 /* Error codes */
-#define DNFERR_MAX	(-1)	/* maximum error code */
-#define DNFERR_MALLOC	(-1)	/* insufficient memory */
-#define DNFERR_FOPEN	(-2)	/* file open error */
-#define DNFERR_FILEIO	(-3)	/* file I/O error */
-#define DNFERR_DUPSPEC	(-4)	/* duplicate filter specification */
-#define DNFERR_INTERR	(-5)	/* internal error (bug) */
-#define DNFERR_SYNTAX	(-6)	/* syntax error in filter file */
-#define DNFERR_MIN	(-6)	/* minimum error code */
+#define DNFERR_MAX      (-1)    /* maximum error code */
+#define DNFERR_MALLOC   (-1)    /* insufficient memory */
+#define DNFERR_FOPEN    (-2)    /* file open error */
+#define DNFERR_FILEIO   (-3)    /* file I/O error */
+#define DNFERR_DUPSPEC  (-4)    /* duplicate filter specification */
+#define DNFERR_INTERR   (-5)    /* internal error (bug) */
+#define DNFERR_SYNTAX   (-6)    /* syntax error in filter file */
+#define DNFERR_MIN      (-6)    /* minimum error code */
 
 /* This is used to return error information from dns_filter_setup() */
 typedef struct DNSFilterErr_s DNSFilterErr_t;
 struct DNSFilterErr_s {
-    int errNo;			/* DNFERR_xxxx error code */
-    int lineno;			/* file line number, if applicable */
-    char * filename;		/* filename, if applicable */
-    char * errstr;		/* error text, if any */
+    int errNo;                  /* DNFERR_xxxx error code */
+    int lineno;                 /* file line number, if applicable */
+    char * filename;            /* filename, if applicable */
+    char * errstr;              /* error text, if any */
 };
 
 /* Data and functions in dnfilter.c */
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h
index 45383c76d23..7bce6c285ba 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,11 +13,11 @@
 
 /*
  * func.h: Handles the function hash table
- * 
+ *
  * httpd uses a table of internal functions hashed by a name string such that
  * users can reference specific functions from the configuration files.
- * 
- * Any function referenced by configuration files will be passed a 
+ *
+ * Any function referenced by configuration files will be passed a
  * parameter, a Request structure. The functions do not return anything.
  *
  * Rob McCool
@@ -44,8 +44,8 @@ typedef int Func(pblock *, Session *, Request *);
 typedef Func *FuncPtr;
 
 /*
- * FuncStruct is a structure used in the static declaration of the 
- * functions. This static declaration is parsed into a hash table at 
+ * FuncStruct is a structure used in the static declaration of the
+ * functions. This static declaration is parsed into a hash table at
  * startup. You should initialize the next entry to NULL.
  */
 
@@ -59,7 +59,7 @@ struct FuncStruct {
 /* --------------------------- Hash definitions --------------------------- */
 
 
-/* 
+/*
  * This is a primitive hash function. Once more is known about the names of
  * the functions, this will be optimized.
  */
@@ -72,7 +72,7 @@ struct FuncStruct {
 
 
 /*
- * func_init reads the static FuncStruct arrays and creates the global 
+ * func_init reads the static FuncStruct arrays and creates the global
  * function table from them.
  *
  * func_init will only read from the static arrays defined in func.c.
@@ -91,7 +91,7 @@ FuncPtr func_find(char *name);
  * func_exec will try to execute the function whose name is the "fn" entry
  * in the given pblock. If name is not found, it will log a misconfig of
  * missing fn parameter. If it can't find it, it will log that. In these
- * cases it will return REQ_ABORTED. Otherwise, it will return what the 
+ * cases it will return REQ_ABORTED. Otherwise, it will return what the
  * function being executed returns.
  */
 
@@ -99,8 +99,8 @@ int func_exec(pblock *pb, Session *sn, Request *rq);
 
 /*
  * func_insert dynamically inserts a named function into the server's
- * table of functions. Returns the FuncStruct it keeps in internal 
- * databases, because on server restart you are responsible for freeing 
+ * table of functions. Returns the FuncStruct it keeps in internal
+ * databases, because on server restart you are responsible for freeing
  * (or not) its contents.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h
index bc23879ebe8..c139d536482 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * http.h: Deals with HTTP-related issues
- * 
+ *
  * Rob McCool
  */
 
@@ -78,7 +78,7 @@ int http_parse_request(char *t, Request *rq, Session *sn);
 /*
  * Scans HTTP headers from the given netbuf, and places them in headers.
  * If netbuf is NULL, the session's inbuf is used.
- * 
+ *
  * Folded lines are joined and the linefeed removed (but not the whitespace).
  * If there are any repeat headers they are joined and the two field bodies
  * separated by a comma and space.
@@ -106,7 +106,7 @@ int http_start_response(Session *sn, Request *rq);
 
 /*
  * http_hdrs2env takes the entries from the given pblock and converts them
- * to an environment. 
+ * to an environment.
  *
  * Each name entry will be made uppercase, prefixed with HTTP_ and any
  * occurrence of - will be converted to _.
@@ -133,7 +133,7 @@ int http_set_finfo(Session *sn, Request *rq, struct stat *finfo);
 
 
 /*
- * Takes the given pblock and prints headers into the given buffer at 
+ * Takes the given pblock and prints headers into the given buffer at
  * position pos. Returns the buffer, reallocated if needed. Modifies pos.
  */
 
@@ -155,10 +155,10 @@ void http_finish_request(Session *sn, Request *rq);
 void http_handle_session(Session *sn);
 
 /*
- * http_uri2url takes the give URI prefix and URI suffix and creates a 
+ * http_uri2url takes the give URI prefix and URI suffix and creates a
  * newly-allocated full URL from them of the form
  * http://(server):(port)(prefix)(suffix)
- * 
+ *
  * If you want either prefix or suffix to be skipped, use "" instead of NULL.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h
index efc6d1202e3..ee50b8a7821 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * httpact.h: Defines the API characteristics for HTTP servers
- * 
+ *
  * Rob McCool
  */
 
@@ -44,7 +44,7 @@
 /*
  * directive_name2num will return the position of the abbreviated directive
  * dir in the directive table.
- * 
+ *
  * If dir does not exist in the table, it will return -1.
  */
 
@@ -113,6 +113,6 @@ struct hostent *servact_gethostbyname(char *host, Session *sn, Request *rq);
 int servact_connect(char *host, int port, Session *sn, Request *rq);
 
 
-#endif	/* ! MCC_PROXY */
+#endif  /* ! MCC_PROXY */
 
 #endif
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h
index a0aa92e3ac9..a5d490798c3 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -15,15 +15,15 @@
 #define __ipfilter_h
 
 /* Define error codes */
-#define IPFERR_MAX	(-1)	/* maximum error code value */
-#define IPFERR_MALLOC	(-1)	/* insufficient memory */
-#define IPFERR_FOPEN	(-2)	/* file open error */
-#define IPFERR_FILEIO	(-3)	/* file I/O error */
-#define IPFERR_DUPSPEC	(-4)	/* duplicate filter specification */
-#define IPFERR_INTERR	(-5)	/* internal error (bug) */
-#define IPFERR_SYNTAX	(-6)	/* syntax error in filter file */
-#define IPFERR_CNFLICT	(-7)	/* conflicting filter specification */
-#define IPFERR_MIN	(-7)	/* minimum error code value */
+#define IPFERR_MAX      (-1)    /* maximum error code value */
+#define IPFERR_MALLOC   (-1)    /* insufficient memory */
+#define IPFERR_FOPEN    (-2)    /* file open error */
+#define IPFERR_FILEIO   (-3)    /* file I/O error */
+#define IPFERR_DUPSPEC  (-4)    /* duplicate filter specification */
+#define IPFERR_INTERR   (-5)    /* internal error (bug) */
+#define IPFERR_SYNTAX   (-6)    /* syntax error in filter file */
+#define IPFERR_CNFLICT  (-7)    /* conflicting filter specification */
+#define IPFERR_MIN      (-7)    /* minimum error code value */
 
 /* Define a scalar IP address value */
 typedef unsigned long IPAddr_t;
@@ -31,10 +31,10 @@ typedef unsigned long IPAddr_t;
 /* Define structure for returning error information */
 typedef struct IPFilterErr_s IPFilterErr_t;
 struct IPFilterErr_s {
-    int errNo;			/* IPFERR_xxxx error code */
-    int lineno;			/* file line number, if applicable */
-    char * filename;		/* filename, if applicable */
-    char * errstr;		/* error text, if any */
+    int errNo;                  /* IPFERR_xxxx error code */
+    int lineno;                 /* file line number, if applicable */
+    char * filename;            /* filename, if applicable */
+    char * errstr;              /* error text, if any */
 };
 
 /* Data and functions in ipfilter.c */
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h
index 2641e87246c..6666b336c15 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * log.h: Records transactions, reports errors to administrators, etc.
- * 
+ *
  * Rob McCool
  */
 
@@ -43,7 +43,7 @@
  * will be reported.
  */
 
-int log_error(int degree, char *func, Session *sn, Request *rq, 
+int log_error(int degree, char *func, Session *sn, Request *rq,
               char *fmt, ...);
 
 #endif
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h
index d7d49816280..40a1590e913 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,17 +13,17 @@
 
 /*
  * object.h: Handle httpd objects
- * 
+ *
  * Manages information about a document from config. files. Called mainly
  * by objset.c.
- * 
+ *
  * This module does not assume anything about the directives being parsed.
  * That is handled by objset.c.
- * 
+ *
  * This module requires the pblock module from the base library.
- * 
+ *
  * Rob McCool
- * 
+ *
  */
 
 
@@ -53,8 +53,8 @@
 /*
  * Hierarchy of httpd_object
  *
- * An object contains dtables. 
- * 
+ * An object contains dtables.
+ *
  * Each dtable is a table of directives that were entered of a certain type.
  * There is one dtable for each unique type of directive.
  *
@@ -93,7 +93,7 @@ typedef struct {
  *
  * The name pblock array contains the names for this object, such as its
  * virtual location, its physical location, or its identifier.
- * 
+ *
  * tmpl contains any templates allocated to this object.
  */
 
@@ -113,7 +113,7 @@ typedef struct {
 /*
  * directive_name2num will return the position of the abbreviated directive
  * dir in the directive table.
- * 
+ *
  * If dir does not exist in the table, it will return -1.
  */
 
@@ -141,7 +141,7 @@ httpd_object *object_create(int nd, pblock *name);
 void object_free(httpd_object *obj);
 
 /*
- * object_add_directive will add a new directive to the dtable for 
+ * object_add_directive will add a new directive to the dtable for
  * the directive class at position dc.
  */
 
@@ -150,7 +150,7 @@ void object_add_directive(int dc, pblock *p, pblock *c, httpd_object *obj);
 
 /*
  * object_findnext finds the object configured to follow the given object,
- * and stores the variables in rq->vars. It returns REQ_PROCEED if more 
+ * and stores the variables in rq->vars. It returns REQ_PROCEED if more
  * objects should be processed, or REQ_NOACTION if it did not find any
  * further objects to process. If something bad happens, REQ_ABORTED is
  * returned.
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h
index f7e07ef243b..6022433e27d 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,11 +13,11 @@
 
 /*
  * objset.h: Handles object sets
- * 
+ *
  * Each object is produced by reading a config file of some form. See the
- * server documentation for descriptions of the directives that are 
+ * server documentation for descriptions of the directives that are
  * recognized, what they do, and how they are parsed.
- * 
+ *
  * This module requires the pblock and buffer modules from the base library.
  *
  * Rob McCool
@@ -42,9 +42,9 @@
 /* ------------------------------ Constants ------------------------------- */
 
 
-/* 
+/*
  * The default number of objects to leave room for in an object set,
- * and the number of new entries by which to increase the size when that 
+ * and the number of new entries by which to increase the size when that
  * room is filled.
  */
 
@@ -53,7 +53,7 @@
 /*
  * When parsing config. files, httpd will put a limit on how long
  * the parameters to a directive can be (in characters).
- * 
+ *
  * Currently set to 10 lines (80 chars/line).
  */
 
@@ -70,7 +70,7 @@
 
 
 /*
- * httpd_objset is a container for a bunch of objects. obj is a 
+ * httpd_objset is a container for a bunch of objects. obj is a
  * NULL-terminated array of objects. pos points to the entry after the last
  * one in the array. You should not mess with pos, but can read it to find
  * the last entry.
@@ -86,8 +86,8 @@ typedef struct {
 
 
 /*
- * objset_scan_buffer will scan through buffer, looking for object 
- * configuration information, and adding them to the object set os if it 
+ * objset_scan_buffer will scan through buffer, looking for object
+ * configuration information, and adding them to the object set os if it
  * finds any. If os is NULL it will allocate a new object set.
  *
  * If any error occurs (syntax error, premature EOF) this function will
@@ -121,7 +121,7 @@ void objset_free_setonly(httpd_objset *os);
 
 /*
  * objset_new_object will add a new object to objset with the specified
- * name. It returns a pointer to the new object (which may be anywhere in 
+ * name. It returns a pointer to the new object (which may be anywhere in
  * the objset).
  */
 
@@ -139,16 +139,16 @@ void objset_add_object(httpd_object *obj, httpd_objset *os);
  * ign is a set of objects to ignore.
  */
 
-httpd_object *objset_findbyname(char *name, httpd_objset *ign, 
+httpd_object *objset_findbyname(char *name, httpd_objset *ign,
                                 httpd_objset *os);
 
 /*
- * objset_findbyppath will find the object in objset having the given 
+ * objset_findbyppath will find the object in objset having the given
  * partial path entry. Returns object if found, NULL otherwise.
  * ign is a set of objects to ignore.
  */
 
-httpd_object *objset_findbyppath(char *ppath, httpd_objset *ign, 
+httpd_object *objset_findbyppath(char *ppath, httpd_objset *ign,
                                  httpd_objset *os);
 
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h
index a57d9fc7aa4..bf7f6ec3e4d 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -12,10 +12,10 @@
 
 
 /*
- * protocol.h: Switch which protocol we're speaking. 
- * 
+ * protocol.h: Switch which protocol we're speaking.
+ *
  * Currently only HTTP, but expected to include MTP in the future.
- * 
+ *
  * Rob McCool
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h
index 46ff5e2d4fb..e198ce22df8 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -13,7 +13,7 @@
 
 /*
  * req.h: Request-specific data structures and functions
- * 
+ *
  * Rob McCool
  */
 
@@ -37,7 +37,7 @@
 #define REQ_HASHSIZE 10
 #define REQ_MAX_LINE 4096
 
-    
+
 /*
  * The REQ_ return codes. These codes are used to determine what the server
  * should do after a particular module completes its task.
@@ -108,7 +108,7 @@ void request_free(Request *req);
 
 /*
  * Restarts a request for a given URI internally. If rq is non-NULL, the
- * function will keep the old request's headers and protocol, but with a new 
+ * function will keep the old request's headers and protocol, but with a new
  * URI and method of GET. If the previous method was HEAD, this is preserved.
  * Any other method becomes GET. You may assume that if you give it a request
  * structure that it will use the same structure.
@@ -122,7 +122,7 @@ Request *request_restart_internal(char *uri, Request *rq);
 
 /*
  * request_translate_uri performs virtual to physical mapping on the given
- * uri and returns either a path string or NULL depending on whether it was 
+ * uri and returns either a path string or NULL depending on whether it was
  * successful or not.
  */
 
@@ -130,8 +130,8 @@ char *request_translate_uri(char *uri, Session *sn);
 
 
 /*
- * request_header finds the named header depending on the requesting 
- * protocol. If possible, it will not load headers until the first is 
+ * request_header finds the named header depending on the requesting
+ * protocol. If possible, it will not load headers until the first is
  * requested. You have to watch out because this can return REQ_ABORTED.
  */
 
@@ -146,9 +146,9 @@ int request_loadheaders(Session *sn, Request *rq);
 
 /*
  * request_stat_path tries to stat path. If path is NULL, it will look in
- * the vars pblock for "path". If the stat is successful, it returns the stat 
- * structure. If not, returns NULL and leaves a message in rq->staterr. If a 
- * previous call to this function was successful, and path is the same, the 
+ * the vars pblock for "path". If the stat is successful, it returns the stat
+ * structure. If not, returns NULL and leaves a message in rq->staterr. If a
+ * previous call to this function was successful, and path is the same, the
  * function will simply return the previously found value.
  *
  * User functions should not free this structure.
@@ -178,7 +178,7 @@ int request_fileinfo(Session *sn, Request *rq);
 
 
 /*
- * request_handle_processed takes a Request structure with its reqpb 
+ * request_handle_processed takes a Request structure with its reqpb
  * block filled in and handles the request.
  */
 
@@ -200,7 +200,7 @@ int request_service(Session *sn, Request *rq);
 void request_handle(Session *sn);
 
 /*
- * Moved here due to problems with interdependency. See object.h for 
+ * Moved here due to problems with interdependency. See object.h for
  * description.
  */
 
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h
index 79c7e3f5347..292ca95d732 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
@@ -12,7 +12,7 @@
 
 
 /*
- * servact.h: Define the server's actions, depending on what type of 
+ * servact.h: Define the server's actions, depending on what type of
  * server it is.
  *
  * Rob McCool
diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h
index 61d51923500..68983c7aeae 100644
--- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h
+++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, 1995.  Netscape Communications Corporation.  All
  * rights reserved.
- * 
+ *
  * Use of this software is governed by the terms of the license agreement for
  * the Netscape Communications or Netscape Comemrce Server between the
  * parties.
diff --git a/apps/JAWS/clients/WebSTONE/src/parse_file_list.h b/apps/JAWS/clients/WebSTONE/src/parse_file_list.h
index 6733c0ec638..ce2767105e6 100644
--- a/apps/JAWS/clients/WebSTONE/src/parse_file_list.h
+++ b/apps/JAWS/clients/WebSTONE/src/parse_file_list.h
@@ -13,7 +13,7 @@
 
 extern int count_file_list(const char *);
 
-extern void parse_file_list (char *, page_list_t *, 
-				 long int *, long int *);
+extern void parse_file_list (char *, page_list_t *,
+                                 long int *, long int *);
 
 #endif /* !__PARSE_FILE_LIST_H__ */
diff --git a/apps/JAWS/clients/WebSTONE/src/statistics.h b/apps/JAWS/clients/WebSTONE/src/statistics.h
index c1693d8fc34..75b6be86e87 100644
--- a/apps/JAWS/clients/WebSTONE/src/statistics.h
+++ b/apps/JAWS/clients/WebSTONE/src/statistics.h
@@ -4,8 +4,8 @@
 #ifndef _STATISTICS_H_
 #define _STATISTICS_H_
 
-extern double	mean(const double, const int);
-extern double	variance(const double, const double, const int);
-extern double	stddev(const double, const double, const int);
+extern double   mean(const double, const int);
+extern double   variance(const double, const double, const int);
+extern double   stddev(const double, const double, const int);
 
 #endif /* ! _STATISTICS_H_ */
diff --git a/apps/JAWS/clients/WebSTONE/src/sysdep.h b/apps/JAWS/clients/WebSTONE/src/sysdep.h
index 03c6602789b..5b6e533291e 100644
--- a/apps/JAWS/clients/WebSTONE/src/sysdep.h
+++ b/apps/JAWS/clients/WebSTONE/src/sysdep.h
@@ -1,14 +1,14 @@
-#ifndef __SYSDEP_H__ 
+#ifndef __SYSDEP_H__
 #define __SYSDEP_H__
 /**************************************************************************
- * $Header$								  *
- * 		 Copyright (C) 1995 Silicon Graphics, Inc.		  *
- *									  *
- *  These coded instructions, statements, and computer programs were	  *
+ * $Header$                                                                *
+ *               Copyright (C) 1995 Silicon Graphics, Inc.                *
+ *                                                                        *
+ *  These coded instructions, statements, and computer programs were      *
  *  developed by SGI for public use.  If any changes are made to this code*
  *  please try to get the changes back to the author.  Feel free to make  *
- *  modifications and changes to the code and release it.		  *
- *									  *
+ *  modifications and changes to the code and release it.                 *
+ *                                                                        *
  **************************************************************************/
 
 /* include config.h, output from autoconf */
@@ -36,87 +36,87 @@
 
 /* encapsulation of minor UNIX/WIN NT differences */
 #ifdef WIN32
-#define NETREAD(sock, buf, len)  	recv(sock, buf, len, 0)
-#define NETWRITE(sock, buf, len) 	send(sock, buf, len, 0)
-#define NETCLOSE(sock)     		closesocket(sock)
-#define	BADSOCKET(sock)			((sock) == INVALID_SOCKET)
-#define	BADSOCKET_ERRNO(sock)		BADSOCKET(sock)
-#define	BADSOCKET_VALUE			INVALID_SOCKET
-#define S_ADDR				S_un.S_addr
+#define NETREAD(sock, buf, len)         recv(sock, buf, len, 0)
+#define NETWRITE(sock, buf, len)        send(sock, buf, len, 0)
+#define NETCLOSE(sock)                  closesocket(sock)
+#define BADSOCKET(sock)                 ((sock) == INVALID_SOCKET)
+#define BADSOCKET_ERRNO(sock)           BADSOCKET(sock)
+#define BADSOCKET_VALUE                 INVALID_SOCKET
+#define S_ADDR                          S_un.S_addr
 
 #ifdef USE_TIMEZONE
 #error  NT gettimeofday() doesn't support USE_TIMEZONE (yet)
 #else
-#define	GETTIMEOFDAY(timeval, tz)	gettimeofday(timeval)
+#define GETTIMEOFDAY(timeval, tz)       gettimeofday(timeval)
 #endif /* USE_TIMEZONE */
 
-typedef unsigned short			NETPORT;
-#define	SRANDOM				srand
+typedef unsigned short                  NETPORT;
+#define SRANDOM                         srand
 #define RANDOM_R                        rand_r
-#define	RANDOM				rand
-#define	THREAD				__declspec ( thread )
-#define	PROGPATH			"c:\\webstone\\webclient"
-#define FILENAME_SIZE			256
-#define HAVE_VPRINTF			1
+#define RANDOM                          rand
+#define THREAD                          __declspec ( thread )
+#define PROGPATH                        "c:\\webstone\\webclient"
+#define FILENAME_SIZE                   256
+#define HAVE_VPRINTF                    1
 
-#define	SIGCHLD				0	/* dummy value */
-#define	SIGALRM				0	/* dummy value */
-typedef int				pid_t;
-typedef	unsigned short			ushort;
-#define MAXPATHLEN			512
+#define SIGCHLD                         0       /* dummy value */
+#define SIGALRM                         0       /* dummy value */
+typedef int                             pid_t;
+typedef unsigned short                  ushort;
+#define MAXPATHLEN                      512
 
 
 
 #else /* not WIN32 */
-#define NETREAD(sock, buf, len)		read(sock, buf, len)
-#define NETWRITE(sock, buf, len)	write(sock, buf, len)
-#define	NETCLOSE(sock)			close(sock)
-#define BADSOCKET(sock)			((sock) < 0)
-#define BADSOCKET_ERRNO(sock)		(BADSOCKET(sock) || errno)
-#define	BADSOCKET_VALUE			(-1)
-#define S_ADDR				s_addr
+#define NETREAD(sock, buf, len)         read(sock, buf, len)
+#define NETWRITE(sock, buf, len)        write(sock, buf, len)
+#define NETCLOSE(sock)                  close(sock)
+#define BADSOCKET(sock)                 ((sock) < 0)
+#define BADSOCKET_ERRNO(sock)           (BADSOCKET(sock) || errno)
+#define BADSOCKET_VALUE                 (-1)
+#define S_ADDR                          s_addr
 
 #ifdef USE_TIMEZONE
-#define	GETTIMEOFDAY(timeval,tz)	gettimeofday(timeval, NULL)
+#define GETTIMEOFDAY(timeval,tz)        gettimeofday(timeval, NULL)
 #else
-#define	GETTIMEOFDAY(timeval,tz)	gettimeofday(timeval, tz)
+#define GETTIMEOFDAY(timeval,tz)        gettimeofday(timeval, tz)
 #endif /* USE_TIMEZONE */
 
-typedef unsigned short			NETPORT;
-#define SRANDOM				srandom
-#define RANDOM				random
-#define	THREAD
-#define PROGPATH			"/tmp/webclient" /* "/usr/local/bin/webclient" */
-#define	FILENAME_SIZE			1024
-#define HAVE_VPRINTF			1
-
-typedef int				SOCKET;
-#define min(a,b)			(((a) < (b)) ? a : b)
-#define max(a,b)			(((a) > (b)) ? a : b)
+typedef unsigned short                  NETPORT;
+#define SRANDOM                         srandom
+#define RANDOM                          random
+#define THREAD
+#define PROGPATH                        "/tmp/webclient" /* "/usr/local/bin/webclient" */
+#define FILENAME_SIZE                   1024
+#define HAVE_VPRINTF                    1
+
+typedef int                             SOCKET;
+#define min(a,b)                        (((a) < (b)) ? a : b)
+#define max(a,b)                        (((a) > (b)) ? a : b)
 #endif /* WIN32 */
 
 
 /* function prototypes */
 
 #ifdef WIN32
-int	getopt(int argc, char ** argv, char *opts);
-int	getpid(void);
-int	gettimeofday(struct timeval *curTimeP);
-int	random_number(int max);
-SOCKET	rexec(const char **hostname, NETPORT port, char *username, char *password,
-		char *command, SOCKET *sockerr);
-void	sleep(int secs);
+int     getopt(int argc, char ** argv, char *opts);
+int     getpid(void);
+int     gettimeofday(struct timeval *curTimeP);
+int     random_number(int max);
+SOCKET  rexec(const char **hostname, NETPORT port, char *username, char *password,
+                char *command, SOCKET *sockerr);
+void    sleep(int secs);
 
 #else
 #ifdef NO_REXEC
-extern int	rexec(char **, int, char *, char *, char *, int *);
-#endif 
+extern int      rexec(char **, int, char *, char *, char *, int *);
+#endif
 #endif /* WIN32 */
 
 
 #ifndef HAVE_STRERROR
 /* strerror() is not available on SunOS 4.x and others */
-char *strerror(int errnum); 
+char *strerror(int errnum);
 
 #endif
 /* strerror() */
diff --git a/apps/JAWS/clients/WebSTONE/src/timefunc.h b/apps/JAWS/clients/WebSTONE/src/timefunc.h
index a1514358316..5690a2aafab 100644
--- a/apps/JAWS/clients/WebSTONE/src/timefunc.h
+++ b/apps/JAWS/clients/WebSTONE/src/timefunc.h
@@ -1,30 +1,30 @@
 /**************************************************************************
  $Header$
- * 		 Copyright (C) 1995 Silicon Graphics, Inc.		  *
- *									  *
- *  These coded instructions, statements, and computer programs were	  *
+ *               Copyright (C) 1995 Silicon Graphics, Inc.                *
+ *                                                                        *
+ *  These coded instructions, statements, and computer programs were      *
  *  developed by SGI for public use.  If any changes are made to this code*
  *  please try to get the changes back to the author.  Feel free to make  *
- *  modifications and changes to the code and release it.		  *
- *									  *
+ *  modifications and changes to the code and release it.                 *
+ *                                                                        *
  **************************************************************************/
 
 #ifndef __TIMEFUNC_H__
 #define __TIMEFUNC_H__
 
-extern double	timevaldouble(struct timeval *);
-extern void	doubletimeval(const double, struct timeval *);
+extern double   timevaldouble(struct timeval *);
+extern void     doubletimeval(const double, struct timeval *);
 
-extern void	addtime(struct timeval *, struct timeval *);
-extern void	compdifftime(struct timeval *, struct timeval *, struct timeval *);
-extern void	mintime(struct timeval *, struct timeval *);
-extern void	maxtime(struct timeval *, struct timeval *);
-extern void	avgtime(struct timeval *, int, struct timeval *);
-extern void	variancetime(struct timeval *, double, int, struct timeval *);
-extern void	stddevtime(struct timeval *, double, int, struct timeval *);
+extern void     addtime(struct timeval *, struct timeval *);
+extern void     compdifftime(struct timeval *, struct timeval *, struct timeval *);
+extern void     mintime(struct timeval *, struct timeval *);
+extern void     maxtime(struct timeval *, struct timeval *);
+extern void     avgtime(struct timeval *, int, struct timeval *);
+extern void     variancetime(struct timeval *, double, int, struct timeval *);
+extern void     stddevtime(struct timeval *, double, int, struct timeval *);
 
-extern void	sqtime(struct timeval *, struct timeval *);
+extern void     sqtime(struct timeval *, struct timeval *);
 
-extern double	thruputpersec(const double, struct timeval *);
+extern double   thruputpersec(const double, struct timeval *);
 
 #endif /* !__TIMEFUNC_H__ */
diff --git a/apps/JAWS/remora/app/Remora_Export.h b/apps/JAWS/remora/app/Remora_Export.h
index 379f3bb1a82..484cfd238d4 100644
--- a/apps/JAWS/remora/app/Remora_Export.h
+++ b/apps/JAWS/remora/app/Remora_Export.h
@@ -1,13 +1,13 @@
 // $Id
 
 // ===================================================================
-// 
+//
 // = FILENAME
 //    Remora_Export.h
 //
 // = AUTHOR
 //    Seth Widoff
-// 
+//
 // ===================================================================
 
 
@@ -24,24 +24,24 @@
 class Remora_Export
 {
 public:
-  
+
   Remora_Export(const char* label = NO_NAME, int value = 0,
-		int max_value = MAX_VALUE); 
+                int max_value = MAX_VALUE);
 
   Remora_Export(const Remora_Export& export);
 
   ~Remora_Export();
-  
+
   void operator=(const int new_value);
   void operator=(const Remora_Export& export);
 
-  void operator+=(const int new_value);  
+  void operator+=(const int new_value);
   void operator+=(const Remora_Export& export);
 
-  void operator*=(const int new_value);  
+  void operator*=(const int new_value);
   void operator*=(const Remora_Export& export);
 
-  void operator/=(const int new_value);  
+  void operator/=(const int new_value);
   void operator/=(const Remora_Export& export);
 
   void operator-=(const int new_value);
@@ -49,19 +49,19 @@ public:
 
   operator CORBA::Long() const;
   operator CORBA::Long&();
-  
+
   friend int operator==(const Remora_Export& me, const int new_value);
   friend int operator==(const Remora_Export& me, const Remora_Export& export);
 
   friend int operator!=(const Remora_Export& me, const int new_value);
   friend int operator!=(const Remora_Export& me, const Remora_Export& export);
-  
+
   friend int operator<=(const Remora_Export& me, const int new_value);
   friend int operator<=(const Remora_Export& me, const Remora_Export& export);
-  
+
   friend int operator>=(const Remora_Export& me, const int new_value);
   friend int operator>=(const Remora_Export& me, const Remora_Export& export);
-  
+
   friend int operator<(const Remora_Export& me, const int new_value);
   friend int operator<(const Remora_Export& me, const Remora_Export& export);
 
@@ -71,13 +71,13 @@ public:
 private:
 
   void init();
-  
+
   void update_value(int new_value);
 
   remora::Statistic stat_;
-    
+
   remora::Remora_Statistics_Agent_ptr remora_agent_;
-  
+
 };
 
 #include "Remora_Export.i"
diff --git a/apps/JAWS/remora/app/Remora_Import.h b/apps/JAWS/remora/app/Remora_Import.h
index 8cfecd84ac4..a41a1826448 100644
--- a/apps/JAWS/remora/app/Remora_Import.h
+++ b/apps/JAWS/remora/app/Remora_Import.h
@@ -1,13 +1,13 @@
 // $Id
 
 // ===================================================================
-// 
+//
 // = FILENAME
 //    Remora_Import.h
 //
 // = AUTHOR
 //    Seth Widoff
-// 
+//
 // ===================================================================
 
 #ifndef REMORA_IMPORT_H
@@ -25,14 +25,14 @@ class Remora_Import
 public:
 
   Remora_Import(const char * label = NO_NAME, int value = 0,
-		int min_value = 0, int max_value = MAX_VALUE);
+                int min_value = 0, int max_value = MAX_VALUE);
 
   Remora_Import(const Remora_Import& import);
 
   ~Remora_Import();
 
   CORBA::Long get(void);
-  
+
   operator CORBA::Long();
 
   friend int operator==( Remora_Import& me,  int new_value);
@@ -40,13 +40,13 @@ public:
 
   friend int operator!=( Remora_Import& me,  int new_value);
   friend int operator!=( Remora_Import& me,  Remora_Import& export);
-  
+
   friend int operator<=( Remora_Import& me,  int new_value);
   friend int operator<=( Remora_Import& me,  Remora_Import& export);
-  
+
   friend int operator>=( Remora_Import& me,  int new_value);
   friend int operator>=( Remora_Import& me,  Remora_Import& export);
-  
+
   friend int operator<( Remora_Import& me,  int new_value);
   friend int operator<( Remora_Import& me,  Remora_Import& export);
 
@@ -62,7 +62,7 @@ private:
   remora::Control control_;
 
   remora::Remora_Controls_Agent_ptr remora_agent_;
-  
+
 };
 
 #include "Remora_Import.i"
diff --git a/apps/JAWS/server/HTTP_Config.h b/apps/JAWS/server/HTTP_Config.h
index fc8adacb0a1..1f978972750 100644
--- a/apps/JAWS/server/HTTP_Config.h
+++ b/apps/JAWS/server/HTTP_Config.h
@@ -6,13 +6,13 @@
 //
 // = LIBRARY
 //   jaws
-// 
+//
 // = FILENAME
 //    HTTP_Config.h
 //
 // = AUTHOR
 //    James Hu
-// 
+//
 // ============================================================================
 
 // = Forward declaration.
diff --git a/apps/JAWS/server/HTTP_Handler.h b/apps/JAWS/server/HTTP_Handler.h
index 0865ee326ae..0a61ae88782 100644
--- a/apps/JAWS/server/HTTP_Handler.h
+++ b/apps/JAWS/server/HTTP_Handler.h
@@ -6,16 +6,16 @@
 //
 // = LIBRARY
 //    jaws
-// 
+//
 // = FILENAME
 //    HTTP_Handler.h
 //
 // = AUTHOR
 //    James Hu and Irfan Pyarali
-// 
+//
 // ============================================================================
 
-#if !defined (HTTP_HANDLER_H)
+#ifndef HTTP_HANDLER_H
 #define HTTP_HANDLER_H
 
 // = Forward declarations
@@ -23,22 +23,27 @@ class Message_Block;
 class HTTP_Handler_Factory;
 
 #include "ace/Asynch_IO.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "HTTP_Request.h"
 #include "HTTP_Response.h"
 #include "IO.h"
 
 class HTTP_Handler : protected JAWS_IO_Handler
   // = TITLE
-  //     
+  //
   //     This class is used to implement the HTTP protocol
   //
   // = DESCRIPTION
-  //     
-  //	 The HTTP_Handler class is a state based implementation of the
-  //	 HTTP protocol. Therefore, it can be used synchronously and
-  //	 asynchronously. It uses an abstract IO class to move between
-  //	 different HTTP protocol states. It is up to the IO class to
-  //	 decide on synchronous or asynchronous I/O.
+  //
+  //     The HTTP_Handler class is a state based implementation of the
+  //     HTTP protocol. Therefore, it can be used synchronously and
+  //     asynchronously. It uses an abstract IO class to move between
+  //     different HTTP protocol states. It is up to the IO class to
+  //     decide on synchronous or asynchronous I/O.
 {
   // Friend I/O classes. Can call protected methods.
   friend class JAWS_Synch_IO;
@@ -49,8 +54,8 @@ class HTTP_Handler : protected JAWS_IO_Handler
   friend class Synch_HTTP_Handler_Factory;
 
 public:
-  virtual void open (ACE_HANDLE handle, 
-		     ACE_Message_Block &initial_data);
+  virtual void open (ACE_HANDLE handle,
+                     ACE_Message_Block &initial_data);
   // The handler is initialized with a connection <handle> of a new
   // client and any <initial_data> that came across. The
   // <initial_data> block will be of MAX_REQUEST_SIZE and the number
@@ -59,7 +64,7 @@ public:
 
 protected:
   HTTP_Handler (JAWS_IO &io,
-		HTTP_Handler_Factory &factory);
+                HTTP_Handler_Factory &factory);
   // The constructor is passed the factory that created <this> and the
   // IO mechanism that the handler should use.
 
@@ -73,7 +78,7 @@ protected:
   // This is the termination state of the handler. After successful or
   // unsuccessful completions, the handler will end up in this state
   // (method).
-  
+
   virtual void request_too_long (void);
   // Request too long.
 
@@ -94,11 +99,11 @@ protected:
   virtual void error_message_complete (void);
 
 public:
-  enum 
+  enum
   {
     MAX_SOCKBUFSIZE = 64 * 1024,
     MAX_REQUEST_SIZE = 8192,
-    METHODSIZ = 10, 
+    METHODSIZ = 10,
     VERSIONSIZ = 10
   };
 
@@ -118,11 +123,11 @@ private:
 
 class HTTP_Handler_Factory
   // = TITLE
-  //     
+  //
   //     This class is used to create new HTTP handlers
   //
   // = DESCRIPTION
-  //     
+  //
   //     This is an abstract factory for creating new HTTP handlers.
 {
 public:
@@ -133,7 +138,7 @@ public:
   // This creates a new HTTP_Handler
 
   virtual void destroy_http_handler (HTTP_Handler &handler,
-				     JAWS_IO &io) = 0;
+                                     JAWS_IO &io) = 0;
   // The HTTP handler will call this method from HTTP_Handler::done to
   // tell the factory to reap up the handler as it is now done with
   // the protocol
@@ -141,7 +146,7 @@ public:
 
 class Synch_HTTP_Handler_Factory : public HTTP_Handler_Factory
   // = TITLE
-  //     
+  //
   //     This class is used to create new HTTP handlers that will use
   //     Synch IO
   //
@@ -152,7 +157,7 @@ public:
   // This creates a new HTTP_Handler
 
   void destroy_http_handler (HTTP_Handler &handler,
-			     JAWS_IO &io);
+                             JAWS_IO &io);
   // The HTTP handler will call this method from HTTP_Handler::done to
   // tell the factory to reap up the handler as it is now done with
   // the protocol
@@ -168,7 +173,7 @@ class Asynch_HTTP_Handler_Factory : public HTTP_Handler_Factory, public ACE_Serv
 {
 public:
   void destroy_http_handler (HTTP_Handler &handler,
-			     JAWS_IO &io);
+                             JAWS_IO &io);
   // The HTTP handler will call this method from HTTP_Handler::done to
   // tell the factory to reap up the handler as it is now done with
   // the protocol
diff --git a/apps/JAWS/server/HTTP_Helpers.h b/apps/JAWS/server/HTTP_Helpers.h
index b22533d62b0..68f05729e48 100644
--- a/apps/JAWS/server/HTTP_Helpers.h
+++ b/apps/JAWS/server/HTTP_Helpers.h
@@ -6,20 +6,24 @@
 //
 // = LIBRARY
 //    apps
-// 
+//
 // = FILENAME
 //    HTTP_Helpers.h
 //
 // = AUTHOR
 //    James Hu
-// 
+//
 // ============================================================================
 
-#if !defined (HTTP_HELPERS_H)
+#ifndef HTTP_HELPERS_H
 #define HTTP_HELPERS_H
 
 #include "ace/Synch.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class HTTP_Helper
 // Static functions to enhance the lives of HTTP programmers everywhere.
 {
@@ -68,7 +72,7 @@ public:
   static const char **instance (void);
   // Singleton access point.
 
-  enum STATUS_CODE 
+  enum STATUS_CODE
   {
     STATUS_OK = 200,
     STATUS_CREATED = 201,
@@ -88,7 +92,7 @@ public:
     STATUS_INSUFFICIENT_DATA = 399
   };
 
-  enum 
+  enum
   {
     MAX_STATUS_CODE = 599
   };
diff --git a/apps/JAWS/server/HTTP_Request.h b/apps/JAWS/server/HTTP_Request.h
index 907926e70a4..48dac56366c 100644
--- a/apps/JAWS/server/HTTP_Request.h
+++ b/apps/JAWS/server/HTTP_Request.h
@@ -6,27 +6,32 @@
 //
 // = LIBRARY
 //   jaws
-// 
+//
 // = FILENAME
 //    HTTP_Request.h
 //
 // = AUTHOR
 //    James Hu
-// 
+//
 // ============================================================================
 
-#if !defined (HTTP_REQUEST_H)
+#ifndef HTTP_REQUEST_H
 #define HTTP_REQUEST_H
 
 class ACE_Message_Block;
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Parse_Headers.h"
 
-class HTTP_Request 
+class HTTP_Request
   // = TITLE
   //     This parses the client request of an HTTP transaction.
-  // 
+  //
   // = DESCRIPTION
 {
 public:
@@ -44,7 +49,7 @@ public:
   // form: METHOD URI VERSION.
 
   int init (char *const buffer,
-	    int buflen);
+            int buflen);
   // Initialize the request object.  This will parse the buffer and
   // prepare for the accessors.
 
diff --git a/apps/JAWS/server/HTTP_Response.h b/apps/JAWS/server/HTTP_Response.h
index 0ddbf7268d1..3b9a63b6433 100644
--- a/apps/JAWS/server/HTTP_Response.h
+++ b/apps/JAWS/server/HTTP_Response.h
@@ -6,16 +6,16 @@
 //
 // = LIBRARY
 //    jaws
-// 
+//
 // = FILENAME
 //    HTTP_Response.h
 //
 // = AUTHOR
 //    James Hu
-// 
+//
 // ============================================================================
 
-#if !defined (HTTP_RESPONSE_H)
+#ifndef HTTP_RESPONSE_H
 #define HTTP_RESPONSE_H
 
 class JAWS_IO;
@@ -33,7 +33,7 @@ class HTTP_Response
 {
 public:
   HTTP_Response (JAWS_IO &io,
-		 HTTP_Request &request);
+                 HTTP_Request &request);
   HTTP_Response (HTTP_Request &request, JAWS_IO &io);
   ~HTTP_Response (void);
 
@@ -41,7 +41,7 @@ public:
   // This is called by the handler to initiate a response.
 
   void error_response (int status,
-		       const char *log_message);
+                       const char *log_message);
   // This returns an error response for cases where there is a problem
   // with the request, logging the log_message.
 
diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h
index d682ffbc88f..614f98b3e24 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //   jaws
-// 
+//
 // = FILENAME
 //    HTTP_Server.h
 //
 // = AUTHOR
 //    James Hu
-// 
+//
 // ============================================================================
 
-#if !defined (HTTP_SERVER_H)
+#ifndef HTTP_SERVER_H
 #define HTTP_SERVER_H
 
 #include "ace/Service_Object.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Acceptor.h"
 #include "ace/LOCK_SOCK_Acceptor.h"
@@ -40,7 +45,7 @@ class HTTP_Server : public ACE_Service_Object
   // = TITLE
   //     This server is used to create HTTP Handlers for the Web
   //     server
-  // 
+  //
   // = DESCRIPTION
 {
 public:
@@ -56,10 +61,10 @@ protected:
 
   virtual int asynch_thread_pool (void);
   // Asynch Thread Pool implementation
-  
+
   virtual int synch_thread_pool (void);
   // Synch Thread Pool implementation
-  
+
 private:
   // James, comment these data members.
   void parse_args (int argc, char **argv);
@@ -75,7 +80,7 @@ private:
 class Synch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH>
   // = TITLE
   //     Used to implement Synch Thread Pool
-  // 
+  //
   // = DESCRIPTION
   //     Describe this and the others below.
 {
@@ -92,7 +97,7 @@ private:
 class Thread_Per_Request_Task : public ACE_Task<ACE_NULL_SYNCH>
   // = TITLE
   //     Used to implement Thread Per Request.
-  // 
+  //
   // = DESCRIPTION
   //     Spawns a new thread for every new incoming connection.  The
   //     handle below is the socket stream of the incoming connection.
@@ -115,7 +120,7 @@ private:
 class Asynch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH>
   // = TITLE
   //     Used to implement Asynch Thread Pool
-  // 
+  //
   // = DESCRIPTION
   //     The proactor below utilizes WaitForMultipleObjects.
 {
diff --git a/apps/JAWS/server/IO.h b/apps/JAWS/server/IO.h
index 5f14a1ed965..cf22d1ff09f 100644
--- a/apps/JAWS/server/IO.h
+++ b/apps/JAWS/server/IO.h
@@ -6,32 +6,37 @@
 //
 // = LIBRARY
 //   jaws
-// 
+//
 // = FILENAME
 //    IO.h
 //
 // = AUTHOR
 //    James Hu
-// 
+//
 // ============================================================================
 
-#if !defined (JAWS_IO_H)
+#ifndef JAWS_IO_H
 #define JAWS_IO_H
 
 class ACE_Message_Block;
 class JAWS_IO_Handler;
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Asynch_IO.h"
 
 class JAWS_IO
   // = TITLE
-  //     
+  //
   //     This class defines the abstract interface for an I/O class in
   //     the context of Web-likes servers
   //
   // = DESCRIPTION
-  //     
+  //
   //     An I/O class should have the following interface. Derived
   //     classes will define the exactly how the I/O will take place
   //     (Asynchronous, Synchronous, Reactive)
@@ -49,24 +54,24 @@ public:
   // read from the handle size bytes into the message block.
 
   virtual void transmit_file (const char *filename,
-			      const char *header,
-			      int header_size,
-			      const char *trailer,
-			      int trailer_size) = 0;
+                              const char *header,
+                              int header_size,
+                              const char *trailer,
+                              int trailer_size) = 0;
   // send header, filename, trailer to the handle.
 
   virtual void receive_file (const char *filename,
-			     void *initial_data,
-			     int initial_data_length,
-			     int entire_length) = 0;
+                             void *initial_data,
+                             int initial_data_length,
+                             int entire_length) = 0;
   // read data from the handle and store in filename.
 
-  virtual void send_confirmation_message (const char *buffer, int length) = 0; 
+  virtual void send_confirmation_message (const char *buffer, int length) = 0;
   // send a confirmation message to the handle.
 
-  virtual void send_error_message (const char *buffer, int length) = 0; 
+  virtual void send_error_message (const char *buffer, int length) = 0;
   // send an error message to the handle.
-  
+
 protected:
   ACE_HANDLE handle_;
   JAWS_IO_Handler *handler_;
@@ -74,7 +79,7 @@ protected:
 
 class JAWS_IO_Handler
   // = TITLE
-  //     
+  //
   //     This class defines the abstract interface for an I/O handler class in
   //     the context of Web-likes servers
   //
@@ -121,7 +126,7 @@ public:
 
 class JAWS_Synch_IO : public JAWS_IO
   // = TITLE
-  //     
+  //
   //     This class defines the interface for a Synchronous I/O class.
   //
   // = DESCRIPTION
@@ -131,28 +136,28 @@ public:
 
   ~JAWS_Synch_IO (void);
 
-  void read (ACE_Message_Block& mb, int size);  
+  void read (ACE_Message_Block& mb, int size);
 
   void transmit_file (const char *filename,
-		      const char *header,
-		      int header_size,
-		      const char *trailer,
-		      int trailer_size);
+                      const char *header,
+                      int header_size,
+                      const char *trailer,
+                      int trailer_size);
 
   void receive_file (const char *filename,
-		     void *initial_data,
-		     int initial_data_length,
-		     int entire_length);
+                     void *initial_data,
+                     int initial_data_length,
+                     int entire_length);
 
-  void send_confirmation_message (const char *buffer, 
-				  int length); 
+  void send_confirmation_message (const char *buffer,
+                                  int length);
 
   void send_error_message (const char *buffer,
-			   int length); 
-  
+                           int length);
+
 protected:
   virtual void send_message (const char *buffer,
-			     int length); 
+                             int length);
 };
 
 // This only works on Win32
@@ -160,7 +165,7 @@ protected:
 
 class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler
   // = TITLE
-  //     
+  //
   //     This class defines the interface for a Asynchronous I/O class.
   //
   // = DESCRIPTION
@@ -173,21 +178,21 @@ public:
   void read (ACE_Message_Block& mb, int size);
 
   void transmit_file (const char *filename,
-		      const char *header,
-		      int header_size,
-		      const char *trailer,
-		      int trailer_size);
+                      const char *header,
+                      int header_size,
+                      const char *trailer,
+                      int trailer_size);
 
   void receive_file (const char *filename,
-		     void *initial_data,
-		     int initial_data_length,
-		     int entire_length);
+                     void *initial_data,
+                     int initial_data_length,
+                     int entire_length);
 
   void send_confirmation_message (const char *buffer,
-				  int length);
+                                  int length);
 
   void send_error_message (const char *buffer,
-			   int length); 
+                           int length);
 
 protected:
   enum Message_Types
@@ -197,8 +202,8 @@ protected:
   };
 
   virtual void send_message (const char *buffer,
-			     int length,
-			     int act); 
+                             int length,
+                             int act);
 
   virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result);
   // This method will be called when an asynchronous read completes on
diff --git a/apps/JAWS/server/JAWS_Concurrency.h b/apps/JAWS/server/JAWS_Concurrency.h
index b6f9efe6fbb..39b4700df72 100644
--- a/apps/JAWS/server/JAWS_Concurrency.h
+++ b/apps/JAWS/server/JAWS_Concurrency.h
@@ -1,10 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_CONCURRENCY_H)
+#ifndef JAWS_CONCURRENCY_H
 #define JAWS_CONCURRENCY_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "IO.h"
 
diff --git a/apps/JAWS/server/JAWS_Pipeline.h b/apps/JAWS/server/JAWS_Pipeline.h
index 7867213076f..bac2acc6f91 100644
--- a/apps/JAWS/server/JAWS_Pipeline.h
+++ b/apps/JAWS/server/JAWS_Pipeline.h
@@ -1,10 +1,15 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_PIPELINE_H)
+#ifndef JAWS_PIPELINE_H
 #define JAWS_PIPELINE_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Config.h"
 #include "ace/Stream.h"
 #include "ace/Module.h"
diff --git a/apps/JAWS/server/JAWS_Pipeline_Handler.h b/apps/JAWS/server/JAWS_Pipeline_Handler.h
index 784b44f8b7c..7e9becb6f5e 100644
--- a/apps/JAWS/server/JAWS_Pipeline_Handler.h
+++ b/apps/JAWS/server/JAWS_Pipeline_Handler.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
-#if !defined (JAWS_PIPELINE_HANDLER_H)
+#ifndef JAWS_PIPELINE_HANDLER_H
 #define JAWS_PIPELINE_HANDLER_H
 
 #include "JAWS_Pipeline.h"
diff --git a/apps/JAWS/server/Parse_Headers.h b/apps/JAWS/server/Parse_Headers.h
index 126243d4582..68274bd442b 100644
--- a/apps/JAWS/server/Parse_Headers.h
+++ b/apps/JAWS/server/Parse_Headers.h
@@ -15,11 +15,15 @@
 //
 // ============================================================================
 
-#if !defined (PARSE_HEADERS_H)
+#ifndef PARSE_HEADERS_H
 #define PARSE_HEADERS_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class Headers_Map_Item
 {
 friend class Headers_Map;
diff --git a/apps/JAWS/stress_testing/global.h b/apps/JAWS/stress_testing/global.h
index 8cb45fb3dd1..58a0b24b3e0 100644
--- a/apps/JAWS/stress_testing/global.h
+++ b/apps/JAWS/stress_testing/global.h
@@ -1,6 +1,11 @@
 // $Id$
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/OS.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
diff --git a/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h b/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h
index 351fa0641ad..e8a193e8385 100644
--- a/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h
+++ b/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h
@@ -5,20 +5,24 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Input_Handler.h
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_INPUT_HANDLER_H)
+#ifndef _INPUT_HANDLER_H
 #define _INPUT_HANDLER_
 
 #include "ace/Service_Config.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
 // Forward declaration.
 class Notification_Receiver_Handler;
@@ -34,12 +38,12 @@ class Input_Handler : public ACE_Service_Object
 public:
   Input_Handler (Notification_Receiver_Handler *,
                  ACE_HANDLE h = 0);
-  
+
   virtual int handle_input (ACE_HANDLE);
   // Dispatch the callback when events occur.
 
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
+  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
+                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
   // Close down the handler.
 
   int consumer_initiated_shutdown (void);
@@ -55,7 +59,7 @@ private:
   virtual ACE_HANDLE get_handle (void) const;
 
   ACE_HANDLE handle_;
-  // ACE_HANDLE where the input comes from. 
+  // ACE_HANDLE where the input comes from.
 
   Notification_Receiver_Handler *receiver_handler_;
   // Pointer to the <Notification_Receiver_Handler> that receives
diff --git a/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h b/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h
index e51d0a359e6..e5595339158 100644
--- a/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h
+++ b/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h
@@ -5,28 +5,33 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Notifier_Receiver_Handler.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Subclass of Corba_Handler that sets up the Notification_Receiver handler
 //    for use with the ACE ACE_Reactor.
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_NOTIFICATION_RECEIVER_HANDLER_H)
+#ifndef _NOTIFICATION_RECEIVER_HANDLER_H
 #define _NOTIFICATION_RECEIVER_HANDLER_H
 
 #include "ace/CORBA_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Event_Comm_i.h"
 
 #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
 
-class Notification_Receiver_Handler 
+class Notification_Receiver_Handler
 {
   // = TITLE
   //    Subclass of Corba_Handler that sets up the Notification
@@ -42,8 +47,8 @@ public:
   Event_Comm::Notification_Receiver *receiver (void);
   Event_Comm::Notifier *notifier (void);
 
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
+  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
+                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
   // Close down the handler.
 
 private:
diff --git a/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h b/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h
index 4a5ab5c2389..813a8b7af36 100644
--- a/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h
+++ b/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h
@@ -5,23 +5,27 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Input_Handler.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Handle input from the keyboard.
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_INPUT_HANDLER_H)
+#ifndef _INPUT_HANDLER_H
 #define _INPUT_HANDLER_H
 
 #include "ace/Service_Config.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
 
 // Forward declaration.
@@ -33,7 +37,7 @@ class Input_Handler : public ACE_Service_Object
   //   Handles input events generated from a keyboard.
   //
   // = DESCRIPTION
-  //   The events are currently framed and forwarded to 
+  //   The events are currently framed and forwarded to
   //   all Consumers.  In the future, we will need to
   //   be more selective and only send to those Consumers
   //   whose filtering criteria matches!
@@ -46,14 +50,14 @@ public:
   // Frame input events and notify <Consumers>.
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
   // Close down the handler.
 
 protected:
   virtual ACE_HANDLE get_handle (void) const;
 
   ACE_HANDLE handle_;
-  // ACE_HANDLE where the input comes from. 
+  // ACE_HANDLE where the input comes from.
 
   Notifier_Handler *notifier_;
   // Pointer to a <Notifier_Handler> that's used to inform Consumers
diff --git a/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h b/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h
index 7d9c4609634..3c9df6b6aaf 100644
--- a/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h
+++ b/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Notifier_Handler.h
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_NOTIFIER_HANDLER_H)
+#ifndef _NOTIFIER_HANDLER_H
 #define _NOTIFIER_HANDLER_H
 
 #include "ace/CORBA_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Event_Comm_i.h"
 
 #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
@@ -28,14 +33,14 @@ class Notifier_Handler
 {
 public:
   Notifier_Handler (const char *service_location,
-		    const char *marker = "notifier",
-		    int putit = 1); // Default marker name.
+                    const char *marker = "notifier",
+                    int putit = 1); // Default marker name.
 
   Event_Comm::Notifier *notifier (void);
   void notifier (Event_Comm::Notifier *);
 
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
+  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
+                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
   // Close down the handler.
 
 private:
diff --git a/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h b/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h
index f8d3a12bb7f..3775d071683 100644
--- a/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h
+++ b/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h
@@ -6,20 +6,20 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Event_Comm_i.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Class interface for the implementation of the distributed
 //    event notification mechanism.
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_EVENT_COMM_I_H)
+#ifndef _EVENT_COMM_I_H
 #define _EVENT_COMM_I_H
 
 #include "Notification_Receiver_i.h"
diff --git a/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h b/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h
index eb5efa718dd..dbcd6671d8f 100644
--- a/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h
+++ b/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h
@@ -6,19 +6,19 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Notification_Receiver__i.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Class interface for the implementation of the <Notification_Receiver>
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_Notification_Receiver_i_H)
+#ifndef _Notification_Receiver_i_H
 #define _Notification_Receiver_i_H
 
 #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
@@ -35,11 +35,11 @@ public:
   ~Notification_Receiver_i (void);
 
   virtual void receive_notification (const Event_Comm::Notification &notification,
-				     CORBA::Environment &IT_env);
+                                     CORBA::Environment &IT_env);
   // Pass the <Notification> to the <Notification_Receiver>.
 
   virtual void disconnect (const char *reason,
-			   CORBA::Environment &IT_env);
+                           CORBA::Environment &IT_env);
   // Disconnect the <Notification_Receiver> from the <Notifier>,
   // giving it the <reason>.
 };
diff --git a/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h b/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h
index 5e7ac590f37..61249d68386 100644
--- a/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h
+++ b/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h
@@ -6,22 +6,27 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Notifier_i.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Class interface for the implementation of the <Notifier>
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_Notifier_i_H)
+#ifndef _Notifier_i_H
 #define _Notifier_i_H
 
 #include "ace/Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "ace/SString.h"
 #include "Event_Comm.hh"
@@ -38,7 +43,7 @@ class Notifier_i
   // = DESCRIPTION
 {
 public:
-  enum 
+  enum
   {
     DEFAULT_SIZE = 1024 // Default max number of Event_Comm::Notification_Receivers.
   };
@@ -47,27 +52,27 @@ public:
   // Initialize a Notifier_i object with the specified size hint.
 
   void send_disconnect (const char *reason,
-			CORBA::Environment &IT_env);
+                        CORBA::Environment &IT_env);
   // Disconnect all the receivers, giving them the <reason>.
 
   void send_notification (const Event_Comm::Notification &notification,
-			  CORBA::Environment &IT_env);
+                          CORBA::Environment &IT_env);
   // Send the <Notification> to all the consumers who
   // have subscribed and who match the filtering criteria.
 
   void subscribe (Event_Comm::Notification_Receiver *notification_receiver,
-		  const char *filtering_criteria,
-		  CORBA::Environment &IT_env);
-  // Subscribe the <Notification_Receiver> to receive events that 
+                  const char *filtering_criteria,
+                  CORBA::Environment &IT_env);
+  // Subscribe the <Notification_Receiver> to receive events that
   // match <filtering_criteria> applied by the <Notifier>.
 
   void unsubscribe (Event_Comm::Notification_Receiver *notification_receiver,
-		    const char *filtering_criteria,
-		    CORBA::Environment &IT_env);
+                    const char *filtering_criteria,
+                    CORBA::Environment &IT_env);
   // Unsubscribe the <Notification_Receiver>.
 
 private:
-  // The following implementation should be replaced 
+  // The following implementation should be replaced
   // by a standard container class from STL...
 
   typedef ACE_Map_Manager <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> MAP_MANAGER;
diff --git a/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h b/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h
index edab38fc612..8142ac91632 100644
--- a/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h
+++ b/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h
@@ -5,20 +5,20 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Event_Comm_i.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Class interface for the implementation of the distributed
 //    event notification mechanism.
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_EVENT_COMM_I_H)
+#ifndef _EVENT_COMM_I_H
 #define _EVENT_COMM_I_H
 
 #include "Notification_Receiver_i.h"
diff --git a/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h b/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h
index ac86f5852b7..4466db11c21 100644
--- a/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h
+++ b/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h
@@ -5,19 +5,19 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Notification_Receiver__i.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Class interface for the implementation of the <Notification_Receiver>
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_Notification_Receiver_i_H)
+#ifndef _Notification_Receiver_i_H
 #define _Notification_Receiver_i_H
 
 #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
@@ -36,11 +36,11 @@ public:
   // Destructor.
 
   virtual void receive_notification (const Event_Comm::Notification &notification,
-				     CORBA::Environment &IT_env);
+                                     CORBA::Environment &IT_env);
   // Pass the <Notification> to the <Notification_Receiver>.
 
   virtual void disconnect (const char *reason,
-			   CORBA::Environment &IT_env);
+                           CORBA::Environment &IT_env);
   // Disconnect the <Notification_Receiver> from the <Notifier>,
   // giving it the <reason>.
 };
diff --git a/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h b/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h
index 42183395bea..dd1d17ef16c 100644
--- a/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h
+++ b/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h
@@ -6,22 +6,27 @@
 //
 // = LIBRARY
 //    EventComm
-// 
+//
 // = FILENAME
 //    Notifier_i.h
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    Class interface for the implementation of the <Notifier>
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (_Notifier_i_H)
+#ifndef _Notifier_i_H
 #define _Notifier_i_H
 
 #include "ace/Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "ace/SString.h"
 #include "Event_Comm.hh"
@@ -36,7 +41,7 @@ class Notifier_i
   // = TITLE
   //   Defines the implementation class for event <Notifiers>.
 public:
-  enum 
+  enum
   {
     DEFAULT_SIZE = 1024 // Default max number of Event_Comm::Notification_Receivers.
   };
@@ -45,34 +50,34 @@ public:
   // Initialize a Notifier_i object with the specified size hint.
 
   void send_disconnect (const char *reason,
-			CORBA::Environment &IT_env);
+                        CORBA::Environment &IT_env);
   // Disconnect all the receivers, giving them the <reason>.
 
   void send_notification (const Event_Comm::Notification &notification,
-			  CORBA::Environment &IT_env);
+                          CORBA::Environment &IT_env);
   // Send the <Notification> to all the consumers who have subscribed
   // and who match the filtering criteria.
 
   void subscribe (Event_Comm::Notification_Receiver *notification_receiver,
-		  const char *filtering_criteria,
-		  CORBA::Environment &IT_env);
+                  const char *filtering_criteria,
+                  CORBA::Environment &IT_env);
   // Subscribe the <Notification_Receiver> to receive events that
   // match <filtering_criteria> applied by the <Notifier>.
 
   void unsubscribe (Event_Comm::Notification_Receiver *notification_receiver,
-		    const char *filtering_criteria,
-		    CORBA::Environment &IT_env);
+                    const char *filtering_criteria,
+                    CORBA::Environment &IT_env);
   // Unsubscribe the <Notification_Receiver>.
 
 private:
-  // The following implementation should be replaced 
+  // The following implementation should be replaced
   // by a standard container class from STL...
 
-  typedef ACE_Map_Manager <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> 
+  typedef ACE_Map_Manager <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex>
           MAP_MANAGER;
-  typedef ACE_Map_Iterator <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> 
+  typedef ACE_Map_Iterator <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex>
           MAP_ITERATOR;
-  typedef ACE_Map_Entry <ACE_SString, Notification_Receiver_Entry *> 
+  typedef ACE_Map_Entry <ACE_SString, Notification_Receiver_Entry *>
           MAP_ENTRY;
 
   MAP_MANAGER map_;
diff --git a/apps/Orbix-Examples/Logger/Logger.h b/apps/Orbix-Examples/Logger/Logger.h
index 5832c96aab6..a233204f362 100644
--- a/apps/Orbix-Examples/Logger/Logger.h
+++ b/apps/Orbix-Examples/Logger/Logger.h
@@ -2,15 +2,20 @@
 // $Id$
 
 
-#if !defined (_LOGGER_H)
+#ifndef _LOGGER_H
 #define _LOGGER_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "logger.hh"
 
 class Logger
   // = TITLE
-  //     Wrapper class that uses CORBA object reference 
+  //     Wrapper class that uses CORBA object reference
   //     as the transport mechanism to simplify implementation.
 {
 public:
@@ -35,7 +40,7 @@ public:
 
   int stop_timer (profile_logger::Elapsed_Time &et);
   // Deactivate the timer and return the elapsed time.
-  
+
 private:
   profile_logger *logref_;
   // CORBA object reference proxy.
diff --git a/apps/Orbix-Examples/Logger/logger_i.h b/apps/Orbix-Examples/Logger/logger_i.h
index 40d7b77c6bf..407af302aba 100644
--- a/apps/Orbix-Examples/Logger/logger_i.h
+++ b/apps/Orbix-Examples/Logger/logger_i.h
@@ -3,10 +3,15 @@
 
 
 #include "ace/Profile_Timer.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #define EXCEPTIONS
 #include "logger.hh"
 
-class logger_i 
+class logger_i
 #if defined (USE_BOA_IMPL)
   : virtual public loggerBOAImpl
 #endif /* USE_BOA_IMPL */
@@ -44,7 +49,7 @@ class profile_logger_i :
   public virtual profile_loggerBOAImpl,
   public virtual Logger_i
 #else /* USE_TIE */
-  public logger_i 
+  public logger_i
 #endif /* USE_BOA_IMPL */
   // = TITLE
   // Implementation of the profiler logger interface.
@@ -57,7 +62,7 @@ public:
   // Activate the timer.
 
   virtual void stop_timer (profile_logger::Elapsed_Time &et,
-			   CORBA::Environment &env);
+                           CORBA::Environment &env);
   // Deactivate the timer and return the elapsed time.
 
 private:
@@ -65,7 +70,7 @@ private:
   // Object that keeps track of the user and system execution time.
 };
 
-#if !defined (USE_BOA_IMPL)
+#ifndef USE_BOA_IMPL
 // Indicate that the C++ classes logger_i and profile_logger_i implement
 // the IDL interface logger and profile_logger, respectively:
 
diff --git a/apps/drwho/BS_Client.h b/apps/drwho/BS_Client.h
index b6e62ebb339..9859768df82 100644
--- a/apps/drwho/BS_Client.h
+++ b/apps/drwho/BS_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_BS_CLIENT_H)
+#ifndef _BS_CLIENT_H
 #define _BS_CLIENT_H
 
 #include "Binary_Search.h"
@@ -22,7 +22,7 @@
 class BS_Client : public Binary_Search
 {
   // = TITLE
-  //    Provides the client's binary search lookup table abstraction. 
+  //    Provides the client's binary search lookup table abstraction.
 public:
   // = Initialization.
   BS_Client (void);
diff --git a/apps/drwho/BS_Server.h b/apps/drwho/BS_Server.h
index 03ff73d0aac..3c7c1a82afc 100644
--- a/apps/drwho/BS_Server.h
+++ b/apps/drwho/BS_Server.h
@@ -10,14 +10,14 @@
 //    BS_Server.h
 //
 // = DESCRIPTION
-//    Provides the server's binary search lookup table abstraction. 
+//    Provides the server's binary search lookup table abstraction.
 //
 // = AUTHOR
 //    Douglas C. Schmidt
 //
 // ============================================================================
 
-#if !defined (_BS_SERVER_H)
+#ifndef _BS_SERVER_H
 #define _BS_SERVER_H
 
 #include "Binary_Search.h"
@@ -25,7 +25,7 @@
 class BS_Server : public Binary_Search
 {
   // = TITLE
-  //    Provides the server's binary search lookup table abstraction. 
+  //    Provides the server's binary search lookup table abstraction.
 public:
   // = Initialization.
   BS_Server (const char *packet);
diff --git a/apps/drwho/Binary_Search.h b/apps/drwho/Binary_Search.h
index 2cdbcbc511c..ae8dc93cb29 100644
--- a/apps/drwho/Binary_Search.h
+++ b/apps/drwho/Binary_Search.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (_BINARY_SEARCH_H)
+#ifndef _BINARY_SEARCH_H
 #define _BINARY_SEARCH_H
 
 #include "Search_Struct.h"
diff --git a/apps/drwho/CM_Client.h b/apps/drwho/CM_Client.h
index 09bc7e40d8f..1e789633a5a 100644
--- a/apps/drwho/CM_Client.h
+++ b/apps/drwho/CM_Client.h
@@ -11,14 +11,14 @@
 //
 // = DESCRIPTION
 //    Provides a virtual communcations layer for the client in the
-//    drwho program. 
+//    drwho program.
 //
 // = AUTHOR
 //    Douglas C. Schmidt
 //
 // ============================================================================
 
-#if !defined (_CM_CLIENT_H)
+#ifndef _CM_CLIENT_H
 #define _CM_CLIENT_H
 
 #include "Comm_Manager.h"
diff --git a/apps/drwho/CM_Server.h b/apps/drwho/CM_Server.h
index 0e944db3064..a91402a5e48 100644
--- a/apps/drwho/CM_Server.h
+++ b/apps/drwho/CM_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_CM_SERVER_H)
+#ifndef _CM_SERVER_H
 #define _CM_SERVER_H
 
 #include "Options.h"
diff --git a/apps/drwho/Comm_Manager.h b/apps/drwho/Comm_Manager.h
index 0dfd6b7c72e..ec3caf93e74 100644
--- a/apps/drwho/Comm_Manager.h
+++ b/apps/drwho/Comm_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_COMM_MANAGER_H)
+#ifndef _COMM_MANAGER_H
 #define _COMM_MANAGER_H
 
 #include "global.h"
diff --git a/apps/drwho/Drwho_Node.h b/apps/drwho/Drwho_Node.h
index c3c1418bbc8..02251b669df 100644
--- a/apps/drwho/Drwho_Node.h
+++ b/apps/drwho/Drwho_Node.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_DRWHO_NODE_H)
+#ifndef _DRWHO_NODE_H
 #define _DRWHO_NODE_H
 
 #include "global.h"
@@ -48,5 +48,5 @@ public:
   int inactive_count_;
   Drwho_Node *next_;
 };
-  
+
 #endif /* _DRWHO_NODE_H */
diff --git a/apps/drwho/File_Manager.h b/apps/drwho/File_Manager.h
index 374ba10b992..55482b2823d 100644
--- a/apps/drwho/File_Manager.h
+++ b/apps/drwho/File_Manager.h
@@ -14,11 +14,16 @@
 //
 // ============================================================================
 
-#if !defined (_FILE_MANAGER_H)
+#ifndef _FILE_MANAGER_H
 #define _FILE_MANAGER_H
 
 #include "global.h"
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Mem_Map.h"
 
 class File_Manager
diff --git a/apps/drwho/HT_Client.h b/apps/drwho/HT_Client.h
index 16828077d00..274cc6e72e6 100644
--- a/apps/drwho/HT_Client.h
+++ b/apps/drwho/HT_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_HT_CLIENT_H)
+#ifndef _HT_CLIENT_H
 #define _HT_CLIENT_H
 
 #include "Hash_Table.h"
@@ -22,7 +22,7 @@
 class HT_Client : public Hash_Table
 {
   // = TITLE
-  //   Provides the client's hash table abstraction. 
+  //   Provides the client's hash table abstraction.
 public:
   virtual Protocol_Record *insert (const char *key_name,
                                    int max_len = MAXUSERIDNAMELEN);
diff --git a/apps/drwho/HT_Server.h b/apps/drwho/HT_Server.h
index 96b110b14b0..3dbff633cfb 100644
--- a/apps/drwho/HT_Server.h
+++ b/apps/drwho/HT_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_HT_SERVER_H)
+#ifndef _HT_SERVER_H
 #define _HT_SERVER_H
 
 #include "Hash_Table.h"
diff --git a/apps/drwho/Hash_Table.h b/apps/drwho/Hash_Table.h
index 327c55b74dd..44f5ea769fc 100644
--- a/apps/drwho/Hash_Table.h
+++ b/apps/drwho/Hash_Table.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_HASH_TABLE_H)
+#ifndef _HASH_TABLE_H
 #define _HASH_TABLE_H
 
 #include "Search_Struct.h"
@@ -32,7 +32,7 @@ public:
   virtual Protocol_Record *get_each_entry (void);
 
 protected:
-  enum 
+  enum
   {
     HASH_TABLE_SIZE = 500
   };
diff --git a/apps/drwho/Multicast_Manager.h b/apps/drwho/Multicast_Manager.h
index 33e815fe8b6..5b5f42eddbc 100644
--- a/apps/drwho/Multicast_Manager.h
+++ b/apps/drwho/Multicast_Manager.h
@@ -14,12 +14,12 @@
 //
 // ============================================================================
 
-#if !defined (_MULTICAST_MANAGER_H)
+#ifndef _MULTICAST_MANAGER_H
 #define _MULTICAST_MANAGER_H
 
 #include "global.h"
 
-class Host_Elem 
+class Host_Elem
 {
 public:
   const char *host_name;
@@ -30,7 +30,7 @@ public:
   Host_Elem (const char *h_name, Host_Elem *n);
 };
 
-class Multicast_Manager 
+class Multicast_Manager
 {
   // = TITLE
   //   This file handles all the operations upon host machines names
diff --git a/apps/drwho/Options.h b/apps/drwho/Options.h
index d009c358e7e..13cf06777d2 100644
--- a/apps/drwho/Options.h
+++ b/apps/drwho/Options.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_OPTIONS_H)
+#ifndef _OPTIONS_H
 #define _OPTIONS_H
 
 #include "global.h"
@@ -38,16 +38,16 @@ public:
 
   // Different types of messages.
   enum Protocol_Types
-  { 
-    PROTO_USR     = 1, // Only return info on one user. 
-    PROTO_ALL     = 2, // Return info on all users logged in around the system. 
-    PROTO_FLO     = 3, // Return info on friends logged in. 
-    PROTO_RUSER   = 4, // Return info in ruser format! 
-    PROTO_RWHO    = 5, // Return info in rwho format. 
-    PROTO_WHO     = 6, // Return info in who format. 
-    PROTO_RUPTIME = 7  // Return info in ruptime format. 
+  {
+    PROTO_USR     = 1, // Only return info on one user.
+    PROTO_ALL     = 2, // Return info on all users logged in around the system.
+    PROTO_FLO     = 3, // Return info on friends logged in.
+    PROTO_RUSER   = 4, // Return info in ruser format!
+    PROTO_RWHO    = 5, // Return info in rwho format.
+    PROTO_WHO     = 6, // Return info in who format.
+    PROTO_RUPTIME = 7  // Return info in ruptime format.
   };
-  
+
   static void set_options (int argc, char *argv[]);
   static void set_opt (Option_Types opt);
   static int get_opt (Option_Types opt);
diff --git a/apps/drwho/PMC_All.h b/apps/drwho/PMC_All.h
index 6f7578b492a..308388adf4f 100644
--- a/apps/drwho/PMC_All.h
+++ b/apps/drwho/PMC_All.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_ALL_H)
+#ifndef _PMC_ALL_H
 #define _PMC_ALL_H
 
 #include "PM_Client.h"
@@ -22,7 +22,7 @@
 class PMC_All : public PM_Client
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `all' users... 
+  //   Provides the client's lookup table abstraction for `all' users...
 
 protected:
   virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record);
diff --git a/apps/drwho/PMC_Flo.h b/apps/drwho/PMC_Flo.h
index 88f534023be..305a8d8803c 100644
--- a/apps/drwho/PMC_Flo.h
+++ b/apps/drwho/PMC_Flo.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_FLO_H)
+#ifndef _PMC_FLO_H
 #define _PMC_FLO_H
 
 #include "PM_Client.h"
@@ -22,7 +22,7 @@
 class PMC_Flo : public PM_Client
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `flo' users... 
+  //   Provides the client's lookup table abstraction for `flo' users...
 
 public:
   PMC_Flo (void);
diff --git a/apps/drwho/PMC_Ruser.h b/apps/drwho/PMC_Ruser.h
index f121fc95be7..fe3d3c23363 100644
--- a/apps/drwho/PMC_Ruser.h
+++ b/apps/drwho/PMC_Ruser.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_RUSER_H)
+#ifndef _PMC_RUSER_H
 #define _PMC_RUSER_H
 
 #include "PM_Client.h"
@@ -22,7 +22,7 @@
 class PMC_Ruser : public PM_Client
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `ruser' users... 
+  //   Provides the client's lookup table abstraction for `ruser' users...
 
 public:
   PMC_Ruser (void);
diff --git a/apps/drwho/PMC_Usr.h b/apps/drwho/PMC_Usr.h
index 09edd37fa28..f98c8325b83 100644
--- a/apps/drwho/PMC_Usr.h
+++ b/apps/drwho/PMC_Usr.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_USR_H)
+#ifndef _PMC_USR_H
 #define _PMC_USR_H
 
 #include "PM_Client.h"
diff --git a/apps/drwho/PMS_All.h b/apps/drwho/PMS_All.h
index b4de614d5df..41459f57cbe 100644
--- a/apps/drwho/PMS_All.h
+++ b/apps/drwho/PMS_All.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_ALL_H)
+#ifndef _PMS_ALL_H
 #define _PMS_ALL_H
 
 #include "PM_Server.h"
diff --git a/apps/drwho/PMS_Flo.h b/apps/drwho/PMS_Flo.h
index 5ef36641015..b7fefa5abec 100644
--- a/apps/drwho/PMS_Flo.h
+++ b/apps/drwho/PMS_Flo.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_FLO_H)
+#ifndef _PMS_FLO_H
 #define _PMS_FLO_H
 
 #include "PM_Server.h"
@@ -22,7 +22,7 @@
 class PMS_Flo : public PM_Server
 {
   // = TITLE
-  //   Provides the server's lookup table abstraction for `flo' users... 
+  //   Provides the server's lookup table abstraction for `flo' users...
 
 public:
   PMS_Flo (void);
diff --git a/apps/drwho/PMS_Ruser.h b/apps/drwho/PMS_Ruser.h
index cecca15b7b5..f26e916549f 100644
--- a/apps/drwho/PMS_Ruser.h
+++ b/apps/drwho/PMS_Ruser.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_RUSER_H)
+#ifndef _PMS_RUSER_H
 #define _PMS_RUSER_H
 
 #include "PM_Server.h"
@@ -22,7 +22,7 @@
 class PMS_Ruser : public PM_Server
 {
   // = TITLE
-  //   Provides the server's lookup table abstraction for `ruser' users... 
+  //   Provides the server's lookup table abstraction for `ruser' users...
 
 public:
   PMS_Ruser (void);
diff --git a/apps/drwho/PMS_Usr.h b/apps/drwho/PMS_Usr.h
index 2d1df1f3d46..1f29e43d653 100644
--- a/apps/drwho/PMS_Usr.h
+++ b/apps/drwho/PMS_Usr.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_USR_H)
+#ifndef _PMS_USR_H
 #define _PMS_USR_H
 
 #include "PM_Server.h"
@@ -22,7 +22,7 @@
 class PMS_Usr : public PM_Server
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `Usr' users... 
+  //   Provides the client's lookup table abstraction for `Usr' users...
 
 public:
   PMS_Usr (void);
diff --git a/apps/drwho/PM_Client.h b/apps/drwho/PM_Client.h
index 6c7b3c90660..f44ab84f69f 100644
--- a/apps/drwho/PM_Client.h
+++ b/apps/drwho/PM_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PM_CLIENT_H)
+#ifndef _PM_CLIENT_H
 #define _PM_CLIENT_H
 
 #include "Protocol_Manager.h"
@@ -22,7 +22,7 @@
 class PM_Client : public Protocol_Manager
 {
   // = TITLE
-  //   Provides the client side of the friend manager lookup table abstraction. 
+  //   Provides the client side of the friend manager lookup table abstraction.
 public:
   PM_Client (void);
   virtual ~PM_Client (void);
diff --git a/apps/drwho/PM_Server.h b/apps/drwho/PM_Server.h
index 11dba1748ab..2a355c8e262 100644
--- a/apps/drwho/PM_Server.h
+++ b/apps/drwho/PM_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PM_SERVER_H)
+#ifndef _PM_SERVER_H
 #define _PM_SERVER_H
 
 #include "Protocol_Manager.h"
@@ -22,7 +22,7 @@
 class PM_Server : public Protocol_Manager
 {
   // = TITLE
-  //   Handle the server's lookup table abstraction. 
+  //   Handle the server's lookup table abstraction.
 
 public:
   PM_Server (void);
diff --git a/apps/drwho/Protocol_Manager.h b/apps/drwho/Protocol_Manager.h
index 63f95d9b342..d61e752c8df 100644
--- a/apps/drwho/Protocol_Manager.h
+++ b/apps/drwho/Protocol_Manager.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (_PROTOCOL_MANAGER_H)
+#ifndef _PROTOCOL_MANAGER_H
 #define _PROTOCOL_MANAGER_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Options.h"
 #include "Search_Struct.h"
 #include "Protocol_Record.h"
@@ -26,7 +31,7 @@ class Protocol_Manager
 {
   // = TITLE
   //   A base class that consolidates friend management functionality
-  //   shared by both clients and servers.  
+  //   shared by both clients and servers.
 public:
   Protocol_Manager (void);
   virtual ~Protocol_Manager (void);
diff --git a/apps/drwho/Protocol_Record.h b/apps/drwho/Protocol_Record.h
index 74d48b7494a..60cf250adf1 100644
--- a/apps/drwho/Protocol_Record.h
+++ b/apps/drwho/Protocol_Record.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PROTOCOL_RECORD_H)
+#ifndef _PROTOCOL_RECORD_H
 #define _PROTOCOL_RECORD_H
 
 #include "Drwho_Node.h"
@@ -22,7 +22,7 @@
 class Protocol_Record
 {
   // = TITLE
-  //   Stores information about a single friend's status. 
+  //   Stores information about a single friend's status.
 
 public:
   Protocol_Record (void);
diff --git a/apps/drwho/Rwho_DB_Manager.h b/apps/drwho/Rwho_DB_Manager.h
index bb8029fff9a..b995a172a7d 100644
--- a/apps/drwho/Rwho_DB_Manager.h
+++ b/apps/drwho/Rwho_DB_Manager.h
@@ -14,14 +14,19 @@
 //
 // ============================================================================
 
-#if !defined (_RWHO_DB_MANAGER_H)
+#ifndef _RWHO_DB_MANAGER_H
 #define _RWHO_DB_MANAGER_H
 
 #include <protocols/rwhod.h>
 #include "ace/Dirent.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Protocol_Record.h"
 
-class RWho_DB_Manager 
+class RWho_DB_Manager
 {
   // = TITLE
   //   This class returns the user/machine pairs one at a time from
diff --git a/apps/drwho/SL_Client.h b/apps/drwho/SL_Client.h
index 7af14197258..16be3842064 100644
--- a/apps/drwho/SL_Client.h
+++ b/apps/drwho/SL_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SL_CLIENT_H)
+#ifndef _SL_CLIENT_H
 #define _SL_CLIENT_H
 
 #include "Single_Lookup.h"
@@ -22,7 +22,7 @@
 class SL_Client : public Single_Lookup
 {
   // = TITLE
-  //   Provides the client's single user lookup table abstraction. 
+  //   Provides the client's single user lookup table abstraction.
 
 public:
   SL_Client (const char *key_name);
diff --git a/apps/drwho/SL_Server.h b/apps/drwho/SL_Server.h
index 7302371275a..2a8ee2ba054 100644
--- a/apps/drwho/SL_Server.h
+++ b/apps/drwho/SL_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SL_SERVER_H)
+#ifndef _SL_SERVER_H
 #define _SL_SERVER_H
 
 #include "Single_Lookup.h"
@@ -22,7 +22,7 @@
 class SL_Server : public Single_Lookup
 {
   // = TITLE
-  //   Provides the server's single user lookup table abstraction. 
+  //   Provides the server's single user lookup table abstraction.
 
 public:
   SL_Server (const char *packet);
diff --git a/apps/drwho/SML_Client.h b/apps/drwho/SML_Client.h
index 42dedf46248..d02fb8d6fa0 100644
--- a/apps/drwho/SML_Client.h
+++ b/apps/drwho/SML_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SML_CLIENT_H)
+#ifndef _SML_CLIENT_H
 #define _SML_CLIENT_H
 
 #include "SM_Client.h"
diff --git a/apps/drwho/SML_Server.h b/apps/drwho/SML_Server.h
index cb1f1d0d80e..5fc665450df 100644
--- a/apps/drwho/SML_Server.h
+++ b/apps/drwho/SML_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SML_SERVER_H)
+#ifndef _SML_SERVER_H
 #define _SML_SERVER_H
 
 #include "SM_Server.h"
diff --git a/apps/drwho/SMR_Client.h b/apps/drwho/SMR_Client.h
index dc3081f1210..9725c3ebd96 100644
--- a/apps/drwho/SMR_Client.h
+++ b/apps/drwho/SMR_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SMR_CLIENT_H)
+#ifndef _SMR_CLIENT_H
 #define _SMR_CLIENT_H
 
 #include "SM_Client.h"
diff --git a/apps/drwho/SMR_Server.h b/apps/drwho/SMR_Server.h
index d471245aeae..af8b384d701 100644
--- a/apps/drwho/SMR_Server.h
+++ b/apps/drwho/SMR_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SMR_SERVER_H)
+#ifndef _SMR_SERVER_H
 #define _SMR_SERVER_H
 
 #include "SM_Server.h"
diff --git a/apps/drwho/SM_Client.h b/apps/drwho/SM_Client.h
index 884ad94b4de..0a262f71c78 100644
--- a/apps/drwho/SM_Client.h
+++ b/apps/drwho/SM_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SM_CLIENT_H)
+#ifndef _SM_CLIENT_H
 #define _SM_CLIENT_H
 
 #include "PM_Client.h"
diff --git a/apps/drwho/SM_Server.h b/apps/drwho/SM_Server.h
index 83aa063cd72..f9fbc9857d1 100644
--- a/apps/drwho/SM_Server.h
+++ b/apps/drwho/SM_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SM_SERVER_H)
+#ifndef _SM_SERVER_H
 #define _SM_SERVER_H
 
 #include "PM_Server.h"
diff --git a/apps/drwho/Search_Struct.h b/apps/drwho/Search_Struct.h
index 6b7f12b9750..c45dcbf6086 100644
--- a/apps/drwho/Search_Struct.h
+++ b/apps/drwho/Search_Struct.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SEARCH_STRUCT_H)
+#ifndef _SEARCH_STRUCT_H
 #define _SEARCH_STRUCT_H
 
 #include "Protocol_Record.h"
diff --git a/apps/drwho/Select_Manager.h b/apps/drwho/Select_Manager.h
index c4f89b7e57b..0f6af73e443 100644
--- a/apps/drwho/Select_Manager.h
+++ b/apps/drwho/Select_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SELECT_MANAGER_H)
+#ifndef _SELECT_MANAGER_H
 #define _SELECT_MANAGER_H
 
 class Select_Manager
diff --git a/apps/drwho/Single_Lookup.h b/apps/drwho/Single_Lookup.h
index 4b00249ef05..fa86301215e 100644
--- a/apps/drwho/Single_Lookup.h
+++ b/apps/drwho/Single_Lookup.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SINGLE_LOOKUP_H)
+#ifndef _SINGLE_LOOKUP_H
 #define _SINGLE_LOOKUP_H
 
 #include "Options.h"
diff --git a/apps/drwho/global.h b/apps/drwho/global.h
index 090b20b5b33..d049bd3f43d 100644
--- a/apps/drwho/global.h
+++ b/apps/drwho/global.h
@@ -17,32 +17,36 @@
 //
 // ============================================================================
 
-#if !defined (_GLOBAL_H)
+#ifndef _GLOBAL_H
 #define _GLOBAL_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // These constants are used throughout drwho.
 
-enum 
+enum
 {
   MAXUSERIDNAMELEN = 8,
-  MAX_USER_TIMEOUT = 300, 
-  MAX_HOST_TIMEOUT = 300, 
+  MAX_USER_TIMEOUT = 300,
+  MAX_HOST_TIMEOUT = 300,
   UDP_PACKET_SIZE = 1024 * 8,
   PORT_NUMBER = 12344
 };
 
-// Default name of file where friends info is stored. 
+// Default name of file where friends info is stored.
 #define FRIEND_FILE ".friends.dta"
 
-// Default name where rwho info is stored. 
+// Default name where rwho info is stored.
 #define RWHODIR "/usr/spool/rwho"
 
-// Macros for handling message types. 
+// Macros for handling message types.
 #define GET_PACKET_TYPE(P)      (ntohs (*((short *) P)))
 #define SET_PACKET_TYPE(P,T)    ((*(short *) P) = ntohs (T))
 #define SKIP_PACKET_TYPE(P)     ((P) + sizeof (short))
-#define SUBTRACT_PACKET_TYPE(L) ((L) - sizeof (short)) 
+#define SUBTRACT_PACKET_TYPE(L) ((L) - sizeof (short))
 
 #endif /* _GLOBAL_H */
diff --git a/apps/gperf/src/Bool_Array.h b/apps/gperf/src/Bool_Array.h
index b922adfa517..0e869b1a128 100644
--- a/apps/gperf/src/Bool_Array.h
+++ b/apps/gperf/src/Bool_Array.h
@@ -21,15 +21,20 @@ along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.*/
 
-#if !defined (BOOL_ARRAY_H)
+#ifndef BOOL_ARRAY_H
 #define BOOL_ARRAY_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Options.h"
 
 #if defined (ACE_HAS_GPERF)
 
-class Bool_Array 
+class Bool_Array
 {
   // = TITLE
   //   Efficient lookup table abstraction implemented as a "Generation
@@ -56,14 +61,14 @@ public:
   // Reinitializes the array (requires O(1) time).
 
 private:
-  u_long *storage_array_;    
+  u_long *storage_array_;
   // Initialization of the index space.
 
-  u_long generation_number_; 
+  u_long generation_number_;
   // Keep track of the current Generation.
 
   u_long size_;
-  // Keep track of array size. 
+  // Keep track of array size.
 };
 
 #endif /* ACE_HAS_GPERF */
diff --git a/apps/gperf/src/Gen_Perf.h b/apps/gperf/src/Gen_Perf.h
index 567a7ab0a3c..6d93b1c653f 100644
--- a/apps/gperf/src/Gen_Perf.h
+++ b/apps/gperf/src/Gen_Perf.h
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
-#if !defined (GEN_PERF_H)
+#ifndef GEN_PERF_H
 #define GEN_PERF_H
 
 #include "Options.h"
diff --git a/apps/gperf/src/Hash_Table.h b/apps/gperf/src/Hash_Table.h
index 2ac57f444ac..5234f94ce26 100644
--- a/apps/gperf/src/Hash_Table.h
+++ b/apps/gperf/src/Hash_Table.h
@@ -21,10 +21,15 @@ along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
 USA.  */
 
-#if !defined (HASH_TABLE_H)
+#ifndef HASH_TABLE_H
 #define HASH_TABLE_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Options.h"
 #include "List_Node.h"
 
@@ -32,11 +37,11 @@ USA.  */
 // @@ This class should be replaced by something in ACE, e.g.,
 // ACE_Hash_Map_Manager.  Perhaps we should implement a new
 // ACE_Hash_Map that uses double hashing, however!
-class Hash_Table 
+class Hash_Table
 {
   // = TITLE
   //   Hash table used to check for duplicate keyword entries.
-  // 
+  //
   // = DESCRIPTION
   //   This implementation uses "double hashing."
 public:
@@ -48,12 +53,12 @@ public:
 
 private:
   List_Node **table_;
-  // Vector of pointers to linked lists of List_Node's. 
+  // Vector of pointers to linked lists of List_Node's.
 
   size_t size_;
-  // Size of the vector. 
+  // Size of the vector.
 
-  int collisions_; 
+  int collisions_;
   // Find out how well our double hashing is working!
 };
 
diff --git a/apps/gperf/src/Iterator.h b/apps/gperf/src/Iterator.h
index 3fc2dee72d9..fc150efdc72 100644
--- a/apps/gperf/src/Iterator.h
+++ b/apps/gperf/src/Iterator.h
@@ -21,14 +21,19 @@ along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-#if !defined (ITERATOR_H)
+#ifndef ITERATOR_H
 #define ITERATOR_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Options.h"
 
 #if defined (ACE_HAS_GPERF)
-class Iterator 
+class Iterator
 {
   // = TITLE
   //   Provides an Iterator that expands and decodes a control string
@@ -52,23 +57,23 @@ public:
   int operator () (void);
 
 private:
-  char *str;                    
+  char *str;
   // A pointer to the string provided by the user.
 
-  int end;                    
-  // Value returned after last key is processed. 
+  int end;
+  // Value returned after last key is processed.
 
-  int end_word;               
+  int end_word;
   // A value marking the abstract ``end of word'' (usually '$').
 
-  int error_value;            
-  // Error value returned when input is syntactically erroneous. 
+  int error_value;
+  // Error value returned when input is syntactically erroneous.
 
   int hi_bound;
-  // Greatest possible value, inclusive. 
+  // Greatest possible value, inclusive.
 
   int lo_bound;
-  // Smallest possible value, inclusive. 
+  // Smallest possible value, inclusive.
 };
 
 #endif /* ACE_HAS_GPERF */
diff --git a/apps/gperf/src/Key_List.h b/apps/gperf/src/Key_List.h
index bebad1ccc48..1a2d30421a9 100644
--- a/apps/gperf/src/Key_List.h
+++ b/apps/gperf/src/Key_List.h
@@ -21,7 +21,7 @@ along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
 USA.  */
 
-#if !defined (KEY_LIST_H)
+#ifndef KEY_LIST_H
 #define KEY_LIST_H
 
 #include "Options.h"
diff --git a/apps/gperf/src/List_Node.h b/apps/gperf/src/List_Node.h
index d46ffd376fc..59ca19ed1a8 100644
--- a/apps/gperf/src/List_Node.h
+++ b/apps/gperf/src/List_Node.h
@@ -21,18 +21,23 @@ along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
 USA.  */
 
-#if !defined (LIST_NODE_H)
+#ifndef LIST_NODE_H
 #define LIST_NODE_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Options.h"
 
 #if defined (ACE_HAS_GPERF)
-class List_Node 
-{ 
+class List_Node
+{
   // = TITLE
   //   Data and function members for defining values and operations of
-  //   a list node.  
+  //   a list node.
 public:
   // = Initialization and termination methods.
   List_Node (char *key, int len);
@@ -43,32 +48,32 @@ public:
 
   static void sort (char *base, int len);
 
-  List_Node *link;              
+  List_Node *link;
   // TRUE if key has an identical KEY_SET as another key.
 
-  List_Node *next;              
-  // Points to next element on the list. 
+  List_Node *next;
+  // Points to next element on the list.
 
   char *key;
-  // Each keyword string stored here. 
+  // Each keyword string stored here.
 
-  char *rest;              
-  // Additional information for building hash function. 
+  char *rest;
+  // Additional information for building hash function.
 
-  char *keysig;          
-  // Set of characters to hash, specified by user. 
+  char *keysig;
+  // Set of characters to hash, specified by user.
 
-  int length;            
-  // Length of the key. 
+  int length;
+  // Length of the key.
 
-  int hash_value;        
-  // Hash value for the key. 
+  int hash_value;
+  // Hash value for the key.
 
-  int occurrence;        
-  // A metric for frequency of key set occurrences. 
+  int occurrence;
+  // A metric for frequency of key set occurrences.
 
   int index;
-  // Position of this node relative to other nodes. 
+  // Position of this node relative to other nodes.
 };
 
 #endif /* ACE_HAS_GPERF */
diff --git a/apps/gperf/src/Options.h b/apps/gperf/src/Options.h
index 8b20aca2742..4b102892a32 100644
--- a/apps/gperf/src/Options.h
+++ b/apps/gperf/src/Options.h
@@ -21,11 +21,15 @@ along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
 USA.  */
 
-#if !defined (OPTIONS_H)
+#ifndef OPTIONS_H
 #define OPTIONS_H
 
 #include "ace/Log_Msg.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (ACE_HAS_GPERF)
 
 // Enumerate the potential debugging Options.
@@ -52,7 +56,7 @@ enum Option_Type
   CONSTANT     = 0400000,       // Make the generated tables readonly (const).
   CPLUSPLUS    = 01000000,      // Generate C++ code.
   C            = 02000000,      // Generate C code.
-  ENUM	       = 04000000,      // Use enum for constants.
+  ENUM         = 04000000,      // Use enum for constants.
   STRCASECMP   = 010000000,     // Use the case insensitive comparison.
   OPTIMIZE     = 020000000,     // Assume all input keywords are in the keyset.
   ADA          = 040000000,     // Generate Ada code.
diff --git a/apps/gperf/src/Vectors.h b/apps/gperf/src/Vectors.h
index bc3fa35a3fb..f66a2d5e5a7 100644
--- a/apps/gperf/src/Vectors.h
+++ b/apps/gperf/src/Vectors.h
@@ -21,28 +21,32 @@ along with GNU GPERF; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
 USA.  */
 
-#if !defined (VECTORS_H)
+#ifndef VECTORS_H
 #define VECTORS_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (ACE_HAS_GPERF)
 
 class Vectors
 {
-  // = TITLE 
+  // = TITLE
   //   Static class data members that are shared between several
-  //   classes via inheritance.  
+  //   classes via inheritance.
 public:
-  enum 
+  enum
   {
     ALPHA_SIZE = 128
   };
 
-  static int occurrences[ALPHA_SIZE]; 
+  static int occurrences[ALPHA_SIZE];
   // Counts occurrences of each key set character.
 
-  static int asso_values[ALPHA_SIZE]; 
+  static int asso_values[ALPHA_SIZE];
   // Value associated with each character.
 };
 
diff --git a/docs/tutorials/001/acceptor.h b/docs/tutorials/001/acceptor.h
index 988b1948231..094e68acdf5 100644
--- a/docs/tutorials/001/acceptor.h
+++ b/docs/tutorials/001/acceptor.h
@@ -2,7 +2,7 @@
 // $Id$
 
 
-#if !defined (_CLIENT_ACCEPTOR_H)
+#ifndef _CLIENT_ACCEPTOR_H
 #define _CLIENT_ACCEPTOR_H
 
 /*
@@ -11,6 +11,10 @@
  */
 #include "ace/SOCK_Acceptor.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
   An Event_Handler is what you register with ACE_Reactor.  When events occur,
   the reactor will callback on the Event_Handler.  More on that in a few lines.
@@ -72,7 +76,7 @@ public:
      */
     return _reactor->register_handler( this, ACE_Event_Handler::ACCEPT_MASK );
   }
-  
+
 private:
 
   /*
@@ -84,8 +88,8 @@ private:
     acceptor object, so that's what we provide.
    */
   ACE_HANDLE get_handle (void) const
-  { 
-    return this->peer_acceptor_.get_handle (); 
+  {
+    return this->peer_acceptor_.get_handle ();
   }
 
   /*
@@ -100,7 +104,7 @@ private:
       disconnects.
      */
     Logging_Handler *svc_handler = new Logging_Handler;
-  
+
     /*
       To complete the connection, we invoke the accept() method call on
       the acceptor object and provide it with the connection handler instance.
@@ -117,7 +121,7 @@ private:
      */
     if (svc_handler->open (reactor_) == -1)
       svc_handler->close ();
-  
+
     return 0;
   }
 
@@ -126,7 +130,7 @@ protected:
   /*
     Our acceptor object instance
    */
-  ACE_SOCK_Acceptor peer_acceptor_;     
+  ACE_SOCK_Acceptor peer_acceptor_;
 
   /*
     A place to remember our reactor pointer
diff --git a/docs/tutorials/001/logger.h b/docs/tutorials/001/logger.h
index 8063f83f48a..6e46176fd6e 100644
--- a/docs/tutorials/001/logger.h
+++ b/docs/tutorials/001/logger.h
@@ -2,7 +2,7 @@
 // $Id$
 
 
-#if !defined (_CLIENT_HANDLER_H)
+#ifndef _CLIENT_HANDLER_H
 #define _CLIENT_HANDLER_H
 
 /*
@@ -11,6 +11,10 @@
  */
 #include "ace/Event_Handler.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/INET_Addr.h"
 
 /*
@@ -92,7 +96,7 @@ protected:
      */
     char buf[128];
     memset(buf,0,sizeof(buf));
-    
+
     /*
       Invoke the recv() method of the ACE_SOCK_Stream to get some data.  It will
       return -1 if there is an error.  Otherwise, it will return the number of bytes
@@ -114,7 +118,7 @@ protected:
     default:
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) from client: %s",buf));
     }
-  
+
     return 0;
   }
 
@@ -139,7 +143,7 @@ protected:
       Since we know we were dynamically allocated by the acceptor, now is a good
       time to get rid of ourselves.
      */
-    delete this;    
+    delete this;
 
     return 0;
   }
@@ -149,7 +153,7 @@ protected:
   /*
     Our peer connection.
    */
-  ACE_SOCK_Stream cli_stream_; 
+  ACE_SOCK_Stream cli_stream_;
 
   /*
     Our reactor (and our acceptor's reactor).
diff --git a/docs/tutorials/002/handler.h b/docs/tutorials/002/handler.h
index e7796cbb47b..a66ccccb9e6 100644
--- a/docs/tutorials/002/handler.h
+++ b/docs/tutorials/002/handler.h
@@ -5,6 +5,11 @@
 #define LOGGING_HANDLER_H
 
 #include "ace/INET_Addr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "ace/Reactor.h"
 
diff --git a/docs/tutorials/005/client_acceptor.h b/docs/tutorials/005/client_acceptor.h
index 82416fa999c..fa3d3b41be8 100644
--- a/docs/tutorials/005/client_acceptor.h
+++ b/docs/tutorials/005/client_acceptor.h
@@ -7,17 +7,21 @@
 /*
    The ACE_Acceptor<> template lives in the ace/Acceptor.h header file. You'll
    find a very consitent naming convention between the ACE objects and the
-   headers where they can be found.  In general, the ACE object ACE_Foobar will 
+   headers where they can be found.  In general, the ACE object ACE_Foobar will
 
 
-   be found in ace/Foobar.h.   
+   be found in ace/Foobar.h.
  */
 
 #include "ace/Acceptor.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
    Since we want to work with sockets, we'll need a SOCK_Acceptor to allow the
-   clients to connect to us.   
+   clients to connect to us.
  */
 #include "ace/SOCK_Acceptor.h"
 
@@ -25,7 +29,7 @@
    The Client_Handler object we develop will be used to handle clients once
    they're connected.  The ACE_Acceptor<> template's first parameter requires
    such an object.  In some cases, you can get by with just a forward
-   declaration on the class, in others you have to have the whole thing.   
+   declaration on the class, in others you have to have the whole thing.
  */
 #include "client_handler.h"
 
@@ -34,7 +38,7 @@
    connection attempts and create Client_Handler objects when they happen. In
    Tutorial 001, we wrote the basic acceptor logic on our own before we
    realized that ACE_Acceptor<> was available.  You'll get spoiled using the
-   ACE templates because they take away a lot of the tedious details!   
+   ACE templates because they take away a lot of the tedious details!
  */
 typedef ACE_Acceptor < Client_Handler, ACE_SOCK_ACCEPTOR > Client_Acceptor;
 
diff --git a/docs/tutorials/005/client_handler.h b/docs/tutorials/005/client_handler.h
index bdd8d903f6f..b1e4af021d3 100644
--- a/docs/tutorials/005/client_handler.h
+++ b/docs/tutorials/005/client_handler.h
@@ -8,22 +8,27 @@
    Our client handler must exist somewhere in the ACE_Event_Handler object
    hierarchy.  This is a requirement of the ACE_Reactor because it maintains
    ACE_Event_Handler pointers for each registered event handler.  You could
-   derive our Client_Handler directly from ACE_Event_Handler but you still have 
+   derive our Client_Handler directly from ACE_Event_Handler but you still have
    to have an ACE_SOCK_Stream for the actually connection.  With a direct
    derivative of ACE_Event_Handler, you'll have to contain and maintain an
    ACE_SOCK_Stream instance yourself.  With ACE_Svc_Handler (which is a
    derivative of ACE_Event_Handler) some of those details are handled for you.
-    
+
  */
 
 #include "ace/Svc_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 
 /*
-   Another feature of ACE_Svc_Handler is it's ability to present the ACE_Task<> 
+   Another feature of ACE_Svc_Handler is it's ability to present the ACE_Task<>
    interface as well.  That's what the ACE_NULL_SYNCH parameter below is all
    about.  That's beyond our scope here but we'll come back to it in the next
-   tutorial when we start looking at concurrency options.   
+   tutorial when we start looking at concurrency options.
  */
 class Client_Handler : public ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH >
 {
@@ -38,20 +43,20 @@ public:
      intuitive (at least to me).  Instead, we provide a new method of
      destruction and we make our destructor protected so that only ourselves,
      our derivatives and our friends can delete us. It's a nice
-     compromise.   
+     compromise.
    */
   void destroy (void);
 
   /*
      Most ACE objects have an open() method.  That's how you make them ready
-     to do work.  ACE_Event_Handler has a virtual open() method which allows us 
+     to do work.  ACE_Event_Handler has a virtual open() method which allows us
      to create this overrride.  ACE_Acceptor<> will invoke this method after
      creating a new Client_Handler when a client connects. Notice that the
      parameter to open() is a void*.  It just so happens that the pointer
-     points to the acceptor which created us.  You would like for the parameter 
+     points to the acceptor which created us.  You would like for the parameter
      to be an ACE_Acceptor<>* but since ACE_Event_Handler is generic, that
      would tie it too closely to the ACE_Acceptor<> set of objects.  In our
-     definition of open() you'll see how we get around that.   
+     definition of open() you'll see how we get around that.
    */
   int open (void *_acceptor);
 
@@ -62,8 +67,8 @@ public:
      clean itself up. Since an event handler can be registered for more than
      one type of callback, the callback mask is provided to inform
      handle_close() exactly which method failed.  That way, you don't have to
-     maintain state information between your handle_* method calls. The _handle 
-     parameter is explained below...   
+     maintain state information between your handle_* method calls. The _handle
+     parameter is explained below...
    */
   int handle_close (ACE_HANDLE _handle, ACE_Reactor_Mask _mask);
 
@@ -78,7 +83,7 @@ protected:
      maintains it's own peer (ACE_SOCK_Stream) object, this is redundant for
      us.  However, if we had been derived directly from ACE_Event_Handler, we
      may have chosen not to contain the peer.  In that case, the _handleg
-     would be important to us for reading the client's data.   
+     would be important to us for reading the client's data.
    */
   int handle_input (ACE_HANDLE _handle);
 
@@ -87,15 +92,15 @@ protected:
      function which I will call from handle_input().  That allows me to
      introduce concurrencly in later tutorials with a no changes to the worker
      function.  You can think of process() as application-level code and
-     everything elase as application-framework code.   
+     everything elase as application-framework code.
    */
   int process (char *_rdbuf, int _rdbuf_len);
 
   /*
      We don't really do anything in our destructor but we've declared it to be
      protected to prevent casual deletion of this object.  As I said above, I
-     really would prefer that everyone goes through the destroy() method to get 
-     rid of us.   
+     really would prefer that everyone goes through the destroy() method to get
+     rid of us.
    */
    ~Client_Handler (void);
 };
diff --git a/docs/tutorials/006/client_acceptor.h b/docs/tutorials/006/client_acceptor.h
index b0944f3a316..2318b6adacd 100644
--- a/docs/tutorials/006/client_acceptor.h
+++ b/docs/tutorials/006/client_acceptor.h
@@ -7,17 +7,21 @@
 /*
    The ACE_Acceptor<> template lives in the ace/Acceptor.h header file. You'll
    find a very consitent naming convention between the ACE objects and the
-   headers where they can be found.  In general, the ACE object ACE_Foobar will 
+   headers where they can be found.  In general, the ACE object ACE_Foobar will
 
 
-   be found in ace/Foobar.h.   
+   be found in ace/Foobar.h.
  */
 
 #include "ace/Acceptor.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
    Since we want to work with sockets, we'll need a SOCK_Acceptor to allow the
-   clients to connect to us.   
+   clients to connect to us.
  */
 #include "ace/SOCK_Acceptor.h"
 
@@ -25,7 +29,7 @@
    The Client_Handler object we develop will be used to handle clients once
    they're connected.  The ACE_Acceptor<> template's first parameter requires
    such an object.  In some cases, you can get by with just a forward
-   declaration on the class, in others you have to have the whole thing.   
+   declaration on the class, in others you have to have the whole thing.
  */
 #include "client_handler.h"
 
@@ -34,7 +38,7 @@
    connection attempts and create Client_Handler objects when they happen. In
    Tutorial 001, we wrote the basic acceptor logic on our own before we
    realized that ACE_Acceptor<> was available.  You'll get spoiled using the
-   ACE templates because they take away a lot of the tedious details!   
+   ACE templates because they take away a lot of the tedious details!
  */
 typedef ACE_Acceptor < Client_Handler, ACE_SOCK_ACCEPTOR > Client_Acceptor_Base;
 
@@ -49,32 +53,32 @@ typedef ACE_Acceptor < Client_Handler, ACE_SOCK_ACCEPTOR > Client_Acceptor_Base;
 class Client_Acceptor : public Client_Acceptor_Base
 {
 public:
-	/*
-	   This is always a good idea.  If nothing else, it makes your code more
-	   orthogonal no matter what baseclasses your objects have.
-	 */
-	typedef Client_Acceptor_Base inherited;
-
-	/*
-	   Construct the object with the concurrency strategy.  Since this tutorial
-	   is focused on thread-per-connection, we make that the default.  We could
-	   have chosen to omitt the default and populate it in main() instead.
-	 */
-	Client_Acceptor( int _thread_per_connection = 1 )
-	 : thread_per_connection_(_thread_per_connection)
-	{
-	}
-
-	/*
-	   Return the value of our strategy flag.  This is used by the Client_Handler
-	   to decide how to act.  If 'true' then the handler will behave in a
-	   thread-per-connection manner.
-	 */
-	int thread_per_connection(void)
-		{ return this->thread_per_connection_; }
+        /*
+           This is always a good idea.  If nothing else, it makes your code more
+           orthogonal no matter what baseclasses your objects have.
+         */
+        typedef Client_Acceptor_Base inherited;
+
+        /*
+           Construct the object with the concurrency strategy.  Since this tutorial
+           is focused on thread-per-connection, we make that the default.  We could
+           have chosen to omitt the default and populate it in main() instead.
+         */
+        Client_Acceptor( int _thread_per_connection = 1 )
+         : thread_per_connection_(_thread_per_connection)
+        {
+        }
+
+        /*
+           Return the value of our strategy flag.  This is used by the Client_Handler
+           to decide how to act.  If 'true' then the handler will behave in a
+           thread-per-connection manner.
+         */
+        int thread_per_connection(void)
+                { return this->thread_per_connection_; }
 
 protected:
-	int thread_per_connection_;
+        int thread_per_connection_;
 
 };
 
diff --git a/docs/tutorials/006/client_handler.h b/docs/tutorials/006/client_handler.h
index d80c23e942d..83a4c326b94 100644
--- a/docs/tutorials/006/client_handler.h
+++ b/docs/tutorials/006/client_handler.h
@@ -8,19 +8,24 @@
    Our client handler must exist somewhere in the ACE_Event_Handler object
    hierarchy.  This is a requirement of the ACE_Reactor because it maintains
    ACE_Event_Handler pointers for each registered event handler.  You could
-   derive our Client_Handler directly from ACE_Event_Handler but you still have 
+   derive our Client_Handler directly from ACE_Event_Handler but you still have
    to have an ACE_SOCK_Stream for the actually connection.  With a direct
    derivative of ACE_Event_Handler, you'll have to contain and maintain an
    ACE_SOCK_Stream instance yourself.  With ACE_Svc_Handler (which is a
    derivative of ACE_Event_Handler) some of those details are handled for you.
-    
+
  */
 
 #include "ace/Svc_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 
 /*
-   Another feature of ACE_Svc_Handler is it's ability to present the ACE_Task<> 
+   Another feature of ACE_Svc_Handler is it's ability to present the ACE_Task<>
    interface as well.  That's what the ACE_NULL_SYNCH parameter below is all
    about.  If our Client_Acceptor has chosen thread-per-connection then our
    open() method will activate us into a thread.  At that point, our svc()
@@ -42,27 +47,27 @@ public:
      intuitive (at least to me).  Instead, we provide a new method of
      destruction and we make our destructor protected so that only ourselves,
      our derivatives and our friends can delete us. It's a nice
-     compromise.   
+     compromise.
    */
   void destroy (void);
 
   /*
      Most ACE objects have an open() method.  That's how you make them ready
-     to do work.  ACE_Event_Handler has a virtual open() method which allows us 
+     to do work.  ACE_Event_Handler has a virtual open() method which allows us
      to create this overrride.  ACE_Acceptor<> will invoke this method after
      creating a new Client_Handler when a client connects. Notice that the
      parameter to open() is a void*.  It just so happens that the pointer
-     points to the acceptor which created us.  You would like for the parameter 
+     points to the acceptor which created us.  You would like for the parameter
      to be an ACE_Acceptor<>* but since ACE_Event_Handler is generic, that
      would tie it too closely to the ACE_Acceptor<> set of objects.  In our
-     definition of open() you'll see how we get around that.   
+     definition of open() you'll see how we get around that.
    */
   int open (void *_acceptor);
 
   /*
      When an ACE_Task<> object falls out of the svc() method, the framework
-	 will call the close() method.  That's where we want to cleanup ourselves
-	 if we're running in either thread-per-connection or thread-pool mode.
+         will call the close() method.  That's where we want to cleanup ourselves
+         if we're running in either thread-per-connection or thread-pool mode.
    */
   int close(u_long flags = 0);
 
@@ -73,8 +78,8 @@ public:
      clean itself up. Since an event handler can be registered for more than
      one type of callback, the callback mask is provided to inform
      handle_close() exactly which method failed.  That way, you don't have to
-     maintain state information between your handle_* method calls. The _handle 
-     parameter is explained below...   
+     maintain state information between your handle_* method calls. The _handle
+     parameter is explained below...
    */
   int handle_close (ACE_HANDLE _handle, ACE_Reactor_Mask _mask);
 
@@ -97,7 +102,7 @@ protected:
      maintains it's own peer (ACE_SOCK_Stream) object, this is redundant for
      us.  However, if we had been derived directly from ACE_Event_Handler, we
      may have chosen not to contain the peer.  In that case, the _handleg
-     would be important to us for reading the client's data.   
+     would be important to us for reading the client's data.
    */
   int handle_input (ACE_HANDLE _handle);
 
@@ -112,8 +117,8 @@ protected:
   /*
      We don't really do anything in our destructor but we've declared it to be
      protected to prevent casual deletion of this object.  As I said above, I
-     really would prefer that everyone goes through the destroy() method to get 
-     rid of us.   
+     really would prefer that everyone goes through the destroy() method to get
+     rid of us.
    */
    ~Client_Handler (void);
 };
diff --git a/docs/tutorials/007/client_acceptor.h b/docs/tutorials/007/client_acceptor.h
index e1c0eded6fd..82c761879ea 100644
--- a/docs/tutorials/007/client_acceptor.h
+++ b/docs/tutorials/007/client_acceptor.h
@@ -7,15 +7,19 @@
 /*
    The ACE_Acceptor<> template lives in the ace/Acceptor.h header file. You'll
    find a very consitent naming convention between the ACE objects and the
-   headers where they can be found.  In general, the ACE object ACE_Foobar will 
-   be found in ace/Foobar.h.   
+   headers where they can be found.  In general, the ACE object ACE_Foobar will
+   be found in ace/Foobar.h.
  */
 
 #include "ace/Acceptor.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
    Since we want to work with sockets, we'll need a SOCK_Acceptor to allow the
-   clients to connect to us.   
+   clients to connect to us.
  */
 #include "ace/SOCK_Acceptor.h"
 
@@ -23,7 +27,7 @@
    The Client_Handler object we develop will be used to handle clients once
    they're connected.  The ACE_Acceptor<> template's first parameter requires
    such an object.  In some cases, you can get by with just a forward
-   declaration on the class, in others you have to have the whole thing.   
+   declaration on the class, in others you have to have the whole thing.
  */
 #include "client_handler.h"
 
@@ -32,7 +36,7 @@
    connection attempts and create Client_Handler objects when they happen. In
    Tutorial 001, we wrote the basic acceptor logic on our own before we
    realized that ACE_Acceptor<> was available.  You'll get spoiled using the
-   ACE templates because they take away a lot of the tedious details!   
+   ACE templates because they take away a lot of the tedious details!
  */
 typedef ACE_Acceptor < Client_Handler, ACE_SOCK_ACCEPTOR > Client_Acceptor_Base;
 
@@ -57,81 +61,81 @@ typedef ACE_Acceptor < Client_Handler, ACE_SOCK_ACCEPTOR > Client_Acceptor_Base;
 class Client_Acceptor : public Client_Acceptor_Base
 {
 public:
-	typedef Client_Acceptor_Base inherited;
-
-	/*
-	   Now that we have more than two strategies, we need more than a boolean
-	   to tell us what we're using.  A set of enums is a good choice because
-	   it allows us to use named values.  Another option would be a set of
-	   static const integers.
-	 */
-	enum concurrency_t
-	{
-		single_threaded_,
-		thread_per_connection_,
-		thread_pool_
-	};
-
-	/*
-	    The default constructor allows the programmer to choose the concurrency
-		strategy.  Since we want to focus on thread-pool, that's what we'll use
-		if nothing is specified.
-	 */
-	Client_Acceptor( int _concurrency = thread_pool_ );
-
-	/*
-	    Another option is to construct the object with an existing thread pool.
-		The  concurrency strategy is pretty obvious at that point.
-	 */
-	Client_Acceptor( Thread_Pool & _thread_pool );
-
-	/*
-	    Our destructor will take care of shutting down the thread-pool
-		if applicable.
-	 */
-	~Client_Acceptor( void );
-
-	/*
-	    Open ourselves and register with the given reactor.  The thread pool size
-		can be specified here if you want to use that concurrency strategy.
-	 */
-	int open( const ACE_INET_Addr & _addr, ACE_Reactor * _reactor,
-		int _pool_size = Thread_Pool::default_pool_size_ );
-
-	/*
-	    Close ourselves and our thread pool if applicable
-	 */
-	int close(void);
-
-	/*
-	   What is our concurrency strategy?
-	 */
-	int concurrency(void)
-		{ return this->concurrency_; }
-
-	/*
-	    Give back a pointer to our thread pool.  Our Client_Handler objects
-		will need this so that their handle_input() methods can put themselves
-		into the pool.  Another alternative would be a globally accessible
-		thread pool.  ACE_Singleton<> is a way to achieve that.
-	 */
-	Thread_Pool * thread_pool(void)
-		{ return & this->the_thread_pool_; }
-
-	/*
-	   Since we can be constructed with a Thread_Pool reference, there are times
-	   when we need to know if the thread pool we're using is ours or if we're
-	   just borrowing it from somebody else.
-	 */
-	int thread_pool_is_private(void)
-		{ return &the_thread_pool_ == &private_thread_pool_; }
+        typedef Client_Acceptor_Base inherited;
+
+        /*
+           Now that we have more than two strategies, we need more than a boolean
+           to tell us what we're using.  A set of enums is a good choice because
+           it allows us to use named values.  Another option would be a set of
+           static const integers.
+         */
+        enum concurrency_t
+        {
+                single_threaded_,
+                thread_per_connection_,
+                thread_pool_
+        };
+
+        /*
+            The default constructor allows the programmer to choose the concurrency
+                strategy.  Since we want to focus on thread-pool, that's what we'll use
+                if nothing is specified.
+         */
+        Client_Acceptor( int _concurrency = thread_pool_ );
+
+        /*
+            Another option is to construct the object with an existing thread pool.
+                The  concurrency strategy is pretty obvious at that point.
+         */
+        Client_Acceptor( Thread_Pool & _thread_pool );
+
+        /*
+            Our destructor will take care of shutting down the thread-pool
+                if applicable.
+         */
+        ~Client_Acceptor( void );
+
+        /*
+            Open ourselves and register with the given reactor.  The thread pool size
+                can be specified here if you want to use that concurrency strategy.
+         */
+        int open( const ACE_INET_Addr & _addr, ACE_Reactor * _reactor,
+                int _pool_size = Thread_Pool::default_pool_size_ );
+
+        /*
+            Close ourselves and our thread pool if applicable
+         */
+        int close(void);
+
+        /*
+           What is our concurrency strategy?
+         */
+        int concurrency(void)
+                { return this->concurrency_; }
+
+        /*
+            Give back a pointer to our thread pool.  Our Client_Handler objects
+                will need this so that their handle_input() methods can put themselves
+                into the pool.  Another alternative would be a globally accessible
+                thread pool.  ACE_Singleton<> is a way to achieve that.
+         */
+        Thread_Pool * thread_pool(void)
+                { return & this->the_thread_pool_; }
+
+        /*
+           Since we can be constructed with a Thread_Pool reference, there are times
+           when we need to know if the thread pool we're using is ours or if we're
+           just borrowing it from somebody else.
+         */
+        int thread_pool_is_private(void)
+                { return &the_thread_pool_ == &private_thread_pool_; }
 
 protected:
-	int concurrency_;
+        int concurrency_;
 
-	Thread_Pool   private_thread_pool_;
+        Thread_Pool   private_thread_pool_;
 
-	Thread_Pool & the_thread_pool_;
+        Thread_Pool & the_thread_pool_;
 };
 
 #endif // CLIENT_ACCEPTOR_H
diff --git a/docs/tutorials/007/client_handler.h b/docs/tutorials/007/client_handler.h
index 340cde65a4d..57fd5e033d2 100644
--- a/docs/tutorials/007/client_handler.h
+++ b/docs/tutorials/007/client_handler.h
@@ -8,7 +8,7 @@
    Our client handler must exist somewhere in the ACE_Event_Handler object
    hierarchy.  This is a requirement of the ACE_Reactor because it maintains
    ACE_Event_Handler pointers for each registered event handler.  You could
-   derive our Client_Handler directly from ACE_Event_Handler but you still have 
+   derive our Client_Handler directly from ACE_Event_Handler but you still have
    to have an ACE_SOCK_Stream for the actually connection.  With a direct
    derivative of ACE_Event_Handler, you'll have to contain and maintain an
    ACE_SOCK_Stream instance yourself.  With ACE_Svc_Handler (which is a
@@ -16,16 +16,21 @@
  */
 
 #include "ace/Svc_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 
 class Client_Acceptor;
 class Thread_Pool;
 
 /*
-   Another feature of ACE_Svc_Handler is it's ability to present the ACE_Task<> 
+   Another feature of ACE_Svc_Handler is it's ability to present the ACE_Task<>
    interface as well.  That's what the ACE_NULL_SYNCH parameter below is all
    about.  That's beyond our scope here but we'll come back to it in the next
-   tutorial when we start looking at concurrency options.   
+   tutorial when we start looking at concurrency options.
  */
 class Client_Handler : public ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH >
 {
@@ -41,27 +46,27 @@ public:
      intuitive (at least to me).  Instead, we provide a new method of
      destruction and we make our destructor protected so that only ourselves,
      our derivatives and our friends can delete us. It's a nice
-     compromise.   
+     compromise.
    */
   void destroy (void);
 
   /*
      Most ACE objects have an open() method.  That's how you make them ready
-     to do work.  ACE_Event_Handler has a virtual open() method which allows us 
+     to do work.  ACE_Event_Handler has a virtual open() method which allows us
      to create this overrride.  ACE_Acceptor<> will invoke this method after
      creating a new Client_Handler when a client connects. Notice that the
      parameter to open() is a void*.  It just so happens that the pointer
-     points to the acceptor which created us.  You would like for the parameter 
+     points to the acceptor which created us.  You would like for the parameter
      to be an ACE_Acceptor<>* but since ACE_Event_Handler is generic, that
      would tie it too closely to the ACE_Acceptor<> set of objects.  In our
-     definition of open() you'll see how we get around that.   
+     definition of open() you'll see how we get around that.
    */
   int open (void *_acceptor);
 
   /*
      When an ACE_Task<> object falls out of the svc() method, the framework
-	 will call the close() method.  That's where we want to cleanup ourselves
-	 if we're running in either thread-per-connection or thread-pool mode.
+         will call the close() method.  That's where we want to cleanup ourselves
+         if we're running in either thread-per-connection or thread-pool mode.
    */
   int close(u_long flags = 0);
 
@@ -72,8 +77,8 @@ public:
      clean itself up. Since an event handler can be registered for more than
      one type of callback, the callback mask is provided to inform
      handle_close() exactly which method failed.  That way, you don't have to
-     maintain state information between your handle_* method calls. The _handle 
-     parameter is explained below...   
+     maintain state information between your handle_* method calls. The _handle
+     parameter is explained below...
    */
   int handle_close (ACE_HANDLE _handle, ACE_Reactor_Mask _mask);
 
@@ -86,7 +91,7 @@ public:
      maintains it's own peer (ACE_SOCK_Stream) object, this is redundant for
      us.  However, if we had been derived directly from ACE_Event_Handler, we
      may have chosen not to contain the peer.  In that case, the _handleg
-     would be important to us for reading the client's data.   
+     would be important to us for reading the client's data.
    */
   int handle_input (ACE_HANDLE _handle);
 
@@ -105,39 +110,39 @@ protected:
      function which I will call from handle_input().  That allows me to
      introduce concurrencly in later tutorials with a no changes to the worker
      function.  You can think of process() as application-level code and
-     everything elase as application-framework code.   
+     everything elase as application-framework code.
    */
   int process (char *_rdbuf, int _rdbuf_len);
 
   /*
      We don't really do anything in our destructor but we've declared it to be
      protected to prevent casual deletion of this object.  As I said above, I
-     really would prefer that everyone goes through the destroy() method to get 
-     rid of us.   
+     really would prefer that everyone goes through the destroy() method to get
+     rid of us.
    */
    ~Client_Handler (void);
 
    /*
       When we get to the definition of Client_Handler we'll see that there are
-	  several places where we go back to the Client_Acceptor for information.
-	  It is generally a good idea to do that through an accesor rather than
-	  using the member variable directly.
+          several places where we go back to the Client_Acceptor for information.
+          It is generally a good idea to do that through an accesor rather than
+          using the member variable directly.
     */
    Client_Acceptor * client_acceptor( void )
-   		{ return this->client_acceptor_; }
+                { return this->client_acceptor_; }
 
    /*
       And since you shouldn't access a member variable directly, neither should you
-	  set (mutate) it.  Although it might seem silly to do it this way, you'll thank
-	  yourself for it later.
+          set (mutate) it.  Although it might seem silly to do it this way, you'll thank
+          yourself for it later.
     */
    void client_acceptor( Client_Acceptor * _client_acceptor )
-   		{ this->client_acceptor_ = _client_acceptor; }
+                { this->client_acceptor_ = _client_acceptor; }
 
    /*
       The concurrency() accessor tells us the current concurrency strategy.  It actually
-	  queries the Client_Acceptor for it but by having the accessor in place, we could
-	  change our implementation without affecting everything that needs to know.
+          queries the Client_Acceptor for it but by having the accessor in place, we could
+          change our implementation without affecting everything that needs to know.
     */
    int concurrency(void);
 
@@ -151,12 +156,12 @@ protected:
 
    /*
       For some reason I didn't create accessor/mutator methods for this.  So much for
-	  consistency....
+          consistency....
 
-	  This variable is used to remember the thread in which we were created:  the "creator"
-	  thread in other words.  handle_input() needs to know if it is operating in the
-	  main reactor thread (which is the one that created us) or if it is operating in
-	  one of the thread pool threads.  More on this when we get to handle_input().
+          This variable is used to remember the thread in which we were created:  the "creator"
+          thread in other words.  handle_input() needs to know if it is operating in the
+          main reactor thread (which is the one that created us) or if it is operating in
+          one of the thread pool threads.  More on this when we get to handle_input().
     */
    ACE_thread_t      creator_;
 };
diff --git a/docs/tutorials/007/thread_pool.h b/docs/tutorials/007/thread_pool.h
index ebf2e162ce4..0897b1d47af 100644
--- a/docs/tutorials/007/thread_pool.h
+++ b/docs/tutorials/007/thread_pool.h
@@ -10,6 +10,10 @@
  */
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
    We need a forward reference for ACE_Event_Handler so that our enqueue() method
    can accept a pointer to one.
@@ -29,38 +33,38 @@ public:
 
   typedef ACE_Task<ACE_MT_SYNCH> inherited;
 
-	/*
-	   Provide an enumeration for the default pool size.  By doing this, other objects
-	   can use the value when they want a default.
-	 */
-	enum size_t
-	{
-	  default_pool_size_ = 5
-	};
+        /*
+           Provide an enumeration for the default pool size.  By doing this, other objects
+           can use the value when they want a default.
+         */
+        enum size_t
+        {
+          default_pool_size_ = 5
+        };
 
-	// Basic constructor
-	Thread_Pool(void);
+        // Basic constructor
+        Thread_Pool(void);
 
-	/*
-	   Opening the thread pool causes one or more threads to be activated.  When activated,
-	   they all execute the svc() method declared below.
-	 */
-	int open( int _pool_size = default_pool_size_ );
+        /*
+           Opening the thread pool causes one or more threads to be activated.  When activated,
+           they all execute the svc() method declared below.
+         */
+        int open( int _pool_size = default_pool_size_ );
 
     /*
        Some compilers will complain that our open() above attempts to
        override a virtual function in the baseclass.  We have no
        intention of overriding that method but in order to keep the
-       compiler quiet we have to add this method as a pass-thru to the 
+       compiler quiet we have to add this method as a pass-thru to the
        baseclass method.
     */
-	virtual int open(void * _void_data)
-		{ return inherited::open(_void_data); }
+        virtual int open(void * _void_data)
+                { return inherited::open(_void_data); }
 
-	/*
-	   When you're done wit the thread pool, you have to have some way to shut it down.
-	   This is what close() is for.
-	 */
+        /*
+           When you're done wit the thread pool, you have to have some way to shut it down.
+           This is what close() is for.
+         */
     int close( void );
 
     /*
@@ -70,38 +74,38 @@ public:
     virtual int close( u_long flags )
         { return inherited::close(flags); }
 
-	/*
-	   To use the thread pool, you have to put some unit of work into it.  Since we're
-	   dealing with event handlers (or at least their derivatives), I've chosen to provide
-	   an enqueue() method that takes a pointer to an ACE_Event_Handler.  The handler's
-	   handle_input() method will be called, so your object has to know when it is being
-	   called by the thread pool.
-	 */
-	int enqueue( ACE_Event_Handler * _handler );
-
-	/*
-	   Another handy ACE template is ACE_Atomic_Op<>.  When parameterized, this allows
-	   is to have a thread-safe counting object.  The typical arithmetic operators are
-	   all internally thread-safe so that you can share it across threads without worrying
-	   about any contention issues.
-	 */
-	typedef ACE_Atomic_Op<ACE_Mutex,int> counter_t;
+        /*
+           To use the thread pool, you have to put some unit of work into it.  Since we're
+           dealing with event handlers (or at least their derivatives), I've chosen to provide
+           an enqueue() method that takes a pointer to an ACE_Event_Handler.  The handler's
+           handle_input() method will be called, so your object has to know when it is being
+           called by the thread pool.
+         */
+        int enqueue( ACE_Event_Handler * _handler );
+
+        /*
+           Another handy ACE template is ACE_Atomic_Op<>.  When parameterized, this allows
+           is to have a thread-safe counting object.  The typical arithmetic operators are
+           all internally thread-safe so that you can share it across threads without worrying
+           about any contention issues.
+         */
+        typedef ACE_Atomic_Op<ACE_Mutex,int> counter_t;
 
 protected:
 
-	/*
-	   Our svc() method will dequeue the enqueued event handler objects and invoke the
-	   handle_input() method on each.  Since we're likely running in more than one thread,
-	   idle threads can take work from the queue while other threads are busy executing
-	   handle_input() on some object.
-	 */
-	int svc(void);
-
-	/*
-	   We use the atomic op to keep a count of the number of threads in which our svc()
-	   method is running.  This is particularly important when we want to close() it down!
-	 */
-	counter_t active_threads_;
+        /*
+           Our svc() method will dequeue the enqueued event handler objects and invoke the
+           handle_input() method on each.  Since we're likely running in more than one thread,
+           idle threads can take work from the queue while other threads are busy executing
+           handle_input() on some object.
+         */
+        int svc(void);
+
+        /*
+           We use the atomic op to keep a count of the number of threads in which our svc()
+           method is running.  This is particularly important when we want to close() it down!
+         */
+        counter_t active_threads_;
 };
 
 #endif // THREAD_POOL_H
diff --git a/docs/tutorials/010/block.h b/docs/tutorials/010/block.h
index 662c3c1e536..583886872cb 100644
--- a/docs/tutorials/010/block.h
+++ b/docs/tutorials/010/block.h
@@ -6,8 +6,12 @@
 
 #include "ace/Message_Block.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
-   This simple ACE_Message_Block derivative will inform us of it's construction 
+   This simple ACE_Message_Block derivative will inform us of it's construction
    and destruction.  We'll use this to assure ourselves that we don't have any
    memory leaks.  In a real application, of course, this isn't necessary.
  */
diff --git a/docs/tutorials/010/task.h b/docs/tutorials/010/task.h
index 9f242c124dd..2aecb429c03 100644
--- a/docs/tutorials/010/task.h
+++ b/docs/tutorials/010/task.h
@@ -6,6 +6,10 @@
 
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
   Like the thread-pool server tutorial, we'll derive from ACE_Task<>.
   Our goal here is to show off the ACE_Message_Queue and the best way
@@ -17,7 +21,7 @@ class Task : public ACE_Task < ACE_MT_SYNCH >
 public:
 
   typedef ACE_Task < ACE_MT_SYNCH > inherited;
-    
+
     /*
       The constructor/destructor are simple but take care of some
       necessary housekeeping.
diff --git a/docs/tutorials/011/block.h b/docs/tutorials/011/block.h
index bfd49d723f7..1ffc5cb4e9d 100644
--- a/docs/tutorials/011/block.h
+++ b/docs/tutorials/011/block.h
@@ -6,6 +6,10 @@
 
 #include "ace/Message_Block.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class Block : public ACE_Message_Block
 {
 public:
diff --git a/docs/tutorials/011/task.h b/docs/tutorials/011/task.h
index 436326c68a0..8646fac1a7c 100644
--- a/docs/tutorials/011/task.h
+++ b/docs/tutorials/011/task.h
@@ -6,6 +6,10 @@
 
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class Task : public ACE_Task < ACE_MT_SYNCH >
 {
 public:
diff --git a/docs/tutorials/012/data.h b/docs/tutorials/012/data.h
index 3c656608425..54e8e55e87c 100644
--- a/docs/tutorials/012/data.h
+++ b/docs/tutorials/012/data.h
@@ -6,6 +6,10 @@
 
 #include "ace/Message_Block.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
   We'll start by defining a basic unit of work that can be put into
   the message queue.  The threads in the pool will expect to find one
@@ -71,8 +75,8 @@ protected:
 
 /*
   We derive a Message_Block from ACE_Message_Block and teach it about
-  our Unit_Of_Work object.  When our task's svc() method pulls a block 
-  out of the queue, it can then invoke the virtual methods of the work 
+  our Unit_Of_Work object.  When our task's svc() method pulls a block
+  out of the queue, it can then invoke the virtual methods of the work
   object safely.  In this implementation we've also retained the
   original ACE_Message_Block functionallity so that we can use the
   underlying ACE_Data_Block objects to store data other than our
@@ -96,7 +100,7 @@ public:
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) Message_Block ctor 0x%x for 0x%x\n", (void *) this, data_));
         }
 
-	~Message_Block(void)
+        ~Message_Block(void)
         {
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) Message_Block dtor 0x%x for 0x%x\n", (void *) this, data_));
             delete data_;
diff --git a/docs/tutorials/012/task.h b/docs/tutorials/012/task.h
index 52dcf022b3e..877ac98ede5 100644
--- a/docs/tutorials/012/task.h
+++ b/docs/tutorials/012/task.h
@@ -6,6 +6,10 @@
 
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /*
   This is our basic thread-pool Task.  We have a choice of pool size
   on the open() and the usual svc() and close() methods.
diff --git a/docs/tutorials/013/block.h b/docs/tutorials/013/block.h
index 40a31bd1b07..26604a57e4c 100644
--- a/docs/tutorials/013/block.h
+++ b/docs/tutorials/013/block.h
@@ -5,6 +5,11 @@
 #define BLOCK_H
 
 #include "ace/Message_Block.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "mld.h"
 #include "work.h"
@@ -16,7 +21,7 @@
    out of scope unexpectedly.  An ACE_Message_Block will be deleted as soon as
    it's release() method is called but the ACE_Data_Blocks it uses are
    reference counted and only delete when the last reference release()es the
-   block.  We use that trait to simply our object memory management. 
+   block.  We use that trait to simply our object memory management.
  */
 class Data_Block : public ACE_Data_Block
 {
@@ -49,9 +54,9 @@ public:
      ~Lock (void);
 
     // When the Data_Block is destroyed, the Message_Block is
-    // holding a lock with this object.  If we were to destroy 
+    // holding a lock with this object.  If we were to destroy
     // the Lock with the Data_Block, we would have a
-    // segfault.  Instead, the Data_Block invokes destroy() to 
+    // segfault.  Instead, the Data_Block invokes destroy() to
     // mark the object as un-needed so that when the
     // Message_Block invokes release() to drop the lock, the
     // Lock can delete itself.
@@ -65,7 +70,7 @@ protected:
 
 /*
    This simple derivative of ACE_Message_Block will construct our Data_Block
-   object to contain a unit of work. 
+   object to contain a unit of work.
  */
 class Message_Block : public ACE_Message_Block
 {
diff --git a/docs/tutorials/013/mld.h b/docs/tutorials/013/mld.h
index a9ee1de02b4..7dbd982e863 100644
--- a/docs/tutorials/013/mld.h
+++ b/docs/tutorials/013/mld.h
@@ -5,13 +5,18 @@
 #define MLD_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Singleton.h"
 
 /*
    This is a cheap memory leak detector.  Each class I want to watch over
    contains an mld object.  The mld object's ctor increments a global counter
    while the dtor decrements it.  If the counter is non-zero when the program
-   is ready to exit then there may be a leak. 
+   is ready to exit then there may be a leak.
  */
 
 class mld
@@ -30,12 +35,12 @@ protected:
 
 /*
    Just drop 'MLD' anywhere in your class definition to get cheap memory leak
-   detection for your class. 
+   detection for your class.
  */
 #define MLD            mld mld_
 
 /*
-   Use 'MLD_COUNTER' in main() to see if things are OK. 
+   Use 'MLD_COUNTER' in main() to see if things are OK.
  */
 #define MLD_COUNTER    mld::value()
 
diff --git a/docs/tutorials/013/task.h b/docs/tutorials/013/task.h
index 0c813641169..8c11a8872c6 100644
--- a/docs/tutorials/013/task.h
+++ b/docs/tutorials/013/task.h
@@ -5,15 +5,20 @@
 #define TASK_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "mld.h"
 
 /*
-   This is much like the Task we've used in the past for implementing a  thread 
-   pool.  This time, however, I've made the Task an element in a  singly-linked 
+   This is much like the Task we've used in the past for implementing a  thread
+   pool.  This time, however, I've made the Task an element in a  singly-linked
    list.  As the svc() method finishes the process() on a  unit of work, it
    will enqueue that unit of work to the next_ Task if  there is one.  If the
    Task does not have a next_ Task, it will invoke the unit of work object's
-   fini() method after invoking process(). 
+   fini() method after invoking process().
  */
 class Task : public ACE_Task < ACE_MT_SYNCH >
 {
diff --git a/docs/tutorials/013/work.h b/docs/tutorials/013/work.h
index 26e10b96266..0cf60afd1ed 100644
--- a/docs/tutorials/013/work.h
+++ b/docs/tutorials/013/work.h
@@ -5,12 +5,17 @@
 #define WORK_H
 
 #include "ace/Log_Msg.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 #include "mld.h"
 
 /*
    Our specilized message queue and thread pool will know how to do "work" on
-   our Unit_Of_Work baseclass. 
+   our Unit_Of_Work baseclass.
  */
 class Unit_Of_Work
 {
@@ -42,7 +47,7 @@ protected:
 
 /*
    A fairly trivial work derivative that implements an equally trivial state
-   machine in process() 
+   machine in process()
  */
 class Work : public Unit_Of_Work
 {
diff --git a/docs/tutorials/014/EndTask.h b/docs/tutorials/014/EndTask.h
index e4ab823f1f9..1666c5e8869 100644
--- a/docs/tutorials/014/EndTask.h
+++ b/docs/tutorials/014/EndTask.h
@@ -22,9 +22,9 @@
 // your first module, and a Stream_Tail behind your
 // last module.
 //
-// If your put() a message to the Stream Tail, it 
+// If your put() a message to the Stream Tail, it
 // assumes you did so in error. This simple EndTask
-// class allows you to push a message to it and just 
+// class allows you to push a message to it and just
 // have it safely Go Away.
 //
 // All this Task does is release the Message_Block
@@ -39,33 +39,33 @@ public:
   typedef Task inherited;
 
   EndTask(const char *nameOfTask) :
-    inherited(nameOfTask, 0) { 
+    inherited(nameOfTask, 0) {
 
     // when we get open()'d, it with 0 threads
     // since there is actually no processing to do.
 
-	cerr << __LINE__ << " " << __FILE__ << endl;
+        cerr << __LINE__ << " " << __FILE__ << endl;
   };
 
   virtual int open(void *)
   {
-	cerr << __LINE__ << " " << __FILE__ << endl;
-	return 0;
+        cerr << __LINE__ << " " << __FILE__ << endl;
+        return 0;
   }
 
   virtual int open(void)
   {
-	cerr << __LINE__ << " " << __FILE__ << endl;
-	return 0;
+        cerr << __LINE__ << " " << __FILE__ << endl;
+        return 0;
   }
 
   virtual ~EndTask(void) {
   };
 
   virtual int put(ACE_Message_Block *message,
-		  ACE_Time_Value *timeout) {
+                  ACE_Time_Value *timeout) {
 
-	cerr << __LINE__ << " " << __FILE__ << endl;
+        cerr << __LINE__ << " " << __FILE__ << endl;
     ACE_UNUSED_ARG(timeout);
 
     // we don't have anything to do, so
diff --git a/docs/tutorials/014/Task.h b/docs/tutorials/014/Task.h
index e4797f49892..adb533c01ef 100644
--- a/docs/tutorials/014/Task.h
+++ b/docs/tutorials/014/Task.h
@@ -42,8 +42,8 @@ public:
   // This closes down the Task and all service threads.
 
   virtual int put(ACE_Message_Block *message,
-		  ACE_Time_Value *timeout);
-  // This is the interface that ACE_Stream uses to 
+                  ACE_Time_Value *timeout);
+  // This is the interface that ACE_Stream uses to
   // communicate with our Task.
 
   virtual int svc(void);
diff --git a/docs/tutorials/015/Client.h b/docs/tutorials/015/Client.h
index 63d22b03f73..c9f4e496bf2 100644
--- a/docs/tutorials/015/Client.h
+++ b/docs/tutorials/015/Client.h
@@ -5,6 +5,11 @@
 #define CLIENT_H
 
 #include "ace/SOCK_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Protocol_Stream.h"
 
 class ACE_Message_Block;
@@ -41,11 +46,11 @@ public:
     int get( ACE_Message_Block * & _response );
 
 private:
-        // Protocol_Stream hides the protocol conformance details from 
+        // Protocol_Stream hides the protocol conformance details from
         // us.
     Protocol_Stream stream_;
 
-        // We create a connection on the peer_ and then pass ownership 
+        // We create a connection on the peer_ and then pass ownership
         // of it to the protocol stream.
     ACE_SOCK_Stream peer_;
 
@@ -54,7 +59,7 @@ private:
     const char * server_;
 
         // Accessors for the complex member variables.
-    
+
     Protocol_Stream & stream(void)
         {
             return this->stream_;
diff --git a/docs/tutorials/015/Compressor.h b/docs/tutorials/015/Compressor.h
index bc0257b16d1..4aaa83144ed 100644
--- a/docs/tutorials/015/Compressor.h
+++ b/docs/tutorials/015/Compressor.h
@@ -12,18 +12,18 @@
 class Compressor : public Protocol_Task
 {
 public:
-    
+
     typedef Protocol_Task inherited;
 
         // I've given you the option of creating this task derivative
-        // with a number of threads.  In retro-spect that really isn't 
+        // with a number of threads.  In retro-spect that really isn't
         // a good idea.  Most client/server systems rely on requests
-        // and responses happening in a predicatable order.  Introduce 
+        // and responses happening in a predicatable order.  Introduce
         // a thread pool and message queue and that ordering goes
         // right out the window.  In other words:  Don't ever use the
         // constructor parameter!
     Compressor( int _thr_count = 0 );
-    
+
     ~Compressor(void);
 
 protected:
diff --git a/docs/tutorials/015/Crypt.h b/docs/tutorials/015/Crypt.h
index 7a38e1bdb52..c7fb1d5948f 100644
--- a/docs/tutorials/015/Crypt.h
+++ b/docs/tutorials/015/Crypt.h
@@ -18,7 +18,7 @@ public:
         // Again we have the option of multiple threads and again I
         // regret tempting folks to use it.
     Crypt( int _thr_count = 0 );
-    
+
     ~Crypt(void);
 
 protected:
diff --git a/docs/tutorials/015/Handler.h b/docs/tutorials/015/Handler.h
index 7e3123f7cf2..73aa2573b0c 100644
--- a/docs/tutorials/015/Handler.h
+++ b/docs/tutorials/015/Handler.h
@@ -5,6 +5,11 @@
 #define HANDLER_H
 
 #include "ace/Svc_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "Protocol_Stream.h"
 
@@ -33,7 +38,7 @@ public:
         // differences between destroy() and close() so don't try to
         // use either for all cases.
     int close (u_long);
-    
+
 protected:
 
         // Respond to peer() activity.
diff --git a/docs/tutorials/015/Protocol_Stream.h b/docs/tutorials/015/Protocol_Stream.h
index 384e7240e4f..686d39126e0 100644
--- a/docs/tutorials/015/Protocol_Stream.h
+++ b/docs/tutorials/015/Protocol_Stream.h
@@ -5,6 +5,11 @@
 #define PROTOCOL_STREAM_H
 
 #include "ace/SOCK_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Stream.h"
 
 // Shorthand for the stream.
@@ -46,18 +51,18 @@ public:
              _timeout = 0 );
 
         // Tell the Recv task to read some data and send it upstream.
-        // The data will pass through the protocol tasks and be queued 
+        // The data will pass through the protocol tasks and be queued
         // into the stream head reader task's message queue.  If
         // you've installed a _reader in open() then that task's
         // recv() method will see the message and may consume it
         // instead of passing it to the stream head for queueing.
     int get(void);
-    
+
     ACE_SOCK_Stream & peer(void)
         {
             return this->peer_;
         }
-    
+
 private:
         // Our peer connection
     ACE_SOCK_Stream peer_;
diff --git a/docs/tutorials/015/Protocol_Task.h b/docs/tutorials/015/Protocol_Task.h
index eeec1d71588..194809327ec 100644
--- a/docs/tutorials/015/Protocol_Task.h
+++ b/docs/tutorials/015/Protocol_Task.h
@@ -6,6 +6,10 @@
 
 #include "ace/Task.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /* A typical ACE_Task<> derivative that adds a few things appropriate
    to protocol stacks.
 */
@@ -20,13 +24,13 @@ public:
         // zero and let things proceed serially.  You might have a
         // need, however, for some of your tasks to have their own thread.
     Protocol_Task( int _thr_count );
-    
+
     ~Protocol_Task(void);
 
         // open() is invoked when the task is inserted into the stream.
     virtual int open(void *arg);
 
-        // close() is invoked when the stream is closed (flags will be 
+        // close() is invoked when the stream is closed (flags will be
         // set to '1') and when the svc() method exits (flags will be
         // '0').
     virtual int close(u_long flags);
@@ -36,13 +40,13 @@ public:
     virtual int put(ACE_Message_Block *message,
                     ACE_Time_Value *timeout);
 
-        // If you choose to activate the task then this method will be 
+        // If you choose to activate the task then this method will be
         // doing all of the work.
     virtual int svc(void);
 
 protected:
 
-        // Called by put() or svc() as necessary to process a block of 
+        // Called by put() or svc() as necessary to process a block of
         // data.
     int process(ACE_Message_Block * message, ACE_Time_Value *timeout);
 
@@ -57,7 +61,7 @@ protected:
         // the peer.
     virtual int send(ACE_Message_Block *message,
                      ACE_Time_Value *timeout);
-    
+
         // Tasks on the reader (upstream) side will be receiving data
         // that came from the peer.
     virtual int recv(ACE_Message_Block * message,
diff --git a/docs/tutorials/015/Recv.h b/docs/tutorials/015/Recv.h
index 4514f816aa9..a7058435bf5 100644
--- a/docs/tutorials/015/Recv.h
+++ b/docs/tutorials/015/Recv.h
@@ -19,7 +19,7 @@ public:
 
      // Give it someone to talk to...
     Recv( ACE_SOCK_Stream & _peer );
-    
+
     ~Recv(void);
 
      // Trigger a read from the socket
@@ -32,7 +32,7 @@ public:
         {
             return this->error_;
         }
-    
+
 protected:
 
     ACE_SOCK_Stream & peer(void)
diff --git a/docs/tutorials/015/Server.h b/docs/tutorials/015/Server.h
index 0e6b9f9c9cf..6b1eecf05e5 100644
--- a/docs/tutorials/015/Server.h
+++ b/docs/tutorials/015/Server.h
@@ -5,6 +5,11 @@
 #define SERVER_H
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Acceptor.h"
 #include "Handler.h"
 
@@ -36,7 +41,7 @@ public:
     int run(void);
 
 private:
-        // This will accept client connection requests and instantiate 
+        // This will accept client connection requests and instantiate
         // a Handler object for each new connection.
     Acceptor acceptor_;
 
diff --git a/docs/tutorials/015/Xmit.h b/docs/tutorials/015/Xmit.h
index 7d8df91e0ef..097f3afdaba 100644
--- a/docs/tutorials/015/Xmit.h
+++ b/docs/tutorials/015/Xmit.h
@@ -21,14 +21,14 @@ public:
      // We must be given a valid peer when constructed.  Without that
      // we don't know who to send data to.
     Xmit( ACE_SOCK_Stream & _peer );
-    
+
     ~Xmit(void);
 
-     // As you know, close() will be called in a couple of ways by the 
+     // As you know, close() will be called in a couple of ways by the
      // ACE framework.  We use that opportunity to terminate the
      // connection to the peer.
     int close(u_long flags);
-    
+
 protected:
 
     ACE_SOCK_Stream & peer(void)
diff --git a/examples/ASX/Event_Server/Event_Server/Consumer_Router.h b/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
index 56e58c58c37..82682dfa2c0 100644
--- a/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
+++ b/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (_CONSUMER_ROUTER_H)
+#ifndef _CONSUMER_ROUTER_H
 #define _CONSUMER_ROUTER_H
 
 #include "ace/SOCK_Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/UPIPE_Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "Peer_Router.h"
@@ -13,7 +18,7 @@ class Consumer_Router : public Peer_Router
 {
   // = TITLE
   //     Provides the interface between one or more Consumers and the
-  //     Event Server <ACE_Stream>.  
+  //     Event Server <ACE_Stream>.
   //
   // = DESCRIPTION
   //     This class normally sits on "top" of the Stream and routes
diff --git a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
index a5c18496789..22dc0613a5c 100644
--- a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
+++ b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (_EVENT_ANALYZER_H)
-#define _EVENT_ANALYZER_H     
+#ifndef _EVENT_ANALYZER_H
+#define _EVENT_ANALYZER_H
 
 #include "ace/Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Module.h"
 #include "ace/Task.h"
 #include "ace/Synch.h"
diff --git a/examples/ASX/Event_Server/Event_Server/Options.h b/examples/ASX/Event_Server/Event_Server/Options.h
index 9e9bb0e7a14..fbde9aa1c34 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/examples/ASX/Event_Server/Event_Server/Options.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (OPTIONS_H)
+#ifndef OPTIONS_H
 #define OPTIONS_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 
 class Options
@@ -72,46 +77,46 @@ private:
   Options (void);
   ~Options (void);
 
-  ACE_Profile_Timer itimer_;	        
+  ACE_Profile_Timer itimer_;
   // Time the process.
 
-  size_t thr_count_;		
+  size_t thr_count_;
   // Number of threads to spawn.
 
-  long t_flags_;		
+  long t_flags_;
   // Flags to <thr_create>.
 
-  size_t high_water_mark_;	
+  size_t high_water_mark_;
   // ACE_Task high water mark.
 
-  size_t low_water_mark_;        
+  size_t low_water_mark_;
   // ACE_Task low water mark.
 
-  size_t message_size_;		
+  size_t message_size_;
   // Size of a message.
 
-  size_t initial_queue_length_;	
+  size_t initial_queue_length_;
   // Initial number of items in the queue.
 
-  size_t iterations_;		
+  size_t iterations_;
   // Number of iterations to run the test program.
 
-  int debugging_;		
+  int debugging_;
   // Extra debugging info.
 
-  int verbosity_;		
+  int verbosity_;
   // Extra verbose messages.
 
-  u_short consumer_port_;	
+  u_short consumer_port_;
   // Port that the Consumer_Router is using.
 
-  u_short supplier_port_;	
+  u_short supplier_port_;
   // Port that the Supplier_Router is using.
 
   static Options *instance_;
   // Static Singleton.
 
-  friend class ACE_Shutup_GPlusPlus; 
+  friend class ACE_Shutup_GPlusPlus;
   // Turn off g++ warning...
 };
 
diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/examples/ASX/Event_Server/Event_Server/Peer_Router.h
index 3369fe6415f..35ce90ee52d 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.h
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (_PEER_ROUTER_H)
+#ifndef _PEER_ROUTER_H
 #define _PEER_ROUTER_H
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Map_Manager.h"
 
@@ -31,7 +36,7 @@ public:
   virtual int handle_input (ACE_HANDLE);
   // Receive input from a peer.
 
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);  
+  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
   // Send output to a peer.  Note that this implementation "blocks" if
   // flow control occurs.  This is undesirable for "real"
   // applications.  The best way around this is to make the
@@ -39,7 +44,7 @@ public:
   // $ACE_ROOT/apps/Gateway/Gateway application.
 
 protected:
-  Peer_Router_Context *peer_router_context_;  
+  Peer_Router_Context *peer_router_context_;
   // Pointer to router context.  This maintains the state that is
   // shared by both Tasks in a <Peer_Router> Module.
 };
@@ -48,7 +53,7 @@ class Peer_Router_Context : public ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>
 {
   // = TITLE
   //     Defines state and behavior shared between both Tasks in a
-  //     <Peer_Router> Module.  
+  //     <Peer_Router> Module.
   //
   // = DESCRIPTION
   //     This class also serves as an <ACE_Acceptor>, which creates
@@ -92,11 +97,11 @@ private:
   // Pointer to the <Peer_Router> that we are accepting for.
 
   // = Useful typedefs.
-  typedef ACE_Map_Manager <ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX> 
+  typedef ACE_Map_Manager <ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
           PEER_MAP;
-  typedef ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX> 
+  typedef ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
           PEER_ITERATOR;
-  typedef ACE_Map_Entry<ROUTING_KEY, Peer_Handler *> 
+  typedef ACE_Map_Entry<ROUTING_KEY, Peer_Handler *>
           PEER_ENTRY;
 
   PEER_MAP peer_map_;
@@ -129,7 +134,7 @@ protected:
   Peer_Router (Peer_Router_Context *prc);
   // Initialization method.
 
-  virtual int control (ACE_Message_Block *); 
+  virtual int control (ACE_Message_Block *);
   // Handle control messages arriving from adjacent Modules.
 
   Peer_Router_Context *context (void) const;
diff --git a/examples/ASX/Event_Server/Event_Server/Supplier_Router.h b/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
index b83035cc957..b960ff35da2 100644
--- a/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
+++ b/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (_SUPPLIER_ROUTER_H)
+#ifndef _SUPPLIER_ROUTER_H
 #define _SUPPLIER_ROUTER_H
 
 #include "ace/INET_Addr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Map_Manager.h"
 #include "ace/Svc_Handler.h"
@@ -14,8 +19,8 @@ class Supplier_Router : public Peer_Router
 {
   // = TITLE
   //     Provides the interface between one or more Suppliers and the
-  //     Event Server ACE_Stream.  
-  //     
+  //     Event Server ACE_Stream.
+  //
   // = DESCRIPTION
   //     This class normally sits on "bottom" of the Stream and sends
   //     all messages coming from Suppliers via its "write" <Task>
diff --git a/examples/ASX/UPIPE_Event_Server/Consumer_Router.h b/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
index 4568ddf8311..bfd86f94f05 100644
--- a/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
+++ b/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
@@ -4,10 +4,15 @@
 // The interface between one or more consumers and an Event Server
 // ACE_Stream.
 
-#if !defined (_CONSUMER_ROUTER_H)
+#ifndef _CONSUMER_ROUTER_H
 #define _CONSUMER_ROUTER_H
 
 #include "ace/Thread_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/UPIPE_Acceptor.h"
 #include "ace/UPIPE_Addr.h"
 #include "ace/Svc_Handler.h"
@@ -21,7 +26,7 @@ typedef ACE_HANDLE CONSUMER_KEY;
 
 typedef Peer_Router<Consumer_Handler, CONSUMER_KEY> CONSUMER_ROUTER;
 
-class Consumer_Handler 
+class Consumer_Handler
   : public Peer_Handler<CONSUMER_ROUTER, CONSUMER_KEY>
 {
 public:
diff --git a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
index a815e7d642a..00cdb33cc7c 100644
--- a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
+++ b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
@@ -3,10 +3,15 @@
 
 // Signal router.
 
-#if !defined (_EVENT_ANALYZER_H)
-#define _EVENT_ANALYZER_H     
+#ifndef _EVENT_ANALYZER_H
+#define _EVENT_ANALYZER_H
 
 #include "ace/Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Module.h"
 #include "ace/Task.h"
 #include "ace/Synch.h"
diff --git a/examples/ASX/UPIPE_Event_Server/Options.h b/examples/ASX/UPIPE_Event_Server/Options.h
index fff2593e435..e82729d965a 100644
--- a/examples/ASX/UPIPE_Event_Server/Options.h
+++ b/examples/ASX/UPIPE_Event_Server/Options.h
@@ -3,10 +3,15 @@
 
 // Option manager for Event Server.
 
-#if !defined (DEVICE_OPTIONS_H)
+#ifndef DEVICE_OPTIONS_H
 #define DEVICE_OPTIONS_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 
 #if defined (ACE_HAS_THREADS)
@@ -24,7 +29,7 @@ public:
   void   thr_count (size_t count);
   size_t thr_count (void);
 
-  void	 initial_queue_length (size_t length);
+  void   initial_queue_length (size_t length);
   size_t initial_queue_length (void);
 
   void   high_water_mark (size_t size);
@@ -33,7 +38,7 @@ public:
   void   low_water_mark (size_t size);
   size_t low_water_mark (void);
 
-  void	 message_size (size_t size);
+  void   message_size (size_t size);
   size_t message_size (void);
 
   void   iterations (size_t n);
@@ -46,13 +51,13 @@ public:
   char   *supplier_port (void);
 
   void   consumer_port (char *port);
-  char	 *consumer_port (void);
+  char   *consumer_port (void);
 
   void   supplier_file (char *file);
   char   *supplier_file (void);
 
   void   consumer_file (char *file);
-  char	 *consumer_file (void);
+  char   *consumer_file (void);
 
   int    debug (void);
   int    verbose (void);
@@ -60,20 +65,20 @@ public:
   void   print_results (void);
 
 private:
-  ACE_Profile_Timer itimer_;	        // Time the process.
-  size_t	thr_count_;		// Number of threads to spawn.
-  long		t_flags_;		// Flags to thr_create().
-  size_t	high_water_mark_;	// ACE_Task high water mark.
-  size_t	low_water_mark_;        // ACE_Task low water mark.
-  size_t	message_size_;		// Size of a message.
-  size_t	initial_queue_length_;	// Initial number of items in the queue.
-  size_t	iterations_;		// Number of iterations to run the test program.
-  int		debugging_;		// Extra debugging info.
-  int		verbosity_;		// Extra verbose messages.
-  char		*consumer_port_;	// Port that the Consumer_Router is using.
-  char		*supplier_port_;	// Port that the Supplier_Router is using.
-  char		*consumer_file_;	// file that the Consumer_Router is using.
-  char		*supplier_file_;	// file that the Supplier_Router is using.
+  ACE_Profile_Timer itimer_;            // Time the process.
+  size_t        thr_count_;             // Number of threads to spawn.
+  long          t_flags_;               // Flags to thr_create().
+  size_t        high_water_mark_;       // ACE_Task high water mark.
+  size_t        low_water_mark_;        // ACE_Task low water mark.
+  size_t        message_size_;          // Size of a message.
+  size_t        initial_queue_length_;  // Initial number of items in the queue.
+  size_t        iterations_;            // Number of iterations to run the test program.
+  int           debugging_;             // Extra debugging info.
+  int           verbosity_;             // Extra verbose messages.
+  char          *consumer_port_;        // Port that the Consumer_Router is using.
+  char          *supplier_port_;        // Port that the Supplier_Router is using.
+  char          *consumer_file_;        // file that the Consumer_Router is using.
+  char          *supplier_file_;        // file that the Supplier_Router is using.
 };
 
 extern Options options;
diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/examples/ASX/UPIPE_Event_Server/Peer_Router.h
index c60da36c931..54d25ee371e 100644
--- a/examples/ASX/UPIPE_Event_Server/Peer_Router.h
+++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.h
@@ -4,10 +4,15 @@
 // The interface between one or more peers and a stream.  A peer
 // typically runs remotely on another machine.
 
-#if !defined (_PEER_ROUTER_H)
+#ifndef _PEER_ROUTER_H
 #define _PEER_ROUTER_H
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Svc_Handler.h"
 #include "ace/UPIPE_Acceptor.h"
 #include "ace/UPIPE_Addr.h"
@@ -20,7 +25,7 @@
 template <class PEER_HANDLER, class KEY>
 class Peer_Router;
 
-template <class PEER_HANDLER, class KEY> 
+template <class PEER_HANDLER, class KEY>
 class Acceptor_Factory : public ACE_Acceptor<PEER_HANDLER, ACE_UPIPE_ACCEPTOR>
 {
 public:
@@ -47,11 +52,11 @@ public:
   virtual int handle_input (ACE_HANDLE);
   // Receive input from the peer..
 
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);  
-  // Send output to a peer. 
+  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
+  // Send output to a peer.
 
 protected:
-  ROUTER *router_task_;  
+  ROUTER *router_task_;
   // Pointer to write task..
 
 private:
@@ -85,7 +90,7 @@ public:
 
 protected:
 // Handle control messages arriving from adjacent Modules.
-  virtual int control (ACE_Message_Block *); 
+  virtual int control (ACE_Message_Block *);
 
   // Map used to keep track of active peers.
   ACE_Map_Manager <PEER_KEY, PEER_HANDLER *, ACE_RW_Mutex> peer_map_;
@@ -106,7 +111,7 @@ private:
 #if defined (__ACE_INLINE__)
 #define ACE_INLINE inline
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/examples/ASX/UPIPE_Event_Server/Supplier_Router.h b/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
index 0fcb72f4c20..3fc61c8acfc 100644
--- a/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
+++ b/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
@@ -3,10 +3,15 @@
 
 // The interface between a supplier and an Event Service ACE_Stream.
 
-#if !defined (_SUPPLIER_ROUTER_H)
+#ifndef _SUPPLIER_ROUTER_H
 #define _SUPPLIER_ROUTER_H
 
 #include "ace/UPIPE_Addr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/UPIPE_Acceptor.h"
 #include "ace/Map_Manager.h"
 #include "ace/Svc_Handler.h"
@@ -15,7 +20,7 @@
 #if defined (ACE_HAS_THREADS)
 
 // Forward declaration.
-class Supplier_Handler; 
+class Supplier_Handler;
 
 // Type of search key for SUPPLIER_MAP.
 typedef ACE_HANDLE SUPPLIER_KEY;
@@ -24,7 +29,7 @@ typedef ACE_HANDLE SUPPLIER_KEY;
 
 typedef Peer_Router<Supplier_Handler, SUPPLIER_KEY> SUPPLIER_ROUTER;
 
-class Supplier_Handler 
+class Supplier_Handler
   : public Peer_Handler<SUPPLIER_ROUTER, SUPPLIER_KEY>
 {
 public:
diff --git a/examples/Bounded_Packet_Relay/BPR_Drivers.h b/examples/Bounded_Packet_Relay/BPR_Drivers.h
index 49812a07d79..83f37022994 100644
--- a/examples/Bounded_Packet_Relay/BPR_Drivers.h
+++ b/examples/Bounded_Packet_Relay/BPR_Drivers.h
@@ -26,10 +26,15 @@
 //
 // ============================================================================
 
-#if !defined (_BPR_DRIVERS_H_)
+#ifndef _BPR_DRIVERS_H_
 #define _BPR_DRIVERS_H_
 
 #include "ace/Functor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Synch.h"
 
diff --git a/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
index 31a8a41f798..8ad1b48564c 100644
--- a/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
+++ b/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
@@ -26,11 +26,15 @@
 //
 // ============================================================================
 
-#if !defined (_BPR_DRIVERS_T_H_)
+#ifndef _BPR_DRIVERS_T_H_
 #define _BPR_DRIVERS_T_H_
 
 #include "ace/Functor.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Forward declarations.
 class Input_Device_Wrapper_Base;
 class Output_Device_Wrapper_Base;
diff --git a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
index 11759e10ca5..30cff587f06 100644
--- a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
+++ b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
@@ -25,12 +25,17 @@
 //
 // ============================================================================
 
-#if !defined (_THREAD_BOUNDED_PACKET_RELAY_H_)
+#ifndef _THREAD_BOUNDED_PACKET_RELAY_H_
 #define _THREAD_BOUNDED_PACKET_RELAY_H_
 
 #define ACE_HAS_DEFERRED_TIMER_COMMANDS
 
 #include "ace/Functor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Timer_Heap_T.h"
 #include "ace/Timer_Queue_Adapters.h"
@@ -39,14 +44,14 @@
 // These typedefs ensure that we use the minimal amount of locking
 // necessary.
 typedef ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>
-	Upcall;
+        Upcall;
 typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
-			 Upcall,
-			 ACE_Null_Mutex>
-	Timer_Heap;
+                         Upcall,
+                         ACE_Null_Mutex>
+        Timer_Heap;
 typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
-				  Upcall,
-				  ACE_Null_Mutex>
+                                  Upcall,
+                                  ACE_Null_Mutex>
         Timer_Heap_Iterator;
 typedef ACE_Thread_Timer_Queue_Adapter<Timer_Heap>
         Thread_Timer_Queue;
@@ -171,7 +176,7 @@ public:
 
   User_Input_Task (Bounded_Packet_Relay *relay,
                    Thread_Timer_Queue *queue,
-	           Thread_Bounded_Packet_Relay_Driver &timer_queue_driver);
+                   Thread_Bounded_Packet_Relay_Driver &timer_queue_driver);
   // Constructor.
 
   ~User_Input_Task (void);
@@ -300,7 +305,7 @@ public:
   // Destructor.
 
   virtual int handle_timeout (const ACE_Time_Value &current_time,
-			      const void *arg);
+                              const void *arg);
   // Call back hook.
 
   virtual int cancelled (void);
@@ -344,7 +349,7 @@ public:
   // Destructor.
 
   virtual int handle_timeout (const ACE_Time_Value &current_time,
-			      const void *arg);
+                              const void *arg);
   // Call back hook.
 
   virtual int cancelled (void);
diff --git a/examples/CORBA/Test_i.h b/examples/CORBA/Test_i.h
index dd1e617d1f6..01fe82c75f1 100644
--- a/examples/CORBA/Test_i.h
+++ b/examples/CORBA/Test_i.h
@@ -2,13 +2,18 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Test.hh"
 
 class Test_i
 {
 public:
   virtual void method (long input,
-		       ACE_CORBA_1 (Environment) &IT_env = ACE_CORBA_1 (default_environment));
+                       ACE_CORBA_1 (Environment) &IT_env = ACE_CORBA_1 (default_environment));
 };
 
 DEF_TIE_Test (Test_i)
diff --git a/examples/Connection/blocking/SPIPE-acceptor.h b/examples/Connection/blocking/SPIPE-acceptor.h
index 6428d6ccf55..84253f2e37c 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.h
+++ b/examples/Connection/blocking/SPIPE-acceptor.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (SP_ACCEPTOR_H)
+#ifndef SP_ACCEPTOR_H
 #define SP_ACCEPTOR_H
 
 #include "ace/Svc_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Acceptor.h"
 #include "ace/SPIPE_Stream.h"
 #include "ace/SPIPE_Acceptor.h"
diff --git a/examples/Connection/blocking/SPIPE-connector.h b/examples/Connection/blocking/SPIPE-connector.h
index 3bed82195a7..d9ea2d32629 100644
--- a/examples/Connection/blocking/SPIPE-connector.h
+++ b/examples/Connection/blocking/SPIPE-connector.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (SP_CONNECTOR_H)
+#ifndef SP_CONNECTOR_H
 #define SP_CONNECTOR_H
 
 #include "ace/Svc_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SPIPE_Stream.h"
 #include "ace/Connector.h"
 #include "ace/SPIPE_Connector.h"
@@ -26,7 +31,7 @@ public:
   // = Demultiplexing hooks.
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                            ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK);
 
   virtual ACE_HANDLE get_handle (void) const;
 
@@ -53,7 +58,7 @@ public:
 
   virtual int svc (void);
   // Run the svc.
-  
+
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
   // Report connection errors.
 
diff --git a/examples/Connection/non_blocking/CPP-acceptor.h b/examples/Connection/non_blocking/CPP-acceptor.h
index 70898609aea..3adc524a48c 100644
--- a/examples/Connection/non_blocking/CPP-acceptor.h
+++ b/examples/Connection/non_blocking/CPP-acceptor.h
@@ -1,11 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (CPP_ACCEPTOR_H)
+#ifndef CPP_ACCEPTOR_H
 #define CPP_ACCEPTOR_H
 
 #include "ace/Acceptor.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 template <ACE_PEER_STREAM_1>
 class Svc_Handler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH>
 {
@@ -18,7 +22,7 @@ public:
 
   virtual int open (void *);
   // Perform the work of the SVC_HANDLER.
-  
+
   virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
   // Handle data from the client.
 
@@ -29,7 +33,7 @@ public:
   // Handles acceptor timeouts.
 
 private:
-  typedef ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> 
+  typedef ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH>
           SVC_HANDLER;
 };
 
@@ -63,7 +67,7 @@ public:
   // Run the interative service.
 
 private:
-  typedef ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> 
+  typedef ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
           inherited;
 
   ACE_PEER_ACCEPTOR_ADDR server_addr_;
diff --git a/examples/Connection/non_blocking/CPP-connector.h b/examples/Connection/non_blocking/CPP-connector.h
index 49d7e25ae53..66a75747a51 100644
--- a/examples/Connection/non_blocking/CPP-connector.h
+++ b/examples/Connection/non_blocking/CPP-connector.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (CPP_CONNECTOR_H)
+#ifndef CPP_CONNECTOR_H
 #define CPP_CONNECTOR_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Connector.h"
 
 template <ACE_PEER_STREAM_1>
@@ -12,7 +17,7 @@ class Peer_Handler : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_SYNCH>
 {
   // = TITLE
   //   Handles communication with the server.
-  // 
+  //
   // = DESCRIPTION
   //   This class uses a very clever state machine pattern to keep
   //   track of how it interacts with the user and the server.
@@ -62,12 +67,12 @@ public:
 
   virtual int svc (void);
   // Run the svc.
-  
+
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
   // Report connection errors.
 
 private:
-  typedef ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2> 
+  typedef ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>
           inherited;
 
   ACE_Synch_Options options_;
diff --git a/examples/IPC_SAP/SPIPE_SAP/shared.h b/examples/IPC_SAP/SPIPE_SAP/shared.h
index 3f7d7647023..3d49ce9dc04 100644
--- a/examples/IPC_SAP/SPIPE_SAP/shared.h
+++ b/examples/IPC_SAP/SPIPE_SAP/shared.h
@@ -3,4 +3,8 @@
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 static const char *rendezvous = ACE_DEFAULT_RENDEZVOUS;
diff --git a/examples/Logger/simple-server/Logging_Acceptor.h b/examples/Logger/simple-server/Logging_Acceptor.h
index bfc5bbb3d3e..5a69656638c 100644
--- a/examples/Logger/simple-server/Logging_Acceptor.h
+++ b/examples/Logger/simple-server/Logging_Acceptor.h
@@ -5,24 +5,29 @@
 //
 // = LIBRARY
 //    examples
-// 
+//
 // = FILENAME
-//    Logging_Acceptor.h 
+//    Logging_Acceptor.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_CLIENT_ACCEPTOR_H)
+#ifndef _CLIENT_ACCEPTOR_H
 #define _CLIENT_ACCEPTOR_H
 
 #include "ace/SOCK_Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Event_Handler.h"
 
 class Logging_Acceptor : public ACE_Event_Handler
   // = TITLE
-  //     Handle connection requests from remote client clients. 
+  //     Handle connection requests from remote client clients.
   //
   // = DESCRIPTION
   //     Accepts client connection requests, creates Logging_Handler's
@@ -41,7 +46,7 @@ private:
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
 
-  ACE_SOCK_Acceptor peer_acceptor_;     
+  ACE_SOCK_Acceptor peer_acceptor_;
   // Passive connection acceptor factory.
 };
 
diff --git a/examples/Logger/simple-server/Logging_Handler.h b/examples/Logger/simple-server/Logging_Handler.h
index 59b92f7f1e8..6f960694947 100644
--- a/examples/Logger/simple-server/Logging_Handler.h
+++ b/examples/Logger/simple-server/Logging_Handler.h
@@ -6,26 +6,31 @@
 //
 // = LIBRARY
 //    examples
-// 
+//
 // = FILENAME
-//    Logging_Handler.h 
+//    Logging_Handler.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_CLIENT_HANDLER_H)
+#ifndef _CLIENT_HANDLER_H
 #define _CLIENT_HANDLER_H
 
 #include "ace/Event_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Stream.h"
 
 class Logging_Handler : public ACE_Event_Handler
   // = TITLE
   //     Receive client message from the remote clients.
-  // 
+  //
   // = DESCRIPTION
   //     This class demonstrates how to receive messages from remote
   //     clients using the notification mechanisms in the
@@ -33,7 +38,7 @@ class Logging_Handler : public ACE_Event_Handler
   //     utilize the <ACE_Reactor> timer mechanisms, as well.
 {
 public:
-  Logging_Handler (void);  
+  Logging_Handler (void);
 
   // = Hooks for opening and closing handlers.
   virtual int open (void);
@@ -48,18 +53,18 @@ protected:
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
                             ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
-  virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); 
+  virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
 
   // = Really should be private...
-  virtual ~Logging_Handler (void); 
+  virtual ~Logging_Handler (void);
   // Ensure dynamic allocation.
 
 private:
   char host_name_[MAXHOSTNAMELEN + 1];
   // Host we are connected to.
 
-  ACE_SOCK_Stream cli_stream_; 
-  // Connection with client 
+  ACE_SOCK_Stream cli_stream_;
+  // Connection with client
 };
 
 #endif /* _CLIENT_HANDLER_H */
diff --git a/examples/Logger/simple-server/Reactor_Singleton.h b/examples/Logger/simple-server/Reactor_Singleton.h
index 44f2a91eda7..567029bf5c9 100644
--- a/examples/Logger/simple-server/Reactor_Singleton.h
+++ b/examples/Logger/simple-server/Reactor_Singleton.h
@@ -6,19 +6,24 @@
 //
 // = LIBRARY
 //    examples
-// 
+//
 // = FILENAME
-//    Reactor_Singleton.h 
+//    Reactor_Singleton.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (_REACTOR_SINGLETON_H)
+#ifndef _REACTOR_SINGLETON_H
 #define _REACTOR_SINGLETON_H
 
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Reactor.h"
 
 // Our global Reactor Singleton.
diff --git a/examples/Mem_Map/IO-tests/IO_Test.h b/examples/Mem_Map/IO-tests/IO_Test.h
index 659a85eec15..22dcf578d7f 100644
--- a/examples/Mem_Map/IO-tests/IO_Test.h
+++ b/examples/Mem_Map/IO-tests/IO_Test.h
@@ -5,6 +5,10 @@
 
 #include "ace/Profile_Timer.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /* Base class for all the File I/O tests. */
 
 class IO_Test
@@ -21,8 +25,8 @@ public:
 
 protected:
   // Name of the test
-  const char *name_; 
-  
+  const char *name_;
+
   // Reference to a timer
   ACE_Profile_Timer &tm_;
 };
diff --git a/examples/Reactor/Multicast/Log_Wrapper.h b/examples/Reactor/Multicast/Log_Wrapper.h
index 859ed3c3ae6..75da02839c5 100644
--- a/examples/Reactor/Multicast/Log_Wrapper.h
+++ b/examples/Reactor/Multicast/Log_Wrapper.h
@@ -4,26 +4,31 @@
 // log_wrapper.h
 
 #include "ace/Profile_Timer.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 
-#if !defined (_LOG_WRAPPER_H)
+#ifndef _LOG_WRAPPER_H
 #define _LOG_WRAPPER_H
 
-class Log_Wrapper 
+class Log_Wrapper
   // = TITLE
   //      Provide a wrapper around sending log messages via IP
-  //      multicast. 
+  //      multicast.
 {
 public:
   Log_Wrapper (void);
   ~Log_Wrapper (void);
 
   // = Types of logging messages.
-  enum ACE_Log_Priority 
+  enum ACE_Log_Priority
   {
     LOG_MESSAGE,
-    LOG_DEBUG, 
+    LOG_DEBUG,
     LOG_WARNING,
     LOG_ERROR,
     LOG_EMERG
@@ -31,12 +36,12 @@ public:
 
   int open (const int port, const char* mcast_addr);
   // get an object reference from an orbixd
-  
+
   int log_message (ACE_Log_Priority type, char *message);
   // send a string to the logger
 
   // = Format of the logging record.
-  struct ACE_Log_Record 
+  struct ACE_Log_Record
   {
     u_long sequence_number;
     ACE_Log_Priority type;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
index 2f38b1d37d8..dbd7f4ef634 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
@@ -3,10 +3,15 @@
 
 /* Handles INET broadcast datagram messages from remote hosts on the local subnet. */
 
-#if !defined (_HANDLE_BROADCAST_H)
+#ifndef _HANDLE_BROADCAST_H
 #define _HANDLE_BROADCAST_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram.h"
@@ -35,7 +40,7 @@ extern ACE_Service_Object_Type rb;
 #define ACE_INLINE inline
 #include "Handle_Broadcast.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #endif /* _HANDLE_BROADCAST_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
index dcbf65293f2..90452d0f981 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
@@ -3,10 +3,15 @@
 
 /* Handles UNIX datagram messages from local host. */
 
-#if !defined (_HANDLE_L_CODGRAM_H)
+#ifndef _HANDLE_L_CODGRAM_H
 #define _HANDLE_L_CODGRAM_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/LSOCK_CODgram.h"
 #include "ace/UNIX_Addr.h"
@@ -18,13 +23,13 @@ public:
   virtual int init (int argc, char *argv[]);
   virtual int info (char **, size_t) const;
   virtual int fini (void);
-  
+
 public:
   int open (const ACE_UNIX_Addr &suad, int async = 0);
   virtual ACE_HANDLE get_handle (void) const;
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  
+
   char rendezvous[MAXPATHLEN + 1];
   static const char *DEFAULT_RENDEZVOUS;
 };
@@ -35,7 +40,7 @@ extern ACE_Service_Object_Type lc;
 #define ACE_INLINE inline
 #include "Handle_L_CODgram.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #endif /* _HANDLE_L_CODGRAM_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
index 20e14810ef5..0cefbba6baf 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
@@ -3,10 +3,15 @@
 
 // Handles UNIX datagram messages from local host.
 
-#if !defined (_HANDLE_L_DGRAM_H)
+#ifndef _HANDLE_L_DGRAM_H
 #define _HANDLE_L_DGRAM_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/LSOCK_Dgram.h"
 #include "ace/UNIX_Addr.h"
@@ -37,7 +42,7 @@ extern ACE_Service_Object_Type ld;
 #define ACE_INLINE inline
 #include "Handle_L_Dgram.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* _HANDLE_L_DGRAM_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
index c7037c2d5be..dec235ca502 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
@@ -4,16 +4,21 @@
 /* Handle connections from local UNIX ACE_FIFO */
 /* Read from a well known ACE_FIFO and write to stdout. */
 
-#if !defined (_HANDLE_L_FIFO_H)
+#ifndef _HANDLE_L_FIFO_H
 #define _HANDLE_L_FIFO_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/FIFO_Recv_Msg.h"
 
 class Handle_L_FIFO : public ACE_Service_Object, public ACE_FIFO_Recv_Msg
 {
-public:	
+public:
   Handle_L_FIFO (void);
   virtual int init (int argc, char *argv[]);
   virtual int info (char **, size_t) const;
@@ -34,7 +39,7 @@ extern ACE_Service_Object_Type lf;
 #define ACE_INLINE inline
 #include "Handle_L_FIFO.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #endif /* _HANDLE_L_FIFO_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
index 3d675e1bcdd..82d784e977a 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
@@ -1,13 +1,18 @@
 /* -*- C++ -*- */
 // $Id$
 
-/* Handle connections from local UNIX domain sockets that are sending 
+/* Handle connections from local UNIX domain sockets that are sending
    end-points from a pipe! */
 
-#if !defined (_HANDLE_L_PIPE_H)
+#ifndef _HANDLE_L_PIPE_H
 #define _HANDLE_L_PIPE_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Acceptor.h"
@@ -37,7 +42,7 @@ extern ACE_Service_Object_Type lp;
 #define ACE_INLINE inline
 #include "Handle_L_Pipe.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #endif /* _HANDLE_L_PIPE_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
index 029965f0c94..96c2cd43bf7 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
@@ -4,10 +4,15 @@
 /* Handle connections from local UNIX ACE_SPIPE */
 /* Read from a well known ACE_SPIPE and write to stdout. */
 
-#if !defined (_HANDLE_L_SPIPE_H)
+#ifndef _HANDLE_L_SPIPE_H
 #define _HANDLE_L_SPIPE_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/SPIPE_Acceptor.h"
 
@@ -15,7 +20,7 @@
 
 class Handle_L_SPIPE : public ACE_Service_Object, public ACE_SPIPE_Acceptor
 {
-public:	
+public:
   Handle_L_SPIPE (void);
   virtual int init (int argc, char *argv[]);
   virtual int info (char **, size_t) const;
@@ -36,7 +41,7 @@ extern ACE_Service_Object_Type lsp;
 #define ACE_INLINE inline
 #include "Handle_L_SPIPE.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #endif /* _HANDLE_L_SPIPE_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
index d637b4e240a..8d3c605f451 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
@@ -4,10 +4,15 @@
 
 /* Handle connections from local UNIX domain sockets. */
 
-#if !defined (_HANDLE_L_STREAM_H)
+#ifndef _HANDLE_L_STREAM_H
 #define _HANDLE_L_STREAM_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Acceptor.h"
@@ -40,7 +45,7 @@ extern ACE_Service_Object_Type ls;
 #define ACE_INLINE inline
 #include "Handle_L_Stream.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* _HANDLE_L_STREAM_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
index 5a101b50b73..3764d3e3577 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
@@ -3,10 +3,15 @@
 
 /* Handles INET datagram messages from remote hosts. */
 
-#if !defined (_HANDLE_R_DGRAM_H)
+#ifndef _HANDLE_R_DGRAM_H
 #define _HANDLE_R_DGRAM_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram.h"
@@ -34,7 +39,7 @@ extern ACE_Service_Object_Type rd;
 #define ACE_INLINE inline
 #include "Handle_R_Dgram.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /*  __ACE_INLINE__ */
 
 #endif /* _HANDLE_R_DGRAM_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index 7a4c12f28e9..f011e31c81e 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -3,10 +3,15 @@
 
 /* Handle connections from remote INET connections. */
 
-#if !defined (_HANDLE_R_STREAM_H)
+#ifndef _HANDLE_R_STREAM_H
 #define _HANDLE_R_STREAM_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/SOCK_Acceptor.h"
@@ -28,7 +33,7 @@ private:
 
   ACE_SOCK_Stream    new_remote_stream;
   static u_short DEFAULT_PORT;
-  static char	 *login_name;
+  static char    *login_name;
 };
 
 extern ACE_Service_Object_Type rs;
@@ -37,7 +42,7 @@ extern ACE_Service_Object_Type rs;
 #define ACE_INLINE inline
 #include "Handle_R_Stream.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #endif /* _HANDLE_R_STREAM_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
index 2b6f5133665..1dece35cf68 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
@@ -1,10 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (_HANDLE_THR_STREAM_H)
+#ifndef _HANDLE_THR_STREAM_H
 #define _HANDLE_THR_STREAM_H
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 
 #if defined (ACE_HAS_THREADS)
@@ -13,7 +18,7 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 class Handle_Thr_Acceptor : public ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
   // = TITLE
   //   This factory creates new <SVC_HANDLERS> and runs them with the
-  //   configured <ACE_Thread_Strategy>.  
+  //   configured <ACE_Thread_Strategy>.
 {
 public:
   // = Initialization and termination.
@@ -64,7 +69,7 @@ extern ACE_Service_Object_Type rts;
 #define ACE_INLINE inline
 #include "Handle_Thr_Stream.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index 0bbb3c0457d..7a0aed09737 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -3,10 +3,15 @@
 
 /* Handles timeouts. */
 
-#if !defined (_HANDLE_TIMEOUT_H)
+#ifndef _HANDLE_TIMEOUT_H
 #define _HANDLE_TIMEOUT_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Service_Types.h"
 
 class Handle_Timeout : public ACE_Service_Object
@@ -30,7 +35,7 @@ extern ACE_Service_Object_Type t1;
 #define ACE_INLINE inline
 #include "Handle_Timeout.i"
 #else
-#define ACE_INLINE 
+#define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
 #endif /* _HANDLE_TIMEOUT_H */
diff --git a/examples/Service_Configurator/Misc/Timer_Service.h b/examples/Service_Configurator/Misc/Timer_Service.h
index 642bc3db019..82f6c1ac222 100644
--- a/examples/Service_Configurator/Misc/Timer_Service.h
+++ b/examples/Service_Configurator/Misc/Timer_Service.h
@@ -3,6 +3,10 @@
 
 #include "ace/Service_Config.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class Timer_Service_1 : public ACE_Service_Object
 {
   // = TITLE
@@ -11,16 +15,16 @@ class Timer_Service_1 : public ACE_Service_Object
 public:
   virtual int init (int argc, char *argv[]);
   // Initialization hook.
-  
+
   virtual int handle_timeout (const ACE_Time_Value &,
-			      const void *);
+                              const void *);
   // Timeout hook.
 
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
   // Close hook.
 
 private:
-  enum 
+  enum
   {
     TIMEOUT = 4, // Wait 4 seconds between timeouts
     MAX_TIMEOUTS = 10 // Don't timeout for more than 10 times.
diff --git a/examples/Shared_Malloc/Malloc.h b/examples/Shared_Malloc/Malloc.h
index 57a1eecd1f2..6d4cb6bfc12 100644
--- a/examples/Shared_Malloc/Malloc.h
+++ b/examples/Shared_Malloc/Malloc.h
@@ -1,11 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (MY_MALLOC_H)
+#ifndef MY_MALLOC_H
 #define MY_MALLOC_H
 
 #include "ace/Malloc.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class Malloc
   // = TITLE
   //      Allocator Singleton.
diff --git a/examples/Shared_Malloc/Options.h b/examples/Shared_Malloc/Options.h
index 931f7411673..c96cd5fb322 100644
--- a/examples/Shared_Malloc/Options.h
+++ b/examples/Shared_Malloc/Options.h
@@ -1,11 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (_OPTIONS)
+#ifndef _OPTIONS
 #define _OPTIONS
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class Options
   // = TITLE
   //   Options Singleton.
diff --git a/examples/System_V_IPC/SV_Message_Queues/test.h b/examples/System_V_IPC/SV_Message_Queues/test.h
index 9d1283887dd..e88e567fa40 100644
--- a/examples/System_V_IPC/SV_Message_Queues/test.h
+++ b/examples/System_V_IPC/SV_Message_Queues/test.h
@@ -2,10 +2,15 @@
 // $Id$
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SV_Message.h"
 
 #define MSGSZ 128
-#define SRV_KEY	ACE_DEFAULT_SHM_KEY
+#define SRV_KEY ACE_DEFAULT_SHM_KEY
 #define SRV_ID 1
 
 class Message_Data
@@ -16,7 +21,7 @@ public:
     ::strncpy (this->username_, user, 9);
     ::strncpy (this->mtext_, text, MSGSZ);
   }
-  
+
   long pid (void) { return this->pid_; }
   void pid (long p) { this->pid_ = p; }
   char *user (void) { return this->username_; }
@@ -25,10 +30,10 @@ public:
   void text (char text[]) { ::strncpy (this->mtext_, text, MSGSZ); }
   int length (void) { return sizeof *this - sizeof this->mtext_ + ::strlen (this->mtext_) + 1; }
 
-protected:  
+protected:
   long  pid_;
-  char 	username_[9];
-  char	mtext_[MSGSZ];
+  char  username_[9];
+  char  mtext_[MSGSZ];
 };
 
 class Message_Block : public ACE_SV_Message, public Message_Data
@@ -38,7 +43,7 @@ class Message_Block : public ACE_SV_Message, public Message_Data
   // = DESCRIPTION
   //   This may not be 100 percent portable on all C++ compilers since
   //   it relies on inheritance to be "concatenation."
-  // 
+  //
 public:
   Message_Block (long t,
                  long p = 0,
diff --git a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h
index 7712e016a09..4e8cd9b9d13 100644
--- a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h
+++ b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h
@@ -2,6 +2,11 @@
 // $Id$
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #define SHMSZ 27
 #define SEM_KEY 1234
 #define SHM_KEY 5678
diff --git a/examples/Threads/TSS_Data.h b/examples/Threads/TSS_Data.h
index fb8e6312d14..03fd6c8ff50 100644
--- a/examples/Threads/TSS_Data.h
+++ b/examples/Threads/TSS_Data.h
@@ -4,17 +4,21 @@
 //
 // = LIBRARY
 //    examples
-// 
+//
 // = FILENAME
 //    TSS_Data.cpp
 //
 // = AUTHOR
 //    Prashant Jain and Doug Schmidt
-// 
+//
 // ============================================================================
 
 #include "ace/Singleton.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class TSS_Data
   // = TITLE
   //   Data that is stored in thread-specific storage.
@@ -22,7 +26,7 @@ class TSS_Data
 public:
   void *data (void) { return this->data_; }
   void data (void *v) { this->data_ = v; }
-  
+
 private:
   // = data_ will be thread-specific data so it doesn't need a lock.
   void *data_;
diff --git a/examples/Threads/TSS_Obj.h b/examples/Threads/TSS_Obj.h
index e7d0d553350..c3d087e6188 100644
--- a/examples/Threads/TSS_Obj.h
+++ b/examples/Threads/TSS_Obj.h
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    tests
-// 
+//
 // = FILENAME
 //    TSS_Test.cpp
 //
@@ -14,11 +14,15 @@
 //
 // = AUTHOR
 //    Prashant Jain and Doug Schmidt
-// 
+//
 // ============================================================================
 
 #include "ace/Synch.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class TSS_Obj
   // = TITLE
   //     This object is stored in thread-specific storage.
diff --git a/examples/Threads/TSS_Task.h b/examples/Threads/TSS_Task.h
index fc2b2f7f25c..6ad9b6d1452 100644
--- a/examples/Threads/TSS_Task.h
+++ b/examples/Threads/TSS_Task.h
@@ -6,16 +6,21 @@
 //
 // = LIBRARY
 //    tests
-// 
+//
 // = FILENAME
 //    TSS_Task.h
 //
 // = AUTHOR
 //    Prashant Jain and Doug Schmidt
-// 
+//
 // ============================================================================
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Token.h"
 
 class Test_Task
diff --git a/examples/Timer_Queue/Async_Timer_Queue_Test.h b/examples/Timer_Queue/Async_Timer_Queue_Test.h
index 702512dfb66..92977a58684 100644
--- a/examples/Timer_Queue/Async_Timer_Queue_Test.h
+++ b/examples/Timer_Queue/Async_Timer_Queue_Test.h
@@ -6,12 +6,12 @@
 //
 // = LIBRARY
 //    examples
-// 
+//
 // = FILENAME
 //    Async_Timer_Queue_Test.h
 //
 // = DESCRIPTION
-//      This test exercises the <ACE_Asynch_Timer_Queue_Adapter> 
+//      This test exercises the <ACE_Asynch_Timer_Queue_Adapter>
 //      using an <ACE_Timer_Heap>.
 //
 // = AUTHORS
@@ -19,10 +19,15 @@
 //    Sergio Flores-Gaitan
 // ============================================================================
 
-#if !defined (_ASYNC_TIMER_QUEUE_TEST_H_)
+#ifndef _ASYNC_TIMER_QUEUE_TEST_H_
 #define _ASYNC_TIMER_QUEUE_TEST_H_
 
 #include "ace/Signal.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Timer_Heap.h"
 #include "ace/Timer_Queue_Adapters.h"
 
@@ -34,19 +39,19 @@ class Async_Timer_Handler : public ACE_Event_Handler
   //     Target of the asynchronous timeout operation.
 public:
   virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
+                              const void *arg);
   // Callback hook invoked by the <Timer_Queue>.
 };
 
-class Async_Timer_Queue 
+class Async_Timer_Queue
 {
   // = TITLE
   //     Asynchronous Timer Queue Singleton.
   //
   // = DESCRIPTION
   //     We use this class to avoid global variables and to
-  //     consolidate all the Timer Queue processing in one central 
-  //     place. 
+  //     consolidate all the Timer Queue processing in one central
+  //     place.
 public:
   typedef int (Async_Timer_Queue::*ACTION) (void *);
 
diff --git a/examples/Timer_Queue/Driver.h b/examples/Timer_Queue/Driver.h
index 01c35f27eee..135272de0f4 100644
--- a/examples/Timer_Queue/Driver.h
+++ b/examples/Timer_Queue/Driver.h
@@ -19,10 +19,15 @@
 //
 // ============================================================================
 
-#if !defined (_DRIVER_H_)
+#ifndef _DRIVER_H_
 #define _DRIVER_H_
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Timer_Heap_T.h"
 #include "ace/Timer_Queue_Adapters.h"
 
diff --git a/examples/Timer_Queue/Reactor_Timer_Queue_Test.h b/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
index 66522f2ce52..f80b067d8b1 100644
--- a/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
+++ b/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
@@ -20,10 +20,15 @@
 //
 // ============================================================================
 
-#if !defined (_REACTOR_TIMER_QUEUE_TEST_H_)
+#ifndef _REACTOR_TIMER_QUEUE_TEST_H_
 #define _REACTOR_TIMER_QUEUE_TEST_H_
 
 #include "ace/Timer_Heap.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Driver.h"
 
 class Reactor_Timer_Queue_Test_Driver;
@@ -43,7 +48,7 @@ public:
   typedef int (Input_Handler::*ACTION) (void *);
 
   Input_Handler (ACE_Timer_Queue *tq,
-		 Reactor_Timer_Queue_Test_Driver &timer_queue_driver);
+                 Reactor_Timer_Queue_Test_Driver &timer_queue_driver);
   // Sets <done_> flag to 0, <driver_> to <timer_queue_driver> and
   // timer queue <tq_> to <tq>
 
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/examples/Timer_Queue/Thread_Timer_Queue_Test.h
index fa4c424ea79..710b133b1e9 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.h
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.h
@@ -20,10 +20,15 @@
 //
 // ============================================================================
 
-#if !defined (_THREAD_TIMER_QUEUE_TEST_H_)
+#ifndef _THREAD_TIMER_QUEUE_TEST_H_
 #define _THREAD_TIMER_QUEUE_TEST_H_
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Timer_Heap_T.h"
 #include "ace/Timer_Queue_Adapters.h"
 #include "Driver.h"
@@ -31,14 +36,14 @@
 // These typedefs ensure that we use the minimal amount of locking
 // necessary.
 typedef ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>
-	Upcall;
+        Upcall;
 typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
-			 Upcall,
-			 ACE_Null_Mutex>
-	Timer_Heap;
+                         Upcall,
+                         ACE_Null_Mutex>
+        Timer_Heap;
 typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
-				  Upcall,
-				  ACE_Null_Mutex>
+                                  Upcall,
+                                  ACE_Null_Mutex>
         Timer_Heap_Iterator;
 typedef ACE_Thread_Timer_Queue_Adapter<Timer_Heap>
         Thread_Timer_Queue;
@@ -59,7 +64,7 @@ public:
   typedef int (Input_Task::*ACTION) (void *);
 
   Input_Task (Thread_Timer_Queue *queue,
-	      Thread_Timer_Queue_Test_Driver &timer_queue_driver);
+              Thread_Timer_Queue_Test_Driver &timer_queue_driver);
 
   virtual int svc (void);
   // This method runs the event loop in the new thread.
@@ -133,7 +138,7 @@ public:
   // messages.
 
   virtual int handle_timeout (const ACE_Time_Value &current_time,
-			      const void *arg);
+                              const void *arg);
   // Call back hook.
   virtual int cancelled (void);
 
diff --git a/netsvcs/clients/Naming/Client/Client_Test.h b/netsvcs/clients/Naming/Client/Client_Test.h
index 830db0e73c2..d0b3a1dba9d 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.h
+++ b/netsvcs/clients/Naming/Client/Client_Test.h
@@ -4,6 +4,10 @@
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Define the external Client_Test interface.
 
 ACE_SVC_FACTORY_DECLARE (Client_Test)
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
index b1a82a50f3c..c2702ba04c9 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
@@ -2,6 +2,11 @@
 // $Id$
 
 #include "ace/Event_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Reactor.h"
 #include "ace/Naming_Context.h"
 
@@ -10,8 +15,8 @@ class Dump_Restore : public ACE_Event_Handler
 public:
   enum Operation_Type
     {
-      BIND, 
-      UNBIND, 
+      BIND,
+      UNBIND,
       REBIND
     };
   Dump_Restore (int argc, char *argv[]);
@@ -47,9 +52,9 @@ private:
   int populate (Dump_Restore::Operation_Type op);
 
   int doit (Dump_Restore::Operation_Type op,
-	    char *name,
-	    char *value,
-	    char *type = "");
+            char *name,
+            char *value,
+            char *type = "");
   int bind (char* key, char* value, char* type = "");
   int unbind (char* key);
   int rebind (char* key, char* value, char* type = "");
diff --git a/netsvcs/lib/Base_Optimizer.h b/netsvcs/lib/Base_Optimizer.h
index 86a174c0fce..48cb5059eb8 100644
--- a/netsvcs/lib/Base_Optimizer.h
+++ b/netsvcs/lib/Base_Optimizer.h
@@ -14,11 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (BASE_OPTIMIZER_H)
+#ifndef BASE_OPTIMIZER_H
 #define BASE_OPTIMIZER_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 template<class Base, class Member>
 struct Base_Optimizer : public Base
   // = TITLE
diff --git a/netsvcs/lib/Client_Logging_Handler.h b/netsvcs/lib/Client_Logging_Handler.h
index a470ed4b649..efe2ef0ed33 100644
--- a/netsvcs/lib/Client_Logging_Handler.h
+++ b/netsvcs/lib/Client_Logging_Handler.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    Client_Logging_Handler.h 
+//    Client_Logging_Handler.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
-#if !defined (ACE_CLIENT_LOGGER_H)
+#ifndef ACE_CLIENT_LOGGER_H
 #define ACE_CLIENT_LOGGER_H
 
 #include "ace/SPIPE_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 #include "ace/Synch.h"
@@ -36,7 +41,7 @@ class ACE_Svc_Export ACE_Client_Logging_Handler : public ACE_Svc_Handler<LOGGING
   // = TITLE
   //    This client logging daemon is a mediator that receives logging
   //    records from local applications processes and forwards them to
-  //    the server logging daemon running on another host. 
+  //    the server logging daemon running on another host.
   //
   // = DESCRIPTION
   //     The default implementation uses an <ACE_SPIPE_Stream> to
@@ -63,8 +68,8 @@ public:
 
 private:
   virtual int handle_signal (int signum,
-			     siginfo_t *,
-			     ucontext_t *);
+                             siginfo_t *,
+                             ucontext_t *);
   // Handle SIGPIPE.
 
   virtual int handle_input (ACE_HANDLE);
@@ -78,7 +83,7 @@ private:
 
   virtual int handle_output (ACE_HANDLE);
   // Called back when it's ok to send.
-  
+
   int send (ACE_Log_Record &log_record);
   // Send the <log_record> to the logging server.
 
diff --git a/netsvcs/lib/Log_Message_Receiver.h b/netsvcs/lib/Log_Message_Receiver.h
index f67ad7fa084..8a182dd873f 100644
--- a/netsvcs/lib/Log_Message_Receiver.h
+++ b/netsvcs/lib/Log_Message_Receiver.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (LOG_MESSAGE_RECEIVER_H)
+#ifndef LOG_MESSAGE_RECEIVER_H
 #define LOG_MESSAGE_RECEIVER_H
 
 #include "ace/Log_Record.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 
 // ==========================================================================//
diff --git a/netsvcs/lib/Logging_Strategy.h b/netsvcs/lib/Logging_Strategy.h
index 06290131be5..0ac66225275 100644
--- a/netsvcs/lib/Logging_Strategy.h
+++ b/netsvcs/lib/Logging_Strategy.h
@@ -5,27 +5,31 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Logging_Strategy.h
 //
 // = AUTHOR
-//    Prashant Jain 
-// 
+//    Prashant Jain
+//
 // ============================================================================
 
-#if !defined (ACE_LOGGING_STRATEGY_H)
+#ifndef ACE_LOGGING_STRATEGY_H
 #define ACE_LOGGING_STRATEGY_H
 
 #include "ace/Service_Object.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class ACE_Logging_Strategy : public ACE_Service_Object
   // = TITLE
   //     This class provides the hooks to control the output produced
-  //     by any of the network services. 
-  // 
+  //     by any of the network services.
+  //
   // = DESCRIPTION
-  //   	 Depending upon when this service is invoked and with what
+  //     Depending upon when this service is invoked and with what
   //     flags, the output of other network services can be
   //     controlled. The output can be streamed to stderr, to a file,
   //     to a logging daemon, or it can be set to be "silent".
diff --git a/netsvcs/lib/Name_Handler.h b/netsvcs/lib/Name_Handler.h
index 1642f1d0d3a..9b47952890a 100644
--- a/netsvcs/lib/Name_Handler.h
+++ b/netsvcs/lib/Name_Handler.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_NAME_HANDLER_H)
+#ifndef ACE_NAME_HANDLER_H
 #define ACE_NAME_HANDLER_H
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SString.h"
 #include "ace/Naming_Context.h"
diff --git a/netsvcs/lib/Server_Logging_Handler.h b/netsvcs/lib/Server_Logging_Handler.h
index 493e572d008..3f20c55dbfa 100644
--- a/netsvcs/lib/Server_Logging_Handler.h
+++ b/netsvcs/lib/Server_Logging_Handler.h
@@ -5,16 +5,16 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    Server_Logging_Handler.h 
+//    Server_Logging_Handler.h
 //
 // = AUTHOR
 //    Doug Schmidt and Per Andersson
-// 
+//
 // ============================================================================
 
-#if !defined (ACE_SERVER_LOGGING_HANDLER_H)
+#ifndef ACE_SERVER_LOGGING_HANDLER_H
 #define ACE_SERVER_LOGGING_HANDLER_H
 
 #include "Log_Message_Receiver.h"
@@ -35,21 +35,21 @@ typedef ACE_Server_Logging_Handler<Synch_Static_Receiver> Synch_Logging_Handler_
 typedef ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver> Synch_Thr_Logging_Handler_Static_Receiver;
 
 // NULL synched logging acceptor
-typedef ACE_Server_Logging_Acceptor_T<Null_Synch_Logging_Handler_Static_Receiver, 
-                                      Null_Synch_Static_Receiver, 
-                                      ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> > 
-                  Null_Synch_Logging_Handler_Static_Receiver_Acceptor;                  
+typedef ACE_Server_Logging_Acceptor_T<Null_Synch_Logging_Handler_Static_Receiver,
+                                      Null_Synch_Static_Receiver,
+                                      ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >
+                  Null_Synch_Logging_Handler_Static_Receiver_Acceptor;
 
 // NULL synched logging acceptors
-typedef ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Static_Receiver, 
-                                      Synch_Static_Receiver, 
-                                      ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> > 
-                  Synch_Logging_Handler_Static_Receiver_Acceptor;                  
+typedef ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Static_Receiver,
+                                      Synch_Static_Receiver,
+                                      ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >
+                  Synch_Logging_Handler_Static_Receiver_Acceptor;
 
-typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Static_Receiver, 
-                                      Synch_Static_Receiver, 
-                                      ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> > 
-                  Synch_Thr_Logging_Handler_Static_Receiver_Acceptor;                  
+typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Static_Receiver,
+                                      Synch_Static_Receiver,
+                                      ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >
+                  Synch_Thr_Logging_Handler_Static_Receiver_Acceptor;
 
 // typedefs for Logging Handlers & acceptors using a instance
 // based log message receivers.
@@ -60,17 +60,17 @@ typedef Log_Message_Receiver<ACE_LOGGER_SYNCH> Synch_Receiver;
 // synched logging handlers
 typedef ACE_Server_Logging_Handler<Synch_Receiver> Synch_Logging_Handler_Receiver;
 typedef ACE_Thr_Server_Logging_Handler<Synch_Receiver> Synch_Thr_Logging_Handler_Receiver;
-                                 
+
 // synched logging acceptors
-typedef ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Receiver, 
-                                      Synch_Receiver, 
-                                      ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> > 
-                  Synch_Logging_Handler_Receiver_Acceptor;                  
+typedef ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Receiver,
+                                      Synch_Receiver,
+                                      ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >
+                  Synch_Logging_Handler_Receiver_Acceptor;
 
-typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver, 
+typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver,
                                       Synch_Receiver,
-                                      ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> > 
-                  Synch_Thr_Logging_Handler_Receiver_Acceptor;                  
+                                      ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >
+                  Synch_Thr_Logging_Handler_Receiver_Acceptor;
 
 
 // Define external acceptors
diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h
index dafd1cbac60..9c0797f225e 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/netsvcs/lib/Server_Logging_Handler_T.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SERVER_LOGGING_HANDLER_T_H)
+#ifndef ACE_SERVER_LOGGING_HANDLER_T_H
 #define ACE_SERVER_LOGGING_HANDLER_T_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/TLI_Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Acceptor.h"
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index c4a6caccdeb..617206f6d6c 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -5,25 +5,30 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    TS_Clerk_Handler.h
 //
 // = AUTHOR
-//    Prashant Jain 
-// 
+//    Prashant Jain
+//
 // ============================================================================
 
-#if !defined (ACE_TS_CLERK_HANDLER_H)
+#ifndef ACE_TS_CLERK_HANDLER_H
 #define ACE_TS_CLERK_HANDLER_H
 
 #include "ace/Connector.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Connector.h"
 #include "ace/Malloc.h"
 #include "ace/Time_Request_Reply.h"
 
 // A simple struct containing delta time and a sequence number
-struct ACE_Time_Info 
+struct ACE_Time_Info
 {
   long delta_time_;
   ACE_UINT32 sequence_num_;
@@ -39,7 +44,7 @@ class ACE_Svc_Export ACE_TS_Clerk_Handler : public ACE_Svc_Handler<ACE_SOCK_STRE
   //    the updates to the Clerk Processor
   //
   // = DESCRIPTION
-  //   	The Clerk Processor uses send_request() to send a request for
+  //    The Clerk Processor uses send_request() to send a request for
   //    time update to a server. The Clerk Handler internally computes
   //    the round trip delay for the reply to come back. Once it gets
   //    the reply back from the server (handle_input), it adjusts the
@@ -48,7 +53,7 @@ class ACE_Svc_Export ACE_TS_Clerk_Handler : public ACE_Svc_Handler<ACE_SOCK_STRE
 {
 public:
   ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor = 0,
-			ACE_INET_Addr &addr = (ACE_INET_Addr &) ACE_Addr::sap_any);
+                        ACE_INET_Addr &addr = (ACE_INET_Addr &) ACE_Addr::sap_any);
   // Default constructor.
 
   // = Set/get the current state
@@ -58,7 +63,7 @@ public:
     CONNECTING,    // During connection establishment.
     ESTABLISHED,   // Connection is established and active.
     DISCONNECTING, // In the process of disconnecting.
-    FAILED	   // Connection has failed.
+    FAILED         // Connection has failed.
   };
 
   // = Set/get the current state.
@@ -81,14 +86,14 @@ public:
   // Return the handle of the message_fifo_;
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
   // Called when object is removed from the ACE_Reactor
-  
+
   virtual int handle_input (ACE_HANDLE);
   // Receive time update from a server.
 
   virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
+                              const void *arg);
   // Restart connection asynchronously when timeout occurs.
 
   void remote_addr (ACE_INET_Addr &addr);
@@ -104,7 +109,7 @@ protected:
   // Handle SIGPIPE.
 
   static void stderr_output (int = 0);
-  
+
   enum
     {
       MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
@@ -136,7 +141,7 @@ private:
 
   ACE_UINT32 cur_sequence_num_;
   // Next sequence number of time request (waiting for this update from
-  // the server). 
+  // the server).
 
   ACE_Time_Info time_info_;
   // Record of current delta time and current sequence number
@@ -147,7 +152,7 @@ class ACE_TS_Clerk_Processor : public ACE_Connector <ACE_TS_Clerk_Handler, ACE_S
   //    This class manages all the connections to the servers along
   //    with querying them periodically for time updates.
   // = DESCRIPTION
-  //   	The Clerk Processor creates connections to all the servers and
+  //    The Clerk Processor creates connections to all the servers and
   //    creates an ACE_TS_Clerk_Handler for each connection to handle
   //    the requests and replies. It periodically sends a request for
   //    time update through each of the handlers and uses the replies for
@@ -158,7 +163,7 @@ public:
   // Default constructor
 
   virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
+                              const void *arg);
   // Query servers for time periodically (timeout value)
 
   int initiate_connection (ACE_TS_Clerk_Handler *, ACE_Synch_Options &);
@@ -178,7 +183,7 @@ protected:
   // = Scheduling hooks.
   virtual int suspend (void);
   virtual int resume (void);
-  
+
 private:
   int parse_args (int argc, char *argv[]);
   // Parse svc.conf arguments.
@@ -195,8 +200,8 @@ private:
   // Allocator (used for reading/writing system time from/to shared memory)
 
   typedef ACE_Unbounded_Set <ACE_TS_Clerk_Handler *> HANDLER_SET;
-  typedef ACE_Unbounded_Set_Iterator <ACE_TS_Clerk_Handler *> HANDLER_SET_ITERATOR;  
-  HANDLER_SET handler_set_;  
+  typedef ACE_Unbounded_Set_Iterator <ACE_TS_Clerk_Handler *> HANDLER_SET_ITERATOR;
+  HANDLER_SET handler_set_;
   // Set of TS_Clerk_Handlers and iterator over the set.
 
   struct System_Time
@@ -218,7 +223,7 @@ private:
   // Pool name for backing store
 
   int blocking_semantics_;
-  // Do a blocking/non-blocking connect 
+  // Do a blocking/non-blocking connect
 
   ACE_UINT32 cur_sequence_num_;
   // Sequence number of next expected update from servers
diff --git a/netsvcs/lib/TS_Server_Handler.h b/netsvcs/lib/TS_Server_Handler.h
index 03f763e068d..c4bae7e32f7 100644
--- a/netsvcs/lib/TS_Server_Handler.h
+++ b/netsvcs/lib/TS_Server_Handler.h
@@ -5,19 +5,24 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    TS_Server_Handler.h 
+//    TS_Server_Handler.h
 //
 // = AUTHOR
-//    Prashant Jain 
-// 
+//    Prashant Jain
+//
 // ============================================================================
 
-#if !defined (ACE_TS_SERVER_HANDLER_H)
+#ifndef ACE_TS_SERVER_HANDLER_H
 #define ACE_TS_SERVER_HANDLER_H
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Time_Request_Reply.h"
 
@@ -53,11 +58,11 @@ protected:
 
   virtual int recv_request (void);
   // Receive, frame, and decode the client's request.
-  
+
   virtual int dispatch (void);
   // Dispatch the appropriate operation to handle the client's
   // request.
-  
+
   virtual int send_request (ACE_Time_Request &);
   // Special kind of reply
 
diff --git a/netsvcs/lib/Token_Handler.h b/netsvcs/lib/Token_Handler.h
index a2ef8345f67..5649086e510 100644
--- a/netsvcs/lib/Token_Handler.h
+++ b/netsvcs/lib/Token_Handler.h
@@ -5,20 +5,25 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
 //    Token_Handler.h
 //
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu)
 //    Tim Harrison (harrison@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
-#if !defined (ACE_TOKEN_HANDLER_H)
+#ifndef ACE_TOKEN_HANDLER_H
 #define ACE_TOKEN_HANDLER_H
 
 #include "ace/Acceptor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Local_Tokens.h"
 #include "ace/Token_Collection.h"
@@ -86,11 +91,11 @@ protected:
 
   virtual int recv_request (void);
   // Receive, frame, and decode the client's request.
-  
+
   virtual int dispatch (void);
   // Dispatch the appropriate operation to handle the client's
   // request.
-  
+
   virtual int send_reply (ACE_UINT32 errnum);
   // Create and send a reply to the client.
 
@@ -110,7 +115,7 @@ private:
 
   virtual ACE_Token_Proxy *create_proxy (void);
   // Switches on the type of token_request_ and creates a new
-  // Token_Proxy. 
+  // Token_Proxy.
 
   ACE_Synch_Options request_options_;
   // Keeps track of the synchronization options (i.e., the timeout
@@ -147,7 +152,7 @@ class ACE_TS_Mutex : public ACE_Local_Mutex
 {
 public:
   ACE_TS_Mutex (const char *name,
-		ACE_Token_Handler *th);
+                ACE_Token_Handler *th);
   // Creation.
 
 protected:
@@ -177,7 +182,7 @@ class ACE_TS_RLock : public ACE_Local_RLock
 {
 public:
   ACE_TS_RLock (const char *name,
-		ACE_Token_Handler *th);
+                ACE_Token_Handler *th);
   // Creation.
 
 protected:
@@ -207,7 +212,7 @@ class ACE_TS_WLock : public ACE_Local_WLock
 {
 public:
   ACE_TS_WLock (const char *name,
-		ACE_Token_Handler *th);
+                ACE_Token_Handler *th);
   // Creation.
 
 protected:
diff --git a/performance-tests/Misc/basic_func.h b/performance-tests/Misc/basic_func.h
index 84dba6d208f..9628087aa2c 100644
--- a/performance-tests/Misc/basic_func.h
+++ b/performance-tests/Misc/basic_func.h
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    performance-tests/Misc
-// 
+//
 // = FILENAME
 //    basic_func.h
 //
@@ -13,11 +13,18 @@
 //
 // = AUTHOR
 //    David Levine
-// 
+//
 // ============================================================================
 
+#ifndef BASIC_FUNC_H
+#define BASIC_FUNC_H
+
 #include "ace/ACE.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 extern int A,B,C,D,E,F;
 
 // If your compiler optimizes away Empty_Iteration_Test::run (), then
@@ -67,5 +74,4 @@ class Foo_d_v : public Foo_v
     virtual void v_func ();
 };
 
-
-// EOF
+#endif /8 BASIC_FUNC_H */
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
index 7375602c22e..8a4d57a6cbc 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#if !defined (ACE_BASELINE_TEST_H)
+#ifndef ACE_BASELINE_TEST_H
 #define ACE_BASELINE_TEST_H
 
 #include "Benchmark_Base.h"
diff --git a/performance-tests/Synch-Benchmarks/Benchmark_Base.h b/performance-tests/Synch-Benchmarks/Benchmark_Base.h
index c5ee7e9da17..ed3e46099a6 100644
--- a/performance-tests/Synch-Benchmarks/Benchmark_Base.h
+++ b/performance-tests/Synch-Benchmarks/Benchmark_Base.h
@@ -3,10 +3,15 @@
 
 /* Defines the base class used to dynamically link in the benchmark tests */
 
-#if !defined (ACE_BENCHMARK_BASE_H)
+#ifndef ACE_BENCHMARK_BASE_H
 # define ACE_BENCHMARK_BASE_H
 
 # include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 # include "ace/Service_Repository.h"
 # include "ace/Synch.h"
 # include "ace/Service_Types.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h b/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
index 1845c06d023..eae59d82db6 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (ACE_ADAPTIVE_LOCK_PERFORMANCE_TEST_BASE_H)
+#ifndef ACE_ADAPTIVE_LOCK_PERFORMANCE_TEST_BASE_H
 #define ACE_ADAPTIVE_LOCK_PERFORMANCE_TEST_BASE_H
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
index b1b7eaa7c94..44951835f40 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
@@ -3,7 +3,7 @@
 
 /* Defines the class used to dynamically link in the benchmark tests */
 
-#if !defined (ACE_BENCHMARK_PERFORMANCE_H)
+#ifndef ACE_BENCHMARK_PERFORMANCE_H
 #define ACE_BENCHMARK_PERFORMANCE_H
 
 #include "../Benchmark_Base.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
index 29fe7affc73..18eab50afed 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#if !defined (ACE_PERFORMANCE_TEST_H)
+#ifndef ACE_PERFORMANCE_TEST_H
 #define ACE_PERFORMANCE_TEST_H
 
 #include "../Benchmark_Base.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
index a8ea66c4ff3..80a867df9de 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
@@ -3,10 +3,15 @@
 
 // Option manager for performance tests.
 
-#if !defined (_PERFORMANCE_TEST_OPTIONS_H)
+#ifndef _PERFORMANCE_TEST_OPTIONS_H
 #define _PERFORMANCE_TEST_OPTIONS_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 #include "ace/Log_Msg.h"
 #include "ace/Thread_Manager.h"
@@ -86,36 +91,36 @@ public:
 
   ACE_Atomic_Op<ACE_Thread_Mutex, size_t> msg_count;        // Keep track of number of messages atomically.
   int *thr_work_count;  // Count activity per-thread.
-  int thr_wc_size;	     // Max number of threads.
+  int thr_wc_size;           // Max number of threads.
 
 private:
-  ACE_Profile_Timer _itimer;	        // Keep track of time.
-  char		*_service_entry;        // Name of the shared object file and shared object.
-  char		*_mapped_file;          // Name of the mapped file.
-  char		*_pipe_addr;            // Name of the STREAM pipe.
-  size_t	_sleep_time;            // Time to sleep.
-  size_t	_n_lwps;                // Number of LWPs.
-  size_t	_thr_count;             // Number of threads to spawn.
-  long		_t_flags;               // Flags to thr_create().
-  size_t	_high_water_mark;       // ACE_Queue high water mark.
-  size_t	_low_water_mark;        // ACE_Queue low water mark.
-  size_t	_msg_size;              // Size of a message.
-  size_t	_initial_queue_length;  // Initial number of items in the queue.
-  size_t	_logical_connections;   // Number of logical connections.
-  size_t	_physical_connections;  // Number of physical connections.
-  size_t	_iterations;            // Number of iterations to run the test program.
-  int		_generate;              // Generate the data.
-  int		_udp;                   // Use UDP format.
-  int		_debugging;             // Extra debugging info.
-  int		_verbosity;             // Extra verbose messages.
-  int		_ack;                   // Do an acknowledgement.
-  int		_checksum;              // Is checksumming enabled?.
-  int		_xdr;                   // Is xdr conversion enabled?.
-  int		_free_memory;           // Are we freeing up memory?.
-  int		_zero_copy;             // Implement a zero-copy driver?.
-  int		_print_summary;         // Print a summary of the results only.
-  int		_consecutive_ports;     // Number of consecutive messages from same port.
-  int		_eager_exit;            // Exit eagerly, without cleaning up.
+  ACE_Profile_Timer _itimer;            // Keep track of time.
+  char          *_service_entry;        // Name of the shared object file and shared object.
+  char          *_mapped_file;          // Name of the mapped file.
+  char          *_pipe_addr;            // Name of the STREAM pipe.
+  size_t        _sleep_time;            // Time to sleep.
+  size_t        _n_lwps;                // Number of LWPs.
+  size_t        _thr_count;             // Number of threads to spawn.
+  long          _t_flags;               // Flags to thr_create().
+  size_t        _high_water_mark;       // ACE_Queue high water mark.
+  size_t        _low_water_mark;        // ACE_Queue low water mark.
+  size_t        _msg_size;              // Size of a message.
+  size_t        _initial_queue_length;  // Initial number of items in the queue.
+  size_t        _logical_connections;   // Number of logical connections.
+  size_t        _physical_connections;  // Number of physical connections.
+  size_t        _iterations;            // Number of iterations to run the test program.
+  int           _generate;              // Generate the data.
+  int           _udp;                   // Use UDP format.
+  int           _debugging;             // Extra debugging info.
+  int           _verbosity;             // Extra verbose messages.
+  int           _ack;                   // Do an acknowledgement.
+  int           _checksum;              // Is checksumming enabled?.
+  int           _xdr;                   // Is xdr conversion enabled?.
+  int           _free_memory;           // Are we freeing up memory?.
+  int           _zero_copy;             // Implement a zero-copy driver?.
+  int           _print_summary;         // Print a summary of the results only.
+  int           _consecutive_ports;     // Number of consecutive messages from same port.
+  int           _eager_exit;            // Exit eagerly, without cleaning up.
 };
 
 // Make this available to any code that wants to see it!
diff --git a/performance-tests/TTCP/ORBeline/ttcp_i.h b/performance-tests/TTCP/ORBeline/ttcp_i.h
index b7a82a1b84a..0a4ed7b4b5c 100644
--- a/performance-tests/TTCP/ORBeline/ttcp_i.h
+++ b/performance-tests/TTCP/ORBeline/ttcp_i.h
@@ -5,7 +5,7 @@
 // ttcp_i.C
 // implementation of the ttcp and Profile_Logger objects.
 
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 // This is a total hack...
@@ -16,7 +16,7 @@
 class ttcp_string_i : public ttcp_string_impl {
 public:
 
-  ttcp_string_i();  
+  ttcp_string_i();
 
   virtual void send(const CORBA::String& ttcp_string);
   virtual void send_hack(const CORBA::String& ttcp_string);
@@ -30,7 +30,7 @@ private:
 class ttcp_sequence_i : public ttcp_sequence_impl {
 public:
 
-  ttcp_sequence_i();  
+  ttcp_sequence_i();
 
   virtual void send(const ttcp_sequence::my_sequence& ttcp_seq);
   virtual void send_hack(const CORBA::String& ttcp_string);
diff --git a/performance-tests/TTCP/Orbix/ttcp_i.h b/performance-tests/TTCP/Orbix/ttcp_i.h
index 5db365ee4d1..b9caf2135a5 100644
--- a/performance-tests/TTCP/Orbix/ttcp_i.h
+++ b/performance-tests/TTCP/Orbix/ttcp_i.h
@@ -3,14 +3,14 @@
 
 
 // ttcp_i.C
-// 
+//
 
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 #include "ttcp.hh"
 
-class ttcp_sequence_i 
+class ttcp_sequence_i
   : virtual public ttcp_sequenceBOAImpl
 {
 public:
@@ -25,7 +25,7 @@ private:
 
 // DEF_TIE_ttcp_sequence (ttcp_sequence_i);
 
-class ttcp_string_i 
+class ttcp_string_i
   : virtual public ttcp_stringBOAImpl
 {
 public:
diff --git a/tests/CLASSIX/CLASSIX_Con_Acc_Test.h b/tests/CLASSIX/CLASSIX_Con_Acc_Test.h
index 33726d64905..400077482c4 100644
--- a/tests/CLASSIX/CLASSIX_Con_Acc_Test.h
+++ b/tests/CLASSIX/CLASSIX_Con_Acc_Test.h
@@ -23,6 +23,11 @@
 #define ACE_TESTS_PRIORITY_REACTOR_TEST_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 #include "ace/Synch_T.h"
diff --git a/tests/CLASSIX/CLASSIX_Reactor_Test.h b/tests/CLASSIX/CLASSIX_Reactor_Test.h
index 11b19cb7df1..877c930df30 100644
--- a/tests/CLASSIX/CLASSIX_Reactor_Test.h
+++ b/tests/CLASSIX/CLASSIX_Reactor_Test.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    tests
-// 
+//
 // = FILENAME
 //    Reactor_Test.h
 //
@@ -13,16 +13,21 @@
 //      This file contains class definitions needed for template
 //      instantiation in the Reactor_Test.cpp file.
 //      Based on $ACE_ROOT/tests/MT_Reactor_Timer_Test.h
-//      
+//
 // = AUTHOR
 //    Wei Chiang
-// 
+//
 // ============================================================================
 
-#if !defined (__CLASSIX_REACTOR_TEST_H)
+#ifndef __CLASSIX_REACTOR_TEST_H
 #define __CLASSIX_REACTOR_TEST_H
 
 #include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 
 class Time_Handler : public ACE_Task<ACE_SYNCH>
@@ -39,7 +44,7 @@ public:
                               const void *arg);
 
 private:
-  enum 
+  enum
   {
     TIMER_SLOTS = 10
   };
diff --git a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.h b/tests/CLASSIX/CLASSIX_Select_Reactor_Test.h
index 7c663b59ab5..6f992a74f90 100644
--- a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.h
+++ b/tests/CLASSIX/CLASSIX_Select_Reactor_Test.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    tests
-// 
+//
 // = FILENAME
 //    MT_Reactor_Timer_Test.h
 //
@@ -15,13 +15,18 @@
 //
 // = AUTHOR
 //    Steve Huston
-// 
+//
 // ============================================================================
 
-#if !defined (__MT_REACTOR_TIMER_TEST_H)
+#ifndef __MT_REACTOR_TIMER_TEST_H
 #define __MT_REACTOR_TIMER_TEST_H
 
 #include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 
 class Time_Handler : public ACE_Task<ACE_SYNCH>
@@ -38,7 +43,7 @@ public:
                               const void *arg);
 
 private:
-  enum 
+  enum
   {
     TIMER_SLOTS = 10
   };
diff --git a/tests/CLASSIX/CLASSIX_test_config.h b/tests/CLASSIX/CLASSIX_test_config.h
index a1988fec7b9..cce7e86c1af 100644
--- a/tests/CLASSIX/CLASSIX_test_config.h
+++ b/tests/CLASSIX/CLASSIX_test_config.h
@@ -11,12 +11,17 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TEST_CONFIG_H)
+#ifndef ACE_TEST_CONFIG_H
 #define ACE_TEST_CONFIG_H
 
 // This first #undef protects against command-line definitions.
 #undef ACE_NDEBUG
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/streams.h"
 
 // The second #undef protects against being reset in a config.h file.
diff --git a/tests/Conn_Test.h b/tests/Conn_Test.h
index 44fbcf5b248..c0dc9c37de0 100644
--- a/tests/Conn_Test.h
+++ b/tests/Conn_Test.h
@@ -1,6 +1,11 @@
 // $Id$
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Stream.h"
 
@@ -8,7 +13,7 @@ class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
   // = TITLE
   //      This class is the product created by both <ACE_Connector>
   //      and <ACE_Acceptor> objects.
-  // 
+  //
   // = DESCRIPTION
   //    This class gets its own header file to work around AIX C++
   //    compiler "features" related to template instantiation...  It is
diff --git a/tests/Hash_Map_Manager_Test.h b/tests/Hash_Map_Manager_Test.h
index 0a22d0a773c..5be8cb975c1 100644
--- a/tests/Hash_Map_Manager_Test.h
+++ b/tests/Hash_Map_Manager_Test.h
@@ -11,10 +11,10 @@
 //
 // = AUTHOR
 //    James Hu, Steve Huston
-// 
+//
 // ============================================================================
 
-#if !defined (HASH_MAP_MANAGER_TEST_H)
+#ifndef HASH_MAP_MANAGER_TEST_H
 #define HASH_MAP_MANAGER_TEST_H
 
 class Dumb_String
diff --git a/tests/MT_Reactor_Timer_Test.h b/tests/MT_Reactor_Timer_Test.h
index 8e62aedf074..2be817fba90 100644
--- a/tests/MT_Reactor_Timer_Test.h
+++ b/tests/MT_Reactor_Timer_Test.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    tests
-// 
+//
 // = FILENAME
 //    MT_Reactor_Timer_Test.h
 //
@@ -15,13 +15,18 @@
 //
 // = AUTHOR
 //    Steve Huston
-// 
+//
 // ============================================================================
 
-#if !defined (__MT_REACTOR_TIMER_TEST_H)
+#ifndef __MT_REACTOR_TIMER_TEST_H
 #define __MT_REACTOR_TIMER_TEST_H
 
 #include "ace/Reactor.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Pipe.h"
 
@@ -29,7 +34,7 @@ class Time_Handler : public ACE_Task<ACE_SYNCH>
 {
   // = TITLE
   //   Test out the multi-threading features of the Reactor's timer
-  //   mechanism. 
+  //   mechanism.
 public:
   Time_Handler (void);
 
@@ -42,7 +47,7 @@ public:
                               const void *arg);
 
 private:
-  enum 
+  enum
   {
     TIMER_SLOTS = 10
   };
diff --git a/tests/Priority_Reactor_Test.h b/tests/Priority_Reactor_Test.h
index 63878db8c47..a8a5fa57266 100644
--- a/tests/Priority_Reactor_Test.h
+++ b/tests/Priority_Reactor_Test.h
@@ -22,6 +22,11 @@
 #define ACE_TESTS_PRIORITY_REACTOR_TEST_H
 
 #include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 
diff --git a/tests/Process_Strategy_Test.h b/tests/Process_Strategy_Test.h
index 7731eb014df..7944355255b 100644
--- a/tests/Process_Strategy_Test.h
+++ b/tests/Process_Strategy_Test.h
@@ -15,10 +15,15 @@
 //
 // ============================================================================
 
-#if !defined (PROCESS_STRATEGY_TEST_H)
+#ifndef PROCESS_STRATEGY_TEST_H
 #define PROCESS_STRATEGY_TEST_H
 
 #include "ace/Event_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 
diff --git a/tests/Reactor_Performance_Test.h b/tests/Reactor_Performance_Test.h
index 1575866ef62..a034a80d9e3 100644
--- a/tests/Reactor_Performance_Test.h
+++ b/tests/Reactor_Performance_Test.h
@@ -22,6 +22,11 @@
 #define __REACTOR_PERFORMANCE_TEST_H
 
 #include "ace/SOCK_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Svc_Handler.h"
 #include "ace/Synch.h"
 
diff --git a/tests/Thread_Manager_Test.h b/tests/Thread_Manager_Test.h
index 6a1c6b6fb6f..c9885c33ea7 100644
--- a/tests/Thread_Manager_Test.h
+++ b/tests/Thread_Manager_Test.h
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    tests
-// 
+//
 // = FILENAME
 //    Thread_Manager_Test.h
 //
@@ -14,7 +14,7 @@
 //
 // = AUTHOR
 //    Prashant Jain and Doug C. Schmidt
-// 
+//
 // ============================================================================
 
 #ifndef __THREAD_MANAGER_TEST_H
diff --git a/tests/Thread_Pool_Reactor_Test.h b/tests/Thread_Pool_Reactor_Test.h
index 1e3e3609a2b..cd0eb4aa822 100644
--- a/tests/Thread_Pool_Reactor_Test.h
+++ b/tests/Thread_Pool_Reactor_Test.h
@@ -23,6 +23,11 @@
 #define ACE_TESTS_THREAD_POOL_REACTOR_TEST_H
 
 #include "ace/SOCK_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Svc_Handler.h"
 #include "ace/Synch.h"
 
diff --git a/tests/Upgradable_RW_Test.h b/tests/Upgradable_RW_Test.h
index b385857a6e1..fe378969c21 100644
--- a/tests/Upgradable_RW_Test.h
+++ b/tests/Upgradable_RW_Test.h
@@ -18,6 +18,11 @@
 
 #include "test_config.h"
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
diff --git a/tests/test_config.h b/tests/test_config.h
index 52b6a4ab0e3..d5b2ca208b5 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -12,10 +12,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TEST_CONFIG_H)
+#ifndef ACE_TEST_CONFIG_H
 #define ACE_TEST_CONFIG_H
 
 #include "ace/inc_user_config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (ACE_NLOGGING)
 // ACE_NLOGGING must not be set if the tests are to produce any output.
 #undef ACE_NLOGGING