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

72 files changed, 1619 insertions, 1441 deletions

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 */