--- orig/MessagingC.h	Wed Sep  4 19:44:07 2002
+++ MessagingC.h	Wed Sep  4 19:40:25 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -27,7 +27,12 @@
 #define _TAO_IDL_ORIG_MESSAGINGC_H_
 
 #include "ace/pre.h"
-#include "tao/corba.h"
+#include "tao/corbafwd.h"
+
+#ifndef TAO_MESSAGING_SAFE_INCLUDE 
+#error "You should not include MessagingC.h directly, use Messaging.h"
+#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,6 +42,9 @@
 #include "Messaging_SyncScope_PolicyC.h"
 #include "Messaging_RT_PolicyC.h"
 #include "Messaging_No_ImplC.h"
+#include "tao/ValueBase.h"
+#include "tao/ValueFactory.h"
+
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -682,6 +690,7 @@
 #if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
 #define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
 
+#if 0
 TAO_Messaging_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const Messaging::ExceptionHolder::_tao_seq_Octet &
@@ -691,6 +700,8 @@
     Messaging::ExceptionHolder::_tao_seq_Octet &
   );
 
+#endif /*if 0*/
+
 #endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ */
 
 
--- orig/MessagingC.i	Wed Sep  4 19:44:07 2002
+++ MessagingC.i	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
--- orig/MessagingC.cpp	Wed Sep  4 19:44:07 2002
+++ MessagingC.cpp	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -23,7 +23,7 @@
 // TAO_IDL - Generated from
 // be/be_codegen.cpp:315
 
-#include "MessagingC.h"
+#include "Messaging.h"
 
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
--- orig/MessagingS.h	Wed Sep  4 19:44:07 2002
+++ MessagingS.h	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -27,10 +27,7 @@
 #define _TAO_IDL_ORIG_MESSAGINGS_H_
 
 #include "ace/pre.h"
-#include "Messaging_SyncScope_PolicyS.h"
-#include "Messaging_RT_PolicyS.h"
-#include "Messaging_No_ImplS.h"
-#include "MessagingC.h"
+#include "Messaging.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
--- orig/MessagingS.i	Wed Sep  4 19:44:07 2002
+++ MessagingS.i	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
--- orig/MessagingS.cpp	Wed Sep  4 19:44:07 2002
+++ MessagingS.cpp	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
--- orig/MessagingS_T.h	Wed Sep  4 19:44:07 2002
+++ MessagingS_T.h	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
--- orig/MessagingS_T.i	Wed Sep  4 19:44:07 2002
+++ MessagingS_T.i	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
--- orig/MessagingS_T.cpp	Wed Sep  4 19:44:07 2002
+++ MessagingS_T.cpp	Wed Sep  4 15:10:24 2002
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
+// Messaging.diff,v 1.7 2002/09/05 00:46:44 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by: