1 files changed, 10 insertions, 40 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index d1a72b65667..7cf18dcfe6e 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -462,7 +462,7 @@ TAO_CodeGen::start_server_header (const char *fname)
   if (be_global->gen_amh_classes ())
     {
       this->gen_standard_include (this->server_header_,
-                                  "tao/Messaging/AMH_Response_Handler.h");
+                                  "tao/PortableServer/AMH_Response_Handler.h");
     }
 
   *this->server_header_ << be_nl << be_nl
@@ -885,12 +885,6 @@ TAO_CodeGen::start_implementation_header (const char *fname)
     << "#pragma once\n"
     << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.local_iface_seen_))
-    {
-      *this->implementation_header_ << "#include \"tao/LocalObject.h\"\n\n";
-    }
-
   return 0;
 }
 
@@ -1169,10 +1163,7 @@ TAO_CodeGen::end_server_skeletons (void)
 int
 TAO_CodeGen::end_anyop_source (void)
 {
-  if (!be_global->gen_tmplinst ())
-    {
-      *this->anyop_source_ << "\n";
-    }
+  *this->anyop_source_ << "\n\n";
 
   return 0;
 }
@@ -1383,24 +1374,19 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   this->gen_standard_include (this->client_header_,
                               "tao/ORB.h");
 
-  this->gen_cond_file_include (
-      idl_global->decls_seen_masks.operation_seen_,
-      "tao/SystemException.h",
-      this->client_header_
-    );
-
-  // Not needed at the moment, since UserException.h is pulled in by
-  // ORB.h, which is included in the stub header file. May change if
-  // ORB.h is rearranged to make a lighter include for applications.
-  // System exception throw spec for every operation may change soon.
+  // Not needed at the moment, since Exception.h is pulled in by ORB.h,
+  // included at the top of the stub header file. May change if ORB.h
+  // is rearranged to make a lighter include for applications.
 #if 0
+  // System exception throw spec for every operation may change soon.
   // For IDL exception, we need full knowledge of CORBA::UserException.
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.exception_seen_,
-      "tao/UserException.h",
+      idl_global->decls_seen_masks.operation_seen_
+      | idl_global->decls_seen_masks.exception_seen_,
+      "tao/Exception.h",
       this->client_header_
     );
-#endif  /* 0 */
+#endif
 
   this->gen_standard_include (this->client_header_,
                               "tao/Environment.h");
@@ -1570,22 +1556,6 @@ TAO_CodeGen::gen_stub_src_includes (void)
                                   "tao/Typecode.h");
     }
 
-  // The UserException::_tao_{en,de}code() methods can throw a
-  // CORBA::MARSHAL exception so make sure that system exception is
-  // fully declared/defined by including "tao/SystemException.h".
-  // However, only include "tao/SystemException.h" if a user exception
-  // was encountered and if we're not already including it in the stub
-  // header.
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.exception_seen_)
-      && ACE_BIT_DISABLED (idl_global->decls_seen_info_,
-                           idl_global->decls_seen_masks.operation_seen_))
-    {
-      this->gen_standard_include (this->client_stubs_,
-                                  "tao/SystemException.h");
-    }
-
-
   // Includes whatever Any template classes that may be needed.
   this->gen_any_file_includes ();