Mon Aug 14 12:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

34 files changed, 104 insertions, 1146 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5e7f2f2003f..0663fa74d8b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,27 @@
+Mon Aug 14 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory.mpc:
+        * tao/ObjRefTemplate.mpc:
+        * tao/PortableServer.mpc:
+        * tao/RTCORBA.mpc:
+        * tao/RTPortableServer.mpc:
+        * tao/RTScheduler.mpc:
+        * tao/PI_Server.mpc:
+          Enabed regeneration of *_include.pidl files, this will result
+          in an almost empty C.cpp file but that is needed to retrigger
+          the regeneration of the header files.
+
+        * tao/CodecFactory/IOP_Codec_include{A,C,S}.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_include{A,C,S}.h:
+        * tao/PI_Server/PI_Server_include{A,C,S}.h:
+        * tao/PortableServer/PortableServer_include{A,C,S}.h:
+        * tao/RTCORBA/RTCORBA_include{A,C,S}.h:
+        * tao/RTPortableServer/RTPortableServer_include{A,C,S}.h:
+        * tao/RTScheduling/RTScheduler_include{A,C,S}.h:
+        * tao/RTScheduling/diffs/RTScheduler.diff:
+        * tao/RTPortableServer/RTPortableServerA.h:
+          Removed from the archive
+
 Mon Aug 14 12:49:11 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * TAO_IDL/be/be_global.cpp:
diff --git a/TAO/tao/CodecFactory.mpc b/TAO/tao/CodecFactory.mpc
index ca08301b815..0732157687a 100644
--- a/TAO/tao/CodecFactory.mpc
+++ b/TAO/tao/CodecFactory.mpc
@@ -38,6 +38,15 @@ project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
     CodecFactory/IOP_Codec.pidl
   }
 
+  IDL_Files {
+    idlflags += -Ge 1 -Sci -SS -Sorb -Sa -GX \
+                -Wb,export_macro=TAO_CodecFactory_Export \
+                -Wb,export_include=tao/CodecFactory/codecfactory_export.h \
+                -Wb,unique_include=tao/CodecFactory/CodecFactory.h \
+                -o CodecFactory
+    CodecFactory/IOP_Codec_include.pidl
+  }
+
   Pkgconfig_Files {
     CodecFactory/TAO_CodecFactory.pc.in
   }
diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeA.h b/TAO/tao/CodecFactory/IOP_Codec_includeA.h
deleted file mode 100644
index 77742d1e1be..00000000000
--- a/TAO/tao/CodecFactory/IOP_Codec_includeA.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_IOPCODEC_INCLUDEA_H_
-#define _TAO_IDL_ORIG_IOPCODEC_INCLUDEA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CodecFactory/IOP_Codec_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeC.h b/TAO/tao/CodecFactory/IOP_Codec_includeC.h
deleted file mode 100644
index dae38bfa7b4..00000000000
--- a/TAO/tao/CodecFactory/IOP_Codec_includeC.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:154
-
-#ifndef _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
-#define _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CodecFactory/codecfactory_export.h"
-#include "tao/CodecFactory/CodecFactory.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_CodecFactory_Export
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeS.h b/TAO/tao/CodecFactory/IOP_Codec_includeS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/CodecFactory/IOP_Codec_includeS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index bd86fd5ffc3..f8b0242bed0 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -456,7 +456,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
        1 /* colon separator */ +
        1 /* object key separator */ +
        ACE_OS::strlen (key.in ()));
-  size_t pfx_len = (
+  size_t const pfx_len = (
        ACE_OS::strlen (::the_prefix) /* "iiop" */ +
        1 /* colon separator */);
 
@@ -547,8 +547,8 @@ TAO_IIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 #if defined (ACE_HAS_IPV6)
   // For IPv6 decimal addresses make sure the possibly included scopeid
   // is not published as this has only local meaning.
-  const char* host;
-  const char* pos;
+  const char* host = 0;
+  const char* pos = 0;
   if (this->endpoint_.is_ipv6_decimal_ &&
       (pos = ACE_OS::strchr (host = this->endpoint_.host (), '%')) != 0)
     {
@@ -606,8 +606,8 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void)
 #if defined (ACE_HAS_IPV6)
       // For IPv6 decimal addresses make sure the possibly included scopeid
       // is not published as this has only local meaning.
-      const char* host;
-      const char* pos;
+      const char* host = 0;
+      const char* pos = 0;
       if (endpoint->is_ipv6_decimal_ &&
           (pos = ACE_OS::strchr (host = endpoint->host (), '%')) != 0)
         {
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index fb88494ed45..64505dc920a 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -27,7 +27,7 @@ project : taolib, core, portableserver, pi, valuetype, tao_versioning_idl_defaul
   }
 
   IDL_Files {
-    idlflags += -SS -GA -Gp -Gd -Ge 1 -Sc -Sorb -Sal \
+    idlflags += -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -o Messaging
@@ -36,17 +36,25 @@ project : taolib, core, portableserver, pi, valuetype, tao_versioning_idl_defaul
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sc -Sorb -Sal -GX \
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -o Messaging
     idlflags -= -Sa -St
     Messaging/Pollable.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX \
+                -Wb,export_macro=TAO_Messaging_Export \
+                -Wb,export_include=tao/Messaging/messaging_export.h \
+                -o Messaging
+    idlflags -= -Sa -St
     Messaging/Messaging_Types.pidl
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sc -Sorb -Sal \
+    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -o Messaging
@@ -57,7 +65,7 @@ project : taolib, core, portableserver, pi, valuetype, tao_versioning_idl_defaul
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sc -Sorb -Sal \
+    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
@@ -68,7 +76,7 @@ project : taolib, core, portableserver, pi, valuetype, tao_versioning_idl_defaul
   }
 
   IDL_Files {
-    idlflags += -Ssi -GA -Gp -Gd -Ge 1 -Sc -Sorb -Sal \
+    idlflags += -Ssi -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index bf194a1a695..d069dd0aab0 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -39,6 +39,15 @@ project : valuetype, portableserver, core, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
+                -Wb,export_macro=TAO_ORT_Export \
+                -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
+                -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \
+                -o ObjRefTemplate
+    ObjRefTemplate/ObjectReferenceTemplate_include.pidl
+  }
+
+  IDL_Files {
     idlflags += -Gp -Gd -Ge 1 -SS -GA -Sorb  \
                 -Wb,export_macro=TAO_ORT_Export \
                 -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
deleted file mode 100644
index fbf583b4fef..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDEA_H_
-#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:999
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h
deleted file mode 100644
index bef52c5826e..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDEC_H_
-#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ObjRefTemplate/ort_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_ORT_Export
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_ORT_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:963
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h
deleted file mode 100644
index 65f2ae33b8a..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDES_H_
-#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplateS.h"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:999
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server.mpc
index 849624af7a8..722396cbe67 100644
--- a/TAO/tao/PI_Server.mpc
+++ b/TAO/tao/PI_Server.mpc
@@ -36,6 +36,15 @@ project : taolib, pi, portableserver, core, tao_versioning_idl_defaults {
     PI_Server/ServerRequestInfo.pidl
   }
 
+  IDL_Files {
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
+                -Wb,export_macro=TAO_PI_Server_Export \
+                -Wb,export_include=tao/PI_Server/pi_server_export.h \
+                -Wb,unique_include=tao/PI_Server/ServerRequestInterceptorC.h \
+                -o PI_Server
+    PI_Server/PI_Server_include.pidl
+  }
+
   Pkgconfig_Files {
     PI_Server/TAO_PI_Server.pc.in
   }
diff --git a/TAO/tao/PI_Server/PI_Server_includeA.h b/TAO/tao/PI_Server/PI_Server_includeA.h
deleted file mode 100644
index 44c20559645..00000000000
--- a/TAO/tao/PI_Server/PI_Server_includeA.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_PI_SERVER_INCLUDEA_H_
-#define _TAO_IDL_ORIG_PI_SERVER_INCLUDEA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI_Server/PI_Server_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PI_Server/PI_Server_includeC.h b/TAO/tao/PI_Server/PI_Server_includeC.h
deleted file mode 100644
index cca4fe783bd..00000000000
--- a/TAO/tao/PI_Server/PI_Server_includeC.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PI_SERVER_INCLUDEC_H_
-#define _TAO_IDL_ORIG_PI_SERVER_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI_Server/pi_server_export.h"
-
-#include "tao/PI_Server/ServerRequestInterceptorC.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PI_Server/PI_Server_includeS.h b/TAO/tao/PI_Server/PI_Server_includeS.h
deleted file mode 100644
index dc5cdcf7c2b..00000000000
--- a/TAO/tao/PI_Server/PI_Server_includeS.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI_Server/ServerRequestInterceptorS.h"
-#include "tao/PI_Server/PI_Server_includeC.h"
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index d484db6aa62..d41301eb30d 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -64,6 +64,15 @@ project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
     PortableServer/PS_Current.pidl
   }
 
+  IDL_Files {
+    idlflags += -Ge 1 -Sci -SS -Sorb -Sa -GX \
+                -Wb,export_macro=TAO_PortableServer_Export \
+                -Wb,export_include=tao/PortableServer/portableserver_export.h \
+                -Wb,unique_include=tao/PortableServer/PortableServer.h \
+                -o PortableServer
+    PortableServer/PortableServer_include.pidl
+  }
+
   PIDL_Files {
     PortableServer
   }
diff --git a/TAO/tao/PortableServer/PortableServer_includeA.h b/TAO/tao/PortableServer/PortableServer_includeA.h
deleted file mode 100644
index 2874993878d..00000000000
--- a/TAO/tao/PortableServer/PortableServer_includeA.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEA_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/PortableServer_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h
deleted file mode 100644
index 8f2a1503f6c..00000000000
--- a/TAO/tao/PortableServer/PortableServer_includeC.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:154
-
-#ifndef _TAO_IDL_PORTABLESERVER_INCLUDEC_H_
-#define _TAO_IDL_PORTABLESERVER_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-
-#include "tao/PortableServer/PortableServer.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:1028
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/PortableServer_includeS.h b/TAO/tao/PortableServer/PortableServer_includeS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/PortableServer/PortableServer_includeS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
deleted file mode 100644
index d6638858330..00000000000
--- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- orig/PortableServer_includeC.h	2005-04-11 16:44:03.175430400 +0200
-+++ PortableServer_includeC.h	2005-04-11 16:44:05.098195200 +0200
-@@ -45,7 +45,7 @@
- #include "tao/SystemException.h"
- #include "tao/Environment.h"
- 
--#include "tao/PortableServer/PortableServerC.h"
-+#include "tao/PortableServer/PortableServer.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index b409840f159..9ecfe53e17b 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -29,6 +29,12 @@ project : taolib, core, pi {
   }
 
   IDL_Files {
+    idlflags += -Ge 1 -Sci -SS -Sorb -Sa -GX \
+                -Wb,export_macro=TAO_RTCORBA_Export \
+                -Wb,export_include=tao/RTCORBA/rtcorba_export.h \
+                -Wb,unique_include=tao/RTCORBA/RTCORBA.h \
+                -o RTCORBA
+    RTCORBA/RTCORBA_include.pidl
   }
 
   Pkgconfig_Files {
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeA.h b/TAO/tao/RTCORBA/RTCORBA_includeA.h
deleted file mode 100644
index e0779b11bc4..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA_includeA.h
+++ /dev/null
@@ -1,4 +0,0 @@
-//$Id$
-/**
-* Just a place holder for files that include RTCORBA_include.pidl
-*/
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeC.h b/TAO/tao/RTCORBA/RTCORBA_includeC.h
deleted file mode 100644
index 1b7cc8c0f9a..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA_includeC.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:186
-
-#ifndef _TAO_IDL_ORIG_RTCORBA_INCLUDEC_H_
-#define _TAO_IDL_ORIG_RTCORBA_INCLUDEC_H_
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-
-#include "tao/RTCORBA/RTCORBA.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:50
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/cdr_op.cpp:48
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1050
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeS.h b/TAO/tao/RTCORBA/RTCORBA_includeS.h
deleted file mode 100644
index e0779b11bc4..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA_includeS.h
+++ /dev/null
@@ -1,4 +0,0 @@
-//$Id$
-/**
-* Just a place holder for files that include RTCORBA_include.pidl
-*/
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index 79c6cf8cc12..54b418dc267 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -28,7 +28,7 @@ project : taolib, core, rtcorba, portableserver {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX \
                 -Wb,export_macro=TAO_RTPortableServer_Export \
                 -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
                 -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE \
@@ -37,6 +37,15 @@ project : taolib, core, rtcorba, portableserver {
     RTPortableServer/RTPortableServer.pidl
   }
 
+  IDL_Files {
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
+                -Wb,export_macro=TAO_RTPortableServer_Export \
+                -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
+                -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h \
+                -o RTPortableServer
+    RTPortableServer/RTPortableServer_include.pidl
+  }
+
   Pkgconfig_Files {
     RTPortableServer/TAO_RTPortableServer.pc.in
   }
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.h b/TAO/tao/RTPortableServer/RTPortableServerA.h
deleted file mode 100644
index e543e41332e..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServerA.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-// This file deliberately empty. See bugzilla #2549.
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeA.h b/TAO/tao/RTPortableServer/RTPortableServer_includeA.h
deleted file mode 100644
index e543e41332e..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer_includeA.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-// This file deliberately empty. See bugzilla #2549.
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h
deleted file mode 100644
index 2b42eb48285..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_RTPORTABLESERVER_INCLUDEC_H_
-#define _TAO_IDL_ORIG_RTPORTABLESERVER_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/RTPortableServer/rtportableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-
-#include "tao/RTPortableServer/RTPortableServer.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_RTPortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeS.h b/TAO/tao/RTPortableServer/RTPortableServer_includeS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer_includeS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
index 75069963af5..decdf1fa44a 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -37,6 +37,15 @@ project : taolib, rtcorba, pi, pi_server, portableserver, core, corba_messaging,
     RTScheduling/RTScheduler.pidl
   }
 
+  IDL_Files {
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
+                -Wb,export_macro=TAO_RTScheduler_Export \
+                -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \
+                -Wb,safe_include=tao/RTScheduling/RTScheduler.h \
+                -o RTScheduling
+    RTScheduling/RTScheduler_include.pidl
+  }
+
   Pkgconfig_Files {
     RTScheduling/TAO_RTScheduler.pc.in
   }
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeA.h b/TAO/tao/RTScheduling/RTScheduler_includeA.h
deleted file mode 100644
index 08e80fef94b..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_includeA.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:186
-
-#ifndef _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
-#define _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-
-#include "tao/RTScheduling/RTScheduler.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1050
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeC.h b/TAO/tao/RTScheduling/RTScheduler_includeC.h
deleted file mode 100644
index c9361beee75..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_includeC.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:186
-
-#ifndef _TAO_IDL_RTSCHEDULER_INCLUDEC_H_
-#define _TAO_IDL_RTSCHEDULER_INCLUDEC_H_
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-
-#include "tao/RTScheduling/RTScheduler.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1050
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeS.h b/TAO/tao/RTScheduling/RTScheduler_includeS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_includeS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index 28964b876b4..c98ab463c1c 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -30,7 +30,7 @@ project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sc -Sorb -DCORBA3 \
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -DCORBA3 \
                 -Wb,export_macro=TAO_Strategies_Export \
                 -Wb,export_include=tao/Strategies/strategies_export.h \
                 -o Strategies