.

19 files changed, 275 insertions, 179 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index ef35704cdaf..fcee1df4cd9 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Fri Feb 26 00:43:30 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* orbsvcs/orbsvcs: Updated all the ORB services IDL files so that
+ 	  they are protected by #ifndef ... #endifs.  Thanks to Lothar
+ 	  Werzinger <werzinger.lothar@krones.de> for this suggestion.
+
 Fri Feb 26 00:05:16 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * TAO version 0.3.6 released.
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
index 0d23279ddc1..1d364a1d4ef 100644
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl
@@ -1,5 +1,4 @@
 /* -*- C++ -*- */
-
 // $Id$
 
 // ============================================================================
@@ -11,10 +10,14 @@
 //   AVStreams.idl
 //
 // = AUTHOR
-//    OMG
+//    Sumedh Mungee <sumehd@cs.wustl.edu> and Nagarajan Surendran
+//    <naga@cs.wustl.edu>
 // 
 // ============================================================================
 
+#ifndef TAO_AV_STREAMS_IDL
+#define TAO_AV_STREAMS_IDL
+
 #include "CosPropertyService.idl"
 
 #pragma prefix "omg.org"
@@ -741,11 +744,12 @@ module AVStreams
       raises(InvalidPosition);
   };
 
-// Additional sequences needed for the properties.
+  // Additional sequences needed for the properties.
 
-typedef sequence<FlowConnection> FlowConnection_seq;
-typedef sequence<StreamEndPoint_A> StreamEndPoint_A_seq;
-typedef sequence<StreamEndPoint_B> StreamEndPoint_B_seq;
-typedef sequence<FlowEndPoint> FlowEndPoint_seq;
+  typedef sequence<FlowConnection> FlowConnection_seq;
+  typedef sequence<StreamEndPoint_A> StreamEndPoint_A_seq;
+  typedef sequence<StreamEndPoint_B> StreamEndPoint_B_seq;
+  typedef sequence<FlowEndPoint> FlowEndPoint_seq;
 };
 
+#endif /* TAO_AV_STREAMS_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
index 26b90b70deb..1c7cc0d2994 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
@@ -16,10 +16,13 @@
 //    ftp://www.omg.org/pub/docs/formal/97-11-02.idl
 //
 // = AUTHOR
-//    OMG and Torben Worm <tworm@cs.wustl.edu>
+//    Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
+#ifndef TAO_CONCURRENCY_IDL
+#define TAO_CONCURRENCY_IDL
+
 //CosConcurrencyControl Module, page 7-8
 //Includes the following interfaces:
 //  LockCoordinator, LockSet, TransactionalLockSet, LockSetFactory
@@ -193,4 +196,4 @@ module CosConcurrencyControl
     };
 };
 
-
+#endif /* TAO_CONCURRENCY_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl
index 93da8203357..6ce741d79d1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl
@@ -1,5 +1,8 @@
 // $Id$
 
+#ifndef TAO_EVENTCHANNELADMIN_IDL
+#define  TAO_EVENTCHANNELADMIN_IDL
+
 #include "CosEventComm.idl"
 
 #pragma prefix "omg.org"
@@ -151,3 +154,5 @@ module CosEventChannelAdmin
       // The destroy operation destroys the event channel.
     };
 };
+
+#endif /* TAO_EVENTCHANNELADMIN_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEventComm.idl b/TAO/orbsvcs/orbsvcs/CosEventComm.idl
index e7b2e269e80..fa8381689a2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/CosEventComm.idl
@@ -1,11 +1,15 @@
 // $Id$
 
+#ifndef TAO_EVENTCOMM_IDL
+#define TAO_EVENTCOMM_IDL
+
 #pragma prefix "omg.org"
 
 module CosEventComm
 {
   // = TITLE
-  //   IDL module for the Corba Object Service for Event Communication.
+  //   IDL module for the Corba Object Service for Event
+  //   Communication.
 
   exception Disconnected 
     {
@@ -97,3 +101,5 @@ module CosEventComm
       // reference is disposed.
     };
 };
+
+#endif /* TAO_EVENTCOMM_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
index a24ac7c4075..16c964fa3f1 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
@@ -22,6 +22,9 @@
 //
 // ============================================================================
 
+#ifndef TAO_LIFECYCLE_IDL
+#define TAO_LIFECYCLE_IDL
+
 // OMG IDL for CosLifeCycle Module, page 6-10 in 
 // Includes the following interfaces:
 //   FactoryFinder, LifeCycleObject, GenericFactory
@@ -119,3 +122,5 @@ typedef struct NVP
 
 typedef sequence <NameValuePair> Criteria;
 */
+
+#endif /* TAO_LIFECYCLE_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.idl b/TAO/orbsvcs/orbsvcs/CosNaming.idl
index 701eae8bd78..cfd4153fd4f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.idl
@@ -14,6 +14,9 @@
 //
 // ============================================================================
 
+#ifndef TAO_NAMING_IDL
+#define TAO_NAMING_IDL
+
 #pragma prefix "omg.org"
 
 module CosNaming
@@ -230,3 +233,5 @@ module CosNaming
       // This operation destroys the iterator.
     };
 };
+
+#endif /* TAO_NAMING_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
index 71ec99858a9..4f1d76df69c 100644
--- a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
+++ b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
@@ -19,6 +19,9 @@
 //
 // ================================================================
 
+#ifndef TAO_PROPERTY_IDL
+#define TAO_PROPERTY_IDL
+
 #pragma prefix "omg.org"
 
 module CosPropertyService
@@ -404,3 +407,5 @@ module CosPropertyService
       // The destroy operation destroys the iterator.
     };
 };
+
+#endif /* TAO_PROPERTY_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosTimeBase.idl b/TAO/orbsvcs/orbsvcs/CosTimeBase.idl
index 3d4eed07d76..dd522810f69 100644
--- a/TAO/orbsvcs/orbsvcs/CosTimeBase.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTimeBase.idl
@@ -1,13 +1,12 @@
-//
 // $Id$
-//
 
 #ifndef COS_TIME_BASE_IDL
 #define COS_TIME_BASE_IDL
 
 #pragma prefix "omg.org"
 
-module TimeBase {
+module TimeBase 
+{
   // = TITLE
   //   COS Time Service basic types.
   //
@@ -26,7 +25,9 @@ module TimeBase {
   typedef short TdfT;
   // Minutes of displacement from the Greenwich time.
 
-  struct UtcT {
+  struct UtcT 
+  {
+    // = TITLE
     //   Structure of the time value.  The inaccuracy is packed into
     //   inacclo & inacchi.  The tdf holds the time displacement
     //   factor.
@@ -48,7 +49,7 @@ module TimeBase {
 
   };
 
-   struct IntervalT
+  struct IntervalT
   {
     // = TITLE
     // This type holds a time interval represented as two TimeT values
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.idl b/TAO/orbsvcs/orbsvcs/CosTrading.idl
index b8fe1703e5e..3b8beedb491 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.idl
@@ -13,6 +13,9 @@
 //
 // ========================================================================
 
+#ifndef TAO_TRADING_IDL
+#define TAO_TRADING_IDL
+
 #pragma prefix "omg.org"
 
 module CosTrading
@@ -680,3 +683,5 @@ module CosTradingSequences
   typedef sequence<double> DoubleSeq;
   typedef sequence<string> StringSeq;
 };
+
+#endif /* TAO_TRADING_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/LifeCycleService.idl b/TAO/orbsvcs/orbsvcs/LifeCycleService.idl
index e750cfd7b42..d1cf1872d0b 100644
--- a/TAO/orbsvcs/orbsvcs/LifeCycleService.idl
+++ b/TAO/orbsvcs/orbsvcs/LifeCycleService.idl
@@ -14,6 +14,9 @@
 //
 // ============================================================================
 
+#ifndef TAO_LIFECYCLESERVICE_IDL
+#define TAO_LIFECYCLESERVICE_IDL
+
 #include "CosLifeCycle.idl"
 
 module LifeCycleService
@@ -69,3 +72,4 @@ module LifeCycleService
     };
 };
 
+#endif /* TAO_LIFECYCLESERVICE_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Logger.idl b/TAO/orbsvcs/orbsvcs/Logger.idl
index c6c10f13e65..7feaeafcfb6 100644
--- a/TAO/orbsvcs/orbsvcs/Logger.idl
+++ b/TAO/orbsvcs/orbsvcs/Logger.idl
@@ -1,5 +1,8 @@
 // $Id$
 
+#ifndef TAO_LOGGER_IDL
+#define TAO_LOGGER_IDL
+
 // TAO_MAXLOGMSGLEN must be the same size as ACE_MAXLOGMSGLEN.
 #if !defined TAO_MAXLOGMSGLEN
 #define TAO_MAXLOGMSGLEN 4 * 1024
@@ -112,3 +115,5 @@ interface Logger_Factory
   // Returns a new <Logger> instance if <name> is unique, or retuns a
   // previously created instance of that name
 };
+
+#endif /* TAO_LOGGER_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Ping.idl b/TAO/orbsvcs/orbsvcs/Ping.idl
index 96abb0b32de..50be83c601a 100644
--- a/TAO/orbsvcs/orbsvcs/Ping.idl
+++ b/TAO/orbsvcs/orbsvcs/Ping.idl
@@ -1,10 +1,16 @@
 // $Id$
 
+#ifndef TAO_PING_IDL
+#define TAO_PING_IDL
+
 interface Ping_Object
 {
   void ping ();
-  // Used for checking for liveness of a server.  When the server receives
-  // this, it should send back a response indicating it is sill alive.
-  // Depending on the policy specified, a timeout can be reached where the
-  // Implementation Repository will restart the server.
+  // Used for checking for liveness of a server.  When the server
+  // receives this, it should send back a response indicating it is
+  // sill alive.  Depending on the policy specified, a timeout can be
+  // reached where the Implementation Repository will restart the
+  // server.
 };
+
+#endif /*TAO_PING_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
index be3bf59e968..42e8395ed3b 100644
--- a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
@@ -1,168 +1,181 @@
-//
 // $Id$
-//
+
+#ifndef TAO_RTEC_EVENTCHANNELADMIN_IDL
+#define TAO_RTEC_EVENTCHANNELADMIN_IDL
+
 #include "RtecEventComm.idl"
 #include "RtecScheduler.idl"
 
-module RtecEventChannelAdmin {
-
+module RtecEventChannelAdmin 
+{
   exception AlreadyConnected {};
   exception TypeError {};
 
-  struct Dependency {
+  struct Dependency 
+  {
     RtecEventComm::Event event;
     RtecScheduler::handle_t rt_info;
   };
   typedef sequence<Dependency> DependencySet;
 
-  struct ConsumerQOS {
+  struct ConsumerQOS 
+  {
     DependencySet dependencies;
     boolean is_gateway;
   };
 
-  struct Publication {
+  struct Publication 
+  {
     RtecEventComm::Event event;
     RtecScheduler::Dependency_Info dependency_info;
   };
   typedef sequence<Publication> PublicationSet;
 
-  struct SupplierQOS {
+  struct SupplierQOS 
+  {
     PublicationSet publications;
     boolean is_gateway;
   };
 
-  interface ProxyPushSupplier: RtecEventComm::PushSupplier {
-    // = TITLE
-    //   The Proxy Supplier
-    //
-    // = DESCRIPTION
-    //   Consumers receive their events from objects of this type. See
-    //   the interfaces below to see how to gain access to an object
-    //   reference of this type.
-
-    void connect_push_consumer(
-		in RtecEventComm::PushConsumer push_consumer,
-		in ConsumerQOS qos)
-      raises(AlreadyConnected, TypeError);
-    // Before receiving any events the consumer must provide its
-    // publication list and QoS information to the Event Channel
-    // through this method.
-
-    void suspend_connection ();
-    // Temporarly suspend reception of events from the Event
-    // Channel. Calling this method is more efficient than dropping
-    // them on the receiving end and less expensive than disconnecting
-    // and connecting again (but it is not free!!)
-
-    void resume_connection ();
-    // Resume the reception of events.
-  };
-
-  interface ProxyPushConsumer: RtecEventComm::PushConsumer {
-    // = TITLE
-    //   The Proxy Consumer
-    //
-    // = DESCRIPTION
-    //   Suppliers push their events to objects of this type. See the
-    //   interfaces below to see how to gain access to an object
-    //   reference of this type.
-
-    void connect_push_supplier(
-		in RtecEventComm::PushSupplier push_supplier,
-		in SupplierQOS qos)
-      raises(AlreadyConnected);
-    // Before pushing events the supplier must provide its publication
-    // list and QoS information to the Event Channel through this
-    // method.
-  };
+  interface ProxyPushSupplier: RtecEventComm::PushSupplier 
+    {
+      // = TITLE
+      //   The Proxy Supplier
+      //
+      // = DESCRIPTION
+      //   Consumers receive their events from objects of this type. See
+      //   the interfaces below to see how to gain access to an object
+      //   reference of this type.
+
+      void connect_push_consumer(in RtecEventComm::PushConsumer push_consumer,
+                                 in ConsumerQOS qos)
+        raises(AlreadyConnected, TypeError);
+      // Before receiving any events the consumer must provide its
+      // publication list and QoS information to the Event Channel
+      // through this method.
+
+      void suspend_connection ();
+      // Temporarly suspend reception of events from the Event
+      // Channel. Calling this method is more efficient than dropping
+      // them on the receiving end and less expensive than disconnecting
+      // and connecting again (but it is not free!!)
+
+      void resume_connection ();
+      // Resume the reception of events.
+    };
+
+  interface ProxyPushConsumer: RtecEventComm::PushConsumer 
+    {
+      // = TITLE
+      //   The Proxy Consumer
+      //
+      // = DESCRIPTION
+      //   Suppliers push their events to objects of this type. See the
+      //   interfaces below to see how to gain access to an object
+      //   reference of this type.
+
+      void connect_push_supplier (in RtecEventComm::PushSupplier push_supplier,
+                                  in SupplierQOS qos)
+        raises (AlreadyConnected);
+      // Before pushing events the supplier must provide its
+      // publication list and QoS information to the Event Channel
+      // through this method.
+    };
 
   // @@ TODO: Find out the exception specs for the following interface's
   // methods.
-  interface ConsumerAdmin {
-    // = TITLE
-    //   The Supplier factory
-    //
-    // = DESCRIPTION
-    //   Consumers use this interface to create suppliers they can
-    //   connect to.
-
-    ProxyPushSupplier obtain_push_supplier();
-    // Obtain a supplier
-  };
-  interface SupplierAdmin {
-    // = TITLE
-    //   The Consumer factory
-    //
-    // = DESCRIPTION
-    //   Suppliers use this interface to create consumers they can
-    //   connect to.
-
-    ProxyPushConsumer obtain_push_consumer();
-    // Obtain a consumer
-  };
-
-  interface Observer {
-    // = TITLE
-    //   Observes any changes in the consumer or supplier sets for an
-    //   Event Channel
-    //
-    // = DESCRIPTION
-    //   This object receives updates from Event Channels with any
-    //   changes on set of consumer and or suppliers registered with
-    //   the Event Channel.
-
-    void update_consumer (in ConsumerQOS sub);
-    // A change in the list of consumers has ocurred. The disjunction
-    // of the subscriptions (and its equivalent form ) is
-    // passed to the observer.
-
-    void update_supplier (in SupplierQOS pub);
-    // A change in the list of consumers has ocurred. The disjunction
-    // of the publications (and its equivalent form for suppliers).
-  };
+  interface ConsumerAdmin 
+    {
+      // = TITLE
+      //   The Supplier factory
+      //
+      // = DESCRIPTION
+      //   Consumers use this interface to create suppliers they can
+      //   connect to.
+
+      ProxyPushSupplier obtain_push_supplier ();
+      // Obtain a supplier
+    };
+
+  interface SupplierAdmin 
+    {
+      // = TITLE
+      //   The Consumer factory
+      //
+      // = DESCRIPTION
+      //   Suppliers use this interface to create consumers they can
+      //   connect to.
+
+      ProxyPushConsumer obtain_push_consumer ();
+      // Obtain a consumer
+    };
+
+  interface Observer 
+    {
+      // = TITLE
+      //   Observes any changes in the consumer or supplier sets for an
+      //   Event Channel
+      //
+      // = DESCRIPTION
+      //   This object receives updates from Event Channels with any
+      //   changes on set of consumer and or suppliers registered with
+      //   the Event Channel.
+
+      void update_consumer (in ConsumerQOS sub);
+      // A change in the list of consumers has ocurred. The disjunction
+      // of the subscriptions (and its equivalent form ) is
+      // passed to the observer.
+
+      void update_supplier (in SupplierQOS pub);
+      // A change in the list of consumers has ocurred. The disjunction
+      // of the publications (and its equivalent form for suppliers).
+    };
 
   typedef unsigned long Observer_Handle;
   // This is used as an opaque ID to control the addition and removal
   // of handles from an event channel.
 
-  interface EventChannel {
-    // = TITLE
-    //   The Event Channel class
-    //
-    // = DESCRIPTION
-    //   This class provides the main entry point for the Event
-    //   Channel.  The class follows a protocol similar to the
-    //   COS Event Service as described in the CORBAservices spec.
-    //
-    exception SYNCHRONIZATION_ERROR {};
-    exception QOS_ERROR {};
-    exception SUBSCRIPTION_ERROR {};
-    exception CORRELATION_ERROR {};
-    exception DISPATCH_ERROR {};
-    exception CANT_APPEND_OBSERVER {};
-    exception CANT_REMOVE_OBSERVER {};
-
-    ConsumerAdmin for_consumers();
-    // Consumers call this method to gain access to the
-    // ProxyPushSupplier factory.
-
-    SupplierAdmin for_suppliers();
-    // Suppliers call this method to gain access to the
-    // ProxyPushConsumer factory.
-
-    void destroy ();
-    // This method shutdown the Event Channel, destroy any resources
-    // for it and actually shutdown the server where the Event Channel
-    // is running.
-
-    Observer_Handle append_observer (in Observer gw)
-      raises (SYNCHRONIZATION_ERROR,CANT_APPEND_OBSERVER);
-    // Add a gateway to the Event Channel, the handle returned must be
-    // used to remove the gateway from the ORB.
-
-    void remove_observer (in Observer_Handle gw)
-      raises (SYNCHRONIZATION_ERROR,CANT_REMOVE_OBSERVER);
-    // Remove the observer.
-    // @@ TODO: We should raise something if the handle is invalid.
-  };
+  interface EventChannel 
+    {
+      // = TITLE
+      //   The Event Channel class
+      //
+      // = DESCRIPTION
+      //   This class provides the main entry point for the Event
+      //   Channel.  The class follows a protocol similar to the
+      //   COS Event Service as described in the CORBAservices spec.
+      //
+      exception SYNCHRONIZATION_ERROR {};
+      exception QOS_ERROR {};
+      exception SUBSCRIPTION_ERROR {};
+      exception CORRELATION_ERROR {};
+      exception DISPATCH_ERROR {};
+      exception CANT_APPEND_OBSERVER {};
+      exception CANT_REMOVE_OBSERVER {};
+
+      ConsumerAdmin for_consumers ();
+      // Consumers call this method to gain access to the
+      // ProxyPushSupplier factory.
+
+      SupplierAdmin for_suppliers ();
+      // Suppliers call this method to gain access to the
+      // ProxyPushConsumer factory.
+
+      void destroy ();
+      // This method shutdown the Event Channel, destroy any resources
+      // for it and actually shutdown the server where the Event Channel
+      // is running.
+
+      Observer_Handle append_observer (in Observer gw)
+        raises (SYNCHRONIZATION_ERROR,CANT_APPEND_OBSERVER);
+      // Add a gateway to the Event Channel, the handle returned must be
+      // used to remove the gateway from the ORB.
+
+      void remove_observer (in Observer_Handle gw)
+        raises (SYNCHRONIZATION_ERROR,CANT_REMOVE_OBSERVER);
+      // Remove the observer.
+      // @@ TODO: We should raise something if the handle is invalid.
+    };
 };
+
+#endif /* TAO_RTEC_EVENTCHANNELADMIN_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
index b31df29deb6..87d8a5fa8cc 100644
--- a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
@@ -1,6 +1,7 @@
-//
 // $Id$
-//
+
+#ifndef TAO_RTEC_EVENTCOMM_IDL
+#define TAO_RTEC_EVENTCOMM_IDL
 
 #include "CosTimeBase.idl"
 
@@ -9,8 +10,8 @@
 // if pragmas should survive the file scope...
 #pragma prefix ""
 
-module RtecEventComm {
-
+module RtecEventComm 
+{
   // = TITLE
   //   User defined Event Data.
   //
@@ -24,12 +25,13 @@ module RtecEventComm {
   //   sequence of octet.
 
   typedef sequence<octet> EventPayload;
-  struct EventData {
+  struct EventData 
+  {
     long x;
     long y;
 
     double pad0;
-    long   pad1;
+    long pad1;
     // This two objects ensure that the encapsulated stream below is
     // properly aligned; this makes the decoding of the payload more
     // efficient because we can use the usual demarshalling code
@@ -93,13 +95,17 @@ module RtecEventComm {
   };
   typedef sequence<Event> EventSet;
 
-  interface PushConsumer {
-    oneway void push (in EventSet data);
-    void disconnect_push_consumer();
-  };
+  interface PushConsumer 
+    {
+      oneway void push (in EventSet data);
+      void disconnect_push_consumer ();
+    };
 
-  interface PushSupplier {
-    void disconnect_push_supplier();
-  };
+  interface PushSupplier 
+    {
+      void disconnect_push_supplier ();
+    };
 
 };
+
+#endif /* TAO_RTEC_EVENTCOMM_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
index f6513556613..5254c2d283d 100644
--- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
@@ -1,5 +1,8 @@
 // $Id$
 
+#ifndef TAO_RTEC_SCHEDULER_IDL
+#define TAO_RTEC_SCHEDULER_IDL
+
 #include "CosTimeBase.idl"
 #pragma prefix ""
 
@@ -357,4 +360,4 @@ module RtecScheduler
   };
 };
 
-
+#endif /* TAO_RTEC_SCHEDULER_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
index 6f5d043d5c5..68525f07d2d 100644
--- a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
@@ -1,9 +1,12 @@
-//
 // $Id$
-//
+
+#ifndef TAO_RTEC_UDP_ADMIN_IDL
+#define TAO_RTEC_UDP_ADMIN_IDL
+
 #include "RtecEventComm.idl"
 
-module RtecUDPAdmin {
+module RtecUDPAdmin 
+{
   // = TITLE
   //   Multicast Administration module
   //
@@ -12,17 +15,19 @@ module RtecUDPAdmin {
   //   a mapping between event types and multicast addresses must be
   //   stablished.
 
-  struct UDP_Addr {
+  struct UDP_Addr 
+  {
     unsigned long ipaddr;
     unsigned short port;
   };
 
-  interface AddrServer {
-    void get_addr (in RtecEventComm::EventHeader header,
-		   out UDP_Addr addr);
-    // Get the addr and port given the event header.
-  };
+  interface AddrServer 
+    {
+      void get_addr (in RtecEventComm::EventHeader header,
+                     out UDP_Addr addr);
+      // Get the addr and port given the event header.
+    };
 
 };
 
-
+#endif /* TAO_RTEC_UDP_ADMIN_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/TimeService.idl b/TAO/orbsvcs/orbsvcs/TimeService.idl
index ce8568941d9..8d27ca3d7be 100644
--- a/TAO/orbsvcs/orbsvcs/TimeService.idl
+++ b/TAO/orbsvcs/orbsvcs/TimeService.idl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
 // $Id$
 
+#ifndef TAO_TIME_IDL
+#define TAO_TIME_IDL
+
 #include "CosTimeBase.idl"
 
 #pragma prefix "omg.org"
@@ -172,3 +175,5 @@ module CosTime
       // This creates a new TIO with the given parameters.
     };
 };
+
+#endif /* TAO_TIME_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
index ba1ffbce866..13164e1a25b 100644
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ b/TAO/orbsvcs/orbsvcs/sfp.idl
@@ -1,5 +1,8 @@
 /* -*- C++ -*- */
-/* $Id$ */
+// $Id$
+
+#ifndef TAO_SFP_IDL
+#define TAO_SFP_IDL
 
 module flowProtocol
 {
@@ -111,6 +114,7 @@ module flowProtocol
     // "=",'C','R','E'
     unsigned long cred_num;
   };
-
   
 };
+
+#endif /* TAO_SFP_IDL */