Merge pull request #2024 from jwillemsen/jwi-openvmscleanup

Removed OpenVMS support

68 files changed, 76 insertions, 1182 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index dbef0e70184..4de06ce5125 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -182,7 +182,7 @@ document</a>.</p><p>
         TAO service offerings. We support AIX,
         Embarcadero C++ Builder,
         MinGW, Microsoft Visual C++, GCC,
-        Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS on IA64,
+        Cygwin, VxWorks 6.x (kernel and rtp),
         BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris,
         SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS,
         HPUX on IA64, and Android.
diff --git a/ACE/README b/ACE/README
index a579f924d87..44bde74e895 100644
--- a/ACE/README
+++ b/ACE/README
@@ -20,7 +20,7 @@ wrappers and frameworks that perform common communication software
 tasks across a range of OS platforms, including Win32/Win64, most
 versions of UNIX (e.g., SunOS, HP-UX , AIX, Linux, NetBSD, and FreeBSD),
 real-time operating systems (e.g., VxWorks, Chorus, LynxOS, and QNX),
-OpenVMS, and MVS OpenEdition.  A single source tree is used for all
+and MVS OpenEdition.  A single source tree is used for all
 these platforms and porting ACE to other platforms is relatively easy.
 
 The communication software components provided by ACE include event
diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl
index 4e7a77e5d87..0a9a36ec597 100644
--- a/ACE/ace/ACE.inl
+++ b/ACE/ace/ACE.inl
@@ -226,7 +226,7 @@ ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len)
 ACE_INLINE ssize_t
 ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len)
 {
-#if defined (ACE_WIN32) || defined (ACE_OPENVMS) || defined (ACE_MQX)
+#if defined (ACE_WIN32) || defined (ACE_MQX)
   return ACE_OS::recv (handle, (char *) buf, len);
 #else
   return ACE_OS::read (handle, (char *) buf, len);
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index 9fbc28b305f..f2213f379eb 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -811,7 +811,7 @@ ACE_CDR::Fixed ACE_CDR::Fixed::from_integer (ACE_CDR::ULongLong val)
 
 ACE_CDR::Fixed ACE_CDR::Fixed::from_floating (LongDouble val)
 {
-#if defined ACE_OPENVMS || (defined ACE_VXWORKS && !defined __RTP__)
+#if defined ACE_VXWORKS && !defined __RTP__
   typedef double BigFloat;
 #elif defined NONNATIVE_LONGDOUBLE
   typedef LongDouble::NativeImpl BigFloat;
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 7eddc0484fe..69f2c787c4a 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -286,11 +286,7 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TStri
   // BTW. Handle lifecycle management is a little crazy in ACE
   if (this->handle_ != ACE_SHLIB_INVALID_HANDLE)
     {
-#if defined (ACE_OPENVMS)
-      void *sym =  ACE::ldsymbol (this->handle_, auto_name.get ());
-#else
       void *sym =  ACE_OS::dlsym (this->handle_, auto_name.get ());
-#endif
 
       // Linux says that the symbol could be null and that it isn't an
       // error.  So you should check the error message also, but since
@@ -758,13 +754,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
 
               void * const unload_policy_ptr =
                 dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-              int const temp_p =
-                reinterpret_cast<int> (unload_policy_ptr);
-#else
-              intptr_t const temp_p =
-                reinterpret_cast<intptr_t> (unload_policy_ptr);
-#endif
+              intptr_t const temp_p = reinterpret_cast<intptr_t> (unload_policy_ptr);
 
               dll_unload_policy const the_policy =
                 reinterpret_cast<dll_unload_policy> (temp_p);
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index aff8cf083c6..bc9b20a4962 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -559,27 +559,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
  */
 # define ACE_Local_Service_Export
 
-#if defined (ACE_OPENVMS)
-# define ACE_PREPROC_STRINGIFY(A) #A
-# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A
-# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
-void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
-  ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
-    static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
-  ACE_ASSERT (_p != 0); \
-  delete _p; } \
-extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\
-ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \
-{ \
-  ACE_TRACE (#SERVICE_CLASS); \
-  if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
-  return new SERVICE_CLASS; \
-} \
-ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \
-  (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)));
-#else
-# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
+#define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
 void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
   ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
     static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
@@ -593,7 +573,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
     *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new SERVICE_CLASS; \
 }
-#endif
 
 /**
  * For service classes scoped within namespaces, use this macro in
@@ -621,27 +600,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
  * this will ensure unique generated signatures for the various C
  * style functions.
  */
-#if defined (ACE_OPENVMS)
-# define ACE_PREPROC_STRINGIFY(A) #A
-# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A
-# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
-void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
-  ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
-    static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
-  ACE_ASSERT (_p != 0); \
-  delete _p; } \
-extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\
-ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \
-{ \
-  ACE_TRACE (#SERVICE_CLASS); \
-  if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
-  return new NAMESPACE_CLASS; \
-} \
-ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \
-  (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)));
-#else
-# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
+#define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
 void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
   ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
     static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
@@ -655,7 +614,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
     *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new NAMESPACE_CLASS; \
 }
-#endif
 
 /// The canonical name for a service factory method
 # define ACE_SVC_NAME(SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)
diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp
index d3f93584e8e..085ed0b938e 100644
--- a/ACE/ace/Lib_Find.cpp
+++ b/ACE/ace/Lib_Find.cpp
@@ -16,101 +16,6 @@
 #  include "ace/OS_NS_strings.h"
 #endif /* ACE_WIN32 */
 
-#if defined (ACE_OPENVMS)
-#include "ace/RB_Tree.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Singleton.h"
-
-#include /**/ "descrip.h"
-#include /**/ "chfdef.h"
-#include /**/ "stsdef.h"
-#include /**/ "libdef.h"
-
-extern "C" int LIB$FIND_IMAGE_SYMBOL(...);
-
-/**
- * @internal
- *
- * Implements a class to register symbols and addresses for use with DLL
- * symbol retrieval.
- *
- * OpenVMS restricts symbol length to 31 characters encoding any symbols
- * longer than that. In these cases dlsym() only works with the encoded
- * names.
- * This creates serious problems for the service configurator framework
- * where the factory method names often exceed 31 chars and where loading
- * is based on retrieval of method pointers using the *full* name.
- * For OpenVMS we therefor added this singleton class and the
- * ACE_Dynamic_Svc_Registrar class which registers full names and function
- * pointers with this singleton at the time the static ACE_Dynamic_Svc_Registrar
- * object is created in a (service) DLL.
- * By forcing the DLL to load using a common symbol ("NULL") we trigger static
- * object creation *before* the full names are referenced.
- * Symbol references will be resolved as follows on OpenVMS:
- * - first try directly from DLL using the RTL dlsym() function and if that fails;
- * - try to find symbol in singleton registry.
- */
-class ACE_LD_Symbol_Registry
-{
-public:
-  typedef ACE_RB_Tree<const ACE_TCHAR*,
-                      void*,
-                      ACE_Less_Than<const ACE_TCHAR*>,
-                      ACE_Thread_Mutex>
-          TREE;
-
-  void register_symbol (const ACE_TCHAR* symname, void* symaddr);
-
-  void* find_symbol (const ACE_TCHAR* symname);
-
-  ACE_LD_Symbol_Registry () = default;
-
-private:
-  TREE symbol_registry_;
-};
-
-void
-ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname,
-                                         void* symaddr)
-{
-  int const result = symbol_registry_.bind (symname, symaddr);
-  if (result == 1)
-    {
-      ACELIB_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:")
-                          ACE_TEXT (" duplicate symbol %s registered\n"),
-                          ACE_TEXT_ALWAYS_CHAR (symname)));
-    }
-  else if (result == -1)
-    {
-      ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:")
-                           ACE_TEXT (" failed to register symbol %s\n"),
-                           ACE_TEXT_ALWAYS_CHAR (symname)));
-    }
-}
-
-void*
-ACE_LD_Symbol_Registry::find_symbol (const ACE_TCHAR* symname)
-{
-  void* symaddr = 0;
-  int const result = symbol_registry_.find (symname, symaddr);
-
-  return (result == 0 ? symaddr : 0);
-}
-
-/// Declare a process wide singleton
-ACE_SINGLETON_DECLARE (ACE_Singleton,
-                       ACE_LD_Symbol_Registry,
-                       ACE_Thread_Mutex)
-
-typedef ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex>
-        ACE_LD_SYMBOL_REGISTRY;
-
-ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_LD_Symbol_Registry, ACE_SYNCH_MUTEX);
-
-
-#endif
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
@@ -119,76 +24,6 @@ ACE::ldfind (const ACE_TCHAR* filename,
              size_t maxpathnamelen)
 {
   ACE_TRACE ("ACE::ldfind");
-#if defined (ACE_OPENVMS)
-  if (ACE_OS::strlen (filename) >= maxpathnamelen)
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-
-  dsc$descriptor nameDsc;
-  nameDsc.dsc$b_class = DSC$K_CLASS_S;
-  nameDsc.dsc$b_dtype = DSC$K_DTYPE_T;
-  nameDsc.dsc$w_length = ACE_OS::strlen (filename);
-  nameDsc.dsc$a_pointer = (char*)filename;
-
-  char symbol[] = "NULL";
-  dsc$descriptor symbolDsc;
-  symbolDsc.dsc$b_class = DSC$K_CLASS_S;
-  symbolDsc.dsc$b_dtype = DSC$K_DTYPE_T;
-  symbolDsc.dsc$w_length = ACE_OS::strlen (symbol);
-  symbolDsc.dsc$a_pointer = symbol;
-
-  int symbolValue;
-  int result;
-  try
-    {
-      result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0);
-    }
-  catch (chf$signal_array &sig)
-    {
-      result = sig.chf$l_sig_name;
-    }
-
-  int severity = result & STS$M_SEVERITY;
-  int conditionId = result & STS$M_COND_ID;
-  if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO ||
-      (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID)))
-    {
-      ACE_OS::strcpy (pathname, filename);
-      return 0;
-    }
-
-  if (ACE_OS::strlen (filename) + ACE_OS::strlen (ACE_DLL_PREFIX) >= maxpathnamelen)
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-
-
-  ACE_OS::strcpy (pathname, ACE_DLL_PREFIX);
-  ACE_OS::strcat (pathname, filename);
-  nameDsc.dsc$w_length = ACE_OS::strlen (pathname);
-  nameDsc.dsc$a_pointer = pathname;
-  try
-    {
-      result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0);
-    }
-  catch (chf$signal_array &sig)
-    {
-      result = sig.chf$l_sig_name;
-    }
-
-  severity = result & STS$M_SEVERITY;
-  conditionId = result & STS$M_COND_ID;
-  if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO ||
-      (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID)))
-    {
-      return 0;
-    }
-  errno = ENOENT;
-  return -1;
-#endif /* ACE_OPENVMS */
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
   ACE_TCHAR expanded_filename[MAXPATHLEN];
@@ -544,29 +379,6 @@ ACE::ldname (const ACE_TCHAR *entry_point)
 #endif /* ACE_NEEDS_DL_UNDERSCORE */
 }
 
-#if defined (ACE_OPENVMS)
-void
-ACE::ldregister (const ACE_TCHAR *entry_point,
-                 void* entry_addr)
-{
-  ACE_LD_SYMBOL_REGISTRY::instance ()->register_symbol (entry_point,
-                                                        entry_addr);
-}
-
-void *
-ACE::ldsymbol (ACE_SHLIB_HANDLE sh, const ACE_TCHAR *entry_point)
-{
-  void* symaddr = ACE_OS::dlsym (sh, entry_point);
-  // if not found through dlsym() try registry
-  if (!symaddr)
-    {
-      symaddr = ACE_LD_SYMBOL_REGISTRY::instance ()->find_symbol (entry_point);
-    }
-
-  return symaddr;
-}
-#endif
-
 int
 ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
 {
diff --git a/ACE/ace/Lib_Find.h b/ACE/ace/Lib_Find.h
index 3c72a1fc572..6496a93dc4d 100644
--- a/ACE/ace/Lib_Find.h
+++ b/ACE/ace/Lib_Find.h
@@ -16,9 +16,6 @@
 #include /**/ "ace/config-all.h"
 #include /**/ "ace/ACE_export.h"
 #include "ace/os_include/os_stdio.h"
-#if defined (ACE_OPENVMS)
-# include "ace/OS_NS_dlfcn.h"
-#endif
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -57,26 +54,6 @@ namespace ACE
    */
   extern ACE_Export ACE_TCHAR *ldname (const ACE_TCHAR *entry_point);
 
-
-#if defined (ACE_OPENVMS)
-  /**
-   * Registers an @a entry_point and its address for later retrieval
-   * through the ACE::ldsymbol () method.
-   * For use in cases where the OS compiler encodes long symbolnames.
-   */
-  extern ACE_Export void ldregister (const ACE_TCHAR *entry_point,
-                                     void* entry_addr);
-
-  /**
-   * Looks up an @a entry_point address either from previously registered
-   * symbols or through ACE_OS::dlsym ().
-   * Returns 0 in case the entry_point is not found, otherwise nonzero.
-   * For use in cases where the OS compiler encodes long symbolnames.
-   */
-  extern ACE_Export void *ldsymbol (ACE_SHLIB_HANDLE sh,
-                                    const ACE_TCHAR *entry_point);
-#endif
-
   /**
    * Returns the temporary directory including the trailing slash in
    * @a buffer.  Returns -1 for an error or if the buffer_len is not
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index b0f51f7cb0f..db78a8203ca 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1262,12 +1262,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   break;
 
                 case 'P':             // Process ID
-#if defined (ACE_OPENVMS)
-                  // Print the process id in hex on OpenVMS.
-                  ACE_OS::strcpy (fp, ACE_TEXT ("x"));
-#else
                   ACE_OS::strcpy (fp, ACE_TEXT ("d"));
-#endif
                   if (can_check)
                     this_len = ACE_OS::snprintf
                       (bp, bspace, format,
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index 607d3177196..a2689104e79 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -255,10 +255,6 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
                           -1);
     }
 
-#if defined (ACE_OPENVMS)
-  ::fsync(this->mmap_.handle());
-#endif
-
   // Increment by one to put us at the beginning of the next chunk...
   ++map_size;
 #endif /* __Lynx__ */
diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp
index 47fa9b2b3d2..e44677922f0 100644
--- a/ACE/ace/Mem_Map.cpp
+++ b/ACE/ace/Mem_Map.cpp
@@ -188,8 +188,6 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name,
 
 #if defined (INTEGRITY)  || defined (__QNXNTO__) || defined (ACE_VXWORKS)
   this->handle_ = ACE_OS::shm_open (file_name, flags, perms, sa);
-#elif defined (ACE_OPENVMS)
-  ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, this->handle_);
 #else
   this->handle_ = ACE_OS::open (file_name, flags, perms, sa);
 #endif /* INTEGRITY */
diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h
index fd8262de6ae..eec0b65df8f 100644
--- a/ACE/ace/OS_Memory.h
+++ b/ACE/ace/OS_Memory.h
@@ -123,40 +123,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @param ptr the base pointer
  * @param alignment the required alignment
  */
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-inline unsigned int
-ACE_align_binary (unsigned int ptr, unsigned int alignment)
-{
-  unsigned int const tmp = alignment - 1;
-  return (ptr + tmp) & (~tmp);
-}
-#else
 inline uintptr_t
 ACE_align_binary (uintptr_t ptr, uintptr_t alignment)
 {
   uintptr_t const tmp = alignment - 1;
   return (ptr + tmp) & (~tmp);
 }
-#endif
 
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-/// Return the next address aligned to a required boundary
-inline char *
-ACE_ptr_align_binary (char const * ptr, unsigned int alignment)
-{
-  return
-    reinterpret_cast<char *> (
-      ACE_align_binary (reinterpret_cast<unsigned int> (ptr), alignment));
-}
-
-/// Return the next address aligned to a required boundary
-inline char *
-ACE_ptr_align_binary (unsigned char const * ptr, unsigned int alignment)
-{
-  return
-    ACE_ptr_align_binary (reinterpret_cast<char const *> (ptr), alignment);
-}
-#else
 /// Return the next address aligned to a required boundary
 inline char *
 ACE_ptr_align_binary (char const * ptr, uintptr_t alignment)
@@ -173,7 +146,6 @@ ACE_ptr_align_binary (unsigned char const * ptr, uintptr_t alignment)
   return
     ACE_ptr_align_binary (reinterpret_cast<char const *> (ptr), alignment);
 }
-#endif  /* ACE_OPENVMS && __INITIAL_POINTER_SIZE < 64 */
 //@}
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index d1e01ee4a56..19aa67f5026 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -27,10 +27,9 @@
 #include "ace/os_include/os_errno.h"
 #include /**/ "ace/ACE_export.h"
 
-/* OPENVMS needs unistd for cuserid() */
-#if defined (CYGWIN32) || defined (ACE_OPENVMS)
+#if defined (CYGWIN32)
 #  include "ace/os_include/os_unistd.h"
-#endif /* CYGWIN32 || ACE_OPENVMS */
+#endif /* CYGWIN32 */
 
 #if defined (ACE_WIN32)
 # include "io.h"
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 19ef547d013..d40c139c860 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -108,12 +108,6 @@ ACE_OS::atop (const char *s)
   ACE_TRACE ("ACE_OS::atop");
 #if defined (ACE_WIN64)
   intptr_t ip = ::_atoi64 (s);
-#elif defined (ACE_OPENVMS)
-#  if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)
-  int ip = ::atoi (s);
-#  else
-  intptr_t ip = ::atoi (s);
-#  endif
 #else
   intptr_t ip = ::atoi (s);
 #endif /* ACE_WIN64 */
@@ -127,12 +121,6 @@ ACE_OS::atop (const wchar_t *s)
 {
 #  if defined (ACE_WIN64)
   intptr_t ip = ::_wtoi64 (s);
-#  elif defined (ACE_OPENVMS)
-#    if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)
-  int ip = ACE_OS::atoi (s);
-#    else
-  intptr_t ip = ACE_OS::atoi (s);
-#    endif
 #  else
   intptr_t ip = ACE_OS::atoi (s);
 #  endif /* ACE_WIN64 */
diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl
index 1cc6bac8dd9..5ff514997b5 100644
--- a/ACE/ace/OS_NS_sys_mman.inl
+++ b/ACE/ace/OS_NS_sys_mman.inl
@@ -130,11 +130,6 @@ ACE_OS::mmap (void *addr,
   flags |= ACE_OS_EXTRA_MMAP_FLAGS;
 #  endif /* ACE_OS_EXTRA_MMAP_FLAGS */
   ACE_UNUSED_ARG (file_mapping);
-#  if defined (ACE_OPENVMS)
-  //FUZZ: disable check_for_lack_ACE_OS
-  ::fsync(file_handle);
-  //FUZZ: enable check_for_lack_ACE_OS
-#  endif
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_OSCALL_RETURN ((void *) ::mmap ((ACE_MMAP_TYPE) addr,
                                       len,
@@ -240,10 +235,6 @@ ACE_OS::shm_open (const ACE_TCHAR *filename,
   filename = buf;
 #endif
   return ::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms);
-#elif defined (ACE_OPENVMS)
-  //FUZZ: disable check_for_lack_ACE_OS
-  return ::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd"));
-  //FUZZ: enable check_for_lack_ACE_OS
 #else  /* ! ACE_HAS_SHM_OPEN */
   // Just use ::open.
   return ACE_OS::open (filename, mode, perms, sa);
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl
index de6c16fcc76..9dec20de7f9 100644
--- a/ACE/ace/OS_NS_sys_stat.inl
+++ b/ACE/ace/OS_NS_sys_stat.inl
@@ -64,11 +64,6 @@ namespace ACE_OS
 #elif defined (ACE_MQX)
     return MQX_Filesystem::inst ().fstat (handle, stp);
 #else
-#  if defined (ACE_OPENVMS)
-    //FUZZ: disable check_for_lack_ACE_OS
-    ::fsync(handle);
-    //FUZZ: enable check_for_lack_ACE_OS
-#  endif
     return ::fstat (handle, stp);
 #endif /* !ACE_HAS_X86_STAT_MACROS */
   }
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index 295d3160a90..76b763da3df 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -700,14 +700,9 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
           return 0;
         }
 
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-      int const temp_p = reinterpret_cast<int> (func_p);
-#else
       intptr_t const temp_p = reinterpret_cast<intptr_t> (func_p);
-#endif
 
-      ACE_Service_Factory_Ptr func =
-        reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p);
+      ACE_Service_Factory_Ptr func = reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p);
 
       // Invoke the factory function and record it's return value.
       this->symbol_ = (*func) (gobbler);
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index 6946b436619..dc6aa4c7ddf 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -228,21 +228,6 @@ ACE_Pipe::open (int buffer_size)
       return -1;
     }
 # endif /* ! ACE_LACKS_SO_SNDBUF */
-# if defined (ACE_OPENVMS) && !defined (ACE_LACKS_TCP_NODELAY)
-  int one = 1;
-  // OpenVMS implements socketpair(AF_UNIX...) by returning AF_INET sockets.
-  // Since these are plagued by Nagle as any other INET socket we need to set
-  // TCP_NODELAY on the write handle.
-  if (ACE_OS::setsockopt (this->handles_[1],
-                          ACE_IPPROTO_TCP,
-                          TCP_NODELAY,
-                          reinterpret_cast <const char *> (&one),
-                          sizeof (one)) == -1)
-    {
-      this->close ();
-      return -1;
-    }
-# endif /* ACE_OPENVMS && !ACE_LACKS_TCP_NODELAY */
 #endif  /* ! ACE_LACKS_SOCKETPAIR && ! ACE_HAS_STREAM_PIPES */
   // Point both the read and write HANDLES to the appropriate socket
   // HANDLEs.
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index 3386a348582..afa7a0da98d 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -190,67 +190,6 @@ ACE_Process::spawn (ACE_Process_Options &options)
       return this->getpid ();
     }
   return ACE_INVALID_PID;
-
-#elif defined(ACE_OPENVMS)
-  if (ACE_BIT_ENABLED (options.creation_flags (),
-                       ACE_Process_Options::NO_EXEC))
-    ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-
-  int saved_stdin = ACE_STDIN;
-  int saved_stdout = ACE_STDOUT;
-  int saved_stderr = ACE_STDERR;
-  // Save STD file descriptors and redirect
-  if (options.get_stdin () != ACE_INVALID_HANDLE) {
-    if ((saved_stdin = ACE_OS::dup (ACE_STDIN)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stdin (), ACE_STDIN) == -1)
-      ACE_OS::exit (errno);
-  }
-  if (options.get_stdout () != ACE_INVALID_HANDLE) {
-    if ((saved_stdout = ACE_OS::dup (ACE_STDOUT)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stdout (), ACE_STDOUT) == -1)
-      ACE_OS::exit (errno);
-  }
-  if (options.get_stderr () != ACE_INVALID_HANDLE) {
-    if ((saved_stderr = ACE_OS::dup (ACE_STDERR)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stderr (), ACE_STDERR) == -1)
-      ACE_OS::exit (errno);
-  }
-
-  if (options.working_directory () != 0)
-    ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-
-  this->child_id_ = vfork();
-  if (this->child_id_ == 0) {
-      ACE_OS::execvp (options.process_name (),
-                options.command_line_argv ());
-      // something went wrong
-      this->child_id_ = ACE_INVALID_PID;
-  }
-
-  // restore STD file descriptors (if necessary)
-  if (options.get_stdin () != ACE_INVALID_HANDLE) {
-    if (saved_stdin == -1)
-      ACE_OS::close (ACE_STDIN);
-    else
-      ACE_OS::dup2 (saved_stdin, ACE_STDIN);
-  }
-  if (options.get_stdout () != ACE_INVALID_HANDLE) {
-    if (saved_stdout == -1)
-      ACE_OS::close (ACE_STDOUT);
-    else
-      ACE_OS::dup2 (saved_stdout, ACE_STDOUT);
-  }
-  if (options.get_stderr () != ACE_INVALID_HANDLE) {
-    if (saved_stderr == -1)
-      ACE_OS::close (ACE_STDERR);
-    else
-      ACE_OS::dup2 (saved_stderr, ACE_STDERR);
-  }
-
-  return this->child_id_;
 #elif defined (ACE_VXWORKS) && defined (__RTP__)
   if (ACE_BIT_ENABLED (options.creation_flags (),
                        ACE_Process_Options::NO_EXEC))
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp
index 09020466e73..44fea0d26bc 100644
--- a/ACE/ace/SSL/SSL_Context.cpp
+++ b/ACE/ace/SSL/SSL_Context.cpp
@@ -516,7 +516,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file,
         }
 
       // SSL_add_dir_cert_subjects_to_stack is defined at 0.9.8a (but not
-      // on OpenVMS or Mac Classic); it may be available earlier. Change
+      // on Mac Classic); it may be available earlier. Change
       // this comparison if so. It's still (1.0.1g) broken on windows too.
 #if defined (OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090801fL)
 #  if !defined (OPENSSL_SYS_VMS) && !defined (OPENSSL_SYS_MACINTOSH_CLASSIC)
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index fe41085324d..bc82751959c 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -819,14 +819,8 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll)
                        ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")),
                       0);
 
-  void * foo =
-    xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object"));
-
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int const temp_p = reinterpret_cast<int> (foo);
-#else
+  void * foo = xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object"));
   intptr_t const temp_p = reinterpret_cast<intptr_t> (foo);
-#endif
 
   ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (temp_p);
 
diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp
index c7429cfb075..79060626410 100644
--- a/ACE/ace/Service_Object.cpp
+++ b/ACE/ace/Service_Object.cpp
@@ -14,9 +14,6 @@
 #include "ace/DLL.h"
 #include "ace/ACE.h"
 #include "ace/Log_Category.h"
-#if defined (ACE_OPENVMS)
-# include "ace/Lib_Find.h"
-#endif
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -177,13 +174,4 @@ ACE_Service_Type::name (const ACE_TCHAR *n)
   this->name_ = ACE::strnew (n);
 }
 
-#if defined (ACE_OPENVMS)
-ACE_Dynamic_Svc_Registrar::ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name,
-                                                      void* svc_allocator)
-{
-  // register service allocator function by full name in ACE singleton registry
-  ACE::ldregister (alloc_name, svc_allocator);
-}
-#endif
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h
index 4f123319c2e..287391e5202 100644
--- a/ACE/ace/Service_Object.h
+++ b/ACE/ace/Service_Object.h
@@ -180,20 +180,6 @@ private:
   ACE_Service_Object *service_object_;
 };
 
-#if defined (ACE_OPENVMS)
-/**
- * @class ACE_Dynamic_Svc_Registrar
- *
- * @brief Used to register Service allocator function by its full name.
- */
-class ACE_Dynamic_Svc_Registrar
-{
-public:
-  ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name,
-                             void* svc_allocator);
-};
-#endif
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 3bdfb53c03a..32df890caa1 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1012,7 +1012,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
   return get_ip_interfaces_hpux (count, addrs);
 #elif defined (_AIX)
   return get_ip_interfaces_aix (count, addrs);
-#elif (defined (__unix) || defined (__unix__) || defined (ACE_OPENVMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
+#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
   // COMMON (SVR4 and BSD) UNIX CODE
 
   // Call specific routine as necessary.
@@ -1341,7 +1341,7 @@ ACE::get_handle ()
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
 #if defined (sparc)
   handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__unix__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)
+#elif defined (__unix) || defined (__unix__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_HAS_RTEMS)
   // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX,
   // AIX, SunOS 4.x
 
diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp
index 1ada5a8543d..3ae02a406eb 100644
--- a/ACE/ace/Strategies_T.cpp
+++ b/ACE/ace/Strategies_T.cpp
@@ -16,9 +16,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Errno.h"
 #include "ace/Svc_Handler.h"
-#if defined (ACE_OPENVMS)
-# include "ace/Lib_Find.h"
-#endif
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Strategies_T.inl"
@@ -118,15 +115,8 @@ ACE_DLL_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
   ACE_SHLIB_HANDLE handle = ACE_OS::dlopen (this->dll_name_);
 
   // Extract the factory function.
-#if defined (ACE_OPENVMS)
   SVC_HANDLER *(*factory)(void) =
-    (SVC_HANDLER *(*)(void)) ACE::ldsymbol (handle,
-                                            this->factory_function_);
-#else
-  SVC_HANDLER *(*factory)(void) =
-    (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle,
-                                            this->factory_function_);
-#endif
+    (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle, this->factory_function_);
 
   // Call the factory function to obtain the new SVC_Handler (should
   // use RTTI here when it becomes available...)
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 9897a6bd93e..4488e9d20ec 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -35,9 +35,6 @@
 #     include /**/ <wchar.h>
 #     include /**/ <wctype.h>
 #   endif
-# elif defined (ACE_OPENVMS)
-#   include /**/ <wchar.h>
-#   include /**/ <wctype.h>
 # else
 #   include /**/ <cwchar>
 #   include /**/ <cwctype>
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 57e91329998..e64efa29939 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -101,7 +101,7 @@
 
 # if !defined (ACE_HAS_PROCESS_SPAWN)
 #   if !defined (ACE_LACKS_FORK) || \
-       (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) || defined (ACE_OPENVMS)
+       (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP))
 #     define ACE_HAS_PROCESS_SPAWN 1
 #   endif
 # endif /* ACE_HAS_PROCESS_SPAWN */
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
deleted file mode 100644
index 5417d250a25..00000000000
--- a/ACE/ace/config-openvms.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* -*- C++ -*- */
-// The following configuration file is designed to work for OpenVMS 7.3-2
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-#ifdef __cplusplus
-#pragma message disable CODCAUUNR
-#pragma message disable CODEUNREACHABLE
-//#pragma message disable DOLLARID
-//#pragma message disable NOSIMPINT
-//#pragma message disable NOSTDLONGLONG
-#pragma message disable NARROWPTR
-//#pragma message disable LONGEXTERN
-#pragma message disable UNSCOMZER
-#endif
-
-// Use a signed int to match POSIX
-#define __SIGNED_INT_TIME_T
-
-#define ACE_OPENVMS __VMS_VER
-
-#define ACE_DLL_SUFFIX ACE_TEXT("")
-
-#define ACE_HAS_DUMP    1
-
-// need this includes to ensure proper sequence of definitions so that
-// f.i. HP C/C++ does not '#define ' memcpy, memmove etc.
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#undef memset
-#undef memcpy
-#undef memmove
-
-#if defined(__ia64__)
-  // on OpenVMS IA64 we need this get the singleton exported since we build
-  // ACE/TAO with the NOTEMPLATES export option which prohibits exporting
-  // of any template symbols unless explicitly exported
-  #define ACE_HAS_CUSTOM_EXPORT_MACROS
-  #define ACE_Proper_Export_Flag
-  #define ACE_Proper_Import_Flag
-  #define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T
-  #define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>;
-#else
-  #define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-#endif
-
-#define ACE_DEFAULT_BASE_ADDR ((char*)(0x30000000))
-
-#define ACE_MAX_UDP_PACKET_SIZE 65535
-
-/* missing system headers */
-#define ACE_LACKS_STDINT_H  1
-#define ACE_LACKS_SYS_IPC_H 1
-#define ACE_LACKS_SYS_SEM_H 1
-#define ACE_LACKS_SEMAPHORE_H 1
-#define ACE_LACKS_SYS_SELECT_H 1
-#define ACE_LACKS_TERMIOS_H 1
-#define ACE_LACKS_SYS_SHM_H 1
-#define ACE_LACKS_SYS_MSG_H 1
-#define ACE_LACKS_REGEX_H 1
-#define ACE_LACKS_SEARCH_H 1
-#define ACE_LACKS_SCHED_H 1
-#define ACE_LACKS_SYS_SYSCTL_H 1
-#define ACE_LACKS_SYS_PARAM_H 1
-#define ACE_LACKS_SIGINFO_H 1
-#define ACE_LACKS_UCONTEXT_H 1
-
-/* missing rtl functions */
-#define ACE_LACKS_SETPGID 1
-#define ACE_LACKS_SETREUID 1
-#define ACE_LACKS_SETREGID 1
-#define ACE_LACKS_FORK 1
-#define ACE_LACKS_GETPGID 1
-#define ACE_LACKS_SETSID 1
-#define ACE_LACKS_FCNTL 1
-#define ACE_LACKS_SETEGID 1
-#define ACE_LACKS_SETEUID 1
-
-#define ACE_LACKS_REALPATH 1
-
-#define ACE_LACKS_SYMLINKS 1
-
-#define ACE_HAS_P_READ_WRITE
-#define ACE_HAS_CHARPTR_DL 1
-#define ACE_HAS_CLOCK_GETTIME 1
-#define ACE_HAS_CLOCK_SETTIME 1
-#define ACE_HAS_VOIDPTR_GETTIMEOFDAY 1
-#define ACE_HAS_DIRENT 1
-#define ACE_HAS_GETPAGESIZE 1
-#define ACE_HAS_MSG
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
-#define ACE_HAS_3_PARAM_WCSTOK 1
-#define ACE_HAS_SIGSUSPEND 1
-#define ACE_HAS_SIGWAIT 1
-#define ACE_HAS_SIGTIMEDWAIT 1
-
-#define ACE_HAS_SIG_C_FUNC 1
-#define ACE_HAS_SIGISMEMBER_BUG
-#define ACE_HAS_STRNLEN 1
-#define ACE_HAS_STREAMS 1
-#define ACE_HAS_UALARM 1
-#define ACE_HAS_VOIDPTR_MMAP 1
-#define ACE_HAS_VOIDPTR_SOCKOPT 1
-#define ACE_LACKS_LSTAT 1
-#define ACE_LACKS_MADVISE 1
-#define ACE_LACKS_MKFIFO 1
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1
-#define ACE_LACKS_READLINK 1
-#define ACE_LACKS_RLIMIT 1
-#define ACE_LACKS_RLIMIT_PROTOTYPE 1
-#define ACE_LACKS_SETSCHED
-#define ACE_LACKS_SYSCALL 1
-#define ACE_LACKS_WCSTOULL 1
-#define ACE_LACKS_WCSTOLL
-
-/* (missing) standard data types */
-#define ACE_LACKS_CONST_TIMESPEC_PTR 1
-#define ACE_LACKS_SUSECONDS_T 1
-#define ACE_HAS_IDTYPE_T 1
-#define ACE_HAS_SIGINFO_T 1
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
-#define ACE_HAS_SIZET_SOCKET_LEN 1
-#define ACE_HAS_SSIZE_T 1
-#define ACE_LACKS_PRI_T 1
-#define ACE_LACKS_SEMBUF_T 1
-#define ACE_LACKS_STRRECVFD 1
-#define ACE_LACKS_T_ERRNO 1
-
-/* POSIX threads compatibilities */
-#define ACE_LACKS_RWLOCK_T 1
-#define ACE_LACKS_PTHREAD_KILL 1
-#define ACE_LACKS_THREAD_PROCESS_SCOPING 1
-
-#define ACE_HAS_PTHREADS 1
-#define ACE_HAS_PTHREAD_PROCESS_ENUM 1
-#define ACE_LACKS_UNNAMED_SEMAPHORE 1
-#define ACE_MT_SAFE 1
-#define ACE_HAS_THREADS 1
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
-#define ACE_HAS_THR_C_DEST 1
-#define ACE_HAS_THR_C_FUNC 1
-#define ACE_LACKS_PTHREAD_SIGMASK 1
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1
-#define ACE_NEEDS_HUGE_THREAD_STACKSIZE (64U*1024)
-#define ACE_HAS_PTHREAD_SETCONCURRENCY 1
-#define ACE_HAS_PTHREAD_GETCONCURRENCY 1
-#define ACE_HAS_PTHREAD_SCHEDPARAM 1
-
-/* language/platform conformance */
-#define ACE_TEMPLATES_REQUIRE_SOURCE 1
-#define ACE_HAS_AUTOMATIC_INIT_FINI 1
-#define ACE_LACKS_UNIX_SIGNALS 1
-
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
-
-#define ACE_HAS_GPERF 1
-#define ACE_HAS_IP_MULTICAST 1
-#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
-#define ACE_HAS_POSIX_NONBLOCK 1
-#define ACE_HAS_POSIX_TIME 1
-#define ACE_HAS_BROKEN_POSIX_TIME 1
-#define ACE_HAS_SVR4_DYNAMIC_LINKING 1
-
-#define ACE_LACKS_NAMED_POSIX_SEM 1
-#define ACE_LACKS_SYSV_SHMEM 1
-#define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1
-#define ACE_LACKS_UNIX_SYSLOG 1
-#define ACE_LACKS_ALPHASORT 1
-#define ACE_LACKS_ISCTYPE
-#define ACE_LACKS_ISBLANK
-
-#define ACE_LACKS_SETENV
-#define ACE_LACKS_UNSETENV
-
-#define ACE_HAS_SOCK_BUF_SIZE_MAX
-#define ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE 65535
-
-#endif
diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h
index 5970afb2d65..a6a12c845ef 100644
--- a/ACE/ace/os_include/os_time.h
+++ b/ACE/ace/os_include/os_time.h
@@ -57,12 +57,8 @@ typedef struct timespec
   long tv_nsec;
 } timespec_t;
 # elif defined (ACE_HAS_BROKEN_POSIX_TIME)
-#  if defined (ACE_OPENVMS)
-#     include /**/ <timers.h>
-#  else
 // OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs
 #     include /**/ <sys/timers.h>
-#  endif
 # endif /* !ACE_HAS_POSIX_TIME */
 
 # if defined(ACE_LACKS_TIMESPEC_T)
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index 261cce91cc8..39c2c7a092c 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -53,8 +53,7 @@ typedef double ACE_timer_t;
 
 #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8
    typedef off_t ACE_LOFF_T;
-#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \
-  (defined (ACE_OPENVMS) && defined (_LARGEFILE))
+#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__)
    typedef off_t ACE_LOFF_T;
 #elif defined (AIX) || defined (HPUX) || defined (__QNX__)
    typedef off64_t ACE_LOFF_T;
@@ -62,9 +61,7 @@ typedef double ACE_timer_t;
    typedef offset_t ACE_LOFF_T;
 #elif defined (WIN32)
    typedef __int64  ACE_LOFF_T;
-#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || \
-  defined (ACE_LYNXOS_MAJOR) || \
-  (defined (ACE_OPENVMS) && !defined (_LARGEFILE))
+#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || defined (ACE_LYNXOS_MAJOR)
    typedef long long ACE_LOFF_T;
 #else
    typedef loff_t ACE_LOFF_T;
diff --git a/ACE/include/makeinclude/platform_openvms.GNU b/ACE/include/makeinclude/platform_openvms.GNU
deleted file mode 100644
index ee2cb678ba7..00000000000
--- a/ACE/include/makeinclude/platform_openvms.GNU
+++ /dev/null
@@ -1,101 +0,0 @@
-
-# for OpenVMS GNV
-
-ACE_OPENVMS = 1
-versioned_so ?= 0
-debug ?= 1
-optimize ?= 0
-threads ?= 1
-pthread ?= 1
-ssl ?= 0
-rwho ?= 0
-buildbits ?= 32
-
-VDIR            ?= obj/
-VSHDIR          ?= shobj/
-PRELINK_TYPE    ?= USE_OLB
-
-LN_S = cp -p
-DEFFLAGS        +=
-CCFLAGS         += -D__USE_STD_IOSTREAM -ieee -names_as_is_short
-ifeq ($(HOSTTYPE),ia64)
-  CCFLAGS         += "-Wc/warn=DISABLE=(INTOVERFLOW,REFTEMPORARY,INTSIGNCHANGE)"
-else
-  CCFLAGS         += -msg_disable intoverflow,reftemporary,intsignchange
-endif
-CCFLAGS         += -Wc/template=auto
-
-ifeq ($(buildbits),64)
-  CCFLAGS += -Wc/MODEL=ANSI
-endif
-
-ifeq ($(HOSTTYPE),ia64)
-  ACE_OPENVMS_IA64 = 1
-  SYMVEC_OPT_FILE ?= $(LIB_NAME)_symvec.opt
-  ifeq ($(PRJ_TYPE),library)
-    ifeq ($(shared_libs),1)
-      CCFLAGS         += "-Wc/export_sym=(OPTIONS_FILE=$(SYMVEC_OPT_FILE),ALL,NOTEMPLATES)"
-    endif
-  endif
-else
-  LDFLAGS         += -Wl/PRELINK=$(PRELINK_TYPE)/MAP/CROSS
-endif
-
-ifeq ($(debug),1)
- LDFLAGS         += -g
-endif
-LDFLAGS         += -threads
-DCCFLAGS        += -g
-OCCFLAGS        += -O
-
-CFLAGS          += -ieee -names_as_is_short
-DCFLAGS         += -g
-OCFLAGS         += -O
-
-PIC             =
-RANLIB          = @true
-ifeq ($(HOSTTYPE),ia64)
-  ARFLAGS         = -r
-  SOFLAGS         = -shared $(SYMVEC_OPT_FILE)
-else
-  ARFLAGS         = -c
-  SOFLAGS         = -shared -auto_symvec
-endif
-ifeq ($(pthread),1)
-  LIBS            += -lpthread
-endif
-
-CC              = cc
-CXX             = cxx
-LD              = $(CXX)
-DLD             = $(CXX)
-SOVERSION       =
-SOEXT           = exe
-EXEEXT          = .exe
-
-ifeq ($(HOSTTYPE),ia64)
-  REALCLEAN_FILES += $(SYMVEC_OPT_FILE) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \
-	$(CLEANUP_BIN:%=%.DSF) $(basename $(BIN))
-else
-  REALCLEAN_FILES += $(CLEANUP_VSHLIB_NO_VER:%.exe=%_symvec.opt) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \
-	$(CLEANUP_BIN:%=%.DSF) $(basename $(BIN))
-endif
-
-ifneq ($(MAKEFILE),$(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(shell touch $(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(VMS_DUMMY_)
-endif
-
-ifeq ($(HOSTTYPE),ia64)
-  ifeq ($(shared_libs),1)
-   ifneq ($(SHLIB),)
-BUILD          := post_build.local
-
-.PHONY: post_build.local
-
-post_build.local:
-	@-if [ ! -z "$(VSHLIB)" ]; then dcl "set image/success $(VSHLIB)"; echo ""; fi
-
-   endif
-  endif
-endif
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 1a84f3d92cd..82b423c4284 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -187,15 +187,11 @@ $(VLIB): $(VLOBJS)
         #### to lib files, for example.
 	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
   endif # ace_lib_prelink
-  ifeq (1,$(ACE_OPENVMS))
-	find $(TMPINCDIR:%=%) -name "*.$(OBJEXT)" -or -name "*.obj" | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
-  else
-    ifneq (,$(AR.cc.override))
+  ifneq (,$(AR.cc.override))
 	$(AR.cc.override)
     else
 	([ "`echo $(TMPINCDIR:%=%/*.$(OBJEXT))`" != "$(TMPINCDIR:%=%/*.$(OBJEXT))" ] && echo $(TMPINCDIR:%=%/*.$(OBJEXT)); \
 	echo $(filter %.$(OBJEXT), $^)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
-    endif
   endif
   ifdef ibmcxx_build
 # This is required to get AIX IBM C/C++ to instantiate and compile the needed
diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp
index 875bb70d188..7b5f2ef3761 100644
--- a/ACE/tests/Based_Pointer_Test.cpp
+++ b/ACE/tests/Based_Pointer_Test.cpp
@@ -49,7 +49,7 @@ class Void_Pointer : public ACE_Based_Pointer<void>
 # define OBJ_SUFFIX ACE_DLL_SUFFIX
 #endif /* ACE_LD_DECORATOR_STR */
 
-#if defined (ACE_WIN32) || defined (ACE_OPENVMS)
+#if defined (ACE_WIN32)
 #  define OBJ_PREFIX ACE_DLL_PREFIX
 #else
 #  define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX
@@ -108,12 +108,7 @@ int singleton_test ()
                            -1);
        }
 
-#if defined (ACE_OPENVMS)
-    // with OPENVMS symbol names > 31 cause us trouble with dlsym()
-    void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repo_inst"));
-#else
     void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repository_instance"));
-#endif
 
     // Cast the void* to function* with a long as intermediate.
     ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (foo);
diff --git a/ACE/tests/Based_Pointer_Test_Lib.cpp b/ACE/tests/Based_Pointer_Test_Lib.cpp
index 555bd2d98c7..fc0b9481c1a 100644
--- a/ACE/tests/Based_Pointer_Test_Lib.cpp
+++ b/ACE/tests/Based_Pointer_Test_Lib.cpp
@@ -14,16 +14,9 @@
 #include "ace/svc_export.h"
 #include "ace/Based_Pointer_Repository.h"
 
-#if defined (ACE_OPENVMS)
-// with OPENVMS symbol names > 31 cause us trouble with dlsym()
-extern "C" ACE_Svc_Export void *
-get_based_pointer_repo_inst ()
-#else
-extern "C" ACE_Svc_Export void *
-get_based_pointer_repository_instance ()
-#endif
+extern "C" ACE_Svc_Export void *get_based_pointer_repository_instance ()
 {
-    void* baddr = ACE_BASED_POINTER_REPOSITORY::instance();
-    return baddr;
+  void* baddr = ACE_BASED_POINTER_REPOSITORY::instance();
+  return baddr;
 }
 
diff --git a/ACE/tests/Bug_3911_Regression_Test.cpp b/ACE/tests/Bug_3911_Regression_Test.cpp
index 47b9aafaacd..55a98040cd0 100644
--- a/ACE/tests/Bug_3911_Regression_Test.cpp
+++ b/ACE/tests/Bug_3911_Regression_Test.cpp
@@ -20,14 +20,7 @@ init_test ()
 {
   // Cleanup the MMAP file so we won't trip over the leftover mmap
   // file from the previous crash.
-#if defined (ACE_OPENVMS)
-  // OpenVMS cannot do fixed base, ever.
-  ACE_MMAP_Memory_Pool_Options options
-    (0,
-     ACE_MMAP_Memory_Pool_Options::NEVER_FIXED);
-#else
   ACE_MMAP_Memory_Pool_Options options (ACE_DEFAULT_BASE_ADDR);
-#endif /* ACE_OPENVMS */
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options);
   //FUZZ: enable check_for_lack_ACE_OS
diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp
index aee71f3aa1f..40ccca78f00 100644
--- a/ACE/tests/CDR_File_Test.cpp
+++ b/ACE/tests/CDR_File_Test.cpp
@@ -70,32 +70,6 @@ ostream &
 operator << (ostream &os,
              const CDR_Test &t)
 {
-#if defined (ACE_OPENVMS)
-  // to circumvent some obscure bug with OpenVMS iostreams digit conversions
-  // combined with shared libraries????
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("\n"
-                        "Char:               %c\n"
-                        "Short:              %u\n"
-                        "Long:               %d\n"),
-              t.char_,
-              t.word2_,
-              t.word4_));
-
-  ACE_CDR::ULongLong hi = (t.word8_ >> 32);
-  ACE_CDR::ULongLong lo = (t.word8_ & 0xffffffff);
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("\n"
-                        "ULongLong 1st half: %x\n"
-                        "ULongLong 2nd half: %x\n"
-                        "Float:              %f\n"
-                        "Double:             %f\n"),
-              ACE_Utils::truncate_cast<ACE_UINT32> (hi),
-              ACE_Utils::truncate_cast<ACE_UINT32> (lo),
-              t.fpoint_,
-              t.dprec_));
-#else
   os << "Char:              " << t.char_ << endl
      << "Short:             " << t.word2_ << endl
      << "Long:              " << t.word4_ << endl;
@@ -113,7 +87,6 @@ operator << (ostream &os,
      << dec << endl
      << "Float:             " << t.fpoint_ << endl
      << "Double:            " << t.dprec_ << endl;
-#endif
   return os;
 }
 
diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp
index 7e43c6267f8..6539deccb62 100644
--- a/ACE/tests/DLL_Test.cpp
+++ b/ACE/tests/DLL_Test.cpp
@@ -26,7 +26,7 @@
 # define OBJ_SUFFIX ACE_DLL_SUFFIX
 #endif /* ACE_LD_DECORATOR_STR */
 
-#if defined (ACE_WIN32) || defined (ACE_OPENVMS)
+#if defined (ACE_WIN32)
 #  define OBJ_PREFIX ACE_DLL_PREFIX
 #else
 #  define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 384f99365f1..bbbf4c6a61d 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -35,7 +35,7 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
 #define MMAP_FILENAME ACE_TEXT ("test_file")
 #define MUTEX_NAME ACE_TEXT ("test_lock")
 
-#if !defined (ACE_LINUX) && !defined (ACE_OPENVMS) \
+#if !defined (ACE_LINUX) \
     && !defined (ACE_ANDROID) \
     && !(defined (ACE_WIN32) \
          && (defined (ghs) || defined (__MINGW32__) )) \
@@ -91,15 +91,7 @@ myallocator (const void *base_addr = 0)
 
   if (static_allocator.get () == 0)
     {
-#if defined (ACE_OPENVMS)
-      // OpenVMS cannot do fixed base, ever.
-      ACE_UNUSED_ARG (base_addr);
-      ACE_MMAP_Memory_Pool_Options options
-        (0,
-         ACE_MMAP_Memory_Pool_Options::NEVER_FIXED);
-#else
       ACE_MMAP_Memory_Pool_Options options (base_addr);
-#endif /* ACE_OPENVMS */
 
 #if !defined (ACE_TEST_REMAP_ON_FAULT)
       options.minimum_bytes_ = 512 * 1024;
@@ -118,15 +110,7 @@ init_test (const void *base_addr = 0)
 {
   // Cleanup the MMAP file so we won't trip over the leftover mmap
   // file from the previous crash.
-#if defined (ACE_OPENVMS)
-  // OpenVMS cannot do fixed base, ever.
-  ACE_UNUSED_ARG (base_addr);
-  ACE_MMAP_Memory_Pool_Options options
-    (0,
-     ACE_MMAP_Memory_Pool_Options::NEVER_FIXED);
-#else
   ACE_MMAP_Memory_Pool_Options options (base_addr);
-#endif /* ACE_OPENVMS */
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options);
   //FUZZ: enable check_for_lack_ACE_OS
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp
index 67d8f4d8924..241498941b9 100644
--- a/ACE/tests/Process_Manager_Test.cpp
+++ b/ACE/tests/Process_Manager_Test.cpp
@@ -566,8 +566,7 @@ run_main (int argc, ACE_TCHAR *argv[])
     }
 #endif /* ACE_HAS_THREADS */
 
-#if !defined (ACE_OPENVMS) && \
-  (defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS)
+#if defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS
   // --------------------------------------------------
   // Finally, try the reactor stuff...
   mgr.open (ACE_Process_Manager::DEFAULT_SIZE,
@@ -597,7 +596,7 @@ run_main (int argc, ACE_TCHAR *argv[])
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("(%P) %d processes left in manager\n"),
                 nr_procs));
-#endif /* !defined (ACE_OPENVMS) */
+#endif /* defined (ACE_WIN32) */
 #endif // ACE_HAS_PROCESS_SPAWN
   ACE_END_TEST;
   return test_status;
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index afe19c68eee..9434fe85608 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -149,7 +149,7 @@ MM_Shared_Memory_Test: !VxWorks !nsk !ACE_FOR_TAO !LynxOS
 MT_NonBlocking_Connect_Test: !ST
 MT_Reactor_Timer_Test
 MT_Reactor_Upcall_Test: !nsk
-MT_Reference_Counted_Event_Handler_Test: !OpenVMS_IA64Crash !LynxOS
+MT_Reference_Counted_Event_Handler_Test: !LynxOS
 MT_Reference_Counted_Event_Handler_Test -b 0: LynxOS
 MT_Reference_Counted_Event_Handler_Test -a 0: LynxOS
 MT_Reference_Counted_Notify_Test
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 2e79519140c..2eebde2ba5c 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -2012,20 +2012,10 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
   tao_cg->gperf_input_stream ()->file () = nullptr;
 
   // Open the temp file.
-#if defined (ACE_OPENVMS)
-  //FUZZ: disable check_for_lack_ACE_OS
-  ACE_HANDLE input = ::open (tao_cg->gperf_input_filename (),
-                             O_RDONLY,
-                             "shr=get,put,upd",
-                             "ctx=rec",
-                             "fop=dfw");
-  //FUZZ: enable check_for_lack_ACE_OS
-#else
   ACE_HANDLE input =
     ACE::open_temp_file (
       ACE_TEXT_CHAR_TO_TCHAR (tao_cg->gperf_input_filename ()),
       O_RDONLY);
-#endif
 
   if (input == ACE_INVALID_HANDLE)
     {
@@ -2038,40 +2028,16 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
         -1);
     }
 
-#ifndef ACE_OPENVMS
   // Flush the output stream.  Gperf also uses it as output.  Ensure
   // current contents are written before gperf writes.
   ACE_OS::fflush (tao_cg->server_skeletons ()->file ());
-#endif  /* !ACE_OPENVMS */
 
   // Stdout is server skeleton.  Do *not* close the file, just open
   // again with <ACE_OS::open> with WRITE + APPEND option.. After
   // this, remember to update the file offset to the correct location.
-
-#if defined (ACE_OPENVMS)
-  char* gperfOutput = ACE_OS::tempnam (0, "idl_");
-
-  if (gperfOutput == 0)
-    {
-      ACE_OS::close (input);
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("failed to allocate memory\n")),
-                        -1);
-    }
-
-  //FUZZ: disable check_for_lack_ACE_OS
-  ACE_HANDLE output = ::open (gperfOutput,
-                              O_WRONLY | O_CREAT | O_EXCL,
-                              ACE_DEFAULT_FILE_PERMS,
-                              "shr=get,put,upd",
-                              "ctx=rec",
-                              "fop=dfw");
-  //FUZZ: enable check_for_lack_ACE_OS
-#else
   ACE_HANDLE output =
     ACE_OS::open (be_global->be_get_server_skeleton_fname (),
                   O_WRONLY | O_APPEND);
-#endif
 
   if (output == ACE_INVALID_HANDLE)
     {
@@ -2207,49 +2173,6 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
   ACE_OS::close (output);
   ACE_OS::close (input);
 
-#if defined (ACE_OPENVMS)
-  ACE_OS::unlink (tao_cg->gperf_input_filename ());
-  process_options.release_handles ();
-
-  if (result != -1)
-    {
-      FILE* gperfOutputFile = ACE_OS::fopen (gperfOutput, "r");
-
-      if (gperfOutputFile == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Error:%p: Couldn't open ")
-                      ACE_TEXT ("gperf output file\n"),
-                      "fopen"));
-          result = -1;
-        }
-      else
-        {
-          FILE* out = tao_cg->server_skeletons ()->file ();
-          int c;
-
-          while ((c = ACE_OS::fgetc(gperfOutputFile)) != EOF)
-            {
-              ACE_OS::fputc (c, out);
-            }
-
-          if (ferror (gperfOutputFile) || ferror (out))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("Error:%p: Couldn't open ")
-                          ACE_TEXT ("gperf output file\n"),
-                          "get/put"));
-              result = -1;
-            }
-
-          ACE_OS::fclose (gperfOutputFile);
-        }
-    }
-
-  ACE_OS::unlink (gperfOutput);
-  ACE_OS::free (gperfOutput);
-#endif /* ACE_OPENVMS */
-
   return result;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 9ba14e43e27..b08822dc090 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -65,7 +65,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << node->name () << "_ptr p)" << be_nl
           << "{" << be_idt_nl;
 
-      // Workaround for broken HP V7.4-004 on OpenVMS IA83
       if (node->has_mixed_parentage ())
         {
           *os << "::CORBA::AbstractBase_ptr abs = p;" << be_nl
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 8d2105575b6..a26c09cce3a 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -1229,35 +1229,10 @@ DRV_pre_proc (const char *myfile)
 
   UTL_String *utl_string = nullptr;
 
-#if defined (ACE_OPENVMS)
-  {
-    char main_abspath[MAXPATHLEN] = "";
-    char trans_path[MAXPATHLEN] = "";
-    char *main_fullpath =
-      ACE_OS::realpath (IDL_GlobalData::translateName (myfile, trans_path),
-                        main_abspath);
-
-    if (main_fullpath == 0)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Unable to construct full file pathname\n")));
-
-        (void) ACE_OS::unlink (tmp_ifile);
-        (void) ACE_OS::unlink (tmp_file);
-        throw Bailout ();
-      }
-
-    ACE_NEW (utl_string,
-             UTL_String (main_fullpath, true));
-
-    idl_global->set_main_filename (utl_string);
-  }
-#else
   ACE_NEW (utl_string,
            UTL_String (myfile, true));
 
   idl_global->set_main_filename (utl_string);
-#endif
 
   ACE_Auto_String_Free safety (ACE_OS::strdup (myfile));
 
@@ -1346,17 +1321,9 @@ DRV_pre_proc (const char *myfile)
       // If the following open() fails, then we're either being hit with a
       // symbolic link attack, or another process opened the file before
       // us.
-#if defined (ACE_OPENVMS)
-      //FUZZ: disable check_for_lack_ACE_OS
-      fd = ::open (t_file, O_WRONLY | O_CREAT | O_EXCL,
-                   ACE_DEFAULT_FILE_PERMS,
-                   "shr=get,put,upd", "ctx=rec", "fop=dfw");
-      //FUZZ: enable check_for_lack_ACE_OS
-#else
       fd = ACE_OS::open (t_file,
                          O_WRONLY | O_CREAT | O_EXCL,
                          ACE_DEFAULT_FILE_PERMS);
-#endif
 
       if (fd == ACE_INVALID_HANDLE)
         {
@@ -1474,11 +1441,6 @@ DRV_pre_proc (const char *myfile)
   // version the current process
   // would exit if the pre-processor
   // returned with error.
-
-#if defined (ACE_OPENVMS)
-  cpp_options.release_handles();
-#endif
-
   FILE * const yyin = ACE_OS::fopen (t_file, "r");
 
   if (yyin == nullptr)
diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp
index d63e3a2f841..1da6d96da19 100644
--- a/TAO/TAO_IDL/fe/fe_utils.cpp
+++ b/TAO/TAO_IDL/fe/fe_utils.cpp
@@ -436,7 +436,7 @@ FE_Utils::create_implied_ami_uses_stuff ()
 int
 FE_Utils::path_cmp (const char *s, const char *t)
 {
-#if defined (WIN32) || defined (ACE_OPENVMS)
+#if defined (WIN32)
   // Since Windows has case-insensitive filenames, the preprocessor,
   // when searching using a provided relative path, will sometimes
   // capitalize the first letter of the last segment of a path name
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 7b3dbdfa9fb..a07db882427 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -583,20 +583,6 @@ idl_parse_line_and_file (char *buf)
         }
 
       h[i] = '\0';
-#if defined (ACE_OPENVMS)
-      // translate this into *nix format as the OpenVMS preprocessor
-      // possibly produced VMS-style paths here.
-      char trans_path[MAXPATHLEN] = "";
-      char *temp_h = IDL_GlobalData::translateName (h, trans_path);
-      if (temp_h)
-        h = temp_h;
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to construct full file pathname\n")));
-          throw Bailout ();
-        }
-#endif
       ACE_NEW (tmp,
                UTL_String (h, true));
       idl_global->update_prefix (tmp->get_string ());
@@ -615,21 +601,10 @@ idl_parse_line_and_file (char *buf)
 
   if (!is_real_filename)
     {
-#if defined (ACE_OPENVMS)
-      char full_path[MAXPATHLEN] = "";
-      char *full_fname = ACE_OS::realpath (fname->get_string (), full_path);
-      // I don't see the benefit of using ->compare since this is targeted at IDL identifiers
-      // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really
-      // problematic as filenames retrieved through different mechanisms may give different
-      // casing.
-      is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (),
-                                             full_fname) == 0;
-#else
       is_main_filename =
         fname->compare (idl_global->main_filename ())
         || same_file (fname->get_string (),
                       idl_global->main_filename ()->get_string ());
-#endif
     }
 
   if (is_real_filename || is_main_filename)
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index 566e026cb55..fc9ef4403bb 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -3644,20 +3644,6 @@ idl_parse_line_and_file (char *buf)
         }
 
       h[i] = '\0';
-#if defined (ACE_OPENVMS)
-      // translate this into *nix format as the OpenVMS preprocessor
-      // possibly produced VMS-style paths here.
-      char trans_path[MAXPATHLEN] = "";
-      char *temp_h = IDL_GlobalData::translateName (h, trans_path);
-      if (temp_h)
-        h = temp_h;
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to construct full file pathname\n")));
-          throw Bailout ();
-        }
-#endif
       ACE_NEW (tmp,
                UTL_String (h, true));
       idl_global->update_prefix (tmp->get_string ());
@@ -3676,21 +3662,10 @@ idl_parse_line_and_file (char *buf)
 
   if (!is_real_filename)
     {
-#if defined (ACE_OPENVMS)
-      char full_path[MAXPATHLEN] = "";
-      char *full_fname = ACE_OS::realpath (fname->get_string (), full_path);
-      // I don't see the benefit of using ->compare since this is targeted at IDL identifiers
-      // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really
-      // problematic as filenames retrieved through different mechanisms may give different
-      // casing.
-      is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (),
-                                             full_fname) == 0;
-#else
       is_main_filename =
         fname->compare (idl_global->main_filename ())
         || same_file (fname->get_string (),
                       idl_global->main_filename ()->get_string ());
-#endif
     }
 
   if (is_real_filename || is_main_filename)
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 485486a60dd..b59dec8c417 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -657,10 +657,6 @@ public:
   // match the corresponding element on this list, if it is
   // non-zero.
 
-#if defined (ACE_OPENVMS)
-  static char* translateName (const char* name, char *name_buf);
-#endif
-
   AST_Module *corba_module () const;
   void corba_module (AST_Module *m);
   // Accessors for the member.
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 1c9a20bd53b..0eaf4f08f27 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -93,23 +93,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 static long *pSeenOnce = nullptr;
 
-#if defined (ACE_OPENVMS)
-#include <unixlib.h>
-char* IDL_GlobalData::translateName(const char* name, char *name_buf)
-{
-  char* transName = (ACE_OS::strpbrk (name, ":[") == 0
-                      ? (char*)name
-                      : ::decc$translate_vms (name));
-  if (transName)
-    {
-      ACE_OS::strcpy (name_buf, transName);
-      transName = name_buf;
-    }
-
-  return (transName == 0 || ((int)transName) == -1 ) ? 0 : transName;
-}
-#endif
-
 IDL_GlobalData::IDL_GlobalData ()
   : syntax_only_ (false),
     parse_args_exit_ (false),
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index 1d505fb5b88..c64ad7e24d8 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -76,8 +76,8 @@ TAO/tests/Bug_1361_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CO
 TAO/tests/Bug_1476_Test/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
 TAO/tests/Bug_1482_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !QUICK !LynxOS
 TAO/tests/Bug_1482_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST QUICK !LynxOS
-TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash !QUICK
-TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash QUICK
+TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !QUICK
+TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST QUICK
 TAO/tests/Bug_1636_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_1639_Regression/run_test.pl: !CORBA_E_MICRO
 TAO/tests/Bug_1676_Regression/run_test.pl:
@@ -221,12 +221,12 @@ TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
 TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/RTCORBA/Explicit_Binding/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO !ANDROID
 TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !LynxOS
-TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO !OpenVMS_IA64Crash
+TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
 TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/RTCORBA/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO !OpenVMS_IA64Crash
+TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
 TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IPV6 !ACE_FOR_TAO !ANDROID
 TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
@@ -234,7 +234,7 @@ TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_
 TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO !ANDROID
 TAO/tests/RTCORBA/Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
 TAO/tests/RTScheduling/VoidData/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST !OpenVMS_IA64Crash
+TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
 TAO/tests/RTScheduling/DT_Spawn/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/RTScheduling/Current/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
 TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC
@@ -260,7 +260,7 @@ TAO/tests/AlternateIIOP/run_test.pl: !DISABLE_ToFix_LynxOS_x86
 TAO/tests/Optimized_Connection/run_test.pl: !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
 TAO/tests/Cache_Growth_Test/run_test.pl:
 TAO/tests/Muxing/run_test.pl: !ST
-TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !OpenVMS_IA64Crash
+TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/MT_Client/run_test.pl: !ST
 TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR !LynxOS
 TAO/tests/File_IO/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
@@ -278,20 +278,20 @@ TAO/tests/Smart_Proxies/dtor/run_test.pl:
 TAO/tests/Stack_Recursion/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !QUICK
 TAO/tests/Stack_Recursion/run_test.pl -quick : !ST !DISABLE_ToFix_LynxOS_PPC QUICK
 TAO/tests/Skeleton_Inheritance/run_test.pl:
-TAO/tests/Faults/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash
-TAO/tests/Faults/run_test_pp.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash
+TAO/tests/Faults/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
+TAO/tests/Faults/run_test_pp.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/CallbackTest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash
+TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 # Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT
 TAO/tests/Crash_On_Write/run_test.pl: !ST !Win32
 TAO/tests/Mixed_Sync_ASync_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING
 TAO/tests/MT_NoUpcall_Connect/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING
-TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash !QUICK
-TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash QUICK
+TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !QUICK
+TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO QUICK
 TAO/tests/NestedUpcall/Simple/run_test.pl: !ST
 TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl: !ST !CORBA_E_MICRO
 TAO/tests/NestedUpcall/Triangle_Test/run_test.pl: !CORBA_E_MICRO
@@ -342,7 +342,7 @@ TAO/tests/IORTable_Locator/run_test.pl -async_2: !MINIMUM !CORBA_E_COMPACT !CORB
 TAO/tests/IORTable_Locator/run_test.pl -async_3: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash
+TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Time_Policy/run_test.pl:
 TAO/tests/Time_Policy/run_test_hr.pl:
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index f3be0eeaa57..fc8278a1733 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -7,27 +7,27 @@
 #
 # NOTE: This file contains examples and other service level test  for
 # TAO's. Please do not include regular tests here.
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS !HPUX_IA64
-TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !OpenVMS !CORBA_E_MICRO
-TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/Deferred/run_test.pl: !QNX !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS !CORBA_E_MICRO
-TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !OpenVMS !LynxOS !HPUX_IA64
-TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO !OpenVMS !LynxOS
+TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !HPUX_IA64
+TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !CORBA_E_MICRO
+TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Latency/Deferred/run_test.pl: !QNX !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
+TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO
+TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO  !CORBA_E_MICRO
+TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32  !LynxOS !HPUX_IA64
+TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO  !LynxOS
 TAO/examples/Simple/bank/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
 TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
 TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING !Win32 !CORBA_E_MICRO
@@ -142,7 +142,7 @@ TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523ol: !MINIMUM !CORBA_E_
 TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO
 TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO
 TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OSX
-TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OpenVMS
+TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO
 TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl -clients 3 -secs_between_clients 0 -activationmode per_client: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
@@ -156,17 +156,17 @@ TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPAC
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -pingexternal: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
-TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl -kill_server: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
+TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl -kill_server: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR
 TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index ff514f532bd..839b4ceb58c 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -1013,7 +1013,7 @@ having them use the same configurator file.
 	been detected that a connection is closed when reading a server reply
         and having the server possibly process the reqest more than once
         is acceptable. This option currently does not work under FreeBSD,
-        OpenVMS, AIX, and Solaris.
+        AIX, and Solaris.
         The number of retries will not exceed <em>limit</em>.
 	If this option is used then -ORBForwardOnTransientLimit should
 	also be used to avoid a TRANSIENT exception being thrown.
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 9cda0d5e84f..19c3243803f 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -28,14 +28,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_ctype.h"
 
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// for the server build by previous compilation of
-// components which are reused here without recompilation
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
 static const char usage [] =
 "[[-?]\n"
 "                 [-O[RBport] ORB port number]\n"
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index e8d1a07c1d4..5785226c018 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -6,15 +6,6 @@
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// for the server build by previous compilation of TestX
-// components in client build which are reused by server
-// without recompilation
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
 int
 parse_args (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index 23e34e8cdb7..1da174a9384 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -1,14 +1,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// because multiple executables are build in one directory
-// reuising eachothers object files.
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1495_Regression/tid_to_int.h b/TAO/tests/Bug_1495_Regression/tid_to_int.h
index 89cb1b38fb6..33fff902b16 100644
--- a/TAO/tests/Bug_1495_Regression/tid_to_int.h
+++ b/TAO/tests/Bug_1495_Regression/tid_to_int.h
@@ -28,11 +28,7 @@ namespace
     {
       // ACE_thread_t is a pointer.  Cast to an intermediate integer
       // type large enough to hold a pointer.
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-      int const tmp = reinterpret_cast<int> (tid);
-#else
       intptr_t const tmp = reinterpret_cast<intptr_t> (tid);
-#endif
 
       // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type).
       return (thread_id_type) tmp;
diff --git a/TAO/tests/Bug_2084_Regression/tid_to_int.h b/TAO/tests/Bug_2084_Regression/tid_to_int.h
index 4031bfbf991..aec042a2aa3 100644
--- a/TAO/tests/Bug_2084_Regression/tid_to_int.h
+++ b/TAO/tests/Bug_2084_Regression/tid_to_int.h
@@ -28,11 +28,7 @@ namespace
     {
       // ACE_thread_t is a pointer.  Cast to an intermediate integer
       // type large enough to hold a pointer.
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-      int const tmp = reinterpret_cast<int> (tid);
-#else
       intptr_t const tmp = reinterpret_cast<intptr_t> (tid);
-#endif
 
       // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type).
       return (thread_id_type) tmp;
diff --git a/TAO/tests/Bug_3558_Regression/client.cpp b/TAO/tests/Bug_3558_Regression/client.cpp
index 8cca2b9be34..c2bb4e016cd 100644
--- a/TAO/tests/Bug_3558_Regression/client.cpp
+++ b/TAO/tests/Bug_3558_Regression/client.cpp
@@ -55,11 +55,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 static void *
 test_server (void *arg)
 {
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int server_nr = reinterpret_cast<int> (arg);
-#else
   intptr_t server_nr = reinterpret_cast<intptr_t> (arg);
-#endif
 
   ACE_TCHAR ior[256];
 
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index b71122bc23b..ad25d7cb7bd 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -18,13 +18,7 @@
 
 namespace
 {
-#if defined (ACE_OPENVMS)
-  // less threads on OpenVMS otherwise this test
-  // (although working correctly) takes far too long.
-  const size_t N_THREADS = 10;
-#else
   const size_t N_THREADS = 20;
-#endif
   const size_t N_ITERATIONS = 100;
 }
 
diff --git a/TAO/tests/CollocationLockup/run_test.pl b/TAO/tests/CollocationLockup/run_test.pl
index 819642dfe99..0f7aacb946f 100755
--- a/TAO/tests/CollocationLockup/run_test.pl
+++ b/TAO/tests/CollocationLockup/run_test.pl
@@ -14,11 +14,6 @@ $debug_level = '0';
 # 20 seconds and when the bug was fixed it returned before 20 seconds.
 $timeout = 0;
 
-if ($^O eq "VMS") {
-    # On OpenVMS this test does not lock up but takes much longer
-    $timeout = 280;
-}
-
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
         $debug_level = '10';
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index cb57d3ddcaf..8b9fa38005e 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -15,14 +15,7 @@ Crashed_Callback::crash_now_please ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Crashed_Callback - crashing application\n"));
-// OpenVMS seems to hang and not abort and dump core when abort() is called
-// here. This needs further
-#if defined (ACE_OPENVMS)
-  ACE_OS::_exit();
-#else
   ACE_OS::abort();
-#endif
-
 }
 
 void
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index bdb07cfb63d..aae860a4fb4 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -13,13 +13,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
 
-// OpenVMS seems to hang and not abort and dump core when abort() is called
-// here. This needs further investigation.
-#if defined (ACE_OPENVMS)
-      ACE_OS::_exit();
-#else
       ACE_OS::abort();
-#endif
       return;
     }
   this->orb_->shutdown (false);
@@ -51,11 +45,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
   if (is_clean == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
-#if defined (ACE_OPENVMS)
-      ACE_OS::_exit();
-#else
       ACE_OS::abort();
-#endif
       return;
     }
 
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index d23f910e669..a82748d4990 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -14,13 +14,9 @@ Server_Task::svc ()
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
     {
-#if defined (ACE_OPENVMS)
-      // OpenVMS typically takes a lot longer...
-      ACE_Time_Value tv (360, 0);
-#else
       // run the test for at most 120 seconds...
       ACE_Time_Value tv (120, 0);
-#endif
+
       this->orb_->run (tv);
     }
   catch (const CORBA::Exception&)
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e57a0724552..be952d708d6 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -65,11 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       else
         {
           Client_Task client_task (receiver.in (),
-#if defined (ACE_OPENVMS)
-                                  750, /* test takes much longer on OpenVMS */
-#else
                                   1000,
-#endif
                                   32768,
                                   ACE_Thread_Manager::instance ());
 
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index 2704f3b026d..3f907082468 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -63,12 +63,6 @@ Crasher::handle_timeout (ACE_Time_Value const & ,
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Performing intentional crash
   // %a\n"));
-  // This tests hangs on OpenVMS when abort() is used.
-  // Also see Crashed_Callback test.
-#if defined (ACE_OPENVMS)
-  ACE_OS::_exit ();
-#else
   ACE_OS::abort();
-#endif
   return 0;
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index e548316cdc5..3c250bfc2f3 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -6,14 +6,6 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// because multiple executables are build in one directory
-// reuising eachothers object files.
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
 int
 parse_args (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp
index 4fea526b473..09279156ab7 100644
--- a/TAO/tests/POA/Loader/Servant_Activator.cpp
+++ b/TAO/tests/POA/Loader/Servant_Activator.cpp
@@ -37,11 +37,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = this->dll_.symbol (factory_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int function = reinterpret_cast<int> (symbol);
-#else
   intptr_t function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   servant_supplier_ =
     reinterpret_cast<SERVANT_FACTORY> (function);
@@ -49,11 +45,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  function = reinterpret_cast<int> (symbol);
-#else
   function = reinterpret_cast<intptr_t> (symbol);
-#endif
   servant_garbage_collector_ =
     reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
 }
diff --git a/TAO/tests/POA/Loader/Servant_Locator.cpp b/TAO/tests/POA/Loader/Servant_Locator.cpp
index be759f8d63f..8c7c5fb12e2 100644
--- a/TAO/tests/POA/Loader/Servant_Locator.cpp
+++ b/TAO/tests/POA/Loader/Servant_Locator.cpp
@@ -39,11 +39,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // to long first.
   //
   void *symbol = this->dll_.symbol (factory_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int function = reinterpret_cast<int> (symbol);
-#else
   intptr_t function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   servant_supplier_ =
     reinterpret_cast<SERVANT_FACTORY> (function);
@@ -51,11 +47,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  function = reinterpret_cast<int> (symbol);
-#else
   function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   servant_garbage_collector_ =
     reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index 74191316e78..7ffeef724c6 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -73,11 +73,7 @@ ServantManager_i::obtain_servant (const ACE_TCHAR *str,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = dll->symbol (create_symbol_.c_str ());
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int function = reinterpret_cast<int> (symbol);
-#else
   intptr_t function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   SERVANT_FACTORY servant_creator =
     reinterpret_cast<SERVANT_FACTORY> (function);