Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

67 files changed, 218 insertions, 909 deletions

diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index d58ba68db7b..845c1bec8c9 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -2,13 +2,15 @@
 
 #include "tao/PortableServer/Active_Object_Map.h"
 #include "tao/PortableServer/Active_Object_Map_Entry.h"
-#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Active_Object_Map.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "tao/SystemException.h"
+
 #include "ace/Auto_Ptr.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID(PortableServer,
           Active_Object_Map,
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index 829acb189c5..16cec7c1071 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp
index 91820c955f9..ef3c3cac095 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.cpp
+++ b/TAO/tao/PortableServer/Adapter_Activator.cpp
@@ -28,7 +28,6 @@ namespace TAO
     CORBA::Boolean
     Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                         const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // Default policies
       CORBA::PolicyList default_policies;
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
index 71bff543e51..d5d648b8a3b 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -45,8 +45,7 @@ namespace TAO
       Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
 
       CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                      const char *name)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                                      const char *name);
 
     protected:
 
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 63e6773dac9..bdba9bcf3f2 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -7,6 +7,8 @@ ACE_RCSID(PortableServer,
           Default_Servant_Dispatcher,
           "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index f49f84a1d71..2c16f0dad5f 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -7,10 +7,9 @@
 #endif  /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #include "tao/Abstract_Servant_Base.h"
-#include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 #include "tao/Object.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (PortableServer,
            Direct_Collocation_Upcall_Wrapper,
@@ -27,15 +26,12 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall (
   const char * op,
   size_t op_len,
   TAO::Collocation_Strategy strategy)
-    ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO_Abstract_ServantBase * const servant = obj->_servant ();
 
   TAO_Collocated_Skeleton collocated_skel;
 
-  int const status = servant->_find (op, collocated_skel, strategy, op_len);
-
-  if (status == -1)
+  if (servant->_find (op, collocated_skel, strategy, op_len) == -1)
     {
       throw ::CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
index e84fb58ade4..ca178c39e5a 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
@@ -27,7 +27,6 @@
 #include "tao/Exception.h"
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -61,8 +60,7 @@ namespace TAO
       int num_args,
       const char * op,
       size_t op_len,
-      TAO::Collocation_Strategy strategy)
-    ACE_THROW_SPEC ((CORBA::Exception));
+      TAO::Collocation_Strategy strategy);
   };
 
 }  // End namespace TAO
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index 619f02bc679..5e5c697efe6 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            IdAssignmentPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     IdAssignmentPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       IdAssignmentPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     IdAssignmentPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::IdAssignmentPolicyValue
     IdAssignmentPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     IdAssignmentPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::ID_ASSIGNMENT_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
index cf9db21a4f1..b46b3746bdf 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::IdAssignmentPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::IdAssignmentPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index 4949af6817b..f0096d44855 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            IdUniquenessPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     IdUniquenessPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       IdUniquenessPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     IdUniquenessPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::IdUniquenessPolicyValue
     IdUniquenessPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     IdUniquenessPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::ID_UNIQUENESS_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
index 944738e6b94..04335db05e9 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::IdUniquenessPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::IdUniquenessPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h
index 2f5bef0c049..70be6e3c5d2 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.h
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h
@@ -23,9 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 #include "tao/orbconf.h"
-#include "tao/Environment.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index 287d32547e0..6d3a91be8fb 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            ImplicitActivationPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     ImplicitActivationPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ImplicitActivationPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     ImplicitActivationPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ImplicitActivationPolicyValue
     ImplicitActivationPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     ImplicitActivationPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
index 50f1465a0c5..a53dad9fcc3 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::ImplicitActivationPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::ImplicitActivationPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index 32d14ed4fe0..d478bece27d 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            LifespanPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     LifespanPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       LifespanPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     LifespanPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::LifespanPolicyValue
     LifespanPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     LifespanPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::LIFESPAN_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
index 50c3246bc08..78b7be973fa 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.h
+++ b/TAO/tao/PortableServer/LifespanPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       LifespanPolicy (::PortableServer::LifespanPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::LifespanPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::LifespanPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index 3ddbc63ac6b..96918af52df 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
 #include "tao/PI_ForwardC.h"
 #include "ace/Service_Object.h"
 #include "ace/Array_Base.h"
@@ -86,19 +85,11 @@ namespace TAO
      *
      * Methods required by the
      * PortableInterceptor::ObjectReferenceFactory ValueType.
-     *
-     * @todo
-     * @@ Johnny, we won't be needing the exception specification
-     * below for long.  Once bug 1852 is fixed, we can the
-     * exception specification and the "tao/SystemException.h"
-     * include above.
      */
     //@{
     virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      const PortableInterceptor::ObjectId & id) = 0;
     //@}
   };
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl
index 0a0777bc6ab..9a09c7e9f1b 100644
--- a/TAO/tao/PortableServer/Object_Adapter.inl
+++ b/TAO/tao/PortableServer/Object_Adapter.inl
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -50,37 +51,29 @@ TAO_Object_Adapter::transient_poa_name_size ()
 }
 
 ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key
-                                    )
+TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (-1);
 
-  return this->locate_servant_i (key
-                                );
+  return this->locate_servant_i (key);
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key,
-                                  PortableServer::Servant &servant
-                                  )
+                                  PortableServer::Servant &servant)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND);
 
-  return this->find_servant_i (key,
-                               servant
-                              );
+  return this->find_servant_i (key, servant);
 }
 
 ACE_INLINE int
 TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_Root_POA *&poa
-                                         )
+                                         TAO_Root_POA *&poa)
 {
-  return this->hint_strategy_->find_persistent_poa (system_name,
-                                                    poa
-                                                   );
+  return this->hint_strategy_->find_persistent_poa (system_name, poa);
 }
 
 ACE_INLINE int
@@ -93,9 +86,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
 {
   if (activate_it)
     {
-      return this->find_persistent_poa (system_name,
-                                        poa
-                                       );
+      return this->find_persistent_poa (system_name, poa);
     }
   else
     {
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 6625cb3743c..b6e0766e3e8 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -54,15 +54,12 @@ TAO_POA_Manager::~TAO_POA_Manager (void)
 
 char *
 TAO_POA_Manager::get_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 void
 TAO_POA_Manager::activate_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
 {
   // This operation changes the state of the POA manager to active. If
   // issued while the POA manager is in the inactive state, the
@@ -93,8 +90,6 @@ TAO_POA_Manager::activate_i (void)
 void
 TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
                                CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
@@ -163,7 +158,6 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
 
 void
 TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::State state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::AdapterState adapter_state =
     static_cast<PortableInterceptor::AdapterState> (state);
@@ -182,8 +176,6 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
 
 void
 TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
@@ -235,8 +227,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion)
 
 void
 TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index e2935dd6023..8f46f7f56ab 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -62,33 +62,23 @@ class TAO_PortableServer_Export TAO_POA_Manager :
 
 public:
 
-  void activate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void activate (void);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  void hold_requests (CORBA::Boolean wait_for_completion)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void hold_requests (CORBA::Boolean wait_for_completion);
 
   void discard_requests (CORBA::Boolean wait_for_completion
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+                         );
 
   void deactivate (CORBA::Boolean etherealize_objects,
-                   CORBA::Boolean wait_for_completion)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+                   CORBA::Boolean wait_for_completion);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::POAManager::State get_state (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAManager::State get_state (void);
 
-  char *get_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char *get_id (void);
 
   TAO_POA_Manager (TAO_Object_Adapter &object_adapter,
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -104,8 +94,7 @@ public:
   /// Check the state of this POA manager
   void check_state (void);
 
-  PortableServer::POAManager::State get_state_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAManager::State get_state_i ();
 
   virtual CORBA::ORB_ptr _get_orb (void);
 
@@ -115,29 +104,20 @@ public:
 
 protected:
 
-  void activate_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void activate_i (void);
 
   void deactivate_i (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+                     CORBA::Boolean wait_for_completion);
 
   /// Method needed for notifying the IORInterceptors that the state
   /// of POAManager changed.
-  void adapter_manager_state_changed (PortableServer::POAManager::State state)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void adapter_manager_state_changed (PortableServer::POAManager::State state);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  void hold_requests_i (CORBA::Boolean wait_for_completion)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void hold_requests_i (CORBA::Boolean wait_for_completion);
 
-  void discard_requests_i (CORBA::Boolean wait_for_completion)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void discard_requests_i (CORBA::Boolean wait_for_completion);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl
index cfbdb77cd85..066b1112a38 100644
--- a/TAO/tao/PortableServer/POAManager.inl
+++ b/TAO/tao/PortableServer/POAManager.inl
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "tao/Environment.h"
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -15,11 +15,7 @@ TAO_POA_Manager::lock (void)
 
 ACE_INLINE void
 TAO_POA_Manager::activate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->activate_i ();
 }
@@ -28,22 +24,14 @@ TAO_POA_Manager::activate (void)
 
 ACE_INLINE void
 TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->hold_requests_i (wait_for_completion);
 }
 
 ACE_INLINE void
 TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->discard_requests_i (wait_for_completion);
 }
@@ -51,11 +39,7 @@ TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion)
 ACE_INLINE void
 TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                              CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->deactivate_i (etherealize_objects, wait_for_completion);
 }
@@ -64,14 +48,12 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
 
 ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->state_;
 }
 
 ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_);
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index 62606565686..eb3a8ef823f 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -4,6 +4,7 @@
 #include "tao/PortableServer/POAManager.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (PortableServer,
            POAManagerFactory,
@@ -28,9 +29,6 @@ TAO_POAManager_Factory::create_POAManager (
   const char * id,
   const ::CORBA::PolicyList & policies
   )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
-                     ::CORBA::PolicyError))
 {
   // Validate the policy.
   TAO_POA_Policy_Set tao_policies (TAO_POA_Policy_Set (this->object_adapter_.default_poa_policies ()));
@@ -82,7 +80,6 @@ TAO_POAManager_Factory::create_POAManager (
 
 ::PortableServer::POAManagerFactory::POAManagerSeq *
 TAO_POAManager_Factory::list (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers;
   CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong>
@@ -109,7 +106,6 @@ TAO_POAManager_Factory::list (void)
 
 ::PortableServer::POAManager_ptr
 TAO_POAManager_Factory::find (const char * id )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::PortableServer::POAManager_ptr poamanager =
     ::PortableServer::POAManager::_nil();
diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h
index 62d4830b10c..fe6ad4c46ed 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.h
+++ b/TAO/tao/PortableServer/POAManagerFactory.h
@@ -49,16 +49,11 @@ public:
 
   virtual ::PortableServer::POAManager_ptr create_POAManager (
       const char * id,
-      const ::CORBA::PolicyList & policies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                      ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
-                      ::CORBA::PolicyError));
+      const ::CORBA::PolicyList & policies);
 
-  virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void);
 
-  virtual ::PortableServer::POAManager_ptr find (const char * id )
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ::PortableServer::POAManager_ptr find (const char * id);
 
   void remove_all_poamanagers (void);
 
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index 1afa61544d3..defd9558ce1 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -19,8 +19,6 @@ namespace TAO
   {
     PortableServer::POA_ptr
     POA_Current::get_POA (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
@@ -31,8 +29,6 @@ namespace TAO
 
     PortableServer::ObjectId *
     POA_Current::get_object_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
@@ -43,8 +39,6 @@ namespace TAO
 
     PortableServer::Servant
     POA_Current::get_servant (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
@@ -55,8 +49,6 @@ namespace TAO
 
     CORBA::Object_ptr
     POA_Current::get_reference (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index 57a97f0e37e..204190abccd 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -48,18 +48,14 @@ namespace TAO
        * Can raise the @c NoContext exception if this function is
        * not invoked in the context of an upcall.
        */
-      PortableServer::POA_ptr get_POA (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      PortableServer::POA_ptr get_POA (void);
 
       /**
        * Returns the object id of the current request being invoked.  Can
        * raise the @c NoContext exception if this function is not
        * invoked in the context of an upcall.
        */
-      PortableServer::ObjectId *get_object_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      PortableServer::ObjectId *get_object_id (void);
 
       /**
        * This operation returns a locally manufactured reference to the object
@@ -70,18 +66,14 @@ namespace TAO
        * Object::is_equivalent operation to compare the two references may not
        * necessarily return true.
        */
-      CORBA::Object_ptr get_reference (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      CORBA::Object_ptr get_reference (void);
 
       /**
        * Returns a reference to the servant that hosts the object in whose
        * context it is called. If called outside the context of the POA
        * dispatched operation, a NoContext exception is raised
        */
-      PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      PortableServer::Servant get_servant (void);
 
       /// Returns the class that implements this interface.
       POA_Current_Impl *implementation (void);
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp
index 5656041765c..baefc206285 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -9,9 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Object_ptr
 TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr,
                                         int,
-                                        ACE_TCHAR * []
-                                        )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+                                        ACE_TCHAR * [])
 {
   TAO::Portable_Server::POA_Current* adapter = 0;
   ACE_NEW_RETURN (adapter,
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h
index bc0f3a9d7e4..28087757bde 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.h
+++ b/TAO/tao/PortableServer/POA_Current_Factory.h
@@ -34,8 +34,7 @@ public:
   /// Creates a PICurrent and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv [])
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index 53f39fc7686..2757259f5d8 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -19,9 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 #include "ace/Guard_T.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index 4d4aa7d4ddc..592be9ab1e9 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -42,7 +42,6 @@
 
 #include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
-#include "tao/Environment.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/OctetSeqC.h"
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 38d9d2ffe71..1cecf8b3974 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -262,7 +262,6 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj);
@@ -281,7 +280,6 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
     TAO::Collocation_Strategy strategy
 
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
@@ -346,9 +344,6 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     int
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ((TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val *) args[0])->arg () =
     dynamic_cast<POA_CORBA::Policy_ptr>
@@ -367,9 +362,6 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     int
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
     dynamic_cast<POA_CORBA::Policy_ptr>
@@ -386,11 +378,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
     int
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   dynamic_cast<POA_CORBA::Policy_ptr>
     (servant)
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 4f6a78dc428..5158592f1c4 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -146,9 +146,7 @@ namespace POA_CORBA
     virtual CORBA::PolicyType policy_type (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_policy_type_skel (
         TAO_ServerRequest & server_request,
@@ -163,9 +161,7 @@ namespace POA_CORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void copy_skel (
         TAO_ServerRequest & server_request,
@@ -180,9 +176,7 @@ namespace POA_CORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void destroy_skel (
         TAO_ServerRequest & server_request,
@@ -211,8 +205,7 @@ namespace POA_CORBA
     get_strategy (
         CORBA::Object_ptr obj
 
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     void
     dispatch (
@@ -224,8 +217,7 @@ namespace POA_CORBA
         size_t op_len,
         TAO::Collocation_Strategy strategy
 
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
+      );
 
     static _TAO_Policy_Strategized_Proxy_Broker *
     the_TAO_Policy_Strategized_Proxy_Broker (void);
@@ -260,10 +252,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
@@ -274,10 +263,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
@@ -288,10 +274,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
   };
 
   //
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 6424524af08..ef5c094ce39 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -92,30 +92,21 @@ namespace POA_CORBA
 
     CORBA::PolicyType policy_type (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Policy_ptr copy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
index c896883e321..12d3f23e7cb 100644
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ b/TAO/tao/PortableServer/PolicyS_T.inl
@@ -128,9 +128,6 @@ template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->policy_type (
 
@@ -142,11 +139,7 @@ CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
 
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->copy (
 
@@ -160,9 +153,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::Policy_tie<T>::destroy  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
 
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
index 90ab76fe374..6381ccf9bd2 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -14,14 +14,13 @@
 #define TAO_POLICY_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
index 0aa05f9f33d..a1184f34572 100644
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -50,8 +50,7 @@ public:
 
   virtual ~TAO_Regular_POA (void);
 
-  PortableServer::POA_ptr the_parent (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr the_parent (void);
 
 protected:
   virtual void remove_from_parent_i (void);
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
index bbfe8339c0e..a97a96b8471 100644
--- a/TAO/tao/PortableServer/Regular_POA.inl
+++ b/TAO/tao/PortableServer/Regular_POA.inl
@@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableServer::POA_ptr
 TAO_Regular_POA::the_parent (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->parent_);
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index 99e04676cbb..3a1f478abc6 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -23,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     RequestProcessingPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       RequestProcessingPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -35,20 +34,17 @@ namespace TAO
 
     void
     RequestProcessingPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::RequestProcessingPolicyValue
     RequestProcessingPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     RequestProcessingPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::REQUEST_PROCESSING_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
index f9783203f29..d28b27a30b8 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::RequestProcessingPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::RequestProcessingPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index fa8fdc6f861..2d515d52f87 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -67,24 +67,20 @@ namespace TAO
 
       virtual PortableServer::ServantManager_ptr get_servant_manager (
         void)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void set_servant (PortableServer::Servant servant )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy)) = 0;
+        = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
       virtual PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy)) = 0;
+        = 0;
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
@@ -111,18 +107,14 @@ namespace TAO
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void etherealize_objects (CORBA::Boolean etherealize_objects) = 0;
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 00820d38a9d..4ee454e9b61 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -25,8 +25,6 @@ namespace TAO
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyAOMOnly::get_servant_manager (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -34,8 +32,6 @@ namespace TAO
     void
     RequestProcessingStrategyAOMOnly::set_servant_manager (
       PortableServer::ServantManager_ptr /*imgr*/)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -43,8 +39,6 @@ namespace TAO
     void
     RequestProcessingStrategyAOMOnly::set_servant (
       PortableServer::Servant /*servant*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -53,8 +47,6 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyAOMOnly::get_servant (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -101,9 +93,6 @@ namespace TAO
     PortableServer::Servant
     RequestProcessingStrategyAOMOnly::id_to_servant (
       const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       return this->poa_->user_id_to_servant_i (id);
     }
@@ -140,9 +129,6 @@ namespace TAO
     PortableServer::ObjectId *
     RequestProcessingStrategyAOMOnly::servant_to_id (
       PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       return this->poa_->servant_to_user_id (servant);
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index 69555e2a84d..96d79641ce9 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -43,28 +43,20 @@ namespace TAO
 #if (TAO_HAS_MINIMUM_POA == 0)
 
       PortableServer::ServantManager_ptr
-      get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      get_servant_manager (void);
 
       void
       set_servant_manager (PortableServer::ServantManager_ptr imgr
-                           )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+                           );
 
       void
       set_servant (PortableServer::Servant servant
-                   )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+                   );
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
       PortableServer::Servant
-      get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      get_servant (void);
 
       virtual
       TAO_SERVANT_LOCATION
@@ -87,10 +79,7 @@ namespace TAO
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
@@ -101,10 +90,7 @@ namespace TAO
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 4da60d19159..2b18dd7ff53 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -36,8 +36,6 @@ namespace TAO
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyDefaultServant::get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -45,16 +43,12 @@ namespace TAO
     void
     RequestProcessingStrategyDefaultServant::set_servant_manager (
       PortableServer::ServantManager_ptr /*imgr*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
 
     PortableServer::Servant
     RequestProcessingStrategyDefaultServant::get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation returns the default servant associated with the
       // POA.
@@ -65,8 +59,6 @@ namespace TAO
     RequestProcessingStrategyDefaultServant::set_servant (
       PortableServer::Servant servant
       )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation registers the specified servant with the POA as
       // the default servant. This servant will be used for all requests
@@ -171,9 +163,6 @@ namespace TAO
     PortableServer::Servant
     RequestProcessingStrategyDefaultServant::id_to_servant (
       const PortableServer::ObjectId & /*id*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       PortableServer::Servant servant = this->default_servant_.in ();
 
@@ -224,9 +213,6 @@ namespace TAO
     RequestProcessingStrategyDefaultServant::servant_to_id (
       PortableServer::Servant servant
       )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       PortableServer::Servant default_servant = this->default_servant_.in ();
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index 53b8fea0084..f536a91a970 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -44,25 +44,17 @@ namespace TAO
       virtual void strategy_cleanup(void);
 
       PortableServer::ServantManager_ptr
-      get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      get_servant_manager (void);
 
       void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        );
 
-      PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      PortableServer::Servant get_servant (void);
 
       void set_servant (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
@@ -83,10 +75,7 @@ namespace TAO
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
@@ -97,10 +86,7 @@ namespace TAO
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index fd86bc09d46..2729e7c0cc6 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -42,8 +42,6 @@ namespace TAO
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyServantActivator::get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
     }
@@ -51,8 +49,6 @@ namespace TAO
     void
     RequestProcessingStrategyServantActivator::set_servant_manager (
       PortableServer::ServantManager_ptr imgr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
     {
       // This operation sets the default servant manager associated with the
       // POA. This operation may only be invoked once after a POA has been
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
index 0bff114eb4c..7b4504180bf 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -40,14 +40,10 @@ namespace TAO
 
       virtual void strategy_cleanup(void);
 
-      PortableServer::ServantManager_ptr get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      PortableServer::ServantManager_ptr get_servant_manager (void);
 
       void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+                                );
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index 6f9d111df4a..07b9b25853d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -40,8 +40,6 @@ namespace TAO
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyServantLocator::get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
     }
@@ -49,8 +47,6 @@ namespace TAO
     void
     RequestProcessingStrategyServantLocator::set_servant_manager (
       PortableServer::ServantManager_ptr imgr)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation sets the default servant manager associated with the
       // POA. This operation may only be invoked once after a POA has been
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
index 05426727ba1..534f183a3bd 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -40,13 +40,9 @@ namespace TAO
 
       virtual void strategy_cleanup(void);
 
-      PortableServer::ServantManager_ptr get_servant_manager (void)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+      PortableServer::ServantManager_ptr get_servant_manager (void);
 
-      void set_servant_manager (PortableServer::ServantManager_ptr imgr)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+      void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index 71366a29c94..2be69725f9b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -25,27 +25,20 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyServantManager::get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyServantManager::set_servant (
-      PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+      PortableServer::Servant)
     {
-      ACE_UNUSED_ARG (servant);
-
       throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyServantManager::validate_servant_manager (
-      PortableServer::ServantManager_ptr servant_manager
-      )
+      PortableServer::ServantManager_ptr servant_manager)
     {
       // When no servant manager is set, give an exception with minor code 4,
       // see 11.3.8.6 of the corba spec
@@ -65,9 +58,6 @@ namespace TAO
     PortableServer::ObjectId *
     RequestProcessingStrategyServantManager::servant_to_id (
       PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       return this->poa_->servant_to_user_id (servant);
     }
@@ -75,9 +65,6 @@ namespace TAO
     PortableServer::Servant
     RequestProcessingStrategyServantManager::id_to_servant (
       const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       return this->poa_->user_id_to_servant_i (id);
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
index d69ceed12ef..8a6c09546a1 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -37,13 +37,9 @@ namespace TAO
     public:
       RequestProcessingStrategyServantManager (void);
 
-      PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      PortableServer::Servant get_servant (void);
 
-      void set_servant (PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      void set_servant (PortableServer::Servant servant);
 
       void validate_servant_manager (
         PortableServer::ServantManager_ptr servant_manager
@@ -53,16 +49,10 @@ namespace TAO
         const PortableServer::ObjectId &system_id);
 
       virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId &id)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
+        const PortableServer::ObjectId &id);
 
       virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        PortableServer::Servant servant);
 
       virtual ::PortableServer::RequestProcessingPolicyValue type() const;
     };
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 379e991d2f8..0de7c51671d 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -41,7 +41,6 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
-#include "tao/Environment.h"
 #include "tao/Exception.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
@@ -81,7 +80,6 @@ TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
 
 PortableServer::ThreadPolicy_ptr
 TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ThreadPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -97,7 +95,6 @@ TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
 
 PortableServer::LifespanPolicy_ptr
 TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::LifespanPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -112,7 +109,6 @@ TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdUniquenessPolicy_ptr
 TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdUniquenessPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -126,7 +122,6 @@ TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyVal
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdAssignmentPolicy_ptr
 TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdAssignmentPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -141,7 +136,6 @@ TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyVal
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ImplicitActivationPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -153,7 +147,6 @@ TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivat
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ServantRetentionPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -165,7 +158,6 @@ TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionP
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::RequestProcessingPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -364,9 +356,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const char *adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
                             const CORBA::PolicyList &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // Initialize a TAO_POA_Policy_Set instance so that it contains the
   // default POA policies.
@@ -474,9 +463,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
                             const TAO_POA_Policy_Set &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // This operaton creates a new POA as a child of the target POA. The
   // specified name identifies the new POA with respect to other POAs
@@ -556,8 +542,6 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
 PortableServer::POA_ptr
 TAO_Root_POA::find_POA (const char *adapter_name,
                         CORBA::Boolean activate_it)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -572,8 +556,6 @@ TAO_Root_POA::find_POA (const char *adapter_name,
 TAO_Root_POA *
 TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
                           CORBA::Boolean activate_it)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
 {
   TAO_Root_POA *child = 0;
   int result = this->children_.find (child_name,
@@ -659,9 +641,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA (const char *adapter_name,
                           PortableServer::POAManager_ptr poa_manager,
                           const CORBA::PolicyList &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -674,9 +653,6 @@ TAO_Root_POA::create_POA (const char *adapter_name,
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_id (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // If we had upgradeable locks, this would initially be a read lock
   //
@@ -688,9 +664,6 @@ TAO_Root_POA::servant_to_id (PortableServer::Servant servant)
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     servant_to_user_id (servant);
@@ -698,10 +671,6 @@ TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant)
 
 PortableServer::Servant
 TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -711,9 +680,6 @@ TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference)
 
 CORBA::Object_ptr
 TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
@@ -722,7 +688,6 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
 
 PortableServer::POAList *
 TAO_Root_POA::the_children (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -733,9 +698,6 @@ TAO_Root_POA::the_children (void)
 
 PortableServer::Servant
 TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -745,9 +707,6 @@ TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid)
 
 CORBA::Object_ptr
 TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -759,7 +718,6 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
                                         const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
@@ -773,7 +731,6 @@ TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
 void
 TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
                        CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO::Portable_Server::POA_Guard poa_guard (*this , 0);
@@ -792,7 +749,6 @@ TAO_Root_POA::remove_from_parent_i (void)
 void
 TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
                          CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->cleanup_in_progress_)
     return;
@@ -969,7 +925,6 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child)
 
 PortableServer::POAList *
 TAO_Root_POA::the_children_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList_var children;
   CORBA::ULong child_current = static_cast <CORBA::ULong>
@@ -994,7 +949,6 @@ TAO_Root_POA::the_children_i (void)
 
 PortableInterceptor::AdapterName *
 TAO_Root_POA::adapter_name_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The adapter name is the sequence of names starting from the
   // RootPOA to the one whose name is requested.  The name of the
@@ -1052,7 +1006,6 @@ TAO_Root_POA::adapter_name_i (void)
 void
 TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile,
                                  const IOP::TaggedComponent &component)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles.
   const CORBA::ULong profile_count = mprofile.profile_count ();
@@ -1070,7 +1023,6 @@ TAO_Root_POA::add_ior_component_to_profile (
     TAO_MProfile & mprofile,
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles matching the given
   // ProfileId.
@@ -1101,7 +1053,6 @@ void
 TAO_Root_POA::adapter_state_changed (
    const TAO::ORT_Array &array_obj_ref_template,
    PortableInterceptor::AdapterState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->orb_core_.ior_interceptor_adapter ();
@@ -1116,9 +1067,6 @@ PortableServer::ObjectId *
 TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
                                  CORBA::Short priority,
                                  bool &wait_occurred_restart_call)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     activate_object (servant,
@@ -1128,9 +1076,6 @@ TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
 
 PortableServer::ObjectId *
 TAO_Root_POA::activate_object (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   while (1)
     {
@@ -1158,10 +1103,6 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant)
 void
 TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                        PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   while (1)
     {
@@ -1192,10 +1133,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant servant,
                                          CORBA::Short priority,
                                          bool &wait_occurred_restart_call)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.servant_retention_strategy()->
     activate_object_with_id (id,
@@ -1208,8 +1145,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
 void
 TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                         CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->deactivate_all_objects_i (etherealize_objects);
 
@@ -1272,8 +1207,6 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core
 
 void
 TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.request_processing_strategy ()->
     etherealize_objects (etherealize_objects);
@@ -1284,9 +1217,6 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects)
 
 void
 TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -1297,9 +1227,6 @@ TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid)
 
 void
 TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.servant_retention_strategy()->
     deactivate_object (id);
@@ -1313,8 +1240,6 @@ TAO_Root_POA::is_persistent (void) const
 
 CORBA::Object_ptr
 TAO_Root_POA::create_reference (const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
@@ -1326,8 +1251,6 @@ TAO_Root_POA::create_reference (const char *intf)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_i (const char *intf,
                                   CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   if (!this->has_system_id ())
     {
@@ -1341,7 +1264,6 @@ TAO_Root_POA::create_reference_i (const char *intf,
 CORBA::Object_ptr
 TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
                                              const PortableServer::ObjectId & id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const PortableInterceptor::ObjectId &user_oid =
     reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
@@ -1363,7 +1285,6 @@ CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                           const char *intf,
                                           CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the POA has the SYSTEM_ID policy and it detects that the
   // Object Id value was not generated by the system or for this POA,
@@ -1386,9 +1307,6 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     servant_to_id (servant);
@@ -1396,9 +1314,6 @@ TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
 
 CORBA::Object_ptr
 TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     servant_to_reference (servant);
@@ -1406,10 +1321,6 @@ TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant)
 
 PortableServer::Servant
 TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Make sure that the reference is valid.
   if (CORBA::is_nil (reference))
@@ -1490,9 +1401,6 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
 PortableServer::ObjectId *
 TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Make sure that the reference is valid.
   if (CORBA::is_nil (reference))
@@ -1551,9 +1459,6 @@ TAO_Root_POA::cleanup_servant (
 PortableServer::Servant
 TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
 
   PortableServer::Servant servant =
@@ -1582,9 +1487,6 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
 PortableServer::Servant
 TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id
                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     user_id_to_servant (id);
@@ -1594,9 +1496,6 @@ CORBA::Object_ptr
 TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
                                  bool indirect
                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     id_to_reference (id, indirect);
@@ -1604,7 +1503,6 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
 
 CORBA::OctetSeq *
 TAO_Root_POA::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::OctetSeq *id = 0;
   ACE_NEW_THROW_EX (id,
@@ -2407,7 +2305,6 @@ TAO_Root_POA::ORT_adapter_i (void)
 
 PortableServer::AdapterActivator_ptr
 TAO_Root_POA::the_activator (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ());
@@ -2418,7 +2315,6 @@ TAO_Root_POA::the_activator (void)
 void
 TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
                              )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2432,8 +2328,6 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa
 
 PortableServer::ServantManager_ptr
 TAO_Root_POA::get_servant_manager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
@@ -2444,8 +2338,6 @@ TAO_Root_POA::get_servant_manager (void)
 
 void
 TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2456,8 +2348,6 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 
 PortableServer::Servant
 TAO_Root_POA::get_servant_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     get_servant ();
@@ -2465,9 +2355,6 @@ TAO_Root_POA::get_servant_i (void)
 
 PortableServer::Servant
 TAO_Root_POA::get_servant (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -2501,8 +2388,6 @@ TAO_Root_POA::get_servant (void)
 
 void
 TAO_Root_POA::set_servant (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2626,7 +2511,6 @@ TAO_Root_POA::root (void) const
 
 TAO::ORT_Adapter *
 TAO_Root_POA::ORT_adapter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ort_adapter_ != 0)
     return this->ort_adapter_;
@@ -2711,7 +2595,6 @@ TAO_Root_POA::imr_client_adapter_name (void)
 
 PortableServer::POAManager_ptr
 TAO_Root_POA::the_POAManager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
 }
@@ -2719,7 +2602,6 @@ TAO_Root_POA::the_POAManager (void)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 PortableServer::POAManagerFactory_ptr
 TAO_Root_POA::the_POAManagerFactory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_);
 }
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index d7d69bfb6e3..8a046576f3f 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -131,53 +131,43 @@ public:
       PortableServer::POAManager_ptr poa_manager,
       const CORBA::PolicyList &policies
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+    );
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
                                     CORBA::Boolean activate_it
-                                    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
+                                    );
 #endif
 
   void destroy (CORBA::Boolean etherealize_objects,
                 CORBA::Boolean wait_for_completion
-                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                );
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::ThreadPolicy_ptr create_thread_policy (
       PortableServer::ThreadPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::LifespanPolicy_ptr create_lifespan_policy (
       PortableServer::LifespanPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
       PortableServer::IdUniquenessPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
       PortableServer::IdAssignmentPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -185,51 +175,42 @@ public:
   create_implicit_activation_policy (
       PortableServer::ImplicitActivationPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::ServantRetentionPolicy_ptr
   create_servant_retention_policy (
       PortableServer::ServantRetentionPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::RequestProcessingPolicy_ptr
   create_request_processing_policy (
       PortableServer::RequestProcessingPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-  char * the_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * the_name (void);
 
-  PortableServer::POA_ptr the_parent (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr the_parent (void);
 
   PortableServer::POAList *the_children (
       void
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::POAManager_ptr the_POAManager (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::POAManagerFactory_ptr the_POAManagerFactory (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 #endif
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableInterceptor::AdapterName *adapter_name (void);
 
   /// Store the given TaggedComponent for eventual insertion into all
   /// object reference profiles.
@@ -245,115 +226,68 @@ public:
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::AdapterActivator_ptr the_activator (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      );
 
   PortableServer::ServantManager_ptr get_servant_manager (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+      void);
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                            );
 
-  PortableServer::Servant get_servant (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::NoServant,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::Servant get_servant (void);
 
   void set_servant (PortableServer::Servant servant
-                    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                    );
 #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
   PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                             );
 
 #if !defined (CORBA_E_MICRO)
   void activate_object_with_id (const PortableServer::ObjectId &id,
                                 PortableServer::Servant p_servant
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                );
 #endif
 
   void deactivate_object (const PortableServer::ObjectId &oid
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                          );
 
   CORBA::Object_ptr create_reference (const char *intf
-                                      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                      );
 
   CORBA::Object_ptr create_reference_with_id (
       const PortableServer::ObjectId &oid,
       const char *intf
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                           );
 
   PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant p_servant
-                                                )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                                );
 
   CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                          );
 
   PortableServer::Servant reference_to_servant (
       CORBA::Object_ptr reference
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
+    );
 
   PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
+                                             );
 
   PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                         );
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                     );
 
-  CORBA::OctetSeq *id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::OctetSeq *id (void);
 
   /// Accessor for POA policies.
   TAO_POA_Policy_Set &policies (void);
@@ -491,10 +425,7 @@ public:
     bool &wait_occurred_restart_call);
 
   void deactivate_object_i (const PortableServer::ObjectId &oid
-                            )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy));
+                            );
 
   CORBA::Boolean is_persistent (void) const;
 
@@ -549,23 +480,14 @@ public:
       CORBA::Short priority,
       bool &wait_occurred_restart_call
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+    );
 
   CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
                                        bool indirect
-                                       )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                       );
 
   PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                             );
 
   TAO_SYNCH_CONDITION &servant_deactivation_condition (void);
 
@@ -577,10 +499,7 @@ public:
   int delete_child (const String &child);
 
   PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid
-                                                )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                                );
 
   virtual CORBA::ORB_ptr _get_orb (
 
@@ -630,63 +549,49 @@ protected:
       PortableServer::POAManager_ptr poa_manager,
       const CORBA::PolicyList &policies
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+    );
 
   PortableServer::POA_ptr create_POA_i (const String &adapter_name,
                                         PortableServer::POAManager_ptr poa_manager,
                                         const TAO_POA_Policy_Set &policies
-                                        )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+                                        );
 
   TAO_Root_POA *find_POA_i (const ACE_CString &child_name,
                        CORBA::Boolean activate_it
-                       )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
+                       );
 #endif
 
   void destroy_i (CORBA::Boolean etherealize_objects,
                   CORBA::Boolean wait_for_completion
-                  )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                  );
 
   void complete_destruction_i (void);
 
-  PortableServer::POAList *the_children_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAList *the_children_i (void);
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableInterceptor::AdapterName *adapter_name_i (void);
 
   /// Method to notify the IOR Interceptors when there is a state
   /// changed not related to POAManager.
   void adapter_state_changed (
       const TAO::ORT_Array &array_obj_ref_template,
       PortableInterceptor::AdapterState state
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Add the given tagged component to all profiles.
   void add_ior_component (TAO_MProfile & mprofile,
                           const IOP::TaggedComponent & component
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          );
 
   /// Add the given tagged component to all profiles matching the given
   /// ProfileId.
   void add_ior_component_to_profile (TAO_MProfile & mprofile,
                                      const IOP::TaggedComponent & component,
                                      IOP::ProfileId profile_id
-                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     );
 
   /// Wrapper for the ORB's key_to_object that will alter the object pointer
   /// if the ImplRepo is used.
@@ -711,9 +616,7 @@ protected:
                                 TAO_Acceptor_Registry &acceptor_registry
                                );
 
-  PortableServer::Servant get_servant_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::Servant get_servant_i (void);
 
 protected:
 #if !defined (CORBA_E_MICRO)
@@ -721,63 +624,42 @@ protected:
                                   PortableServer::Servant p_servant,
                                   CORBA::Short priority,
                                   bool &wait_occurred_restart_call
-                                  )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                  );
 #endif
 
   virtual void remove_from_parent_i (void);
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                 );
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                  CORBA::Boolean wait_for_completion
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                 );
 
   void wait_for_completions (CORBA::Boolean wait_for_completion
                             );
 
   CORBA::Object_ptr create_reference_i (const char *intf,
                                         CORBA::Short priority
-                                        )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                        );
 
   CORBA::Object_ptr create_reference_with_id_i (
       const PortableServer::ObjectId &oid,
       const char *intf,
       CORBA::Short priority
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::Servant reference_to_servant_i (
       CORBA::Object_ptr reference
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
+    );
 
   CORBA::Object_ptr servant_to_reference_i (PortableServer::Servant p_servant
-                                            )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                            );
 
   PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                           );
 
   /// Call the IORInterceptor::establish_components() method on all
   /// registered IORInterceptors.
@@ -811,16 +693,14 @@ protected:
 protected:
   /// Accessor methods to ObjectReferenceTemplate
   PortableInterceptor::ObjectReferenceTemplate *
-    get_adapter_template (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_adapter_template (void);
 
   /// Accessor methods to ObjectReferenceTemplate, non locked version
   PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void);
 
   /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
   PortableInterceptor::ObjectReferenceFactory *
-    get_obj_ref_factory (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_obj_ref_factory (void);
 
   /// Set the object reference factory
   void set_obj_ref_factory (
@@ -846,14 +726,12 @@ public:
   CORBA::Object_ptr
   invoke_key_to_object_helper_i (const char * repository_id,
                                  const PortableServer::ObjectId & id
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 );
 protected:
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one and hold the POA lock
-  TAO::ORT_Adapter *ORT_adapter (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  TAO::ORT_Adapter *ORT_adapter (void);
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one but assumes the POA lock is already hold
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
index 57851ab838f..d9da3792237 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -2,9 +2,6 @@
 //
 // $Id$
 
-// Exception macros
-#include "tao/Environment.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
@@ -27,21 +24,18 @@ TAO_Root_POA::policies (void)
 
 ACE_INLINE PortableServer::POA_ptr
 TAO_Root_POA::the_parent (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_nil ();
 }
 
 ACE_INLINE PortableInterceptor::AdapterName *
 TAO_Root_POA::adapter_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->adapter_name_i ();
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
 TAO_Root_POA::get_adapter_template (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
@@ -66,7 +60,6 @@ TAO_Root_POA::get_adapter_template_i ()
 
 ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
 TAO_Root_POA::get_obj_ref_factory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
@@ -98,7 +91,6 @@ TAO_Root_POA::name (void) const
 
 ACE_INLINE char *
 TAO_Root_POA::the_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.c_str ());
 }
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index b2598398103..5daea4a5819 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -24,7 +24,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     ServantRetentionPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ServantRetentionPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -36,20 +35,17 @@ namespace TAO
 
     void
     ServantRetentionPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ServantRetentionPolicyValue
     ServantRetentionPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return this->value_;
     }
 
     CORBA::PolicyType
     ServantRetentionPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::SERVANT_RETENTION_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
index 354ade7d9fc..ac39b59738b 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::ServantRetentionPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::ServantRetentionPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index 41ffc3ef013..f1b1de2de9b 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -65,9 +65,7 @@ namespace TAO
         CORBA::Short priority,
         bool &wait_occurred_restart_call
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantAlreadyActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
 #if !defined (CORBA_E_MICRO)
       virtual void activate_object_with_id (
@@ -76,10 +74,7 @@ namespace TAO
         CORBA::Short priority,
         bool &wait_occurred_restart_call
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantAlreadyActive,
-                           PortableServer::POA::ObjectAlreadyActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 #endif
 
       virtual void deactivate_object (const PortableServer::ObjectId &id
@@ -92,56 +87,44 @@ namespace TAO
       virtual PortableServer::ObjectId *system_id_to_object_id (
         const PortableServer::ObjectId &system_id
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual PortableServer::Servant user_id_to_servant (
         const PortableServer::ObjectId &id
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr id_to_reference (
         const PortableServer::ObjectId &id,
         bool indirect
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void deactivate_all_objects (void)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr servant_to_reference (
         PortableServer::Servant servant
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr create_reference (
         const char *intf,
         CORBA::Short priority
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId &oid,
         const char *intf,
         CORBA::Short priority
         )
-          ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+          = 0;
 
       virtual int rebind_using_user_id_and_system_id (
         PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index 5a1b3acf7a7..da629fa29e0 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -63,9 +63,6 @@ namespace TAO
     PortableServer::ObjectId *
     ServantRetentionStrategyNonRetain::system_id_to_object_id (
       const PortableServer::ObjectId &system_id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongAdapter,
-                         PortableServer::POA::WrongPolicy))
     {
       // The system id is the id (and no conversion/transformation is
       // needed).
@@ -80,9 +77,6 @@ namespace TAO
     PortableServer::Servant
     ServantRetentionStrategyNonRetain::user_id_to_servant (
       const PortableServer::ObjectId &/*id*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -91,9 +85,6 @@ namespace TAO
     ServantRetentionStrategyNonRetain::id_to_reference (
       const PortableServer::ObjectId &/*id*/,
       bool /*indirect*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -147,17 +138,12 @@ namespace TAO
 
     void
     ServantRetentionStrategyNonRetain::deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
     }
 
     PortableServer::ObjectId *
     ServantRetentionStrategyNonRetain::servant_to_user_id (
       PortableServer::Servant /*servant*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -165,9 +151,6 @@ namespace TAO
     CORBA::Object_ptr
     ServantRetentionStrategyNonRetain::servant_to_reference (
       PortableServer::Servant /*servant*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -177,9 +160,6 @@ namespace TAO
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
       bool &/*wait_occurred_restart_call*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -191,10 +171,6 @@ namespace TAO
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
       bool &/*wait_occurred_restart_call*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::ObjectAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -204,8 +180,6 @@ namespace TAO
     ServantRetentionStrategyNonRetain::create_reference (
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation creates an object reference that encapsulates a
       // POA-generated Object Id value and the specified interface
@@ -247,7 +221,6 @@ namespace TAO
       const PortableServer::ObjectId &oid,
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // This operation creates an object reference that encapsulates the
       // specified Object Id and interface repository Id values. This
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 6950af6e4c0..8bac1e0af4d 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -46,10 +46,7 @@ namespace TAO
       PortableServer::ObjectId *
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
-                       bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy));
+                       bool &wait_occurred_restart_call);
 
 #if !defined (CORBA_E_MICRO)
       virtual
@@ -57,11 +54,7 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy));
+                               bool &wait_occurred_restart_call);
 #endif
 
       virtual void deactivate_object (const PortableServer::ObjectId &id);
@@ -74,24 +67,15 @@ namespace TAO
 
       virtual PortableServer::ObjectId *system_id_to_object_id (
         const PortableServer::ObjectId &system_id
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+      user_id_to_servant (const PortableServer::ObjectId &id);
 
       CORBA::Object_ptr
       id_to_reference (const PortableServer::ObjectId &id,
-                       bool indirect)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+                       bool indirect);
 
       virtual TAO_SERVANT_LOCATION servant_present (
         const PortableServer::ObjectId &system_id,
@@ -106,33 +90,22 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority);
 
-      virtual void deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      virtual void deactivate_all_objects (void);
 
       virtual PortableServer::ObjectId *servant_to_user_id (
-        PortableServer::Servant servant)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        PortableServer::Servant servant);
 
       virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant servant)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        PortableServer::Servant servant);
 
       virtual CORBA::Object_ptr create_reference (
         const char *intf,
-        CORBA::Short priority)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        CORBA::Short priority);
 
       virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId &oid,
         const char *intf,
-        CORBA::Short priority)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+        CORBA::Short priority);
 
       virtual int rebind_using_user_id_and_system_id (
         PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index ad91b278b33..3177736104e 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -174,9 +174,6 @@ namespace TAO
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::system_id_to_object_id (
       const PortableServer::ObjectId &system_id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongAdapter,
-                         PortableServer::POA::WrongPolicy))
     {
       // The object denoted by the reference does not have to be
       // active for this operation to succeed.
@@ -194,9 +191,6 @@ namespace TAO
     PortableServer::Servant
     ServantRetentionStrategyRetain::user_id_to_servant (
       const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // If the POA has the RETAIN policy and the specified ObjectId is in
       // the Active Object Map, this operation returns the servant
@@ -218,9 +212,6 @@ namespace TAO
     ServantRetentionStrategyRetain::id_to_reference (
       const PortableServer::ObjectId &id,
       bool indirect)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // If an object with the specified Object Id value is currently
       // active, a reference encapsulating the information used to
@@ -463,8 +454,6 @@ namespace TAO
 
     void
     ServantRetentionStrategyRetain::deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // If the etherealize_objects parameter is TRUE, the POA has the
       // RETAIN policy, and a servant manager is registered with the POA,
@@ -510,9 +499,6 @@ namespace TAO
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::servant_to_user_id (
       PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation requires the RETAIN and either the UNIQUE_ID or
       // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
@@ -597,9 +583,6 @@ namespace TAO
     ServantRetentionStrategyRetain::servant_to_system_id_i (
       PortableServer::Servant servant,
       CORBA::Short &priority)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
 #if defined (CORBA_E_COMPACT) || defined (CORBA_E_MICRO)
       if (this->poa_->allow_multiple_activations () ||
@@ -680,9 +663,6 @@ namespace TAO
     CORBA::Object_ptr
     ServantRetentionStrategyRetain::servant_to_reference (
       PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableServer::POA::ServantNotActive,
-                      PortableServer::POA::WrongPolicy))
     {
       // Note: The allocation of an Object Id value and installation in
       // the Active Object Map caused by implicit activation may actually
@@ -728,9 +708,6 @@ namespace TAO
       PortableServer::Servant servant,
       CORBA::Short priority,
       bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
       if (!this->poa_->has_system_id ())
         {
@@ -792,10 +769,6 @@ namespace TAO
       PortableServer::Servant servant,
       CORBA::Short priority,
       bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::ObjectAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // If the POA has the SYSTEM_ID policy and it detects that the
       // Object Id value was not generated by the system or for this POA,
@@ -898,8 +871,6 @@ namespace TAO
     ServantRetentionStrategyRetain::create_reference (
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation creates an object reference that encapsulates a
       // POA-generated Object Id value and the specified interface
@@ -946,7 +917,6 @@ namespace TAO
       const PortableServer::ObjectId &oid,
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // This operation creates an object reference that encapsulates the
       // specified Object Id and interface repository Id values. This
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index 4ea03f1fa3f..ca8dd792244 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -48,10 +48,7 @@ namespace TAO
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
                        bool &wait_occurred_restart_call
-                            )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy));
+                            );
 
 #if !defined (CORBA_E_MICRO)
       virtual
@@ -59,11 +56,7 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy));
+                               bool &wait_occurred_restart_call);
 #endif
 
       void deactivate_object (const PortableServer::ObjectId &id);
@@ -73,23 +66,14 @@ namespace TAO
        );
 
       virtual PortableServer::ObjectId * system_id_to_object_id (
-        const PortableServer::ObjectId &system_id)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy));
+        const PortableServer::ObjectId &system_id);
 
       virtual
       PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+      user_id_to_servant (const PortableServer::ObjectId &id);
 
       CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id,
-                                         bool indirect)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+                                         bool indirect);
 
       virtual
       TAO_SERVANT_LOCATION
@@ -106,40 +90,29 @@ namespace TAO
         CORBA::Short &priority
        );
 
-      virtual void deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      virtual void deactivate_all_objects (void);
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       CORBA::Object_ptr
       servant_to_reference (PortableServer::Servant servant
-                            )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableServer::POA::ServantNotActive,
-                      PortableServer::POA::WrongPolicy));
+                            );
 
       virtual
       CORBA::Object_ptr create_reference (
         const char *intf,
         CORBA::Short priority
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId &oid,
         const char *intf,
         CORBA::Short priority
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException));
+        );
 
       virtual ::PortableServer::ServantRetentionPolicyValue type() const;
 
@@ -158,10 +131,7 @@ namespace TAO
           PortableServer::Servant p_servant,
           CORBA::Short &priority
 
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       int rebind_using_user_id_and_system_id (
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 8a954fda1fa..2ca679a8ff7 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -9,7 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
 #include "tao/Stub.h"
-#include "tao/Environment.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/IFR_Client_Adapter.h"
 
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index 5c5b012e62a..ee9a2675b01 100644
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
@@ -10,8 +10,6 @@
 #endif /* __ACE_INLINE__ */
 
 #include "tao/Exception.h"
-#include "tao/Environment.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index 40d3c9cfcc8..57b630bc0f3 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -22,7 +22,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     ThreadPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ThreadPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -34,20 +33,17 @@ namespace TAO
 
     void
     ThreadPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ThreadPolicyValue
     ThreadPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     ThreadPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::THREAD_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
index cd160aa8452..78cb33815ec 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.h
+++ b/TAO/tao/PortableServer/ThreadPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       ThreadPolicy (::PortableServer::ThreadPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::ThreadPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::ThreadPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
index 0b2b530f7ec..8ba85735a94 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -22,7 +22,6 @@
 #endif /* !ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Versioned_Namespace.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 8cf5df3fb47..8d865765f1d 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -3,6 +3,7 @@
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/DII_Arguments_Converter.h"
+#include "tao/SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ServerRequestInterceptor_Adapter.h"
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index 585fad89eb4..59dbe9b47ab 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -25,8 +25,6 @@
 
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
-#include "ace/CORBA_macros.h"
-
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index 86da46eaefb..a3504f16672 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -8,7 +8,6 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
-#include "ace/CORBA_macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once