Remove obsolescent (void) in functions with no parameters

4606 files changed, 16695 insertions, 16695 deletions

diff --git a/ACE/ACEXML/apps/svcconf/Svcconf.cpp b/ACE/ACEXML/apps/svcconf/Svcconf.cpp
index ad6bc5c4190..66f74adb4b5 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf.cpp
@@ -7,7 +7,7 @@
 #if (ACE_USES_CLASSIC_SVC_CONF == 0)
 
 extern "C" ACE_Proper_Export_Flag ACE_XML_Svc_Conf *
-_ACEXML_create_XML_Svc_Conf_Object (void)
+_ACEXML_create_XML_Svc_Conf_Object ()
 {
   ACE_XML_Svc_Conf *retp = 0;
 
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index 6a4e85d3b61..0f6e9ae5153 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -17,7 +17,7 @@
 # include "Svcconf_Handler.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void)
+ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler ()
   : in_stream_def_ (0),
     in_module_ (0),
     stream_svc_type_ (0),
@@ -25,7 +25,7 @@ ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void)
 {
 }
 
-ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler (void)
+ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler ()
 {
 }
 
@@ -37,7 +37,7 @@ ACEXML_Svcconf_Handler::characters (const ACEXML_Char *,
 }
 
 void
-ACEXML_Svcconf_Handler::endDocument (void)
+ACEXML_Svcconf_Handler::endDocument ()
 {
 }
 
@@ -290,7 +290,7 @@ ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char *)
 }
 
 void
-ACEXML_Svcconf_Handler::startDocument (void)
+ACEXML_Svcconf_Handler::startDocument ()
 {
 }
 
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h
index b1eadf5bb2c..e123c027c8b 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h
+++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h
@@ -24,42 +24,42 @@ public:
    * Set/get name of a parsed entity.
    */
   int name (const ACEXML_Char *n);
-  const ACEXML_Char *name (void);
+  const ACEXML_Char *name ();
 
   /**
    * Set/get type of a dynamic node.
    */
   int service_type (int type);
-  int service_type (void);
+  int service_type ();
 
   /**
    * Set/Get active status.
    */
   int active (int a);
-  int active (void);
+  int active ();
 
   /**
    * Set/get initializer path.
    */
   int path (const ACEXML_Char *n);
-  const ACEXML_Char *path (void);
+  const ACEXML_Char *path ();
 
   /**
    * Set/get initializer init function.
    */
   int init_func (const ACEXML_Char *n);
-  const ACEXML_Char *init_func (void);
+  const ACEXML_Char *init_func ();
 
   /**
    * Set/get initializer init parameter.
    */
   int init_params (const ACEXML_Char *n);
-  const ACEXML_Char *init_params (void);
+  const ACEXML_Char *init_params ();
 
   /**
    * Reset Parsed_Info.
    */
-  void reset (void);
+  void reset ();
 
 protected:
   ACEXML_Char *name_;
@@ -84,12 +84,12 @@ public:
   /*
    * Default constructor.
    */
-  ACEXML_Svcconf_Handler (void);
+  ACEXML_Svcconf_Handler ();
 
   /*
    * Default destructor.
    */
-  virtual ~ACEXML_Svcconf_Handler (void);
+  virtual ~ACEXML_Svcconf_Handler ();
 
   // Methods inherit from ACEXML_ContentHandler.
 
@@ -103,7 +103,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void);
+  virtual void endDocument ();
 
   /*
    * Receive notification of the end of an element.
@@ -143,7 +143,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void)
+  virtual void startDocument ()
     ;
 
   /*
diff --git a/ACE/ACEXML/common/Attributes.cpp b/ACE/ACEXML/common/Attributes.cpp
index ae09b5ccdd4..97d4c8c5872 100644
--- a/ACE/ACEXML/common/Attributes.cpp
+++ b/ACE/ACEXML/common/Attributes.cpp
@@ -1,5 +1,5 @@
 #include "Attributes.h"
 
-ACEXML_Attributes::~ACEXML_Attributes (void)
+ACEXML_Attributes::~ACEXML_Attributes ()
 {
 }
diff --git a/ACE/ACEXML/common/AttributesImpl.cpp b/ACE/ACEXML/common/AttributesImpl.cpp
index 6d48f903f83..b33568ec4e9 100644
--- a/ACE/ACEXML/common/AttributesImpl.cpp
+++ b/ACE/ACEXML/common/AttributesImpl.cpp
@@ -21,7 +21,7 @@ ACEXML_AttributesImpl::ACEXML_AttributesImpl (const
     this->attrs_[i] = attrs.attrs_[i];
 }
 
-ACEXML_AttributesImpl::~ACEXML_AttributesImpl (void)
+ACEXML_AttributesImpl::~ACEXML_AttributesImpl ()
 {
 }
 
@@ -115,7 +115,7 @@ ACEXML_AttributesImpl::getIndex (const ACEXML_Char *uri,
 }
 
 size_t
-ACEXML_AttributesImpl::getLength (void)
+ACEXML_AttributesImpl::getLength ()
 {
   return this->attrs_.size ();
 }
diff --git a/ACE/ACEXML/common/AttributesImpl.h b/ACE/ACEXML/common/AttributesImpl.h
index b746878062c..304558abf94 100644
--- a/ACE/ACEXML/common/AttributesImpl.h
+++ b/ACE/ACEXML/common/AttributesImpl.h
@@ -41,7 +41,7 @@ public:
   friend class ACEXML_AttributesImpl;
 
   /// Default constructor.
-  ACEXML_Attribute (void);
+  ACEXML_Attribute ();
 
   /// Copy constructor.
   ACEXML_Attribute (const ACEXML_Attribute &attr);
@@ -54,7 +54,7 @@ public:
                     const ACEXML_Char *value);
 
   /// Destructor.
-  ~ACEXML_Attribute (void);
+  ~ACEXML_Attribute ();
 
   /// Set all members.
   void setAttribute (const ACEXML_Char *uri,
@@ -147,7 +147,7 @@ public:
    */
   ACEXML_AttributesImpl (int size = ACEXML_AttributesImpl_Default_Size);
   ACEXML_AttributesImpl (const ACEXML_AttributesImpl &attrs);
-  virtual ~ACEXML_AttributesImpl (void);
+  virtual ~ACEXML_AttributesImpl ();
 
   /**
    * Add a new attribute using the argument(s) supplied.
@@ -190,7 +190,7 @@ public:
   /**
    * Return the number of attributes in the list.
    */
-  virtual size_t getLength (void);
+  virtual size_t getLength ();
 
   /**
    * Look up an attribute's local name by index.
diff --git a/ACE/ACEXML/common/CharStream.cpp b/ACE/ACEXML/common/CharStream.cpp
index 00c1f32ab54..09dc0905fa5 100644
--- a/ACE/ACEXML/common/CharStream.cpp
+++ b/ACE/ACEXML/common/CharStream.cpp
@@ -2,6 +2,6 @@
 
 #include "ACEXML/common/CharStream.h"
 
-ACEXML_CharStream::~ACEXML_CharStream (void)
+ACEXML_CharStream::~ACEXML_CharStream ()
 {
 }
diff --git a/ACE/ACEXML/common/ContentHandler.cpp b/ACE/ACEXML/common/ContentHandler.cpp
index d114e6a9b53..f28ee6a1780 100644
--- a/ACE/ACEXML/common/ContentHandler.cpp
+++ b/ACE/ACEXML/common/ContentHandler.cpp
@@ -1,5 +1,5 @@
 #include "ContentHandler.h"
 
-ACEXML_ContentHandler::~ACEXML_ContentHandler (void)
+ACEXML_ContentHandler::~ACEXML_ContentHandler ()
 {
 }
diff --git a/ACE/ACEXML/common/DTDHandler.cpp b/ACE/ACEXML/common/DTDHandler.cpp
index 282ebf0cde6..e8a40f4b124 100644
--- a/ACE/ACEXML/common/DTDHandler.cpp
+++ b/ACE/ACEXML/common/DTDHandler.cpp
@@ -1,5 +1,5 @@
 #include "DTDHandler.h"
 
-ACEXML_DTDHandler::~ACEXML_DTDHandler (void)
+ACEXML_DTDHandler::~ACEXML_DTDHandler ()
 {
 }
diff --git a/ACE/ACEXML/common/DefaultHandler.cpp b/ACE/ACEXML/common/DefaultHandler.cpp
index 2338518e312..dd023d7e51d 100644
--- a/ACE/ACEXML/common/DefaultHandler.cpp
+++ b/ACE/ACEXML/common/DefaultHandler.cpp
@@ -2,11 +2,11 @@
 
 #include "ACEXML/common/DefaultHandler.h"
 
-ACEXML_DefaultHandler::ACEXML_DefaultHandler (void)
+ACEXML_DefaultHandler::ACEXML_DefaultHandler ()
 {
 }
 
-ACEXML_DefaultHandler::~ACEXML_DefaultHandler (void)
+ACEXML_DefaultHandler::~ACEXML_DefaultHandler ()
 {
 }
 
@@ -18,7 +18,7 @@ ACEXML_DefaultHandler::characters (const ACEXML_Char *,
 }
 
 void
-ACEXML_DefaultHandler::endDocument (void)
+ACEXML_DefaultHandler::endDocument ()
 {
 }
 
@@ -63,7 +63,7 @@ ACEXML_DefaultHandler::skippedEntity (const ACEXML_Char *)
 }
 
 void
-ACEXML_DefaultHandler::startDocument (void)
+ACEXML_DefaultHandler::startDocument ()
 {
   // No-op.
 }
diff --git a/ACE/ACEXML/common/EntityResolver.cpp b/ACE/ACEXML/common/EntityResolver.cpp
index 92d948a9cff..ea251f41f2a 100644
--- a/ACE/ACEXML/common/EntityResolver.cpp
+++ b/ACE/ACEXML/common/EntityResolver.cpp
@@ -1,5 +1,5 @@
 #include "EntityResolver.h"
 
-ACEXML_EntityResolver::~ACEXML_EntityResolver (void)
+ACEXML_EntityResolver::~ACEXML_EntityResolver ()
 {
 }
diff --git a/ACE/ACEXML/common/ErrorHandler.cpp b/ACE/ACEXML/common/ErrorHandler.cpp
index 59426c3a7e7..29afddb5b5f 100644
--- a/ACE/ACEXML/common/ErrorHandler.cpp
+++ b/ACE/ACEXML/common/ErrorHandler.cpp
@@ -1,5 +1,5 @@
 #include "ErrorHandler.h"
 
-ACEXML_ErrorHandler::~ACEXML_ErrorHandler (void)
+ACEXML_ErrorHandler::~ACEXML_ErrorHandler ()
 {
 }
diff --git a/ACE/ACEXML/common/FileCharStream.cpp b/ACE/ACEXML/common/FileCharStream.cpp
index b7a8538a38d..eba9e8b2660 100644
--- a/ACE/ACEXML/common/FileCharStream.cpp
+++ b/ACE/ACEXML/common/FileCharStream.cpp
@@ -9,13 +9,13 @@
 #  include "ace/OS_NS_wchar.h"
 #endif /* ACE_USES_WCHAR */
 
-ACEXML_FileCharStream::ACEXML_FileCharStream (void)
+ACEXML_FileCharStream::ACEXML_FileCharStream ()
   : filename_ (0), encoding_ (0), size_ (0), infile_ (0),
     close_infile_ (true), peek_ (0)
 {
 }
 
-ACEXML_FileCharStream::~ACEXML_FileCharStream (void)
+ACEXML_FileCharStream::~ACEXML_FileCharStream ()
 {
   this->close();
 }
@@ -60,7 +60,7 @@ ACEXML_FileCharStream::open (const ACEXML_Char *name)
 }
 
 int
-ACEXML_FileCharStream::determine_encoding (void)
+ACEXML_FileCharStream::determine_encoding ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -114,7 +114,7 @@ ACEXML_FileCharStream::rewind()
 }
 
 int
-ACEXML_FileCharStream::available (void)
+ACEXML_FileCharStream::available ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -126,7 +126,7 @@ ACEXML_FileCharStream::available (void)
 }
 
 int
-ACEXML_FileCharStream::close (void)
+ACEXML_FileCharStream::close ()
 {
   if (this->infile_ != 0)
     {
@@ -177,7 +177,7 @@ ACEXML_FileCharStream::get (ACEXML_Char& ch)
 }
 
 int
-ACEXML_FileCharStream::peek (void)
+ACEXML_FileCharStream::peek ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -226,7 +226,7 @@ ACEXML_FileCharStream::get_i (ACEXML_Char& ch)
 }
 
 int
-ACEXML_FileCharStream::peek_i (void)
+ACEXML_FileCharStream::peek_i ()
 {
   // If we are reading a UTF-8 encoded file, just use the plain unget.
   if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0)
@@ -262,13 +262,13 @@ ACEXML_FileCharStream::peek_i (void)
 #endif /* ACE_USES_WCHAR */
 
 const ACEXML_Char*
-ACEXML_FileCharStream::getEncoding (void)
+ACEXML_FileCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_FileCharStream::getSystemId (void)
+ACEXML_FileCharStream::getSystemId ()
 {
   return this->filename_;
 }
diff --git a/ACE/ACEXML/common/FileCharStream.h b/ACE/ACEXML/common/FileCharStream.h
index 2d273b87a7c..f1459976acf 100644
--- a/ACE/ACEXML/common/FileCharStream.h
+++ b/ACE/ACEXML/common/FileCharStream.h
@@ -112,7 +112,7 @@ private:
    *  encoding of the file. Subsequent call to get() returns this
    *  character.
    */
-  int peek_i (void);
+  int peek_i ();
 
 #endif /* ACE_USES_WCHAR */
 
diff --git a/ACE/ACEXML/common/HttpCharStream.cpp b/ACE/ACEXML/common/HttpCharStream.cpp
index 804f467a5fd..4fc0a1178a3 100644
--- a/ACE/ACEXML/common/HttpCharStream.cpp
+++ b/ACE/ACEXML/common/HttpCharStream.cpp
@@ -19,7 +19,7 @@ static const int HDST_CR = 13;
 static const int HDST_CRLF = 14;
 static const int HDST_CRLFCR = 15;
 
-ACEXML_HttpCharStream::ACEXML_HttpCharStream (void)
+ACEXML_HttpCharStream::ACEXML_HttpCharStream ()
   : url_(0),
     url_addr_(0),
     stream_(0),
@@ -30,7 +30,7 @@ ACEXML_HttpCharStream::ACEXML_HttpCharStream (void)
 {
 }
 
-ACEXML_HttpCharStream::~ACEXML_HttpCharStream (void)
+ACEXML_HttpCharStream::~ACEXML_HttpCharStream ()
 {
   this->close ();
 }
@@ -269,7 +269,7 @@ ACEXML_HttpCharStream::get_url (size_t& len)
 
 
 int
-ACEXML_HttpCharStream::send_request (void)
+ACEXML_HttpCharStream::send_request ()
 {
   char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name()));
   ACE_Auto_Basic_Array_Ptr<char> path_ptr (path);
@@ -301,7 +301,7 @@ ACEXML_HttpCharStream::send_request (void)
 
 
 int
-ACEXML_HttpCharStream::available (void)
+ACEXML_HttpCharStream::available ()
 {
   if (this->stream_ == 0)
     return -1;
@@ -309,7 +309,7 @@ ACEXML_HttpCharStream::available (void)
 }
 
 int
-ACEXML_HttpCharStream::close (void)
+ACEXML_HttpCharStream::close ()
 {
   delete[] this->url_;
   this->url_ = 0;
@@ -333,7 +333,7 @@ ACEXML_HttpCharStream::close (void)
 }
 
 int
-ACEXML_HttpCharStream::determine_encoding (void)
+ACEXML_HttpCharStream::determine_encoding ()
 {
   if (this->stream_ == 0)
     return -1;
@@ -377,7 +377,7 @@ ACEXML_HttpCharStream::determine_encoding (void)
 }
 
 void
-ACEXML_HttpCharStream::rewind (void)
+ACEXML_HttpCharStream::rewind ()
 {
   if (this->stream_ == 0)
     return;
@@ -390,13 +390,13 @@ ACEXML_HttpCharStream::rewind (void)
 }
 
 const ACEXML_Char*
-ACEXML_HttpCharStream::getEncoding (void)
+ACEXML_HttpCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_HttpCharStream::getSystemId (void)
+ACEXML_HttpCharStream::getSystemId ()
 {
   return this->url_;
 }
@@ -431,7 +431,7 @@ ACEXML_HttpCharStream::get (ACEXML_Char& ch)
 }
 
 int
-ACEXML_HttpCharStream::peek (void)
+ACEXML_HttpCharStream::peek ()
 {
   if (this->stream_ == 0)
     return -1;
@@ -469,7 +469,7 @@ ACEXML_HttpCharStream::get_i (ACEXML_Char& ch)
 }
 
 int
-ACEXML_HttpCharStream::peek_i (void)
+ACEXML_HttpCharStream::peek_i ()
 {
   // If we are reading a UTF-8 encoded file, just use the plain unget.
   if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0)
diff --git a/ACE/ACEXML/common/HttpCharStream.h b/ACE/ACEXML/common/HttpCharStream.h
index 24359adc767..f6d7cd167ad 100644
--- a/ACE/ACEXML/common/HttpCharStream.h
+++ b/ACE/ACEXML/common/HttpCharStream.h
@@ -31,10 +31,10 @@ class ACEXML_Export ACEXML_HttpCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_HttpCharStream (void);
+  ACEXML_HttpCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_HttpCharStream (void);
+  virtual ~ACEXML_HttpCharStream ();
 
   /// Open an URL.
   int open (const ACEXML_Char *url);
@@ -43,12 +43,12 @@ public:
    *  Returns the available ACEXML_Char in the buffer.  -1
    *  if the object is not initialized properly.
    */
-  virtual int available (void);
+  virtual int available ();
 
   /**
    *  Close this stream and release all resources used by it.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    *  Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -65,27 +65,27 @@ public:
    *  Peek the next ACEXML_Char in the CharStream.  Return the
    *  character if succeess, -1 if EOS is reached.
    */
-  virtual int peek (void);
+  virtual int peek ();
 
   /**
    *  Resets the file pointer to the beginning of the stream.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
   /**
    *  Determine the encoding of the file.
    */
-  virtual int determine_encoding (void);
+  virtual int determine_encoding ();
 
   /**
    * Get the encoding of the file
    */
-  virtual const ACEXML_Char* getEncoding (void);
+  virtual const ACEXML_Char* getEncoding ();
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void);
+  virtual const ACEXML_Char* getSystemId ();
 
 
 private:
@@ -101,14 +101,14 @@ private:
    *  encoding of the file. Subsequent call to get() returns this
    *  character.
    */
-  int peek_i (void);
+  int peek_i ();
 
 #endif /* ACE_USES_WCHAR */
 
   /**
    *  Send a HTTP/1.1 request to fetch the contents of the URL.
    */
-  int send_request (void);
+  int send_request ();
 
   /**
    *  Fetch the URL and save it in backing store.
diff --git a/ACE/ACEXML/common/InputSource.cpp b/ACE/ACEXML/common/InputSource.cpp
index 6d5a40ad2e4..a18405223bf 100644
--- a/ACE/ACEXML/common/InputSource.cpp
+++ b/ACE/ACEXML/common/InputSource.cpp
@@ -4,7 +4,7 @@
 #include "ACEXML/common/StreamFactory.h"
 #include "ace/ACE.h"
 
-ACEXML_InputSource::ACEXML_InputSource (void)
+ACEXML_InputSource::ACEXML_InputSource ()
   : charStream_ (0),
     encoding_ (0),
     publicId_ (0),
@@ -40,7 +40,7 @@ ACEXML_InputSource::ACEXML_InputSource (const ACEXML_Char *systemId)
     }
 }
 
-ACEXML_InputSource::~ACEXML_InputSource (void)
+ACEXML_InputSource::~ACEXML_InputSource ()
 {
   delete[] this->publicId_;
   this->publicId_ = 0;
diff --git a/ACE/ACEXML/common/Locator.cpp b/ACE/ACEXML/common/Locator.cpp
index 6e3b6341ad9..e055408b2ba 100644
--- a/ACE/ACEXML/common/Locator.cpp
+++ b/ACE/ACEXML/common/Locator.cpp
@@ -1,5 +1,5 @@
 #include "Locator.h"
 
-ACEXML_Locator::~ACEXML_Locator (void)
+ACEXML_Locator::~ACEXML_Locator ()
 {
 }
diff --git a/ACE/ACEXML/common/LocatorImpl.cpp b/ACE/ACEXML/common/LocatorImpl.cpp
index 96234be24a9..47501f57368 100644
--- a/ACE/ACEXML/common/LocatorImpl.cpp
+++ b/ACE/ACEXML/common/LocatorImpl.cpp
@@ -6,7 +6,7 @@
 # include "ACEXML/common/LocatorImpl.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_LocatorImpl::ACEXML_LocatorImpl (void)
+ACEXML_LocatorImpl::ACEXML_LocatorImpl ()
   : publicId_ (0),
     systemId_ (0),
     lineNumber_ (1),
@@ -32,13 +32,13 @@ ACEXML_LocatorImpl::ACEXML_LocatorImpl (const ACEXML_Locator& locator)
 {
 }
 
-ACEXML_LocatorImpl::~ACEXML_LocatorImpl (void)
+ACEXML_LocatorImpl::~ACEXML_LocatorImpl ()
 {
   this->reset();
 }
 
 void
-ACEXML_LocatorImpl::reset (void)
+ACEXML_LocatorImpl::reset ()
 {
   delete[] this->publicId_;
   this->publicId_ = 0;
diff --git a/ACE/ACEXML/common/Mem_Map_Stream.cpp b/ACE/ACEXML/common/Mem_Map_Stream.cpp
index 42a3cdb9881..dfcf04a48b7 100644
--- a/ACE/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACE/ACEXML/common/Mem_Map_Stream.cpp
@@ -4,7 +4,7 @@
 
 #include "ACEXML/common/Mem_Map_Stream.h"
 
-ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void)
+ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream ()
   : svc_handler_ (0),
     recv_pos_ (0),
     get_pos_ (0),
@@ -13,7 +13,7 @@ ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void)
 }
 
 ACE_SOCK_Stream &
-ACEXML_Mem_Map_Stream::stream (void)
+ACEXML_Mem_Map_Stream::stream ()
 {
   return svc_handler_->peer ();
 }
@@ -32,7 +32,7 @@ ACEXML_Mem_Map_Stream::eof () const
 }
 
 int
-ACEXML_Mem_Map_Stream::get_char (void)
+ACEXML_Mem_Map_Stream::get_char ()
 {
   if (this->eof () && this->grow_file_and_remap () == -1)
     return EOF;
@@ -40,7 +40,7 @@ ACEXML_Mem_Map_Stream::get_char (void)
 }
 
 void
-ACEXML_Mem_Map_Stream::rewind (void)
+ACEXML_Mem_Map_Stream::rewind ()
 {
   this->recv_pos_ = reinterpret_cast<char *> (this->mem_map_.addr ());
   this->get_pos_ = this->recv_pos_;
@@ -131,7 +131,7 @@ ACEXML_Mem_Map_Stream::seek (ACE_OFF_T offset, int whence)
 }
 
 Svc_Handler *
-ACEXML_Mem_Map_Stream::svc_handler (void)
+ACEXML_Mem_Map_Stream::svc_handler ()
 {
   return this->svc_handler_;
 }
@@ -187,7 +187,7 @@ ACEXML_Mem_Map_Stream::open (Connector *connector,
 }
 
 int
-ACEXML_Mem_Map_Stream::grow_file_and_remap (void)
+ACEXML_Mem_Map_Stream::grow_file_and_remap ()
 {
   char buf[8192];
 
@@ -256,7 +256,7 @@ ACEXML_Mem_Map_Stream::grow_file_and_remap (void)
   return 0;
 }
 
-ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void)
+ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream ()
 {
   // Remove the mapping and the file.
   this->mem_map_.remove ();
diff --git a/ACE/ACEXML/common/Mem_Map_Stream.h b/ACE/ACEXML/common/Mem_Map_Stream.h
index df450f5b624..716ea077f8c 100644
--- a/ACE/ACEXML/common/Mem_Map_Stream.h
+++ b/ACE/ACEXML/common/Mem_Map_Stream.h
@@ -53,17 +53,17 @@ class ACEXML_Export ACEXML_Mem_Map_Stream
 {
 public:
   /// Default constructor
-  ACEXML_Mem_Map_Stream (void);
+  ACEXML_Mem_Map_Stream ();
 
   /// Initialize this object.
   virtual int open (Connector *connector,
                     const ACE_INET_Addr &);
 
   /// Destructor.
-  virtual ~ACEXML_Mem_Map_Stream (void);
+  virtual ~ACEXML_Mem_Map_Stream ();
 
   /// Returns the underlying <ACE_SOCK_Stream>.
-  ACE_SOCK_Stream &stream (void);
+  ACE_SOCK_Stream &stream ();
 
   /**
    * Send <size> bytes in <buf> to the connected peer.  This is a
@@ -78,7 +78,7 @@ public:
    * position. Returns EOF when the <get> position reaches the end of the
    * HTTP stream.
    */
-  virtual int get_char (void);
+  virtual int get_char ();
 
   /**
    *  Returns a pointer to array of at most <len> characters starting at
@@ -111,7 +111,7 @@ public:
    *  This works since all the data has been cached in the memory-mapped
    *  backing store.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
   /**
    *  Returns the nth character <offset> from the <get> position in the
@@ -148,7 +148,7 @@ public:
   virtual int eof () const;
 
   /// Returns the underlying service handler.
-  Svc_Handler *svc_handler (void);
+  Svc_Handler *svc_handler ();
 
 private:
   /**
@@ -156,7 +156,7 @@ private:
    *  extend the mapping to cover this chunk.  Returns -1 on failure or
    *  EOF, else 0.
    */
-  int grow_file_and_remap (void);
+  int grow_file_and_remap ();
 
   /**
    *  Connection to peer. The granularity is at the Svc_Handler level.
diff --git a/ACE/ACEXML/common/NamespaceSupport.cpp b/ACE/ACEXML/common/NamespaceSupport.cpp
index 550a3011c82..938ad0bd23d 100644
--- a/ACE/ACEXML/common/NamespaceSupport.cpp
+++ b/ACE/ACEXML/common/NamespaceSupport.cpp
@@ -14,11 +14,11 @@ static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = ACE_TEXT ("xml");
 static const ACEXML_Char ACEXML_XMLNS_URI_name[] = ACE_TEXT ("http://www.w3.org/XML/1998/namespace");
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name;
 
-ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void)
+ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack ()
 {
 }
 
-ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack (void)
+ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack ()
 {
   // Clean up stuff.
 }
@@ -30,7 +30,7 @@ ACEXML_Namespace_Context_Stack::push (ACEXML_NS_CONTEXT *nsc)
 }
 
 ACEXML_NS_CONTEXT *
-ACEXML_Namespace_Context_Stack::pop (void)
+ACEXML_Namespace_Context_Stack::pop ()
 {
   if (this->stack_.size() <= 0)
     return 0;
@@ -46,7 +46,7 @@ ACEXML_Namespace_Context_Stack::pop (void)
 }
 
 int
-ACEXML_NamespaceSupport::popContext (void)
+ACEXML_NamespaceSupport::popContext ()
 {
   delete this->effective_context_;
 
@@ -56,7 +56,7 @@ ACEXML_NamespaceSupport::popContext (void)
 }
 
 int
-ACEXML_NamespaceSupport::pushContext (void)
+ACEXML_NamespaceSupport::pushContext ()
 {
   ACEXML_NS_CONTEXT *temp = this->effective_context_;
   ACE_NEW_RETURN (this->effective_context_,
@@ -75,13 +75,13 @@ ACEXML_NamespaceSupport::pushContext (void)
   return 0;
 }
 
-ACEXML_NamespaceSupport::ACEXML_NamespaceSupport (void)
+ACEXML_NamespaceSupport::ACEXML_NamespaceSupport ()
   : ns_stack_ (),
     effective_context_ (0)
 {}
 
 int
-ACEXML_NamespaceSupport::init (void)
+ACEXML_NamespaceSupport::init ()
 {
   // @@ No way to tell if the new fails.
   ACE_NEW_RETURN (effective_context_, ACEXML_NS_CONTEXT(), -1);
@@ -91,7 +91,7 @@ ACEXML_NamespaceSupport::init (void)
   return this->effective_context_->bind (prefix, uri);
 }
 
-ACEXML_NamespaceSupport::~ACEXML_NamespaceSupport (void)
+ACEXML_NamespaceSupport::~ACEXML_NamespaceSupport ()
 {
   while (this->popContext () == 0)
     ;
@@ -238,7 +238,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
 }
 
 int
-ACEXML_NamespaceSupport::reset (void)
+ACEXML_NamespaceSupport::reset ()
 {
   while (this->popContext() != -1)
     ;
diff --git a/ACE/ACEXML/common/SAXExceptions.cpp b/ACE/ACEXML/common/SAXExceptions.cpp
index bca3d1e46b1..6eed2b94a8f 100644
--- a/ACE/ACEXML/common/SAXExceptions.cpp
+++ b/ACE/ACEXML/common/SAXExceptions.cpp
@@ -18,7 +18,7 @@ const ACEXML_Char ACEXML_SAXParseException::exception_name_[] = ACE_TEXT ("ACEXM
 # include "ACEXML/common/SAXExceptions.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_SAXException::ACEXML_SAXException (void)
+ACEXML_SAXException::ACEXML_SAXException ()
   : message_ (0)
 {
 }
@@ -53,7 +53,7 @@ ACEXML_SAXException::_downcast (ACEXML_Exception* ex)
   return dynamic_cast<ACEXML_SAXException*> (ex);
 }
 
-ACEXML_SAXException::~ACEXML_SAXException (void)
+ACEXML_SAXException::~ACEXML_SAXException ()
 {
   ACE::strdelete (this->message_);
 }
@@ -81,7 +81,7 @@ ACEXML_SAXException::print () const
               this->exception_name_, this->message()));
 }
 
-ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (void)
+ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException ()
 {
 }
 
@@ -109,7 +109,7 @@ ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (const ACEXML_C
 {
 }
 
-ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException (void)
+ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException ()
 {
 }
 
@@ -138,7 +138,7 @@ ACEXML_SAXNotSupportedException::print () const
               this->exception_name_, this->message()));
 }
 
-ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException (void)
+ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException ()
 {
 }
 
@@ -165,7 +165,7 @@ ACEXML_SAXNotRecognizedException::_downcast (ACEXML_Exception* ex)
   return dynamic_cast<ACEXML_SAXNotRecognizedException*> (ex);
 }
 
-ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException (void)
+ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException ()
 {
 }
 
@@ -193,7 +193,7 @@ ACEXML_SAXNotRecognizedException::print () const
               this->exception_name_, this->message()));
 }
 
-ACEXML_SAXParseException::ACEXML_SAXParseException (void)
+ACEXML_SAXParseException::ACEXML_SAXParseException ()
 {
 }
 
@@ -220,7 +220,7 @@ ACEXML_SAXParseException::_downcast (ACEXML_Exception* ex)
   return dynamic_cast<ACEXML_SAXParseException*> (ex);
 }
 
-ACEXML_SAXParseException::~ACEXML_SAXParseException (void)
+ACEXML_SAXParseException::~ACEXML_SAXParseException ()
 {
 }
 
diff --git a/ACE/ACEXML/common/StrCharStream.cpp b/ACE/ACEXML/common/StrCharStream.cpp
index c64740d77e1..339bf4bd8fe 100644
--- a/ACE/ACEXML/common/StrCharStream.cpp
+++ b/ACE/ACEXML/common/StrCharStream.cpp
@@ -4,13 +4,13 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACEXML_StrCharStream::ACEXML_StrCharStream (void)
+ACEXML_StrCharStream::ACEXML_StrCharStream ()
   : start_ (0), ptr_ (0), end_ (0), encoding_ (0), name_ (0)
 {
 }
 
 
-ACEXML_StrCharStream::~ACEXML_StrCharStream (void)
+ACEXML_StrCharStream::~ACEXML_StrCharStream ()
 {
   this->close();
 }
@@ -34,7 +34,7 @@ ACEXML_StrCharStream::open (const ACEXML_Char *str, const ACEXML_Char* name)
 }
 
 int
-ACEXML_StrCharStream::available (void)
+ACEXML_StrCharStream::available ()
 {
   if (this->start_ != 0)
     return static_cast<int> (this->end_ - this->start_); // @@ Will this work on all platforms?
@@ -42,7 +42,7 @@ ACEXML_StrCharStream::available (void)
 }
 
 int
-ACEXML_StrCharStream::close (void)
+ACEXML_StrCharStream::close ()
 {
   delete[] this->start_;
   delete[] this->encoding_;
@@ -54,7 +54,7 @@ ACEXML_StrCharStream::close (void)
 }
 
 int
-ACEXML_StrCharStream::determine_encoding (void)
+ACEXML_StrCharStream::determine_encoding ()
 {
   if (this->start_ == 0)
     return -1;
@@ -76,7 +76,7 @@ ACEXML_StrCharStream::determine_encoding (void)
 }
 
 void
-ACEXML_StrCharStream::rewind (void)
+ACEXML_StrCharStream::rewind ()
 {
   this->ptr_ = this->start_;
   this->determine_encoding();
@@ -109,7 +109,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str, size_t len)
 }
 
 int
-ACEXML_StrCharStream::peek (void)
+ACEXML_StrCharStream::peek ()
 {
   if (this->start_ != 0 && this->ptr_ != this->end_)
     return *this->ptr_;
@@ -117,13 +117,13 @@ ACEXML_StrCharStream::peek (void)
 }
 
 const ACEXML_Char*
-ACEXML_StrCharStream::getEncoding (void)
+ACEXML_StrCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_StrCharStream::getSystemId(void)
+ACEXML_StrCharStream::getSystemId()
 {
   return this->name_;
 }
diff --git a/ACE/ACEXML/common/StrCharStream.h b/ACE/ACEXML/common/StrCharStream.h
index c3554ebbcc5..79eb26bcd9f 100644
--- a/ACE/ACEXML/common/StrCharStream.h
+++ b/ACE/ACEXML/common/StrCharStream.h
@@ -30,10 +30,10 @@ class ACEXML_Export ACEXML_StrCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_StrCharStream (void);
+  ACEXML_StrCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_StrCharStream (void);
+  virtual ~ACEXML_StrCharStream ();
 
   /// Initializing StrCharStream with @a str and @a name
   int open (const ACEXML_Char *str, const ACEXML_Char* name);
@@ -42,17 +42,17 @@ public:
    * Returns the available ACEXML_Char in the buffer.  -1
    * if the object is not initialized properly.
    */
-  virtual int available (void);
+  virtual int available ();
 
   /**
    * Close this stream and release all resources used by it.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    *  Determine the encoding of the file.
    */
-  virtual int determine_encoding (void);
+  virtual int determine_encoding ();
 
   /**
    * Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -69,22 +69,22 @@ public:
    * Peek the next ACEXML_Char in the CharStream.  Return the
    * character if succeess, -1 if EOS is reached.
    */
-  virtual int peek (void);
+  virtual int peek ();
 
   /*
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void);
+  virtual const ACEXML_Char *getEncoding ();
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void);
+  virtual const ACEXML_Char* getSystemId ();
 
   /**
    *  Resets the pointer to the beginning of the stream.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
 private:
   ACEXML_Char *start_;
diff --git a/ACE/ACEXML/common/StreamFactory.h b/ACE/ACEXML/common/StreamFactory.h
index 2149976b315..68d5bbf1460 100644
--- a/ACE/ACEXML/common/StreamFactory.h
+++ b/ACE/ACEXML/common/StreamFactory.h
@@ -37,7 +37,7 @@ class ACEXML_Export ACEXML_StreamFactory
 {
 public:
   // Destructor
-  virtual ~ACEXML_StreamFactory (void);
+  virtual ~ACEXML_StreamFactory ();
 
   /**
    *  Create the appropriate stream from the @a uri passed and return the
diff --git a/ACE/ACEXML/common/URL_Addr.cpp b/ACE/ACEXML/common/URL_Addr.cpp
index 673b4317956..ccd234d33d6 100644
--- a/ACE/ACEXML/common/URL_Addr.cpp
+++ b/ACE/ACEXML/common/URL_Addr.cpp
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 
-ACEXML_URL_Addr::ACEXML_URL_Addr (void)
+ACEXML_URL_Addr::ACEXML_URL_Addr ()
   : path_name_ (0),
     addr_string_ (0),
     addr_string_len_ (0)
@@ -166,7 +166,7 @@ ACEXML_URL_Addr::ACEXML_URL_Addr (const ACEXML_Char *host_name,
 {
 }
 
-ACEXML_URL_Addr::~ACEXML_URL_Addr (void)
+ACEXML_URL_Addr::~ACEXML_URL_Addr ()
 {
   ACE_OS::free (this->path_name_);
   ACE_OS::free (this->addr_string_);
diff --git a/ACE/ACEXML/common/URL_Addr.h b/ACE/ACEXML/common/URL_Addr.h
index 887834c0410..4d2e3f2c91a 100644
--- a/ACE/ACEXML/common/URL_Addr.h
+++ b/ACE/ACEXML/common/URL_Addr.h
@@ -30,7 +30,7 @@ class ACEXML_Export ACEXML_URL_Addr : public ACE_INET_Addr
 {
 public:
   /// Initialization and termination methods.
-  ACEXML_URL_Addr (void);
+  ACEXML_URL_Addr ();
 
   /// Constructor.
   ACEXML_URL_Addr (const ACEXML_Char *host_name,
@@ -89,7 +89,7 @@ public:
   void operator= (const ACEXML_URL_Addr &addr);
 
   /// Destructor.
-  ~ACEXML_URL_Addr (void);
+  ~ACEXML_URL_Addr ();
 
   /**
    *  Compare two addresses for equality.  The addresses are considered
@@ -107,7 +107,7 @@ public:
   const ACEXML_Char *get_path_name () const;
 
   /// Commit suicide.
-  int destroy (void);
+  int destroy ();
 
 private:
   /// Calculate the maximum length of the address string
diff --git a/ACE/ACEXML/common/XMLFilterImpl.cpp b/ACE/ACEXML/common/XMLFilterImpl.cpp
index c4519cfdb30..3a555931c45 100644
--- a/ACE/ACEXML/common/XMLFilterImpl.cpp
+++ b/ACE/ACEXML/common/XMLFilterImpl.cpp
@@ -6,7 +6,7 @@
 # include "ACEXML/common/XMLFilterImpl.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (void)
+ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl ()
   :  parent_ (0),
      // locator_ (0),
      entityResolver_ (0),
@@ -26,7 +26,7 @@ ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (ACEXML_XMLReader *parent)
 {
 }
 
-ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl (void)
+ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl ()
 {
   // @@ How are all the object lifecycles managed?
 }
@@ -118,7 +118,7 @@ ACEXML_XMLFilterImpl::characters (const ACEXML_Char *ch,
 }
 
 void
-ACEXML_XMLFilterImpl::endDocument (void)
+ACEXML_XMLFilterImpl::endDocument ()
 {
   if (this->contentHandler_ != 0)
     this->contentHandler_->endDocument ();
@@ -177,7 +177,7 @@ ACEXML_XMLFilterImpl::skippedEntity (const ACEXML_Char *name)
 }
 
 void
-ACEXML_XMLFilterImpl::startDocument (void)
+ACEXML_XMLFilterImpl::startDocument ()
 {
   if (this->contentHandler_ != 0)
     this->contentHandler_->startDocument ();
diff --git a/ACE/ACEXML/common/XMLFilterImpl.h b/ACE/ACEXML/common/XMLFilterImpl.h
index ad5034372d9..c982068214d 100644
--- a/ACE/ACEXML/common/XMLFilterImpl.h
+++ b/ACE/ACEXML/common/XMLFilterImpl.h
@@ -41,7 +41,7 @@ public:
   /**
    * Default constructor.  Create with no parent.
    */
-  ACEXML_XMLFilterImpl (void);
+  ACEXML_XMLFilterImpl ();
 
   /**
    * Construct an XML filter with the specified parent.
@@ -51,7 +51,7 @@ public:
   /**
    * Destructor.
    */
-  virtual ~ACEXML_XMLFilterImpl (void);
+  virtual ~ACEXML_XMLFilterImpl ();
 
   /*
    * Look up the value of a feature.
@@ -143,7 +143,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void);
+  virtual void endDocument ();
 
   /*
    * Receive notification of the end of an element.
@@ -183,7 +183,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void);
+  virtual void startDocument ();
 
   /*
    * Receive notification of the beginning of an element.
@@ -241,7 +241,7 @@ public:
    */
   virtual void warning (ACEXML_SAXParseException &exception);
 protected:
-  int setupParser (void);
+  int setupParser ();
   // Set up the event handlers of parent parser to this.
   // Returns -1 if no valid parent is set.
 
diff --git a/ACE/ACEXML/common/XMLReader.cpp b/ACE/ACEXML/common/XMLReader.cpp
index 4a82e875257..74247fe0850 100644
--- a/ACE/ACEXML/common/XMLReader.cpp
+++ b/ACE/ACEXML/common/XMLReader.cpp
@@ -1,5 +1,5 @@
 #include "XMLReader.h"
 
-ACEXML_XMLReader::~ACEXML_XMLReader (void)
+ACEXML_XMLReader::~ACEXML_XMLReader ()
 {
 }
diff --git a/ACE/ACEXML/common/ZipCharStream.cpp b/ACE/ACEXML/common/ZipCharStream.cpp
index 4b54cf73e31..7dcf3a9b47c 100644
--- a/ACE/ACEXML/common/ZipCharStream.cpp
+++ b/ACE/ACEXML/common/ZipCharStream.cpp
@@ -4,13 +4,13 @@
 #include "ace/ACE.h"
 
 
-ACEXML_ZipCharStream::ACEXML_ZipCharStream (void)
+ACEXML_ZipCharStream::ACEXML_ZipCharStream ()
   : filename_ (0), encoding_ (0), size_ (0), infile_ (0), pos_ (0),
     limit_ (0)
 {
 }
 
-ACEXML_ZipCharStream::~ACEXML_ZipCharStream (void)
+ACEXML_ZipCharStream::~ACEXML_ZipCharStream ()
 {
   this->close();
 }
@@ -33,7 +33,7 @@ ACEXML_ZipCharStream::open (const ACEXML_Char *name)
 }
 
 int
-ACEXML_ZipCharStream::determine_encoding (void)
+ACEXML_ZipCharStream::determine_encoding ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -82,7 +82,7 @@ ACEXML_ZipCharStream::rewind()
 }
 
 int
-ACEXML_ZipCharStream::available (void)
+ACEXML_ZipCharStream::available ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -93,7 +93,7 @@ ACEXML_ZipCharStream::available (void)
 }
 
 int
-ACEXML_ZipCharStream::close (void)
+ACEXML_ZipCharStream::close ()
 {
   if (this->infile_ != 0)
     {
@@ -182,7 +182,7 @@ ACEXML_ZipCharStream::get (ACEXML_Char& ch)
 
 
 int
-ACEXML_ZipCharStream::peek (void)
+ACEXML_ZipCharStream::peek ()
 {
 #if defined (ACE_USES_WCHAR)
   return this->peek_i();
@@ -192,13 +192,13 @@ ACEXML_ZipCharStream::peek (void)
 }
 
 const ACEXML_Char*
-ACEXML_ZipCharStream::getEncoding (void)
+ACEXML_ZipCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_ZipCharStream::getSystemId (void)
+ACEXML_ZipCharStream::getSystemId ()
 {
   return this->filename_;
 }
@@ -226,7 +226,7 @@ ACEXML_ZipCharStream::get_i (ACEXML_Char& ch)
 }
 
 int
-ACEXML_ZipCharStream::peek_i (void)
+ACEXML_ZipCharStream::peek_i ()
 {
   // If we are reading a UTF-8 encoded file, just use the plain unget.
   if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0)
diff --git a/ACE/ACEXML/common/ZipCharStream.h b/ACE/ACEXML/common/ZipCharStream.h
index 44bc4132c71..3940583088e 100644
--- a/ACE/ACEXML/common/ZipCharStream.h
+++ b/ACE/ACEXML/common/ZipCharStream.h
@@ -38,10 +38,10 @@ class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_ZipCharStream (void);
+  ACEXML_ZipCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_ZipCharStream (void);
+  virtual ~ACEXML_ZipCharStream ();
 
   /// Open a file.
   int open (const ACEXML_Char *name);
@@ -50,12 +50,12 @@ public:
    * Returns the available ACEXML_Char in the buffer.  -1
    * if the object is not initialized properly.
    */
-  virtual int available (void);
+  virtual int available ();
 
   /**
    * Close this stream and release all resources used by it.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -71,29 +71,29 @@ public:
   /**
    *  Determine the encoding of the file.
    */
-  virtual int determine_encoding (void);
+  virtual int determine_encoding ();
 
 
   /**
    * Peek the next ACEXML_Char in the CharStream.  Return the
    * character if success, -1 if EOF is reached.
    */
-  virtual int peek (void);
+  virtual int peek ();
 
   /**
    *  Resets the file pointer to the beginning of the stream.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
   /*
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void);
+  virtual const ACEXML_Char *getEncoding ();
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void);
+  virtual const ACEXML_Char* getSystemId ();
 
 protected:
   /** Read the next character as a normal character. Return -1 if EOF is
@@ -120,7 +120,7 @@ private:
    *  encoding of the file. Subsequent call to get() returns this
    *  character.
    */
-  int peek_i (void);
+  int peek_i ();
 
 #endif /* ACE_USES_WCHAR */
 
diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp
index 8b6ccdc374d..d63a112808f 100644
--- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp
+++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp
@@ -10,7 +10,7 @@ ACEXML_Print_Handler::ACEXML_Print_Handler (ACEXML_Char* fileName)
 {
 }
 
-ACEXML_Print_Handler::~ACEXML_Print_Handler (void)
+ACEXML_Print_Handler::~ACEXML_Print_Handler ()
 {
   delete[] this->fileName_;
 }
@@ -26,7 +26,7 @@ ACEXML_Print_Handler::characters (const ACEXML_Char *cdata,
 }
 
 void
-ACEXML_Print_Handler::endDocument (void)
+ACEXML_Print_Handler::endDocument ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("* Event endDocument () ***************\n")));
@@ -84,7 +84,7 @@ ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name)
 }
 
 void
-ACEXML_Print_Handler::startDocument (void)
+ACEXML_Print_Handler::startDocument ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("* Event startDocument () ***************\n")));
diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h
index da8381f50de..ea4359b2b69 100644
--- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h
+++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h
@@ -30,7 +30,7 @@ public:
   /*
    * Default destructor.
    */
-  virtual ~ACEXML_Print_Handler (void);
+  virtual ~ACEXML_Print_Handler ();
 
   // Methods inherited from ACEXML_ContentHandler.
 
@@ -44,7 +44,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void);
+  virtual void endDocument ();
 
   /*
    * Receive notification of the end of an element.
@@ -84,7 +84,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void);
+  virtual void startDocument ();
 
   /*
    * Receive notification of the beginning of an element.
diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
index 371f404427c..ae1fbc605ec 100644
--- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
+++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
@@ -13,7 +13,7 @@ ACEXML_SAXPrint_Handler::ACEXML_SAXPrint_Handler (const ACEXML_Char* filename)
 {
 }
 
-ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler (void)
+ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler ()
 {
   delete [] this->fileName_;
 }
@@ -29,7 +29,7 @@ ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata,
 }
 
 void
-ACEXML_SAXPrint_Handler::endDocument (void)
+ACEXML_SAXPrint_Handler::endDocument ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
@@ -92,7 +92,7 @@ ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name)
 }
 
 void
-ACEXML_SAXPrint_Handler::startDocument (void)
+ACEXML_SAXPrint_Handler::startDocument ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("* Event startDocument () ***************\n")));
@@ -194,7 +194,7 @@ ACEXML_SAXPrint_Handler::warning (ACEXML_SAXParseException & ex)
 }
 
 void
-ACEXML_SAXPrint_Handler::print_indent (void)
+ACEXML_SAXPrint_Handler::print_indent ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
   for (size_t i = 0; i < this->indent_; ++i)
diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h
index b940c467836..02ce2487386 100644
--- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h
+++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h
@@ -30,7 +30,7 @@ public:
   /*
    * Default destructor.
    */
-  virtual ~ACEXML_SAXPrint_Handler (void);
+  virtual ~ACEXML_SAXPrint_Handler ();
 
   // Methods inherit from ACEXML_ContentHandler.
 
@@ -45,7 +45,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void)
+  virtual void endDocument ()
     ;
 
   /*
@@ -86,7 +86,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void);
+  virtual void startDocument ();
 
   /*
    * Receive notification of the beginning of an element.
diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
index 6a34134531a..586b503cbec 100644
--- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
+++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
@@ -28,7 +28,7 @@ ACEXML_Debug_Attribute_Builder::setName (const ACEXML_Char *n)
 }
 
 const ACEXML_Char *
-ACEXML_Debug_Attribute_Builder::getName (void)
+ACEXML_Debug_Attribute_Builder::getName ()
 {
   return this->name_.fast_rep ();
 }
@@ -63,14 +63,14 @@ ACEXML_Debug_Attribute_Builder::setDefault (const DEFAULT_DECL def,
 }
 
 int
-ACEXML_Debug_Attribute_Builder::validAttr (void)
+ACEXML_Debug_Attribute_Builder::validAttr ()
 {
   // @@ Not implemented.  Always return 1 (true) for now.
   return 1;
 }
 
 void
-ACEXML_Debug_Attribute_Builder::dump (void)
+ACEXML_Debug_Attribute_Builder::dump ()
 {
   cout << this->name_ << " ";
 
@@ -188,7 +188,7 @@ ACEXML_Debug_Attributes_Builder::insertAttribute (
 }
 
 void
-ACEXML_Debug_Attributes_Builder::dump (void)
+ACEXML_Debug_Attributes_Builder::dump ()
 {
   // @@ Print print.
   cout << "<!ATTLIST " << this->element_name_ << endl;
diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
index bd3906bbc87..df6fac84210 100644
--- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
+++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
@@ -43,7 +43,7 @@ public:
    * Specify the name of the attribute.
    */
   virtual int setName (const ACEXML_Char *n);
-  virtual const ACEXML_Char *getName (void);
+  virtual const ACEXML_Char *getName ();
 
   /**
    * Set the attribute type.
@@ -65,13 +65,13 @@ public:
    *
    * @retval 0 if the attribute is not a valid combo.
    */
-  virtual int validAttr (void);
+  virtual int validAttr ();
 
 
   /**
    * Dump the content of the attribute definition.
    */
-  virtual void dump (void);
+  virtual void dump ();
 private:
   /// Attribute name.
   ACEXML_String name_;
@@ -147,7 +147,7 @@ public:
   /**
    * Dump the content of the attribute definition.
    */
-  virtual void dump (void);
+  virtual void dump ();
 protected:
   /// The name of the element type these attributes applied.
   ACEXML_String element_name_;
diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h
index 1e63e8646c7..4f3e4e0cb65 100644
--- a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h
+++ b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h
@@ -101,7 +101,7 @@ public:
   /**
    * Dump the content of the attribute definition.
    */
-  virtual void dump (void);
+  virtual void dump ();
 private:
   CONTENT_TYPE type_;
 
diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp
index f0aea3fdb8b..d98812167aa 100644
--- a/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp
+++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp
@@ -19,7 +19,7 @@ ACEXML_Element_Tree_Name_Node::dump ()
 
 ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_Name_Node)
 
-ACEXML_Element_Tree_List_Node::~ACEXML_Element_Tree_List_Node (void)
+ACEXML_Element_Tree_List_Node::~ACEXML_Element_Tree_List_Node ()
 {
   delete this->head_;
 }
@@ -40,7 +40,7 @@ ACEXML_Element_Tree_List_Node::insert (ACEXML_Element_Tree_Node *node)
 }
 
 void
-ACEXML_Element_Tree_List_Node::dump (void)
+ACEXML_Element_Tree_List_Node::dump ()
 {
   ACEXML_Element_Tree_Node *ptr = this->head_;
   const ACEXML_Char *separator = (this->type_ == SEQUENCE) ? ACE_TEXT(" , ") : ACE_TEXT(" | ");
diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.h b/ACE/ACEXML/parser/debug_validator/Element_Tree.h
index 24dc90e5269..71fae9b6a77 100644
--- a/ACE/ACEXML/parser/debug_validator/Element_Tree.h
+++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.h
@@ -97,16 +97,16 @@ public:
   } LIST_TYPE;
 
   /// Default constructor.
-  ACEXML_Element_Tree_List_Node (void);
+  ACEXML_Element_Tree_List_Node ();
 
   /// Destructor.
-  virtual ~ACEXML_Element_Tree_List_Node (void);
+  virtual ~ACEXML_Element_Tree_List_Node ();
 
   /// Insert a new ACEXML_Element_Tree_Node into the list.
   int insert (ACEXML_Element_Tree_Node *node);
 
   /// Get/set the type of list.
-  LIST_TYPE get (void);
+  LIST_TYPE get ();
   int set (LIST_TYPE type);
 
   virtual void dump ();
@@ -136,11 +136,11 @@ public:
 
   void push (ACEXML_Element_Tree_List_Node *n);
 
-  ACEXML_Element_Tree_List_Node *pop (void);
+  ACEXML_Element_Tree_List_Node *pop ();
 
-  ACEXML_Element_Tree_List_Node *top (void);
+  ACEXML_Element_Tree_List_Node *top ();
 
-  int empty (void);
+  int empty ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.cpp b/ACE/ACEXML/parser/parser/Entity_Manager.cpp
index b9efe5a89d8..a73cbb1b7ea 100644
--- a/ACE/ACEXML/parser/parser/Entity_Manager.cpp
+++ b/ACE/ACEXML/parser/parser/Entity_Manager.cpp
@@ -5,12 +5,12 @@
 #endif /* __ACEXML_INLINE__ */
 
 
-ACEXML_Entity_Manager::ACEXML_Entity_Manager (void)
+ACEXML_Entity_Manager::ACEXML_Entity_Manager ()
   : entities_ (0)
 {
 }
 
-ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void)
+ACEXML_Entity_Manager::~ACEXML_Entity_Manager ()
 {
   this->reset();
 }
diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp
index a722a7cfe7b..48196f26723 100644
--- a/ACE/ACEXML/parser/parser/Parser.cpp
+++ b/ACE/ACEXML/parser/parser/Parser.cpp
@@ -28,7 +28,7 @@ ACEXML_Parser::namespace_prefixes_feature_[] = ACE_TEXT ("http://xml.org/sax/fea
 const ACEXML_Char
 ACEXML_Parser::validation_feature_[] = ACE_TEXT ("http://xml.org/sax/features/validation");
 
-ACEXML_Parser::ACEXML_Parser (void)
+ACEXML_Parser::ACEXML_Parser ()
   :   dtd_handler_ (0),
       entity_resolver_ (0),
       content_handler_ (0),
@@ -51,7 +51,7 @@ ACEXML_Parser::ACEXML_Parser (void)
 {
 }
 
-ACEXML_Parser::~ACEXML_Parser (void)
+ACEXML_Parser::~ACEXML_Parser ()
 {
 }
 
@@ -202,7 +202,7 @@ ACEXML_Parser::parse (ACEXML_InputSource *input)
 }
 
 int
-ACEXML_Parser::parse_doctypedecl (void)
+ACEXML_Parser::parse_doctypedecl ()
 {
   if (this->parse_token (ACE_TEXT ("DOCTYPE")) < 0)
     {
@@ -262,7 +262,7 @@ ACEXML_Parser::parse_doctypedecl (void)
 }
 
 int
-ACEXML_Parser::parse_internal_dtd (void)
+ACEXML_Parser::parse_internal_dtd ()
 {
   this->ref_state_ = ACEXML_ParserInt::IN_INT_DTD;
   ACEXML_Char nextch = this->skip_whitespace ();
@@ -306,7 +306,7 @@ ACEXML_Parser::parse_internal_dtd (void)
 }
 
 int
-ACEXML_Parser::parse_external_dtd (void)
+ACEXML_Parser::parse_external_dtd ()
 {
   this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD;
   ACEXML_Char* publicId = 0;
@@ -348,7 +348,7 @@ ACEXML_Parser::parse_external_dtd (void)
 
 
 int
-ACEXML_Parser::parse_external_subset (void)
+ACEXML_Parser::parse_external_subset ()
 {
   this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD;
   this->external_subset_ = 1;
@@ -395,7 +395,7 @@ ACEXML_Parser::parse_external_subset (void)
 }
 
 int
-ACEXML_Parser::parse_conditional_section (void)
+ACEXML_Parser::parse_conditional_section ()
 {
   ACEXML_Char ch = this->get ();
   int include = 0;
@@ -457,7 +457,7 @@ ACEXML_Parser::parse_conditional_section (void)
 }
 
 int
-ACEXML_Parser::parse_ignoresect (void)
+ACEXML_Parser::parse_ignoresect ()
 {
   ACEXML_Char nextch = this->skip_whitespace();
   int count = 0;
@@ -510,7 +510,7 @@ ACEXML_Parser::parse_ignoresect (void)
 }
 
 int
-ACEXML_Parser::parse_includesect (void)
+ACEXML_Parser::parse_includesect ()
 {
   ACEXML_Char nextch = this->skip_whitespace();
   do {
@@ -561,7 +561,7 @@ ACEXML_Parser::parse_includesect (void)
 }
 
 int
-ACEXML_Parser::parse_markup_decl (void)
+ACEXML_Parser::parse_markup_decl ()
 {
   ACEXML_Char nextch = this->peek ();
   switch (nextch)
@@ -1003,7 +1003,7 @@ ACEXML_Parser::parse_content (const ACEXML_Char* startname,
 
 
 int
-ACEXML_Parser::parse_cdata (void)
+ACEXML_Parser::parse_cdata ()
 {
   if (this->parse_token (ACE_TEXT ("[CDATA[")) < 0)
     {
@@ -1041,7 +1041,7 @@ ACEXML_Parser::parse_cdata (void)
 
 
 int
-ACEXML_Parser::parse_entity_decl (void)
+ACEXML_Parser::parse_entity_decl ()
 {
   ACEXML_Char nextch = 0;
 
@@ -1168,7 +1168,7 @@ ACEXML_Parser::parse_entity_decl (void)
 }
 
 int
-ACEXML_Parser::parse_attlist_decl (void)
+ACEXML_Parser::parse_attlist_decl ()
 {
   if (this->parse_token (ACE_TEXT ("ATTLIST")) < 0)
     {
@@ -1227,7 +1227,7 @@ ACEXML_Parser::parse_attlist_decl (void)
 }
 
 int
-ACEXML_Parser::check_for_PE_reference (void)
+ACEXML_Parser::check_for_PE_reference ()
 {
   ACEXML_Char fwd = '\xFF';
   // Skip any leading whitespaces and store the number of such chars skipped
@@ -1261,7 +1261,7 @@ ACEXML_Parser::check_for_PE_reference (void)
 }
 
 ACEXML_Char*
-ACEXML_Parser::parse_attname (void)
+ACEXML_Parser::parse_attname ()
 {
   // Parse attribute name
   ACEXML_Char *att_name = this->parse_name ();
@@ -1273,7 +1273,7 @@ ACEXML_Parser::parse_attname (void)
 }
 
 int
-ACEXML_Parser::parse_defaultdecl (void)
+ACEXML_Parser::parse_defaultdecl ()
 {
   // DefaultDecl ::=  '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue)
   ACEXML_Char nextch = this->peek ();
@@ -1333,7 +1333,7 @@ ACEXML_Parser::parse_defaultdecl (void)
 }
 
 int
-ACEXML_Parser::parse_tokenized_type (void)
+ACEXML_Parser::parse_tokenized_type ()
 {
   ACEXML_Char ch = this->get();
   switch (ch)
@@ -1451,7 +1451,7 @@ ACEXML_Parser::parse_tokenized_type (void)
  *                                  [VC: Enumeration]
  */
 int
-ACEXML_Parser::parse_atttype (void)
+ACEXML_Parser::parse_atttype ()
 {
   ACEXML_Char nextch = this->peek();
   switch (nextch)
@@ -1546,7 +1546,7 @@ ACEXML_Parser::parse_atttype (void)
 }
 
 int
-ACEXML_Parser::parse_notation_decl (void)
+ACEXML_Parser::parse_notation_decl ()
 {
   if (this->parse_token (ACE_TEXT ("NOTATION")) < 0)
     {
@@ -1610,7 +1610,7 @@ ACEXML_Parser::parse_notation_decl (void)
 }
 
 int
-ACEXML_Parser::parse_element_decl (void)
+ACEXML_Parser::parse_element_decl ()
 {
   if (this->parse_token (ACE_TEXT ("LEMENT")) < 0)
     {
@@ -1664,7 +1664,7 @@ ACEXML_Parser::parse_element_decl (void)
 
 
 int
-ACEXML_Parser::parse_children_definition (void)
+ACEXML_Parser::parse_children_definition ()
 {
   this->get ();                 // consume the '('
   this->check_for_PE_reference ();
@@ -1901,7 +1901,7 @@ ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t& len)
 }
 
 ACEXML_Char*
-ACEXML_Parser::parse_reference_name (void)
+ACEXML_Parser::parse_reference_name ()
 {
   ACEXML_Char ch = this->get ();
   if (!this->isLetter (ch) && (ch != '_' && ch != ':'))
@@ -1995,7 +1995,7 @@ ACEXML_Parser::parse_attvalue (ACEXML_Char *&str)
 }
 
 int
-ACEXML_Parser::parse_entity_reference (void)
+ACEXML_Parser::parse_entity_reference ()
 {
   ACEXML_Char* replace = this->parse_reference_name ();
   if (replace == 0)
@@ -2121,7 +2121,7 @@ ACEXML_Parser::parse_entity_reference (void)
 }
 
 int
-ACEXML_Parser::parse_PE_reference (void)
+ACEXML_Parser::parse_PE_reference ()
 {
   ACEXML_Char* replace = this->parse_reference_name ();
   if (replace == 0)
@@ -2681,7 +2681,7 @@ ACEXML_Parser::fatal_error (const ACEXML_Char* msg)
 }
 
 void
-ACEXML_Parser::parse_version_info (void)
+ACEXML_Parser::parse_version_info ()
 {
   ACEXML_Char* astring;
   if (this->parse_token (ACE_TEXT("ersion")) < 0
@@ -2699,7 +2699,7 @@ ACEXML_Parser::parse_version_info (void)
 }
 
 void
-ACEXML_Parser::parse_encoding_decl (void)
+ACEXML_Parser::parse_encoding_decl ()
 {
   ACEXML_Char* astring = 0;
   if ((this->parse_token (ACE_TEXT("ncoding")) < 0)
@@ -2720,7 +2720,7 @@ ACEXML_Parser::parse_encoding_decl (void)
 }
 
 int
-ACEXML_Parser::parse_text_decl (void)
+ACEXML_Parser::parse_text_decl ()
 {
   // Read xml
   if (this->parse_token (ACE_TEXT("xml")) < 0)
@@ -2754,7 +2754,7 @@ ACEXML_Parser::parse_text_decl (void)
 }
 
 void
-ACEXML_Parser::parse_xml_decl (void)
+ACEXML_Parser::parse_xml_decl ()
 {
   // Read <?xml
   if (this->parse_token (ACE_TEXT("xml")) < 0)
@@ -2800,7 +2800,7 @@ ACEXML_Parser::parse_xml_decl (void)
 }
 
 int
-ACEXML_Parser::parse_comment (void)
+ACEXML_Parser::parse_comment ()
 {
   int state = 0;
 
@@ -2825,7 +2825,7 @@ ACEXML_Parser::parse_comment (void)
 }
 
 int
-ACEXML_Parser::parse_processing_instruction (void)
+ACEXML_Parser::parse_processing_instruction ()
 {
   const ACEXML_Char *pitarget = this->parse_name ();
   ACEXML_Char *instruction = 0;
@@ -2871,7 +2871,7 @@ ACEXML_Parser::parse_processing_instruction (void)
 }
 
 void
-ACEXML_Parser::reset (void)
+ACEXML_Parser::reset ()
 {
   this->doctype_ = 0;
   if (this->ctx_stack_.pop (this->current_) == -1)
diff --git a/ACE/ACEXML/tests/ContentHandler_Test.cpp b/ACE/ACEXML/tests/ContentHandler_Test.cpp
index fc905ac7e6c..4e4231e7d6f 100644
--- a/ACE/ACEXML/tests/ContentHandler_Test.cpp
+++ b/ACE/ACEXML/tests/ContentHandler_Test.cpp
@@ -23,7 +23,7 @@ public:
                            size_t start,
                            size_t length);
 
-  const ACEXML_Char *get_test_string (void)
+  const ACEXML_Char *get_test_string ()
     { return Basic_Content_Tester::test_string_; }
 
 private:
diff --git a/ACE/ASNMP/tests/Gauge_Test.cpp b/ACE/ASNMP/tests/Gauge_Test.cpp
index 5660069ad5a..31f49af2532 100644
--- a/ACE/ASNMP/tests/Gauge_Test.cpp
+++ b/ACE/ASNMP/tests/Gauge_Test.cpp
@@ -54,7 +54,7 @@ DAMAGES.
    value of 2^32-1 (4294967295 dec) for gauges.
  */
 static void
-TestGuage (void)
+TestGuage ()
 {
 #if !defined (ACE_WIN32)
    long l = LONG_MAX, nl = LONG_MIN;  // limits.h
diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h
index 39601b60064..c8895165d99 100644
--- a/ACE/ASNMP/tests/test_config.h
+++ b/ACE/ASNMP/tests/test_config.h
@@ -97,11 +97,11 @@ char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
 class ACE_Test_Output
 {
 public:
-  ACE_Test_Output (void);
-  ~ACE_Test_Output (void);
+  ACE_Test_Output ();
+  ~ACE_Test_Output ();
   int set_output (const ACE_TCHAR *filename, int append = 0);
-  ofstream *output_file (void);
-  void close (void);
+  ofstream *output_file ();
+  void close ();
 
 private:
   ofstream output_file_;
@@ -109,11 +109,11 @@ private:
 
 static ACE_Test_Output ace_file_stream;
 
-ACE_Test_Output::ACE_Test_Output (void)
+ACE_Test_Output::ACE_Test_Output ()
 {
 }
 
-ACE_Test_Output::~ACE_Test_Output (void)
+ACE_Test_Output::~ACE_Test_Output ()
 {
 }
 
@@ -140,13 +140,13 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 }
 
 ofstream *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return &this->output_file_;
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
   this->output_file_.flush ();
   this->output_file_.close ();
diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp
index 30bea05196a..4890ad4d5c5 100644
--- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp
+++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp
@@ -61,7 +61,7 @@ init_i (const DSRT_ConfigInfo&)
 }
 
 template <class DSRT_Scheduler_Traits> int
-DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits>::svc (void)
+DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits>::svc ()
 {
   ACE_hthread_t scheduler_thr_handle;
   ACE_Thread::self (scheduler_thr_handle);
diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
index a86202c6db2..20452b8ae49 100644
--- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
+++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
@@ -68,7 +68,7 @@ namespace Kokyu
     cond_t sched_queue_modified_cond_;
 
   private:
-    int svc (void);
+    int svc ();
   };
 }
 
diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp
index fc9ba57b4ef..f67e48d60b5 100644
--- a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp
+++ b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp
@@ -42,7 +42,7 @@ template <class DSRT_Scheduler_Traits,
 int Sched_Ready_Queue<DSRT_Scheduler_Traits,
                       More_Eligible_Comparator,
                       ACE_LOCK>::
-current_size (void)
+current_size ()
 {
   return
     ACE_Utils::truncate_cast<int> (
diff --git a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp
index 6ceb80369fd..6bd96d96150 100644
--- a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp
+++ b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp
@@ -57,7 +57,7 @@ public:
      exec_duration_ (exec_duration)
   {}
 
-  int svc (void);
+  int svc ();
 
  private:
   ACE_Barrier& barrier_;
@@ -67,7 +67,7 @@ public:
   int exec_duration_;
 };
 
-int MyTask::svc (void)
+int MyTask::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
diff --git a/ACE/ace/ATM_Stream.h b/ACE/ace/ATM_Stream.h
index e140d97477f..6bf102b933e 100644
--- a/ACE/ace/ATM_Stream.h
+++ b/ACE/ace/ATM_Stream.h
@@ -59,7 +59,7 @@ public:
   ACE_HANDLE get_handle () const;
 
   /// Get the underlying stream.
-  ATM_Stream& get_stream (void);
+  ATM_Stream& get_stream ();
 
   /// Get the name of the connected host.
   char* get_peer_name () const;
diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h
index 2e5d8f75f1f..f9401839f62 100644
--- a/ACE/ace/Activation_Queue.h
+++ b/ACE/ace/Activation_Queue.h
@@ -77,7 +77,7 @@ public:
                         ACE_Allocator *db_alloc = 0);
 
   /// Destructor.
-  virtual ~ACE_Activation_Queue (void);
+  virtual ~ACE_Activation_Queue ();
 
   // = Activate Queue operations.
 
diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp
index ddf9531f10a..a3e1c267686 100644
--- a/ACE/ace/Argv_Type_Converter.cpp
+++ b/ACE/ace/Argv_Type_Converter.cpp
@@ -78,7 +78,7 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter ()
 
 #if defined (ACE_USES_WCHAR)
 void
-ACE_Argv_Type_Converter::initialize (void)
+ACE_Argv_Type_Converter::initialize ()
 {
   if (this->original_type_)
     {
@@ -100,7 +100,7 @@ ACE_Argv_Type_Converter::initialize (void)
 
 
 void
-ACE_Argv_Type_Converter::align_char_with_wchar (void)
+ACE_Argv_Type_Converter::align_char_with_wchar ()
 {
   for (int wchar_argv_index = 0; wchar_argv_index < this->saved_argc_;
        ++wchar_argv_index)
@@ -131,7 +131,7 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void)
 }
 
 void
-ACE_Argv_Type_Converter::align_wchar_with_char (void)
+ACE_Argv_Type_Converter::align_wchar_with_char ()
 {
   for (int char_argv_index = 0; char_argv_index < saved_argc_;
        ++char_argv_index)
@@ -163,7 +163,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void)
 }
 
 void
-ACE_Argv_Type_Converter::cleanup (void)
+ACE_Argv_Type_Converter::cleanup ()
 {
   for (int i = this->saved_argc_; i < this->before_pass_argc_; ++i)
     {
diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp
index 80ec155ce91..eff953ef89a 100644
--- a/ACE/ace/Asynch_Acceptor.cpp
+++ b/ACE/ace/Asynch_Acceptor.cpp
@@ -23,7 +23,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class HANDLER>
-ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor (void)
+ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor ()
   : addr_family_ (0),
     listen_handle_ (ACE_INVALID_HANDLE),
     pass_addresses_ (false),
@@ -351,7 +351,7 @@ ACE_Asynch_Acceptor<HANDLER>::validate_connection
 }
 
 template <class HANDLER> int
-ACE_Asynch_Acceptor<HANDLER>::cancel (void)
+ACE_Asynch_Acceptor<HANDLER>::cancel ()
 {
   ACE_TRACE ("ACE_Asynch_Acceptor<>::cancel");
 
@@ -430,13 +430,13 @@ ACE_Asynch_Acceptor<HANDLER>::handle (ACE_HANDLE h)
 }
 
 template <class HANDLER> ACE_Asynch_Accept &
-ACE_Asynch_Acceptor<HANDLER>::asynch_accept (void)
+ACE_Asynch_Acceptor<HANDLER>::asynch_accept ()
 {
   return this->asynch_accept_;
 }
 
 template <class HANDLER> HANDLER *
-ACE_Asynch_Acceptor<HANDLER>::make_handler (void)
+ACE_Asynch_Acceptor<HANDLER>::make_handler ()
 {
   // Default behavior
   HANDLER *handler = 0;
@@ -495,7 +495,7 @@ ACE_Asynch_Acceptor<HANDLER>::bytes_to_read (size_t new_value)
 }
 
 template <class HANDLER> int
-ACE_Asynch_Acceptor<HANDLER>::should_reissue_accept (void)
+ACE_Asynch_Acceptor<HANDLER>::should_reissue_accept ()
 {
   return this->reissue_accept_;
 }
diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h
index 172649e5000..7760ba53d5c 100644
--- a/ACE/ace/Asynch_Acceptor.h
+++ b/ACE/ace/Asynch_Acceptor.h
@@ -45,10 +45,10 @@ class ACE_Asynch_Acceptor : public ACE_Handler
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Acceptor (void);
+  ACE_Asynch_Acceptor ();
 
   /// Virtual destruction
-  virtual ~ACE_Asynch_Acceptor (void);
+  virtual ~ACE_Asynch_Acceptor ();
 
   /**
    * @c open starts one or more asynchronous accept requests on a
@@ -138,7 +138,7 @@ public:
    * @note On Windows, only accept operations initiated by the calling thread
    *       are canceled.
    */
-  virtual int cancel (void);
+  virtual int cancel ();
 
   /**
    * Template method to validate peer before service is opened.
@@ -175,7 +175,7 @@ public:
    * @c open() method's @a reissue_accept argument. That value can also
    * be changed using the @c reissue_accept() method.
    */
-  virtual int should_reissue_accept (void);
+  virtual int should_reissue_accept ();
 
   //
   // These are low level tweaking methods
@@ -224,14 +224,14 @@ protected:
                       ACE_INET_Addr &local_address);
 
   /// Return the asynch accept object.
-  ACE_Asynch_Accept &asynch_accept (void);
+  ACE_Asynch_Accept &asynch_accept ();
 
   /**
    * This is the template method used to create new handler.
    * Subclasses must overwrite this method if a new handler creation
    * strategy is required.
    */
-  virtual HANDLER *make_handler (void);
+  virtual HANDLER *make_handler ();
 
   /// Address family used to open this object. Obtained from @a address passed
   /// to @c open().
diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp
index fbb86182517..480c24b9551 100644
--- a/ACE/ace/Asynch_Connector.cpp
+++ b/ACE/ace/Asynch_Connector.cpp
@@ -20,7 +20,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class HANDLER>
-ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector (void)
+ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector ()
   : pass_addresses_ (false),
     validate_new_connection_ (false)
 {
@@ -167,7 +167,7 @@ ACE_Asynch_Connector<HANDLER>::validate_connection
 }
 
 template <class HANDLER> int
-ACE_Asynch_Connector<HANDLER>::cancel (void)
+ACE_Asynch_Connector<HANDLER>::cancel ()
 {
   return this->asynch_connect_.cancel ();
 }
@@ -218,13 +218,13 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result &
 
 
 template <class HANDLER> ACE_Asynch_Connect &
-ACE_Asynch_Connector<HANDLER>::asynch_connect (void)
+ACE_Asynch_Connector<HANDLER>::asynch_connect ()
 {
   return this->asynch_connect_;
 }
 
 template <class HANDLER> HANDLER *
-ACE_Asynch_Connector<HANDLER>::make_handler (void)
+ACE_Asynch_Connector<HANDLER>::make_handler ()
 {
   // Default behavior
   HANDLER *handler = 0;
diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h
index f7162cdb04b..ad09d0a1879 100644
--- a/ACE/ace/Asynch_Connector.h
+++ b/ACE/ace/Asynch_Connector.h
@@ -45,7 +45,7 @@ class ACE_Asynch_Connector : public ACE_Handler
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Connector (void);
+  ACE_Asynch_Connector ();
 
   /// Virtual destruction
   virtual ~ACE_Asynch_Connector () = default;
@@ -73,7 +73,7 @@ public:
    *
    * @note On POSIX, delegates cancelation to ACE_POSIX_Asynch_Connect.
    */
-  virtual int cancel (void);
+  virtual int cancel ();
 
 
   /**
@@ -132,14 +132,14 @@ protected:
                       ACE_INET_Addr &local_address);
 
   /// Return the asynch Connect object.
-  ACE_Asynch_Connect & asynch_connect (void);
+  ACE_Asynch_Connect & asynch_connect ();
 
   /**
    * This is the template method used to create new handler.
    * Subclasses must overwrite this method if a new handler creation
    * strategy is required.
    */
-  virtual HANDLER *make_handler (void);
+  virtual HANDLER *make_handler ();
 
 private:
   /// Asynch_Connect used to make life easier :-)
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index 933ee627d10..3e25b110f31 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -166,7 +166,7 @@ public:
 
 
   /// Destructor.
-  virtual ~ACE_Asynch_Result (void);
+  virtual ~ACE_Asynch_Result ();
 
 protected:
   /// Constructor. This implementation will not be deleted.  The
@@ -244,7 +244,7 @@ public:
    *   For requested operations that are successfully canceled, the
    *   associated  error  status is set to ECANCELED.
    */
-  int cancel (void);
+  int cancel ();
 
 
   // = Access methods.
@@ -288,10 +288,10 @@ class ACE_Export ACE_Asynch_Read_Stream : public ACE_Asynch_Operation
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Read_Stream (void);
+  ACE_Asynch_Read_Stream ();
 
   /// Destructor
-  virtual ~ACE_Asynch_Read_Stream (void);
+  virtual ~ACE_Asynch_Read_Stream ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -400,7 +400,7 @@ public:
     Result (ACE_Asynch_Read_Stream_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// The implementation class.
     ACE_Asynch_Read_Stream_Result_Impl *implementation_;
@@ -430,10 +430,10 @@ class ACE_Export ACE_Asynch_Write_Stream : public ACE_Asynch_Operation
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Write_Stream (void);
+  ACE_Asynch_Write_Stream ();
 
   /// Destructor.
-  virtual ~ACE_Asynch_Write_Stream (void);
+  virtual ~ACE_Asynch_Write_Stream ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -554,7 +554,7 @@ public:
     Result (ACE_Asynch_Write_Stream_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// Implementation class.
     ACE_Asynch_Write_Stream_Result_Impl *implementation_;
@@ -587,10 +587,10 @@ class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Read_File (void);
+  ACE_Asynch_Read_File ();
 
   /// Destructor.
-  virtual ~ACE_Asynch_Read_File (void);
+  virtual ~ACE_Asynch_Read_File ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -698,7 +698,7 @@ public:
     Result (ACE_Asynch_Read_File_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// The implementation class.
     ACE_Asynch_Read_File_Result_Impl *implementation_;
@@ -736,10 +736,10 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Write_File (void);
+  ACE_Asynch_Write_File ();
 
   /// Destructor.
-  virtual ~ACE_Asynch_Write_File (void);
+  virtual ~ACE_Asynch_Write_File ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -832,7 +832,7 @@ public:
     Result (ACE_Asynch_Write_File_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// The implementation class.
     ACE_Asynch_Write_File_Result_Impl *implementation_;
@@ -868,10 +868,10 @@ class ACE_Export ACE_Asynch_Accept : public ACE_Asynch_Operation
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Accept (void);
+  ACE_Asynch_Accept ();
 
   /// Destructor.
-  virtual ~ACE_Asynch_Accept (void);
+  virtual ~ACE_Asynch_Accept ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -975,7 +975,7 @@ public:
     Result (ACE_Asynch_Accept_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// Implementation class.
     ACE_Asynch_Accept_Result_Impl *implementation_;
@@ -1003,10 +1003,10 @@ class ACE_Export ACE_Asynch_Connect : public ACE_Asynch_Operation
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Connect (void);
+  ACE_Asynch_Connect ();
 
   /// Destructor.
-  virtual ~ACE_Asynch_Connect (void);
+  virtual ~ACE_Asynch_Connect ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -1069,7 +1069,7 @@ public:
     Result (ACE_Asynch_Connect_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// Implementation class.
     ACE_Asynch_Connect_Result_Impl *implementation_;
@@ -1108,10 +1108,10 @@ public:
   class Header_And_Trailer;
 
   /// A do nothing constructor.
-  ACE_Asynch_Transmit_File (void);
+  ACE_Asynch_Transmit_File ();
 
   /// Destructor.
-  virtual ~ACE_Asynch_Transmit_File (void);
+  virtual ~ACE_Asynch_Transmit_File ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -1209,7 +1209,7 @@ public:
     Result (ACE_Asynch_Transmit_File_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// The implementation class.
     ACE_Asynch_Transmit_File_Result_Impl *implementation_;
@@ -1234,7 +1234,7 @@ public:
                         size_t trailer_bytes = 0);
 
     /// Destructor
-    virtual ~Header_And_Trailer (void);
+    virtual ~Header_And_Trailer ();
 
     /// This method allows all the member to be set in one fell swoop.
     void header_and_trailer (ACE_Message_Block *header = 0,
@@ -1267,7 +1267,7 @@ public:
     void trailer_bytes (size_t bytes);
 
     /// Conversion routine.
-    ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers (void);
+    ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers ();
 
   protected:
     /// Header data.
@@ -1313,10 +1313,10 @@ class ACE_Export ACE_Asynch_Read_Dgram : public ACE_Asynch_Operation
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Read_Dgram (void);
+  ACE_Asynch_Read_Dgram ();
 
   /// Destructor
-  virtual ~ACE_Asynch_Read_Dgram (void);
+  virtual ~ACE_Asynch_Read_Dgram ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -1415,7 +1415,7 @@ public:
     Result (ACE_Asynch_Read_Dgram_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// The implementation class.
     ACE_Asynch_Read_Dgram_Result_Impl *implementation_;
@@ -1446,10 +1446,10 @@ class ACE_Export ACE_Asynch_Write_Dgram : public ACE_Asynch_Operation
 {
 public:
   /// A do nothing constructor.
-  ACE_Asynch_Write_Dgram (void);
+  ACE_Asynch_Write_Dgram ();
 
   /// Destructor.
-  virtual ~ACE_Asynch_Write_Dgram (void);
+  virtual ~ACE_Asynch_Write_Dgram ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -1545,7 +1545,7 @@ public:
     Result (ACE_Asynch_Write_Dgram_Result_Impl *implementation);
 
     /// Destructor.
-    virtual ~Result (void);
+    virtual ~Result ();
 
     /// Implementation class.
     ACE_Asynch_Write_Dgram_Result_Impl *implementation_;
@@ -1567,13 +1567,13 @@ class ACE_Export ACE_Handler
 {
 public:
   /// A do nothing constructor.
-  ACE_Handler (void);
+  ACE_Handler ();
 
   /// A do nothing constructor which allows proactor to be set to \<p\>.
   ACE_Handler (ACE_Proactor *p);
 
   /// Virtual destruction.
-  virtual ~ACE_Handler (void);
+  virtual ~ACE_Handler ();
 
   /// This method will be called when an asynchronous read completes on
   /// a stream.
@@ -1619,10 +1619,10 @@ public:
    * ACE_Proactor. A special {Wake_Up_Completion} is used to wake up
    * all the threads that are blocking for completions.
    */
-  virtual void handle_wakeup (void);
+  virtual void handle_wakeup ();
 
   /// Get the proactor associated with this handler.
-  ACE_Proactor *proactor (void);
+  ACE_Proactor *proactor ();
 
   /// Set the proactor.
   void proactor (ACE_Proactor *p);
@@ -1657,7 +1657,7 @@ public:
   };
   typedef ACE_Refcounted_Auto_Ptr<Proxy, ACE_SYNCH_MUTEX> Proxy_Ptr;
 
-  Proxy_Ptr &proxy (void);
+  Proxy_Ptr &proxy ();
 
 protected:
   /// The proactor associated with this handler.
@@ -1699,10 +1699,10 @@ class ACE_Export ACE_Service_Handler : public ACE_Handler
 
 public:
   /// A do nothing constructor.
-  ACE_Service_Handler (void);
+  ACE_Service_Handler ();
 
   /// Virtual destruction.
-  virtual ~ACE_Service_Handler (void);
+  virtual ~ACE_Service_Handler ();
 
   /**
    * {open} is called by ACE_Asynch_Acceptor to initialize a new
diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h
index 01880bc1dbc..b87c9930482 100644
--- a/ACE/ace/Asynch_IO_Impl.h
+++ b/ACE/ace/Asynch_IO_Impl.h
@@ -46,7 +46,7 @@ class ACE_Proactor_Impl;
 class ACE_Export ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Result_Impl (void);
+  virtual ~ACE_Asynch_Result_Impl ();
 
   /// Number of bytes transferred by the operation.
   virtual size_t bytes_transferred () const = 0;
@@ -97,7 +97,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Result_Impl (void);
+  ACE_Asynch_Result_Impl ();
 };
 
 /**
@@ -110,7 +110,7 @@ protected:
 class ACE_Export ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Operation_Impl (void);
+  virtual ~ACE_Asynch_Operation_Impl ();
 
   /**
    * Initializes the factory with information which will be used with
@@ -137,7 +137,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Operation_Impl (void);
+  ACE_Asynch_Operation_Impl ();
 };
 
 /**
@@ -150,7 +150,7 @@ protected:
 class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Read_Stream_Impl (void);
+  virtual ~ACE_Asynch_Read_Stream_Impl ();
 
   /// This starts off an asynchronous read. Upto @a bytes_to_read will
   /// be read and stored in the @a message_block.
@@ -174,7 +174,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Read_Stream_Impl (void);
+  ACE_Asynch_Read_Stream_Impl ();
 };
 
 /**
@@ -187,7 +187,7 @@ protected:
 class ACE_Export ACE_Asynch_Read_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Read_Stream_Result_Impl (void);
+  virtual ~ACE_Asynch_Read_Stream_Result_Impl ();
 
   /// The number of bytes which were requested at the start of the
   /// asynchronous read.
@@ -201,7 +201,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Read_Stream_Result_Impl (void);
+  ACE_Asynch_Read_Stream_Result_Impl ();
 };
 
 /**
@@ -214,7 +214,7 @@ protected:
 class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Write_Stream_Impl (void);
+  virtual ~ACE_Asynch_Write_Stream_Impl ();
 
   /// This starts off an asynchronous write.  Upto @a bytes_to_write
   /// will be written from the @a message_block.
@@ -238,7 +238,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Write_Stream_Impl (void);
+  ACE_Asynch_Write_Stream_Impl ();
 };
 
 /**
@@ -251,7 +251,7 @@ protected:
 class ACE_Export ACE_Asynch_Write_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Write_Stream_Result_Impl (void);
+  virtual ~ACE_Asynch_Write_Stream_Result_Impl ();
 
   /// The number of bytes which were requested at the start of the
   /// asynchronous write.
@@ -265,7 +265,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Write_Stream_Result_Impl (void);
+  ACE_Asynch_Write_Stream_Result_Impl ();
 };
 
 /**
@@ -278,7 +278,7 @@ protected:
 class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stream_Impl
 {
 public:
-  virtual ~ACE_Asynch_Read_File_Impl (void);
+  virtual ~ACE_Asynch_Read_File_Impl ();
 
   /**
    * This starts off an asynchronous read.  Upto @a bytes_to_read will
@@ -331,7 +331,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Read_File_Impl (void);
+  ACE_Asynch_Read_File_Impl ();
 };
 
 /**
@@ -344,11 +344,11 @@ class ACE_Export ACE_Asynch_Read_File_Result_Impl : public virtual ACE_Asynch_Re
 {
 public:
   /// Destructor.
-  virtual ~ACE_Asynch_Read_File_Result_Impl (void);
+  virtual ~ACE_Asynch_Read_File_Result_Impl ();
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Read_File_Result_Impl (void);
+  ACE_Asynch_Read_File_Result_Impl ();
 };
 
 /**
@@ -361,7 +361,7 @@ protected:
 class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_Stream_Impl
 {
 public:
-  virtual ~ACE_Asynch_Write_File_Impl (void);
+  virtual ~ACE_Asynch_Write_File_Impl ();
 
   /**
    * This starts off an asynchronous write.  Upto @a bytes_to_write
@@ -414,7 +414,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Write_File_Impl (void);
+  ACE_Asynch_Write_File_Impl ();
 };
 
 /**
@@ -427,11 +427,11 @@ protected:
 class ACE_Export ACE_Asynch_Write_File_Result_Impl : public virtual ACE_Asynch_Write_Stream_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Write_File_Result_Impl (void);
+  virtual ~ACE_Asynch_Write_File_Result_Impl ();
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Write_File_Result_Impl (void);
+  ACE_Asynch_Write_File_Result_Impl ();
 };
 
 /**
@@ -444,7 +444,7 @@ protected:
 class ACE_Export ACE_Asynch_Accept_Impl : public virtual ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Accept_Impl (void);
+  virtual ~ACE_Asynch_Accept_Impl ();
 
   /**
    * This starts off an asynchronous accept.  The asynchronous accept
@@ -467,7 +467,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Accept_Impl (void);
+  ACE_Asynch_Accept_Impl ();
 };
 
 /**
@@ -480,7 +480,7 @@ protected:
 class ACE_Export ACE_Asynch_Accept_Result_Impl : public virtual ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Accept_Result_Impl (void);
+  virtual ~ACE_Asynch_Accept_Result_Impl ();
 
   /// The number of bytes which were requested at the start of the
   /// asynchronous accept.
@@ -497,7 +497,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Accept_Result_Impl (void);
+  ACE_Asynch_Accept_Result_Impl ();
 };
 
 
@@ -511,7 +511,7 @@ protected:
 class ACE_Export ACE_Asynch_Connect_Impl : public virtual ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Connect_Impl (void);
+  virtual ~ACE_Asynch_Connect_Impl ();
 
   /**
    * This starts off an asynchronous connect
@@ -526,7 +526,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Connect_Impl (void);
+  ACE_Asynch_Connect_Impl ();
 };
 
 /**
@@ -539,14 +539,14 @@ protected:
 class ACE_Export ACE_Asynch_Connect_Result_Impl : public virtual ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Connect_Result_Impl (void);
+  virtual ~ACE_Asynch_Connect_Result_Impl ();
 
   /// I/O handle for the connection.
   virtual ACE_HANDLE connect_handle () const = 0;
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Connect_Result_Impl (void);
+  ACE_Asynch_Connect_Result_Impl ();
 };
 
 
@@ -560,7 +560,7 @@ protected:
 class ACE_Asynch_Transmit_File_Impl : public virtual ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Transmit_File_Impl (void);
+  virtual ~ACE_Asynch_Transmit_File_Impl ();
 
   /// This starts off an asynchronous transmit file.
   virtual int transmit_file (ACE_HANDLE file,
@@ -576,7 +576,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Transmit_File_Impl (void);
+  ACE_Asynch_Transmit_File_Impl ();
 };
 
 /**
@@ -589,7 +589,7 @@ protected:
 class ACE_Export ACE_Asynch_Transmit_File_Result_Impl : public virtual ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Transmit_File_Result_Impl (void);
+  virtual ~ACE_Asynch_Transmit_File_Result_Impl ();
 
   /// Socket used for transmitting the file.
   virtual ACE_HANDLE socket () const = 0;
@@ -613,7 +613,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Transmit_File_Result_Impl (void);
+  ACE_Asynch_Transmit_File_Result_Impl ();
 };
 
 
@@ -627,7 +627,7 @@ protected:
 class ACE_Export ACE_Asynch_Read_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Read_Dgram_Impl (void);
+  virtual ~ACE_Asynch_Read_Dgram_Impl ();
 
   /** This starts off an asynchronous read.  Upto
    * <message_block->total_size()> will be read and stored in the
@@ -665,7 +665,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Read_Dgram_Impl (void);
+  ACE_Asynch_Read_Dgram_Impl ();
 };
 
 /**
@@ -678,7 +678,7 @@ protected:
 class ACE_Export ACE_Asynch_Read_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Read_Dgram_Result_Impl (void);
+  virtual ~ACE_Asynch_Read_Dgram_Result_Impl ();
 
   /// Message block which contains the read data
   virtual ACE_Message_Block *message_block () const = 0;
@@ -698,7 +698,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Read_Dgram_Result_Impl (void);
+  ACE_Asynch_Read_Dgram_Result_Impl ();
 };
 
 /**
@@ -711,7 +711,7 @@ protected:
 class ACE_Export ACE_Asynch_Write_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl
 {
 public:
-  virtual ~ACE_Asynch_Write_Dgram_Impl (void);
+  virtual ~ACE_Asynch_Write_Dgram_Impl ();
 
   /** This starts off an asynchronous send.  Upto
    * <message_block->total_length()> will be sent.  @a message_block's
@@ -749,7 +749,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Write_Dgram_Impl (void);
+  ACE_Asynch_Write_Dgram_Impl ();
 };
 
 /**
@@ -762,7 +762,7 @@ protected:
 class ACE_Export ACE_Asynch_Write_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl
 {
 public:
-  virtual ~ACE_Asynch_Write_Dgram_Result_Impl (void);
+  virtual ~ACE_Asynch_Write_Dgram_Result_Impl ();
 
   /// The number of bytes which were requested at the start of the
   /// asynchronous write.
@@ -779,7 +779,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_Asynch_Write_Dgram_Result_Impl (void);
+  ACE_Asynch_Write_Dgram_Result_Impl ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Asynch_Pseudo_Task.h b/ACE/ace/Asynch_Pseudo_Task.h
index 0e311721a9d..8bf712e7687 100644
--- a/ACE/ace/Asynch_Pseudo_Task.h
+++ b/ACE/ace/Asynch_Pseudo_Task.h
@@ -34,8 +34,8 @@ public:
   ACE_Asynch_Pseudo_Task();
   virtual ~ACE_Asynch_Pseudo_Task();
 
-  int start (void);
-  int stop (void);
+  int start ();
+  int stop ();
 
   int register_io_handler (ACE_HANDLE handle,
                            ACE_Event_Handler *handler,
diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp
index 6edc7020aae..4b16b311743 100644
--- a/ACE/ace/Atomic_Op.cpp
+++ b/ACE/ace/Atomic_Op.cpp
@@ -238,7 +238,7 @@ long (*ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange_fn_) (volatile long *, lo
 long (*ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange_add_fn_) (volatile long *, long) = multi_cpu_exchange_add;
 
 void
-ACE_Atomic_Op<ACE_Thread_Mutex, long>::init_functions (void)
+ACE_Atomic_Op<ACE_Thread_Mutex, long>::init_functions ()
 {
   if (ACE_OS::num_processors () == 1)
     {
@@ -271,7 +271,7 @@ long (*ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange_fn_) (volatile l
 long (*ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange_add_fn_) (volatile long *, long) = multi_cpu_exchange_add;
 
 void
-ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::init_functions (void)
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::init_functions ()
 {
   if (ACE_OS::num_processors () == 1)
     {
diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h
index 146cb7c8acd..3534c1bef0c 100644
--- a/ACE/ace/Atomic_Op.h
+++ b/ACE/ace/Atomic_Op.h
@@ -72,7 +72,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long>
 {
 public:
   /// Initialize @c value_ to 0.
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
 
   /// Initialize @c value_ to c.
   ACE_Atomic_Op (long c);
@@ -81,7 +81,7 @@ public:
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &c);
 
   /// Atomically pre-increment @c value_.
-  long operator++ (void);
+  long operator++ ();
 
   /// Atomically post-increment @c value_.
   long operator++ (int);
@@ -90,7 +90,7 @@ public:
   long operator+= (long rhs);
 
   /// Atomically pre-decrement @c value_.
-  long operator-- (void);
+  long operator-- ();
 
   /// Atomically post-decrement @c value_.
   long operator-- (int);
@@ -132,20 +132,20 @@ public:
   void dump () const;
 
   /// Explicitly return @c value_ (by reference).
-  volatile long &value_i (void);
+  volatile long &value_i ();
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
   /// Used during ACE object manager initialization to optimize the fast
   /// atomic op implementation according to the number of CPUs.
-  static void init_functions (void);
+  static void init_functions ();
 
 private:
   /// This function cannot be supported by this template specialization.
   /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   /// template instead.
-  ACE_Thread_Mutex &mutex (void);
+  ACE_Thread_Mutex &mutex ();
 
 private:
   /// Current object decorated by the atomic op.
@@ -170,7 +170,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>
 {
 public:
   /// Initialize @c value_ to 0.
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
 
   /// Initialize @c value_ to c.
   ACE_Atomic_Op (unsigned long c);
@@ -179,7 +179,7 @@ public:
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c);
 
   /// Atomically pre-increment @c value_.
-  unsigned long operator++ (void);
+  unsigned long operator++ ();
 
   /// Atomically post-increment @c value_.
   unsigned long operator++ (int);
@@ -188,7 +188,7 @@ public:
   unsigned long operator+= (unsigned long rhs);
 
   /// Atomically pre-decrement @c value_.
-  unsigned long operator-- (void);
+  unsigned long operator-- ();
 
   /// Atomically post-decrement @c value_.
   unsigned long operator-- (int);
@@ -230,20 +230,20 @@ public:
   void dump () const;
 
   /// Explicitly return @c value_ (by reference).
-  volatile unsigned long &value_i (void);
+  volatile unsigned long &value_i ();
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
   /// Used during ACE object manager initialization to optimize the fast
   /// atomic op implementation according to the number of CPUs.
-  static void init_functions (void);
+  static void init_functions ();
 
 private:
   /// This function cannot be supported by this template specialization.
   /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   /// template instead.
-  ACE_Thread_Mutex &mutex (void);
+  ACE_Thread_Mutex &mutex ();
 
 private:
   /// Current object decorated by the atomic op.
diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h
index 78916c408c8..dde2b427a93 100644
--- a/ACE/ace/Auto_IncDec_T.h
+++ b/ACE/ace/Auto_IncDec_T.h
@@ -42,7 +42,7 @@ public:
   ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter);
 
   /// Implicitly decrement the counter.
-  ~ACE_Auto_IncDec (void);
+  ~ACE_Auto_IncDec ();
 
   /// Dump the state of an object.
   void dump () const;
diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h
index 5d9fc10ef2d..8a65e572655 100644
--- a/ACE/ace/Base_Thread_Adapter.h
+++ b/ACE/ace/Base_Thread_Adapter.h
@@ -99,7 +99,7 @@ public:
 #ifdef ACE_USES_GPROF
   /// Accessor to the itimer_
   /// followed http://sam.zoy.org/writings/programming/gprof.html
-  struct itimerval* timerval (void);
+  struct itimerval* timerval ();
 #endif // ACE_USES_PROF
 
   /// Invoke the close_log_msg_hook, if it is present
diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h
index ba0fa32fcf0..1b88fed51bf 100644
--- a/ACE/ace/Based_Pointer_Repository.h
+++ b/ACE/ace/Based_Pointer_Repository.h
@@ -41,8 +41,8 @@ class ACE_Export ACE_Based_Pointer_Repository
 public:
   // = Use ACE_Null_Mutex to allow locking while iterating.
 
-  ACE_Based_Pointer_Repository (void);
-  ~ACE_Based_Pointer_Repository (void);
+  ACE_Based_Pointer_Repository ();
+  ~ACE_Based_Pointer_Repository ();
 
   // = Search structure methods.
   /**
diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h
index 8ad197b03ac..d29a1a3975d 100644
--- a/ACE/ace/CDR_Size.h
+++ b/ACE/ace/CDR_Size.h
@@ -48,7 +48,7 @@ public:
   bool good_bit () const;
 
   /// Reset current size.
-  void reset (void);
+  void reset ();
 
   /// Return current size.
   size_t total_length () const;
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index 1ac9dee887c..f30f3aa1fb5 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -1053,7 +1053,7 @@ ACE_OutputCDR::register_monitor (const char *id)
 }
 
 void
-ACE_OutputCDR::unregister_monitor (void)
+ACE_OutputCDR::unregister_monitor ()
 {
   this->monitor_->remove_from_registry ();
 }
@@ -2337,7 +2337,7 @@ ACE_InputCDR::register_monitor (const char *id)
 }
 
 void
-ACE_InputCDR::unregister_monitor (void)
+ACE_InputCDR::unregister_monitor ()
 {
   this->monitor_->remove_from_registry ();
 }
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 6cb27ede244..c1cd9973303 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -536,7 +536,7 @@ public:
 #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1)
   /// Register and unregister our buffer size monitor.
   void register_monitor (const char* id);
-  void unregister_monitor (void);
+  void unregister_monitor ();
 #endif /* ACE_HAS_MONITOR_POINTS==1 */
 
 private:
@@ -1086,7 +1086,7 @@ public:
 #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1)
   /// Register and unregister our buffer size monitor.
   void register_monitor (const char* id);
-  void unregister_monitor (void);
+  void unregister_monitor ();
 #endif /* ACE_HAS_MONITOR_POINTS==1 */
 
 protected:
diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h
index f2497487d42..032f03924b6 100644
--- a/ACE/ace/CE_Screen_Output.h
+++ b/ACE/ace/CE_Screen_Output.h
@@ -48,7 +48,7 @@ class ACE_Export ACE_CE_Screen_Output : public ACE_Log_Msg_Callback
 public:
   ACE_CE_Screen_Output (HWND hEdit);
 
-  ACE_CE_Screen_Output (void);
+  ACE_CE_Screen_Output ();
 
   virtual ~ACE_CE_Screen_Output();
 
@@ -58,7 +58,7 @@ public:
   /// Interface to specify active window handle.
   void SetOutputWindow (HWND hWnd);
 
-  void clear (void);
+  void clear ();
 
   /// Stream insertion operator that performs actual print out.
   /**
diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp
index 40933e8928e..229b982ac96 100644
--- a/ACE/ace/Cache_Map_Manager_T.cpp
+++ b/ACE/ace/Cache_Map_Manager_T.cpp
@@ -33,7 +33,7 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
 }
 
 template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES>
-ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Manager (void)
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Manager ()
 {
   this->close ();
 }
@@ -47,7 +47,7 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
 }
 
 template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> int
-ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::close (void)
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::close ()
 {
   return this->map_.close ();
 }
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index 74de2ec6bb3..10490c2167e 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -98,14 +98,14 @@ public:
 
   /// Close down a <Cache_Map_Manager> and release dynamically allocated
   /// resources.
-  virtual ~ACE_Cache_Map_Manager (void);
+  virtual ~ACE_Cache_Map_Manager ();
 
   /// Initialize a cache with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
             ACE_Allocator *alloc = nullptr);
 
   /// Close down a cache and release dynamically allocated resources.
-  int close (void);
+  int close ();
 
   /**
    * Associate @a key with @a value.  If @a key is already in the CMAP_TYPE
@@ -187,7 +187,7 @@ public:
               VALUE &value);
 
   /// Remove entries from the cache depending upon the strategy.
-  int purge (void);
+  int purge ();
 
   /// Return the current size of the cache.
   size_t current_size () const;
@@ -201,18 +201,18 @@ public:
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  ITERATOR begin (void);
-  ITERATOR end (void);
+  ITERATOR begin ();
+  ITERATOR end ();
 
   /// Return reverse iterator.
-  REVERSE_ITERATOR rbegin (void);
-  REVERSE_ITERATOR rend (void);
+  REVERSE_ITERATOR rbegin ();
+  REVERSE_ITERATOR rend ();
 
   /// The map managed by the Cache_Map_Manager.
-  CMAP_TYPE &map (void);
+  CMAP_TYPE &map ();
 
   /// The caching strategy used on the cache.
-  CACHING_STRATEGY &caching_strategy (void);
+  CACHING_STRATEGY &caching_strategy ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -278,20 +278,20 @@ public:
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance
-  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void);
+  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ ();
 
   /// Postfix advance.
   ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void);
+  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- ();
 
   /// Postfix reverse.
   ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int);
 
   /// Returns the iterator of the internal map in the custody of the
   /// Cache_Map_Manager.
-  IMPLEMENTATION &iterator_implementation (void);
+  IMPLEMENTATION &iterator_implementation ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -351,20 +351,20 @@ public:
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance
-  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void);
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ ();
 
   /// Postfix advance.
   ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void);
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- ();
 
   /// Postfix reverse.
   ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int);
 
   /// Returns the iterator of the internal map in the custody of the
   /// Cache_Map_Manager.
-  REVERSE_IMPLEMENTATION &iterator_implementation (void);
+  REVERSE_IMPLEMENTATION &iterator_implementation ();
 
   /// Dump the state of an object.
   void dump () const;
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index 2fa0f6bfa83..ee11f25d8ae 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -36,7 +36,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void)
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex ()
 {
   cleanup ();
 }
@@ -457,13 +457,13 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections (void)
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections ()
 {
   return this->connection_cache_.purge ();
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> CACHING_STRATEGY &
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy (void)
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy ()
 {
   return this->connection_cache_.caching_strategy ();
 }
@@ -522,7 +522,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> void
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup (void)
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup ()
 {
   // Excluded other threads from changing the cache while we cleanup
   ACE_GUARD (MUTEX, ace_mon, *this->lock_);
diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index ef2a0a8c33d..dd7ac7d3da2 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -57,10 +57,10 @@ public:
     int delete_lock = 0);
 
   /// Destructor
-  virtual ~ACE_Cached_Connect_Strategy_Ex (void);
+  virtual ~ACE_Cached_Connect_Strategy_Ex ();
 
   /// Explicit purging of connection entries from the connection cache.
-  virtual int purge_connections (void);
+  virtual int purge_connections ();
 
   /// Mark as closed (non-locking version). This is used during the cleanup of the
   /// connections purged.
@@ -71,7 +71,7 @@ public:
    * method had to be devised to avoid memory leaks and perform
    * cleanup of the <connection_cache_>.
    */
-  void cleanup (void);
+  void cleanup ();
 
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
@@ -100,7 +100,7 @@ public:
           CCSBASE;
 
   // = Accessor.
-  CACHING_STRATEGY &caching_strategy (void);
+  CACHING_STRATEGY &caching_strategy ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Caching_Strategies_T.cpp b/ACE/ace/Caching_Strategies_T.cpp
index 0cc25407a26..27d1827c575 100644
--- a/ACE/ace/Caching_Strategies_T.cpp
+++ b/ACE/ace/Caching_Strategies_T.cpp
@@ -15,14 +15,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::~ACE_Caching_Strategy (void)
+ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::~ACE_Caching_Strategy ()
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////////
 
 template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy (void)
+ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy ()
   : timer_ (0),
     purge_percent_ (10)
 {
@@ -31,7 +31,7 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy (void)
+ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy ()
   : purge_percent_ (10)
 {
 }
@@ -39,7 +39,7 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_FIFO_Caching_Strategy (void)
+ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_FIFO_Caching_Strategy ()
   : order_ (0),
     purge_percent_ (10)
 {
diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h
index c46e30dd957..4441c1ae104 100644
--- a/ACE/ace/Caching_Strategies_T.h
+++ b/ACE/ace/Caching_Strategies_T.h
@@ -43,7 +43,7 @@ class ACE_Caching_Strategy
 {
 public:
   /// Destructor.
-  virtual ~ACE_Caching_Strategy (void);
+  virtual ~ACE_Caching_Strategy ();
 
   /// Accessor method for the timer attributes.
   virtual ATTRIBUTES attributes (void) = 0;
@@ -113,13 +113,13 @@ public:
                                 bool delete_implementation = false);
 
   /// Destructor.
-  ~ACE_Caching_Strategy_Adapter (void);
+  ~ACE_Caching_Strategy_Adapter ();
 
   /// Accessor method for the timer attributes.
-  ATTRIBUTES attributes (void);
+  ATTRIBUTES attributes ();
 
   /// Get the percentage of entries to purge.
-  double purge_percent (void);
+  double purge_percent ();
 
   /// Set the percentage of entries to purge.
   void purge_percent (double percentage);
@@ -152,10 +152,10 @@ public:
                      const ATTRIBUTES &attr);
 
   /// Accessor to the implementation.
-  IMPLEMENTATION &implementation (void);
+  IMPLEMENTATION &implementation ();
 
   /// Purge the cache.
-  CACHING_UTILITY &caching_utility (void);
+  CACHING_UTILITY &caching_utility ();
 
   /// Dumps the state of the object.
   void dump () const;
@@ -209,15 +209,15 @@ public:
    * in the cache which can be purged automagically and by default is
    * set to 10%.
    */
-  ACE_LRU_Caching_Strategy (void);
+  ACE_LRU_Caching_Strategy ();
 
   // = Operations of the strategy.
 
   /// Accessor method for the timer attributes.
-  ATTRIBUTES attributes (void);
+  ATTRIBUTES attributes ();
 
   /// Get the percentage of entries to purge.
-  double purge_percent (void);
+  double purge_percent ();
 
   /// Set the percentage of entries to purge.
   void purge_percent (double percentage);
@@ -251,7 +251,7 @@ public:
                      const ATTRIBUTES &attr);
 
   /// Purge the cache.
-  CACHING_UTILITY &caching_utility (void);
+  CACHING_UTILITY &caching_utility ();
 
   /// Dumps the state of the object.
   void dump () const;
@@ -310,15 +310,15 @@ public:
    * in the cache which can be purged automagically and by default is
    * set to 10%.
    */
-  ACE_LFU_Caching_Strategy (void);
+  ACE_LFU_Caching_Strategy ();
 
   // = Strategy methods.
 
   /// Access the attributes.
-  ATTRIBUTES attributes (void);
+  ATTRIBUTES attributes ();
 
   /// Get the percentage of entries to purge.
-  double purge_percent (void);
+  double purge_percent ();
 
   /// Set the percentage of entries to purge.
   void purge_percent (double percentage);
@@ -350,7 +350,7 @@ public:
                      const ATTRIBUTES &attr);
 
   /// Purge the cache.
-  CACHING_UTILITY &caching_utility (void);
+  CACHING_UTILITY &caching_utility ();
 
   /// Dumps the state of the object.
   void dump () const;
@@ -402,15 +402,15 @@ public:
    * in the cache which can be purged automagically and by default is
    * set to 10%.
    */
-  ACE_FIFO_Caching_Strategy (void);
+  ACE_FIFO_Caching_Strategy ();
 
   // = Strategy methods.
 
   /// Accessor method.
-  ATTRIBUTES attributes (void);
+  ATTRIBUTES attributes ();
 
   /// Get the percentage of entries to purge.
-  double purge_percent (void);
+  double purge_percent ();
 
   /// Set the percentage of entries to purge.
   void purge_percent (double percentage);
@@ -441,7 +441,7 @@ public:
                      const ATTRIBUTES &attr);
 
   /// Purge the cache.
-  CACHING_UTILITY &caching_utility (void);
+  CACHING_UTILITY &caching_utility ();
 
   /// Dumps the state of the object.
   void dump () const;
@@ -484,10 +484,10 @@ public:
   // = Strategy methods. All are NO_OP methods!!!
 
   /// Accessor method.
-  ATTRIBUTES attributes (void);
+  ATTRIBUTES attributes ();
 
   /// Get the percentage of entries to purge.
-  double purge_percent (void);
+  double purge_percent ();
 
   /// Set the percentage of entries to purge.
   void purge_percent (double percentage);
@@ -518,7 +518,7 @@ public:
                      const ATTRIBUTES &attr);
 
   /// Purge the cache.
-  CACHING_UTILITY &caching_utility (void);
+  CACHING_UTILITY &caching_utility ();
 
   /// Dumps the state of the object.
   void dump () const;
diff --git a/ACE/ace/Caching_Utility_T.cpp b/ACE/ace/Caching_Utility_T.cpp
index e9260b64872..2f0ea2c295a 100644
--- a/ACE/ace/Caching_Utility_T.cpp
+++ b/ACE/ace/Caching_Utility_T.cpp
@@ -31,7 +31,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_
 }
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Pair_Caching_Utility (void)
+ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Pair_Caching_Utility ()
 {
   if (this->delete_cleanup_strategy_)
     delete this->cleanup_strategy_;
@@ -129,7 +129,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
 }
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Recyclable_Handler_Caching_Utility (void)
+ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Recyclable_Handler_Caching_Utility ()
 {
   if (this->delete_cleanup_strategy_)
     delete this->cleanup_strategy_;
@@ -249,7 +249,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO
 }
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void)
+ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Refcounted_Recyclable_Handler_Caching_Utility ()
 {
   if (this->delete_cleanup_strategy_)
     delete this->cleanup_strategy_;
@@ -373,7 +373,7 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Ha
 }
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Handler_Caching_Utility (void)
+ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Handler_Caching_Utility ()
 {
   if (this->delete_cleanup_strategy_)
     delete this->cleanup_strategy_;
@@ -466,7 +466,7 @@ ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Null_
 }
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Null_Caching_Utility (void)
+ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Null_Caching_Utility ()
 {
   if (this->delete_cleanup_strategy_)
     delete this->cleanup_strategy_;
diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h
index a86b87d7318..a8d4755541b 100644
--- a/ACE/ace/Caching_Utility_T.h
+++ b/ACE/ace/Caching_Utility_T.h
@@ -50,7 +50,7 @@ public:
                             bool delete_cleanup_strategy = false);
 
   /// Destructor.
-  ~ACE_Pair_Caching_Utility (void);
+  ~ACE_Pair_Caching_Utility ();
 
   /**
    * Purge entries from the @a container. The Cleanup_Strategy will do the
@@ -98,7 +98,7 @@ public:
                                           bool delete_cleanup_strategy = false);
 
   /// Destructor.
-  ~ACE_Recyclable_Handler_Caching_Utility (void);
+  ~ACE_Recyclable_Handler_Caching_Utility ();
 
   /**
    * Purge entries from the @a container. The Cleanup_Strategy will do
@@ -148,7 +148,7 @@ public:
                                                      bool delete_cleanup_strategy = false);
 
   /// Destructor.
-  ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void);
+  ~ACE_Refcounted_Recyclable_Handler_Caching_Utility ();
 
   /**
    * Purge entries from the @a container. The Cleanup_Strategy will do
@@ -204,7 +204,7 @@ public:
                                bool delete_cleanup_strategy = false);
 
   /// Destructor.
-  ~ACE_Handler_Caching_Utility (void);
+  ~ACE_Handler_Caching_Utility ();
 
   /**
    * Purge entries from the @a container. The Cleanup_Strategy will do
@@ -257,7 +257,7 @@ public:
                             bool delete_cleanup_strategy = false);
 
   /// Destructor.
-  ~ACE_Null_Caching_Utility (void);
+  ~ACE_Null_Caching_Utility ();
 
   /**
    * Purge entries from the @a container. The Cleanup_Strategy will do
diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h
index 96abff06465..a5364e4ac7b 100644
--- a/ACE/ace/Capabilities.h
+++ b/ACE/ace/Capabilities.h
@@ -135,10 +135,10 @@ public:
   typedef  ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_CapEntry *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> CAPABILITIES_MAP;
 
   /// The Constructor
-  ACE_Capabilities (void);
+  ACE_Capabilities ();
 
   /// The Destructor
-  ~ACE_Capabilities(void);
+  ~ACE_Capabilities();
 
 public:
   /// Get a string entry.
@@ -172,7 +172,7 @@ protected:
   int is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line);
 
   /// Reset the set of capabilities
-  void resetcaps (void);
+  void resetcaps ();
 
 private:
   /// This is the set of ACE_CapEntry.
diff --git a/ACE/ace/Cleanup_Strategies_T.cpp b/ACE/ace/Cleanup_Strategies_T.cpp
index ecf960124fa..004b9c0c0a7 100644
--- a/ACE/ace/Cleanup_Strategies_T.cpp
+++ b/ACE/ace/Cleanup_Strategies_T.cpp
@@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER>
-ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void)
+ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy ()
 {
 }
 
diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h
index c90dd5c5a5b..65a67cb3143 100644
--- a/ACE/ace/Cleanup_Strategies_T.h
+++ b/ACE/ace/Cleanup_Strategies_T.h
@@ -37,7 +37,7 @@ class ACE_Cleanup_Strategy
 {
 public:
   /// Destructor.
-  virtual ~ACE_Cleanup_Strategy (void);
+  virtual ~ACE_Cleanup_Strategy ();
 
   /// The method which will do the cleanup of the entry in the container.
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
diff --git a/ACE/ace/Codecs.h b/ACE/ace/Codecs.h
index 48a3a48eabd..c311393ac18 100644
--- a/ACE/ace/Codecs.h
+++ b/ACE/ace/Codecs.h
@@ -87,7 +87,7 @@ private:
   ACE_Base64 & operator= (ACE_Base64 const &) = delete;
 
   /// Initialize the tables for encoding/decoding.
-  static void init (void);
+  static void init ();
 
 private:
   /// Alphabet used for decoding i.e decoder_[alphabet_[i = 0..63]] = i
diff --git a/ACE/ace/Codeset_IBM1047.cpp b/ACE/ace/Codeset_IBM1047.cpp
index 014a833ec1f..04938ad7443 100644
--- a/ACE/ace/Codeset_IBM1047.cpp
+++ b/ACE/ace/Codeset_IBM1047.cpp
@@ -63,11 +63,11 @@ namespace
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_IBM1047_ISO8859::ACE_IBM1047_ISO8859 (void)
+ACE_IBM1047_ISO8859::ACE_IBM1047_ISO8859 ()
 {
 }
 
-ACE_IBM1047_ISO8859::~ACE_IBM1047_ISO8859 (void)
+ACE_IBM1047_ISO8859::~ACE_IBM1047_ISO8859 ()
 {
 }
 
@@ -212,11 +212,11 @@ ACE_IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out,
 
 // ****************************************************************
 
-ACE_ISO8859_IBM1047::ACE_ISO8859_IBM1047 (void)
+ACE_ISO8859_IBM1047::ACE_ISO8859_IBM1047 ()
 {
 }
 
-ACE_ISO8859_IBM1047::~ACE_ISO8859_IBM1047 (void)
+ACE_ISO8859_IBM1047::~ACE_ISO8859_IBM1047 ()
 {
 }
 
diff --git a/ACE/ace/Codeset_IBM1047.h b/ACE/ace/Codeset_IBM1047.h
index d9d84aa4019..d4014982d7f 100644
--- a/ACE/ace/Codeset_IBM1047.h
+++ b/ACE/ace/Codeset_IBM1047.h
@@ -43,10 +43,10 @@ class ACE_Export ACE_IBM1047_ISO8859 : public ACE_Char_Codeset_Translator
 {
 public:
   /// A do nothing constructor.
-  ACE_IBM1047_ISO8859 (void);
+  ACE_IBM1047_ISO8859 ();
 
   /// Virtual destruction
-  virtual ~ACE_IBM1047_ISO8859 (void);
+  virtual ~ACE_IBM1047_ISO8859 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_char (ACE_InputCDR &,
@@ -88,10 +88,10 @@ class ACE_Export ACE_ISO8859_IBM1047 : public ACE_Char_Codeset_Translator
 {
 public:
   /// A do nothing constructor.
-  ACE_ISO8859_IBM1047 (void);
+  ACE_ISO8859_IBM1047 ();
 
   /// Virtual destruction
-  virtual ~ACE_ISO8859_IBM1047 (void);
+  virtual ~ACE_ISO8859_IBM1047 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_char (ACE_InputCDR &,
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index 65a5424aecd..7f2a954a814 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -417,7 +417,7 @@ ACE_Section_Key_Win32::ACE_Section_Key_Win32 (HKEY hKey)
 {
 }
 
-ACE_Section_Key_Win32::~ACE_Section_Key_Win32 (void)
+ACE_Section_Key_Win32::~ACE_Section_Key_Win32 ()
 {
   ::RegCloseKey (hKey_);
 }
@@ -449,7 +449,7 @@ ACE_Configuration_Win32Registry::ACE_Configuration_Win32Registry (HKEY hKey, u_l
 }
 
 
-ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry (void)
+ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry ()
 {
 }
 
diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h
index c192f0090a9..b9cb18204d9 100644
--- a/ACE/ace/Configuration.h
+++ b/ACE/ace/Configuration.h
@@ -108,7 +108,7 @@ public:
   ACE_Configuration_Section_Key (const ACE_Configuration_Section_Key &rhs);
 
   /// Destructor, decrements reference count on the referenced key.
-  ~ACE_Configuration_Section_Key (void);
+  ~ACE_Configuration_Section_Key ();
 
   /// Assignment operator, increments reference count for this object
   /// and decrements it on @a rhs.
@@ -528,7 +528,7 @@ protected:
   int load_key (const ACE_Configuration_Section_Key& key, HKEY& hKey);
 
   // Not used
-  ACE_Configuration_Win32Registry (void);
+  ACE_Configuration_Win32Registry ();
   ACE_Configuration_Win32Registry (const ACE_Configuration_Win32Registry& rhs);
   ACE_Configuration_Win32Registry& operator= (const ACE_Configuration_Win32Registry& rhs);
 
@@ -612,7 +612,7 @@ class ACE_Export ACE_Configuration_Value_IntId
 {
 public:
   /// Default constructor
-  ACE_Configuration_Value_IntId (void);
+  ACE_Configuration_Value_IntId ();
 
   /// String constructor, takes ownership of string
   explicit ACE_Configuration_Value_IntId (ACE_TCHAR* string);
@@ -627,7 +627,7 @@ public:
   ACE_Configuration_Value_IntId (const ACE_Configuration_Value_IntId& rhs);
 
   /// Destructor
-  ~ACE_Configuration_Value_IntId (void);
+  ~ACE_Configuration_Value_IntId ();
 
   /// Assignment operator
   ACE_Configuration_Value_IntId& operator= (
@@ -673,7 +673,7 @@ class ACE_Export ACE_Configuration_Section_IntId
 {
 public:
   /// Default ctor
-  ACE_Configuration_Section_IntId (void);
+  ACE_Configuration_Section_IntId ();
 
   /// Named ctor
   ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map,
@@ -683,7 +683,7 @@ public:
   ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs);
 
   /// Destructor
-  ~ACE_Configuration_Section_IntId (void);
+  ~ACE_Configuration_Section_IntId ();
 
   /// Assignment operator
   ACE_Configuration_Section_IntId& operator= (
@@ -739,7 +739,7 @@ public:
 
 protected:
   /// Destructor - will delete the iterators
-  virtual ~ACE_Configuration_Section_Key_Heap (void);
+  virtual ~ACE_Configuration_Section_Key_Heap ();
 
   // Not used
   ACE_Configuration_Section_Key_Heap (const ACE_Configuration_Section_Key_Heap& rhs);
diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp
index 0e64c23d5d7..4e7f83b3687 100644
--- a/ACE/ace/Connector.cpp
+++ b/ACE/ace/Connector.cpp
@@ -44,21 +44,21 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler (A
 }
 
 template <typename SVC_HANDLER>
-ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::~ACE_NonBlocking_Connect_Handler (void)
+ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::~ACE_NonBlocking_Connect_Handler ()
 {
   if (this->cleanup_svc_handler_)
     this->cleanup_svc_handler_->remove_reference ();
 }
 
 template <typename SVC_HANDLER> SVC_HANDLER *
-ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler (void)
+ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler ()
 {
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler");
   return this->svc_handler_;
 }
 
 template <typename SVC_HANDLER> long
-ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (void)
+ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id ()
 {
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id");
   return this->timer_id_;
@@ -213,7 +213,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception (ACE_HANDLE h)
 }
 
 template <typename SVC_HANDLER> int
-ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler (void)
+ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler ()
 {
   return ACE_Event_Handler::ACE_EVENT_HANDLER_NOT_RESUMED;
 }
@@ -612,7 +612,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::nonblocking_connect
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR>
-ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector (void)
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector ()
 {
   ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector");
 
@@ -669,13 +669,13 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor () const
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Unbounded_Set<ACE_HANDLE> &
-ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::non_blocking_handles (void)
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::non_blocking_handles ()
 {
   return this->non_blocking_handles_;
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
-ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void)
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close ()
 {
   // If there are no non-blocking handle pending, return immediately.
   if (this->non_blocking_handles ().size () == 0)
@@ -734,7 +734,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void)
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
-ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini (void)
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini ()
 {
   ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini");
 
@@ -751,14 +751,14 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::init (int, ACE_TCHAR *[])
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
-ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend (void)
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend ()
 {
   ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend");
   return -1;
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
-ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume (void)
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume ()
 {
   ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume");
   return -1;
@@ -896,7 +896,7 @@ ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Strategy_Connector
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR>
-ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector (void)
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector ()
 {
   ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector");
 
@@ -905,7 +905,7 @@ ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector (vo
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
-ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void)
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::close ()
 {
   if (this->delete_creation_strategy_)
     delete this->creation_strategy_;
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index d611f9d6b99..11617eeb870 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -348,7 +348,7 @@ protected:
 
   /// Return the handle set representing the non-blocking connects in
   /// progress.
-  ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles (void);
+  ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles ();
 
   // = Dynamic linking hooks.
   /// Default version does no work and returns -1.  Must be overloaded
@@ -463,10 +463,10 @@ public:
                     int flags = 0);
 
   /// Shutdown a connector and release resources.
-  virtual ~ACE_Strategy_Connector (void);
+  virtual ~ACE_Strategy_Connector ();
 
   /// Close down the Connector
-  virtual int close (void);
+  virtual int close ();
 
   // = Strategies accessors
   virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy () const;
diff --git a/ACE/ace/DEV.h b/ACE/ace/DEV.h
index c7940ff8dc5..16f9423796d 100644
--- a/ACE/ace/DEV.h
+++ b/ACE/ace/DEV.h
@@ -33,7 +33,7 @@ class ACE_Export ACE_DEV : public ACE_IO_SAP
 {
 public:
   /// Close down the DEVICE
-  int close (void);
+  int close ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -50,7 +50,7 @@ public:
 
 protected:
   /// Ensure that this class is an abstract base class
-  ACE_DEV (void);
+  ACE_DEV ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/DEV_Addr.h b/ACE/ace/DEV_Addr.h
index 2609a3febc0..8a22565a570 100644
--- a/ACE/ace/DEV_Addr.h
+++ b/ACE/ace/DEV_Addr.h
@@ -32,7 +32,7 @@ class ACE_Export ACE_DEV_Addr : public ACE_Addr
 {
 public:
   /// Default constructor.
-  ACE_DEV_Addr (void);
+  ACE_DEV_Addr ();
 
   /// Copy constructor.
   ACE_DEV_Addr (const ACE_DEV_Addr &sa);
diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h
index 6363cba6e15..123fb54dca7 100644
--- a/ACE/ace/DEV_Connector.h
+++ b/ACE/ace/DEV_Connector.h
@@ -31,7 +31,7 @@ class ACE_Export ACE_DEV_Connector
 {
 public:
   /// Default constructor.
-  ACE_DEV_Connector (void);
+  ACE_DEV_Connector ();
 
   /**
    * Actively connect and produce a @a new_io if things go well.
diff --git a/ACE/ace/DEV_IO.h b/ACE/ace/DEV_IO.h
index 8188daf4ea4..06cbb39479f 100644
--- a/ACE/ace/DEV_IO.h
+++ b/ACE/ace/DEV_IO.h
@@ -41,7 +41,7 @@ public:
   friend class ACE_DEV_Connector;
 
   /// Default constructor.
-  ACE_DEV_IO (void);
+  ACE_DEV_IO ();
 
   // = Various send operations.
   /// send upto @a n bytes in @a buf.
diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h
index 9c320d20553..6adcc2ceaa8 100644
--- a/ACE/ace/DLL_Manager.h
+++ b/ACE/ace/DLL_Manager.h
@@ -271,13 +271,13 @@ protected:
   ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE);
 
   /// Destructor.
-  ~ACE_DLL_Manager (void);
+  ~ACE_DLL_Manager ();
 
   /// Allocate handle_vector_.
   int open (int size);
 
   /// Close all open dlls and deallocate memory.
-  int close (void);
+  int close ();
 
   /// Find dll in handle_vector_.
   ACE_DLL_Handle *find_dll (const ACE_TCHAR *dll_name) const;
@@ -287,7 +287,7 @@ protected:
 
 private:
   /// Close the singleton instance.
-  static void close_singleton (void);
+  static void close_singleton ();
 
   ACE_DLL_Manager (const ACE_DLL_Manager &) = delete;
   void operator= (const ACE_DLL_Manager &) = delete;
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 05efadb696a..6b0d99b5e94 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -67,7 +67,7 @@ class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify
 {
 public:
   /// Constructor
-  ACE_Dev_Poll_Reactor_Notify (void);
+  ACE_Dev_Poll_Reactor_Notify ();
 
   /**
    * @name Initialization and Termination Methods
@@ -78,7 +78,7 @@ public:
   virtual int open (ACE_Reactor_Impl *,
                     ACE_Timer_Queue *timer_queue = 0,
                     int disable_notify = 0);
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Called by a thread when it wants to unblock the Reactor_Impl.
@@ -107,7 +107,7 @@ public:
   /// Returns the ACE_HANDLE of the notify pipe on which the reactor
   /// is listening for notifications so that other threads can unblock
   /// the Reactor_Impl.
-  virtual ACE_HANDLE notify_handle (void);
+  virtual ACE_HANDLE notify_handle ();
 
   /// Verify whether the buffer has dispatchable info or not.
   virtual int is_dispatchable (ACE_Notification_Buffer &buffer);
@@ -142,7 +142,7 @@ public:
    * passed in via the notify queue before breaking out of its event
    * loop.
    */
-  virtual int max_notify_iterations (void);
+  virtual int max_notify_iterations ();
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -314,7 +314,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
   {
   public:
     /// Constructor.
-    Handler_Repository (void);
+    Handler_Repository ();
 
     /// Initialize a repository that can map handles up to the value @a size.
     /// Since the event tuples are accessed directly using the handle as
@@ -322,7 +322,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
     int open (size_t size);
 
     /// Close down the repository.
-    int close (void);
+    int close ();
 
     /**
      * @name Repository Manipulation Operations
@@ -346,7 +346,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
     int unbind (ACE_HANDLE handle, bool decr_refcnt = true);
 
     /// Remove all the registered tuples.
-    int unbind_all (void);
+    int unbind_all ();
 
     //@}
 
@@ -431,7 +431,7 @@ public:
                         int s_queue = ACE_DEV_POLL_TOKEN::FIFO);
 
   /// Close down and release all resources.
-  virtual ~ACE_Dev_Poll_Reactor (void);
+  virtual ~ACE_Dev_Poll_Reactor ();
 
   /// Initialization.
   virtual int open (size_t size,
@@ -461,7 +461,7 @@ public:
   virtual ACE_Timer_Queue *timer_queue () const;
 
   /// Close down and release all resources.
-  virtual int close (void);
+  virtual int close ();
 
   // = Event loop drivers.
   /**
@@ -522,7 +522,7 @@ public:
    *         non-zero, @c handle_events() and
    *         @c handle_alertable_events() return -1 immediately.
    */
-  virtual int deactivated (void);
+  virtual int deactivated ();
 
   /**
    * Control whether the Reactor will handle any more incoming events
@@ -632,7 +632,7 @@ public:
   virtual int suspend_handler (const ACE_Handle_Set &handles);
 
   /// Suspend all handles temporarily.
-  virtual int suspend_handlers (void);
+  virtual int suspend_handlers ();
 
   /// Resume event_handler. Use ACE_Event_Handler::get_handle() to
   /// get the handle.
@@ -645,16 +645,16 @@ public:
   virtual int resume_handler (const ACE_Handle_Set &handles);
 
   /// Resume all handles.
-  virtual int resume_handlers (void);
+  virtual int resume_handlers ();
 
   /// Does the reactor allow the application to resume the handle on
   /// its own, i.e., can it pass on the control of handle resumption to
   /// the application.
-  virtual int resumable_handler (void);
+  virtual int resumable_handler ();
 
   /// Return true if we any event associations were made by the reactor
   /// for the handles that it waits on, false otherwise.
-  virtual bool uses_event_associations (void);
+  virtual bool uses_event_associations ();
 
   // = Timer management.
 
@@ -760,7 +760,7 @@ public:
    * via the notify queue before breaking out of its
    * ACE_Message_Queue::dequeue() loop.
    */
-  virtual int max_notify_iterations (void);
+  virtual int max_notify_iterations ();
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -795,17 +795,17 @@ public:
 
   /// Returns true if Reactor has been successfully initialized, else
   /// false.
-  virtual bool initialized (void);
+  virtual bool initialized ();
 
   /// Returns the current size of the Reactor's internal descriptor
   /// table.
   virtual size_t size () const;
 
   /// Returns a reference to the Reactor's internal repository lock.
-  virtual ACE_Lock &lock (void);
+  virtual ACE_Lock &lock ();
 
   /// Wake up all threads waiting in the event loop.
-  virtual void wakeup_all_threads (void);
+  virtual void wakeup_all_threads ();
 
   /// Transfers ownership of Reactor_Impl to the @a new_owner.
   /**
@@ -826,7 +826,7 @@ public:
   virtual int owner (ACE_thread_t *owner);
 
   /// Get the existing restart value.
-  virtual bool restart (void);
+  virtual bool restart ();
 
   /// Set a new value for restart and return the original value.
   /**
@@ -848,7 +848,7 @@ public:
   /**
    * @note This is currently a no-op.
    */
-  virtual int requeue_position (void);
+  virtual int requeue_position ();
 
   /**
    * @name Low-level wait_set mask manipulation methods
@@ -1096,14 +1096,14 @@ protected:
 
     /// Destructor. This will release the token if it hasn't been
     /// released till this point
-    ~Token_Guard (void);
+    ~Token_Guard ();
 
     /// Release the token ..
-    void release_token (void);
+    void release_token ();
 
     /// Returns whether the thread that created this object owns the
     /// token or not.
-    bool is_owner (void);
+    bool is_owner ();
 
     /// A helper method that acquires the token 1) at a low priority, and
     /// 2) wait quietly for the token, not waking another thread. This
@@ -1162,11 +1162,11 @@ public:
    * The destructor decrements the reference count on the event
    * handler corresponding to the given handle.
    */
-  ~ACE_Dev_Poll_Handler_Guard (void);
+  ~ACE_Dev_Poll_Handler_Guard ();
 
   /// Release the event handler from this guard; when the destructor is
   /// called, the handler's reference count will not be decremented.
-  void release (void);
+  void release ();
 
 private:
   /// The event handler being managed.
diff --git a/ACE/ace/Dump.h b/ACE/ace/Dump.h
index c07193a5b0b..0547266a4a9 100644
--- a/ACE/ace/Dump.h
+++ b/ACE/ace/Dump.h
@@ -115,7 +115,7 @@ public:
 
   /// Iterates through the entire set of registered objects and
   /// dumps their state.
-  void dump_objects (void);
+  void dump_objects ();
 
   /// Add the tuple <dumper, this_> to the list of registered ACE objects.
   void register_object (const ACE_Dumpable *dumper);
@@ -125,7 +125,7 @@ public:
   void remove_object (const void *this_);
 
   /// Interface to the Singleton instance of the object database.
-  static ACE_ODB *instance (void);
+  static ACE_ODB *instance ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ace/Dump_T.cpp b/ACE/ace/Dump_T.cpp
index 240d2fbfc42..6d0bc56d0e0 100644
--- a/ACE/ace/Dump_T.cpp
+++ b/ACE/ace/Dump_T.cpp
@@ -13,7 +13,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class Concrete>
-ACE_Dumpable_Adapter<Concrete>::~ACE_Dumpable_Adapter (void)
+ACE_Dumpable_Adapter<Concrete>::~ACE_Dumpable_Adapter ()
 {
   ACE_TRACE ("ACE_Dumpable_Adapter<Concrete>::~ACE_Dumpable_Adapter");
 }
diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h
index b9200fbc1b9..ead87898acf 100644
--- a/ACE/ace/Dump_T.h
+++ b/ACE/ace/Dump_T.h
@@ -39,7 +39,7 @@ class ACE_Dumpable_Adapter : public ACE_Dumpable
 {
 public:
   ACE_Dumpable_Adapter (const Concrete *t);
-  ~ACE_Dumpable_Adapter (void);
+  ~ACE_Dumpable_Adapter ();
 
   /// Concrete dump method (simply delegates to the dump() method of
   /// <class Concrete>).
diff --git a/ACE/ace/Dynamic_Service_Dependency.h b/ACE/ace/Dynamic_Service_Dependency.h
index bb5294f408e..484660eb717 100644
--- a/ACE/ace/Dynamic_Service_Dependency.h
+++ b/ACE/ace/Dynamic_Service_Dependency.h
@@ -51,7 +51,7 @@ public:
   ACE_Dynamic_Service_Dependency  (const ACE_Service_Gestalt *cfg,
                                    const ACE_TCHAR *principal);
   ACE_Dynamic_Service_Dependency  (const ACE_TCHAR *principal);
-  ~ACE_Dynamic_Service_Dependency (void);
+  ~ACE_Dynamic_Service_Dependency ();
 
 private:
   void init (const ACE_Service_Gestalt *cfg, const ACE_TCHAR *principal);
diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp
index e5d6fe7dc6f..74569e80eae 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.cpp
+++ b/ACE/ace/ETCL/ETCL_Constraint.cpp
@@ -67,7 +67,7 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint (
   this->op_.str_ = ACE::strnew (str);
 }
 
-ETCL_Literal_Constraint::~ETCL_Literal_Constraint (void)
+ETCL_Literal_Constraint::~ETCL_Literal_Constraint ()
 {
   if (this->type_ == ACE_ETCL_STRING)
     {
@@ -384,7 +384,7 @@ ETCL_Literal_Constraint::operator/ (const ETCL_Literal_Constraint & rhs)
 }
 
 ETCL_Literal_Constraint
-ETCL_Literal_Constraint::operator- (void)
+ETCL_Literal_Constraint::operator- ()
 {
   switch (this->type_)
   {
@@ -465,7 +465,7 @@ ETCL_Identifier::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Union_Value::~ETCL_Union_Value (void)
+ETCL_Union_Value::~ETCL_Union_Value ()
 {
   delete this->string_;
   delete this->integer_;
@@ -479,7 +479,7 @@ ETCL_Union_Value::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Union_Pos::~ETCL_Union_Pos (void)
+ETCL_Union_Pos::~ETCL_Union_Pos ()
 {
   delete this->component_;
   delete this->union_value_;
@@ -493,7 +493,7 @@ ETCL_Union_Pos::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Component_Pos::~ETCL_Component_Pos (void)
+ETCL_Component_Pos::~ETCL_Component_Pos ()
 {
   delete this->component_;
   delete this->integer_;
@@ -507,7 +507,7 @@ ETCL_Component_Pos::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Component_Assoc::~ETCL_Component_Assoc (void)
+ETCL_Component_Assoc::~ETCL_Component_Assoc ()
 {
   delete this->component_;
   delete this->identifier_;
@@ -521,7 +521,7 @@ ETCL_Component_Assoc::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Component_Array::~ETCL_Component_Array (void)
+ETCL_Component_Array::~ETCL_Component_Array ()
 {
   delete this->component_;
   delete this->integer_;
@@ -543,7 +543,7 @@ ETCL_Special::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Component::~ETCL_Component (void)
+ETCL_Component::~ETCL_Component ()
 {
   delete this->component_;
   delete this->identifier_;
@@ -557,7 +557,7 @@ ETCL_Component::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Dot::~ETCL_Dot (void)
+ETCL_Dot::~ETCL_Dot ()
 {
   delete this->component_;
 }
@@ -570,7 +570,7 @@ ETCL_Dot::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Eval::~ETCL_Eval (void)
+ETCL_Eval::~ETCL_Eval ()
 {
   delete this->component_;
 }
@@ -583,7 +583,7 @@ ETCL_Eval::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Default::~ETCL_Default (void)
+ETCL_Default::~ETCL_Default ()
 {
   delete this->component_;
 }
@@ -596,7 +596,7 @@ ETCL_Default::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Exist::~ETCL_Exist (void)
+ETCL_Exist::~ETCL_Exist ()
 {
   delete this->component_;
 }
@@ -609,7 +609,7 @@ ETCL_Exist::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Unary_Expr::~ETCL_Unary_Expr (void)
+ETCL_Unary_Expr::~ETCL_Unary_Expr ()
 {
   delete this->subexpr_;
 }
@@ -622,7 +622,7 @@ ETCL_Unary_Expr::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Binary_Expr::~ETCL_Binary_Expr (void)
+ETCL_Binary_Expr::~ETCL_Binary_Expr ()
 {
   delete this->lhs_;
   delete this->rhs_;
@@ -636,7 +636,7 @@ ETCL_Binary_Expr::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Preference::~ETCL_Preference (void)
+ETCL_Preference::~ETCL_Preference ()
 {
   delete this->subexpr_;
 }
diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp
index 50d666025d8..7c220fbb6a0 100644
--- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp
+++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp
@@ -11,11 +11,11 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ETCL_Constraint_Visitor::ETCL_Constraint_Visitor (void)
+ETCL_Constraint_Visitor::ETCL_Constraint_Visitor ()
 {
 }
 
-ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor (void)
+ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor ()
 {
 }
 
diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h
index ea790676c9a..f83413f6339 100644
--- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h
+++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h
@@ -41,8 +41,8 @@ class ETCL_Preference;
 class ACE_ETCL_Export ETCL_Constraint_Visitor
 {
 public:
-  ETCL_Constraint_Visitor (void);
-  virtual ~ETCL_Constraint_Visitor (void);
+  ETCL_Constraint_Visitor ();
+  virtual ~ETCL_Constraint_Visitor ();
 
   virtual int visit_literal (ETCL_Literal_Constraint *);
   virtual int visit_identifier (ETCL_Identifier *);
diff --git a/ACE/ace/ETCL/ETCL_Interpreter.cpp b/ACE/ace/ETCL/ETCL_Interpreter.cpp
index 0eab66a65df..79f06d1e18d 100644
--- a/ACE/ace/ETCL/ETCL_Interpreter.cpp
+++ b/ACE/ace/ETCL/ETCL_Interpreter.cpp
@@ -10,12 +10,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ETCL_Parser_Export ACE_SYNCH_MUTEX ETCL_Interpreter::parserMutex__;
 
-ETCL_Interpreter::ETCL_Interpreter (void)
+ETCL_Interpreter::ETCL_Interpreter ()
   : root_ (0)
 {
 }
 
-ETCL_Interpreter::~ETCL_Interpreter (void)
+ETCL_Interpreter::~ETCL_Interpreter ()
 {
   delete this->root_;
 }
diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp
index b2bc659285e..32b64630ded 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp
+++ b/ACE/ace/ETCL/ETCL_l.cpp
@@ -1399,7 +1399,7 @@ static int input()
   }
 #endif /* YY_NO_INPUT */
 
-void yyflush_current_buffer (void)
+void yyflush_current_buffer ()
 {
   YY_FLUSH_BUFFER;
 }
@@ -1865,7 +1865,7 @@ extract_string(char* str)
 }
 
 int
-yywrap (void)
+yywrap ()
 {
   return 1;
 }
diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp
index 3f27b8a8670..15e2c0116c2 100644
--- a/ACE/ace/ETCL/ETCL_y.cpp
+++ b/ACE/ace/ETCL/ETCL_y.cpp
@@ -64,8 +64,8 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern int yylex (void);
-extern void yyflush_current_buffer (void);
+extern int yylex ();
+extern void yyflush_current_buffer ();
 
 static void yyerror (const char *)
 {
@@ -538,7 +538,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 #ifdef YYPARSE_PARAM
 int yyparse (void *);
 #else
-int yyparse (void);
+int yyparse ();
 #endif
 #endif
 
diff --git a/ACE/ace/Encoding_Converter.cpp b/ACE/ace/Encoding_Converter.cpp
index 29a3a1d18f9..9c6e71ee5f6 100644
--- a/ACE/ace/Encoding_Converter.cpp
+++ b/ACE/ace/Encoding_Converter.cpp
@@ -3,7 +3,7 @@
 #if defined (ACE_USES_WCHAR)
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Encoding_Converter::~ACE_Encoding_Converter (void)
+ACE_Encoding_Converter::~ACE_Encoding_Converter ()
 {
 }
 
diff --git a/ACE/ace/Encoding_Converter.h b/ACE/ace/Encoding_Converter.h
index c430e8f93a6..9b08f6c7d73 100644
--- a/ACE/ace/Encoding_Converter.h
+++ b/ACE/ace/Encoding_Converter.h
@@ -41,7 +41,7 @@ public:
 
   /// This destructor is here (and virtual) because we have virtual
   /// functions.
-  virtual ~ACE_Encoding_Converter (void);
+  virtual ~ACE_Encoding_Converter ();
 
   /// Convert the source (which can be in any encoding) to UTF-8 and
   /// store it in the provided target buffer.
diff --git a/ACE/ace/Event_Handler_T.cpp b/ACE/ace/Event_Handler_T.cpp
index 6c403c143ca..6e15cbbc94f 100644
--- a/ACE/ace/Event_Handler_T.cpp
+++ b/ACE/ace/Event_Handler_T.cpp
@@ -25,7 +25,7 @@ ACE_Event_Handler_T<T>::dump () const
 }
 
 template<class T>
-ACE_Event_Handler_T<T>::~ACE_Event_Handler_T (void)
+ACE_Event_Handler_T<T>::~ACE_Event_Handler_T ()
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::~ACE_Event_Handler_T");
   if (this->delete_handler_)
diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h
index 258396372a8..a222459388e 100644
--- a/ACE/ace/Event_Handler_T.h
+++ b/ACE/ace/Event_Handler_T.h
@@ -90,7 +90,7 @@ public:
                        IO_HANDLER except = 0);
 
   /// Close down and delete the <op_handler>
-  ~ACE_Event_Handler_T (void);
+  ~ACE_Event_Handler_T ();
 
   // = Override all the ACE_Event_Handler methods.
 
@@ -105,7 +105,7 @@ public:
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
 
   // = Get/set the operations handler.
-  T *op_handler (void);
+  T *op_handler ();
   void op_handler (T *);
 
   // = Get/set the target pointer-to-method used for dispatching.
diff --git a/ACE/ace/FIFO.h b/ACE/ace/FIFO.h
index efbbf8c1403..f738aa783d4 100644
--- a/ACE/ace/FIFO.h
+++ b/ACE/ace/FIFO.h
@@ -52,11 +52,11 @@ public:
             LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Close down the ACE_FIFO without removing the rendezvous point.
-  int close (void);
+  int close ();
 
   /// Close down the ACE_FIFO and remove the rendezvous point from the
   /// file system.
-  int remove (void);
+  int remove ();
 
   /// Return the local address of this endpoint.
   int get_local_addr (const ACE_TCHAR *&rendezvous) const;
@@ -74,7 +74,7 @@ protected:
    */
   //@{
   /// Default constructor.
-  ACE_FIFO (void);
+  ACE_FIFO ();
 
   /// Open up the named pipe on the @a rendezvous in accordance with the
   /// flags.
diff --git a/ACE/ace/FIFO_Recv.h b/ACE/ace/FIFO_Recv.h
index 796aadeca0d..c34bd2180ad 100644
--- a/ACE/ace/FIFO_Recv.h
+++ b/ACE/ace/FIFO_Recv.h
@@ -45,7 +45,7 @@ public:
   /// aren't any writers at the moment!
   //@{
   /// Default constructor.
-  ACE_FIFO_Recv (void);
+  ACE_FIFO_Recv ();
 
   /// Open up a bytestream named pipe for reading.
   ACE_FIFO_Recv (const ACE_TCHAR *rendezvous,
@@ -63,7 +63,7 @@ public:
   //@}
 
   /// Close down the fifo.
-  int close (void);
+  int close ();
 
   /// Recv @a buf of up to @a len bytes.
   ssize_t recv (void *buf, size_t len);
diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h
index c1a39a9669b..f731231c830 100644
--- a/ACE/ace/File_Lock.h
+++ b/ACE/ace/File_Lock.h
@@ -59,7 +59,7 @@ public:
             mode_t mode = 0);
 
   /// Remove a File lock by releasing it and closing down the <handle_>.
-  ~ACE_File_Lock (void);
+  ~ACE_File_Lock ();
 
   /// Remove a File lock by releasing it and closing down the
   /// <handle_>.  If @a unlink_file is true then we unlink the file.
diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp
index ecb2f088a19..9c3cf5992de 100644
--- a/ACE/ace/FlReactor/FlReactor.cpp
+++ b/ACE/ace/FlReactor/FlReactor.cpp
@@ -29,7 +29,7 @@ ACE_FlReactor::ACE_FlReactor (size_t size,
 #endif /* ACE_MT_SAFE */
 }
 
-ACE_FlReactor::~ACE_FlReactor (void)
+ACE_FlReactor::~ACE_FlReactor ()
 {
 }
 
@@ -230,7 +230,7 @@ ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles,
 // timeout in the Reactor's Timer_Queue.
 
 void
-ACE_FlReactor::reset_timeout (void)
+ACE_FlReactor::reset_timeout ()
 {
   ACE_Time_Value *max_wait_time =
     this->timer_queue_->calculate_timeout (0);
diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor/FlReactor.h
index e5dbee8af10..b2d3283fcb6 100644
--- a/ACE/ace/FlReactor/FlReactor.h
+++ b/ACE/ace/FlReactor/FlReactor.h
@@ -47,7 +47,7 @@ public:
   ACE_FlReactor (size_t size = DEFAULT_SIZE,
                  bool restart = false,
                  ACE_Sig_Handler * = 0);
-  virtual ~ACE_FlReactor (void);
+  virtual ~ACE_FlReactor ();
 
   // = Timer operations.
   virtual long schedule_timer (ACE_Event_Handler *event_handler,
@@ -89,7 +89,7 @@ protected:
 private:
   /// This method ensures there's an Fl timeout for the first timeout
   /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
+  void reset_timeout ();
 
   // = Integrate with the FL callback function mechanism.
   static void fl_io_proc (int fd, void*);
diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp
index 339107ba842..7bd06e49b7e 100644
--- a/ACE/ace/FoxReactor/FoxReactor.cpp
+++ b/ACE/ace/FoxReactor/FoxReactor.cpp
@@ -35,7 +35,7 @@ ACE_FoxReactor::ACE_FoxReactor (FXApp* a,
 #endif /* ACE_MT_SAFE */
 }
 
-ACE_FoxReactor::~ACE_FoxReactor (void)
+ACE_FoxReactor::~ACE_FoxReactor ()
 {
 }
 
@@ -232,7 +232,7 @@ ACE_FoxReactor::remove_handler_i (const ACE_Handle_Set &handles,
 // timeout in the Reactor's Timer_Queue.
 
 void
-ACE_FoxReactor::reset_timeout (void)
+ACE_FoxReactor::reset_timeout ()
 {
   ACE_Time_Value *max_wait_time =
     this->timer_queue_->calculate_timeout (0);
diff --git a/ACE/ace/FoxReactor/FoxReactor.h b/ACE/ace/FoxReactor/FoxReactor.h
index 220d2b56a24..f837af62f16 100644
--- a/ACE/ace/FoxReactor/FoxReactor.h
+++ b/ACE/ace/FoxReactor/FoxReactor.h
@@ -43,7 +43,7 @@ public:
                  size_t size = DEFAULT_SIZE,
                  bool restart = false,
                  ACE_Sig_Handler * = 0);
-  virtual ~ACE_FoxReactor (void);
+  virtual ~ACE_FoxReactor ();
 
   void fxapplication(FXApp* a);
 
@@ -94,7 +94,7 @@ protected:
 private:
   /// This method ensures there's an Fox timeout for the first timeout
   /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
+  void reset_timeout ();
 
   FXApp *fxapp;
 
diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp
index d77b8c0a28c..311d9df096a 100644
--- a/ACE/ace/Future.cpp
+++ b/ACE/ace/Future.cpp
@@ -20,7 +20,7 @@ ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future_Rep)
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future)
 
 template <class T>
-ACE_Future_Holder<T>::ACE_Future_Holder (void)
+ACE_Future_Holder<T>::ACE_Future_Holder ()
 {
 }
 
@@ -31,17 +31,17 @@ ACE_Future_Holder<T>::ACE_Future_Holder (const ACE_Future<T> &item)
 }
 
 template <class T>
-ACE_Future_Holder<T>::~ACE_Future_Holder (void)
+ACE_Future_Holder<T>::~ACE_Future_Holder ()
 {
 }
 
 template <class T>
-ACE_Future_Observer<T>::ACE_Future_Observer (void)
+ACE_Future_Observer<T>::ACE_Future_Observer ()
 {
 }
 
 template <class T>
-ACE_Future_Observer<T>::~ACE_Future_Observer (void)
+ACE_Future_Observer<T>::~ACE_Future_Observer ()
 {
 }
 
@@ -72,7 +72,7 @@ ACE_Future_Rep<T>::dump () const
 }
 
 template <class T> ACE_Future_Rep<T> *
-ACE_Future_Rep<T>::internal_create (void)
+ACE_Future_Rep<T>::internal_create ()
 {
   ACE_Future_Rep<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -82,7 +82,7 @@ ACE_Future_Rep<T>::internal_create (void)
 }
 
 template <class T> ACE_Future_Rep<T> *
-ACE_Future_Rep<T>::create (void)
+ACE_Future_Rep<T>::create ()
 {
   // Yes set ref count to zero.
   ACE_Future_Rep<T> *temp = internal_create ();
@@ -142,7 +142,7 @@ ACE_Future_Rep<T>::assign (ACE_Future_Rep<T>*& rep, ACE_Future_Rep<T>* new_rep)
 }
 
 template <class T>
-ACE_Future_Rep<T>::ACE_Future_Rep (void)
+ACE_Future_Rep<T>::ACE_Future_Rep ()
   : value_ (0),
     ref_count_ (0),
     value_ready_ (value_ready_mutex_)
@@ -150,7 +150,7 @@ ACE_Future_Rep<T>::ACE_Future_Rep (void)
 }
 
 template <class T>
-ACE_Future_Rep<T>::~ACE_Future_Rep (void)
+ACE_Future_Rep<T>::~ACE_Future_Rep ()
 {
   delete this->value_;
 }
@@ -288,7 +288,7 @@ ACE_Future_Rep<T>::operator T ()
 }
 
 template <class T>
-ACE_Future<T>::ACE_Future (void)
+ACE_Future<T>::ACE_Future ()
   : future_rep_ (FUTURE_REP::create ())
 {
 }
@@ -307,7 +307,7 @@ ACE_Future<T>::ACE_Future (const T &r)
 }
 
 template <class T>
-ACE_Future<T>::~ACE_Future (void)
+ACE_Future<T>::~ACE_Future ()
 {
   FUTURE_REP::detach (future_rep_);
 }
@@ -332,7 +332,7 @@ ACE_Future<T>::cancel (const T &r)
 }
 
 template <class T> int
-ACE_Future<T>::cancel (void)
+ACE_Future<T>::cancel ()
 {
   // If this ACE_Future is already attached to a ACE_Future_Rep,
   // detach it (maybe delete the ACE_Future_Rep).
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index f63695202fa..4858bcad6f8 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -47,7 +47,7 @@ class ACE_Future_Holder
 {
 public:
   ACE_Future_Holder (const ACE_Future<T> &future);
-  ~ACE_Future_Holder (void);
+  ~ACE_Future_Holder ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -55,7 +55,7 @@ public:
   ACE_Future<T> item_;
 
 protected:
-  ACE_Future_Holder (void);
+  ACE_Future_Holder ();
 };
 
 /**
@@ -73,7 +73,7 @@ class ACE_Future_Observer
 {
 public:
   /// Destructor
-  virtual ~ACE_Future_Observer (void);
+  virtual ~ACE_Future_Observer ();
 
   /// Called by the ACE_Future in which we are subscribed to when
   /// its value is written to.
@@ -84,7 +84,7 @@ public:
 
 protected:
   /// Constructor
-  ACE_Future_Observer (void);
+  ACE_Future_Observer ();
 };
 
 /**
@@ -163,10 +163,10 @@ private:
 
   /// Allocate a new ACE_Future_Rep<T> instance, returning NULL if it
   /// cannot be created.
-  static ACE_Future_Rep<T> *internal_create (void);
+  static ACE_Future_Rep<T> *internal_create ();
 
   /// Create a ACE_Future_Rep<T> and initialize the reference count.
-  static ACE_Future_Rep<T> *create (void);
+  static ACE_Future_Rep<T> *create ();
 
   /**
    * Increase the reference count and return argument. Uses the
@@ -232,7 +232,7 @@ class ACE_Future
 {
 public:
   /// Constructor.
-  ACE_Future (void);
+  ACE_Future ();
 
   /// Copy constructor binds @a this and @a r to the same
   /// ACE_Future_Rep. An ACE_Future_Rep is created if necessary.
@@ -243,7 +243,7 @@ public:
   ACE_Future (const T &r);
 
   /// Destructor.
-  ~ACE_Future (void);
+  ~ACE_Future ();
 
   /// Assignment operator that binds @a this and @a r to the same
   /// ACE_Future_Rep. An ACE_Future_Rep is created if necessary.
@@ -259,7 +259,7 @@ public:
    * to reuse the ACE_Future. But remember, the ACE_Future
    * is now bound to a new ACE_Future_Rep.
    */
-  int cancel (void);
+  int cancel ();
 
   /**
    * Equality operator that returns @c true if both ACE_Future objects
@@ -348,7 +348,7 @@ public:
    * rarely, if ever, be used and that modifying the underlying
    * ACE_Future_Rep should be done with extreme caution.
    */
-  ACE_Future_Rep<T> *get_rep (void);
+  ACE_Future_Rep<T> *get_rep ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Future_Set.cpp b/ACE/ace/Future_Set.cpp
index 413539b2a86..ed9b3c4037d 100644
--- a/ACE/ace/Future_Set.cpp
+++ b/ACE/ace/Future_Set.cpp
@@ -28,7 +28,7 @@ ACE_Future_Set<T>::ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *new_queue)
 }
 
 template <class T>
-ACE_Future_Set<T>::~ACE_Future_Set (void)
+ACE_Future_Set<T>::~ACE_Future_Set ()
 {
   // Detach ourselves from all remaining futures, if any, in our map.
   typename FUTURE_HASH_MAP::iterator iterator =
diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp
index 9c325096aa7..0e128647915 100644
--- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp
+++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp
@@ -143,7 +143,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::op
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i (void)
+ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i ()
 {
   // Protect against "double-deletion" in case the destructor also
   // gets called.
@@ -178,7 +178,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::cl
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i (void)
+ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i ()
 {
   // Iterate through the entire map calling the destuctor of each
   // <ACE_Hash_Multi_Map_Entry>.
@@ -462,7 +462,7 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
+ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i ()
 {
   ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i");
 
@@ -492,7 +492,7 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
+ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i ()
 {
   ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i");
 
@@ -534,7 +534,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
+ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i ()
 {
   ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i");
 
@@ -564,7 +564,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
+ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i ()
 {
   ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i");
 
diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h
index d92cc190bd7..c3e446e1876 100644
--- a/ACE/ace/Hash_Multi_Map_Manager_T.h
+++ b/ACE/ace/Hash_Multi_Map_Manager_T.h
@@ -66,10 +66,10 @@ public:
   ~ACE_Hash_Multi_Map_Entry () = default;
 
   /// Key accessor.
-  EXT_ID& key (void);
+  EXT_ID& key ();
 
   /// Item accessor.
-  ACE_Unbounded_Set<INT_ID>& item (void);
+  ACE_Unbounded_Set<INT_ID>& item ();
 
 public:
   /// Key used to look up an entry.
@@ -222,13 +222,13 @@ public:
 
   /// Close down a Hash_Multi_Map_Manager and release dynamically allocated
   /// resources.
-  int close (void);
+  int close ();
 
   /// Removes all the entries in Hash_Multi_Map_Manager.
-  int unbind_all (void);
+  int unbind_all ();
 
   /// Cleanup the Hash_Multi_Map_Manager.
-  ~ACE_Hash_Multi_Map_Manager (void);
+  ~ACE_Hash_Multi_Map_Manager ();
 
   /**
    * Associate @a ext_id with @a int_id.  If @a ext_id and @a int_id is already
@@ -406,7 +406,7 @@ public:
    * guard the state of an iterator.
    * @note The right name would be lock, but HP/C++ will choke on that!
    */
-  ACE_LOCK &mutex (void);
+  ACE_LOCK &mutex ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -414,12 +414,12 @@ public:
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> begin (void);
-  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> end (void);
+  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> begin ();
+  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> end ();
 
   /// Return reverse iterator.
-  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rbegin (void);
-  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rend (void);
+  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rbegin ();
+  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rend ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -539,11 +539,11 @@ protected:
 
   /// Close down a Map_Manager.  Must be called with
   /// locks held.
-  int close_i (void);
+  int close_i ();
 
   /// Removes all the entries in Map_Manager.  Must be called with
   /// locks held.
-  int unbind_all_i (void);
+  int unbind_all_i ();
 
   /// Pointer to a memory allocator used for table_, so it should
   /// supply size*sizeof (@c ACE_Hash_Multi_Map_Entry<@c EXT_ID, @c INT_ID>),
@@ -572,7 +572,7 @@ protected:
                    size_t &loc);
 
   /// Accessor of the underlying table
-  ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *table (void);
+  ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *table ();
 
   /// Accessor of the current size attribute
   size_t cur_size () const;
@@ -632,7 +632,7 @@ public:
 
   /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated
   /// over.
-  ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
+  ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
@@ -644,11 +644,11 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backward by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Dump the state of an object.
   void dump_i () const;
@@ -698,7 +698,7 @@ public:
 
   /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated
   /// over.
-  const ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
+  const ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
@@ -710,11 +710,11 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backward by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Dump the state of an object.
   void dump_i () const;
@@ -752,7 +752,7 @@ public:
   // = Iteration methods.
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -760,13 +760,13 @@ public:
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
@@ -797,7 +797,7 @@ public:
   // = Iteration methods.
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -805,13 +805,13 @@ public:
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
@@ -850,13 +850,13 @@ public:
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
@@ -869,7 +869,7 @@ public:
 
   /// Returns reference the Hash_Multi_Map_Manager that is being iterated
   /// over.
-  ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
+  ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
@@ -878,11 +878,11 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backward by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Map we are iterating over.
   ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_;
@@ -917,7 +917,7 @@ public:
   // = Iteration methods.
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -925,13 +925,13 @@ public:
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix reverse.
-  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix reverse.
   ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix advance.
-  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix advance.
   ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
diff --git a/ACE/ace/IOStream.cpp b/ACE/ace/IOStream.cpp
index a4158b00140..8d282688785 100644
--- a/ACE/ace/IOStream.cpp
+++ b/ACE/ace/IOStream.cpp
@@ -85,7 +85,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_HANDLE
-ACE_Streambuf::get_handle (void)
+ACE_Streambuf::get_handle ()
 {
   return 0;
 }
@@ -106,7 +106,7 @@ ACE_Streambuf::recv_timeout (ACE_Time_Value *tv)
 }
 
 int
-ACE_Streambuf::underflow (void)
+ACE_Streambuf::underflow ()
 {
   // If input mode is not set, any attempt to read from the stream is
   // a failure.
@@ -314,7 +314,7 @@ ACE_Streambuf::overflow (int c)
 // syncin
 
 int
-ACE_Streambuf::syncin (void)
+ACE_Streambuf::syncin ()
 {
   // As discussed, there really isn't any way to sync input from a
   // socket-like device.  We specifially override this base-class
@@ -325,7 +325,7 @@ ACE_Streambuf::syncin (void)
 // syncout
 
 int
-ACE_Streambuf::syncout (void)
+ACE_Streambuf::syncout ()
 {
   // Unlike syncin, syncout is a doable thing.  All we have to do is
   // write whatever is in the output buffer to the peer.  flushbuf ()
@@ -338,7 +338,7 @@ ACE_Streambuf::syncout (void)
 }
 
 int
-ACE_Streambuf::sync (void)
+ACE_Streambuf::sync ()
 {
   // sync () is fairly traditional in that it syncs both input and
   // output.  We could have omitted the call to syncin () but someday,
@@ -358,7 +358,7 @@ ACE_Streambuf::sync (void)
 // flushbuf
 
 int
-ACE_Streambuf::flushbuf (void)
+ACE_Streambuf::flushbuf ()
 {
   // pptr () is one character beyond the last character put into the
   // buffer.  pbase () points to the beginning of the put buffer.
@@ -415,7 +415,7 @@ ACE_Streambuf::flushbuf (void)
 }
 
 int
-ACE_Streambuf::get_one_byte (void)
+ACE_Streambuf::get_one_byte ()
 {
   this->timeout_ = 0;
 
@@ -439,7 +439,7 @@ ACE_Streambuf::get_one_byte (void)
 // (ie -- gptr == egptr).
 
 int
-ACE_Streambuf::fillbuf (void)
+ACE_Streambuf::fillbuf ()
 {
   // Invoke recv_n to get exactly one byte from the remote.  This will
   // block until something shows up.
@@ -485,7 +485,7 @@ ACE_Streambuf::ACE_Streambuf (u_int streambuf_size, int io_mode)
 }
 
 u_int
-ACE_Streambuf::streambuf_size (void)
+ACE_Streambuf::streambuf_size ()
 {
   return streambuf_size_;
 }
@@ -494,7 +494,7 @@ ACE_Streambuf::streambuf_size (void)
 // gptr.
 
 u_int
-ACE_Streambuf::get_waiting (void)
+ACE_Streambuf::get_waiting ()
 {
   return this->gptr_saved_ - this->eback_saved_;
 }
@@ -503,7 +503,7 @@ ACE_Streambuf::get_waiting (void)
 // gotten); eback + get_avail = egptr.
 
 u_int
-ACE_Streambuf::get_avail (void)
+ACE_Streambuf::get_avail ()
 {
   return this->egptr_saved_ - this->eback_saved_;
 }
@@ -512,7 +512,7 @@ ACE_Streambuf::get_avail (void)
 // pbase + put_avail = pptr.
 
 u_int
-ACE_Streambuf::put_avail (void)
+ACE_Streambuf::put_avail ()
 {
   return this->pptr_saved_ - this->pbase_saved_;
 }
@@ -624,7 +624,7 @@ ACE_Streambuf::reset_put_buffer (char *newBuffer,
 }
 
 void
-ACE_Streambuf::reset_base (void)
+ACE_Streambuf::reset_base ()
 {
   // Until we experience the first get or put operation, we do not
   // know what our current IO mode is.
@@ -642,13 +642,13 @@ ACE_Streambuf::reset_base (void)
 // would be deleted when the object destructs.  Since we are providing
 // separate read/write buffers, it is up to us to manage their memory.
 
-ACE_Streambuf::~ACE_Streambuf (void)
+ACE_Streambuf::~ACE_Streambuf ()
 {
   delete [] this->eback_saved_;
   delete [] this->pbase_saved_;
 }
 
-u_char ACE_Streambuf::timeout (void)
+u_char ACE_Streambuf::timeout ()
 {
   u_char rval = this->timeout_;
   this->timeout_ = 0;
diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h
index e04a1583710..8be12fee0fe 100644
--- a/ACE/ace/IOStream.h
+++ b/ACE/ace/IOStream.h
@@ -134,7 +134,7 @@ public:
    * providing separate read/write buffers, it is up to us to manage
    * their memory.
    */
-  virtual ~ACE_Streambuf (void);
+  virtual ~ACE_Streambuf ();
 
   /// Get the current Time_Value pointer and provide a new one.
   ACE_Time_Value *recv_timeout (ACE_Time_Value *tv = 0);
@@ -154,7 +154,7 @@ public:
 
   /// Return the number of bytes to be 'put' onto the stream media.
   ///    pbase + put_avail = pptr
-  u_int put_avail (void);
+  u_int put_avail ();
 
   /**
    * Use this to allocate a new/different buffer for get operations.
@@ -172,18 +172,18 @@ public:
 
   /// Return the number of bytes not yet gotten.  eback + get_waiting =
   /// gptr
-  u_int get_waiting (void);
+  u_int get_waiting ();
 
   /// Return the number of bytes in the get area (includes some already
   /// gotten); eback + get_avail = egptr
-  u_int get_avail (void);
+  u_int get_avail ();
 
   /// Query the streambuf for the size of its buffers.
-  u_int streambuf_size (void);
+  u_int streambuf_size ();
 
   /// Did we take an error because of an IO operation timeout?
   /// @note Invoking this resets the flag.
-  u_char timeout (void);
+  u_char timeout ();
 
 protected:
   ACE_Streambuf (u_int streambuf_size,
@@ -191,10 +191,10 @@ protected:
 
   /// Sync both input and output. See syncin/syncout below for
   /// descriptions.
-  virtual int sync (void);
+  virtual int sync ();
 
   // = Signatures for the underflow/overflow discussed above.
-  virtual int underflow (void);
+  virtual int underflow ();
 
   /// The overflow function receives the character which caused the
   /// overflow.
@@ -202,7 +202,7 @@ protected:
 
   /// Resets the <base> pointer and streambuf mode.  This is used
   /// internally when get/put buffers are allocatd.
-  void reset_base (void);
+  void reset_base ();
 
 protected:
   // = Two pointer sets for manipulating the read/write areas.
@@ -245,22 +245,22 @@ protected:
    * filebuf, the single common buffer is used forcing the <seek>
    * call.
    */
-  int syncin (void);
+  int syncin ();
 
   /// syncout() is called when the output needs to be flushed.  This is
   /// easily done by calling the peer's send_n function.
-  int syncout (void);
+  int syncout ();
 
   /// flushbuf() is the worker of syncout.  It is a separate function
   /// because it gets used sometimes in different context.
-  int flushbuf (void);
+  int flushbuf ();
 
   /**
    * fillbuf is called in a couple of places.  This is the worker of
    * underflow.  It will attempt to fill the read buffer from the
    * peer.
    */
-  int fillbuf (void);
+  int fillbuf ();
 
   /**
    * Used by fillbuf and others to get exactly one byte from the peer.
@@ -268,7 +268,7 @@ protected:
    * It is virtual because we really need to override it for
    * datagram-derived objects.
    */
-  virtual int get_one_byte (void);
+  virtual int get_one_byte ();
 
   /**
    * Stream connections and "unconnected connections" (ie --
@@ -290,7 +290,7 @@ protected:
                           int flags = 0,
                           ACE_Time_Value *tv = 0) = 0;
 
-  virtual ACE_HANDLE get_handle (void);
+  virtual ACE_HANDLE get_handle ();
 
 #  if !defined (ACE_USES_OLD_IOSTREAMS)
   char *base () const
@@ -314,7 +314,7 @@ protected:
       setbuf (b, (eb - b));
     }
 
-  int out_waiting (void)
+  int out_waiting ()
     {
       return pptr () - pbase ();
     }
diff --git a/ACE/ace/IOStream_T.cpp b/ACE/ace/IOStream_T.cpp
index f0d10ad35a9..a3d8dd9b4d8 100644
--- a/ACE/ace/IOStream_T.cpp
+++ b/ACE/ace/IOStream_T.cpp
@@ -89,7 +89,7 @@ ACE_Streambuf_T<STREAM>::recv_n (char *buf,
 }
 
 template <class STREAM> ACE_HANDLE
-ACE_Streambuf_T<STREAM>::get_handle (void)
+ACE_Streambuf_T<STREAM>::get_handle ()
 {
   return peer_ ? peer_->get_handle () : 0;
 }
@@ -124,7 +124,7 @@ ACE_IOStream<STREAM>::ACE_IOStream (u_int streambuf_size)
 // iostream ()
 
 template <class STREAM>
-ACE_IOStream<STREAM>::~ACE_IOStream (void)
+ACE_IOStream<STREAM>::~ACE_IOStream ()
 {
   delete this->streambuf_;
 }
@@ -133,7 +133,7 @@ ACE_IOStream<STREAM>::~ACE_IOStream (void)
 // function.
 
 template <class STREAM> int
-ACE_IOStream<STREAM>::close (void)
+ACE_IOStream<STREAM>::close ()
 {
   return STREAM::close ();
 }
diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h
index 49ddbf0ad09..ffa6fafffb4 100644
--- a/ACE/ace/IOStream_T.h
+++ b/ACE/ace/IOStream_T.h
@@ -68,7 +68,7 @@ public:
                           ACE_Time_Value *tv = 0);
 
 protected:
-  virtual ACE_HANDLE get_handle (void);
+  virtual ACE_HANDLE get_handle ();
 
   /// This will be our ACE_SOCK_Stream or similar object.
   STREAM *peer_;
@@ -119,11 +119,11 @@ public:
 
   /// We have to get rid of the <streambuf_> ourselves since we gave it
   /// to the <iostream> base class;
-  virtual ~ACE_IOStream (void);
+  virtual ~ACE_IOStream ();
 
   /// The only ambiguity in the multiple inheritance is the <close>
   /// function.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Returns 1 if we're at the end of the <STREAM>, i.e., if the
@@ -184,7 +184,7 @@ public:
       return (0);
     }
   virtual void isfx (void) { return; }
-  virtual int opfx (void)
+  virtual int opfx ()
     {
       if (good () && tie () != 0)
         tie ()->flush ();
@@ -243,7 +243,7 @@ template <class STREAM>
 class ACE_SOCK_Dgram_SC : public STREAM
 {
 public:
-  ACE_SOCK_Dgram_SC (void);
+  ACE_SOCK_Dgram_SC ();
   ACE_SOCK_Dgram_SC (STREAM &source,
                      ACE_INET_Addr &dest);
   ssize_t send_n (char *buf, ssize_t len);
diff --git a/ACE/ace/Init_ACE.h b/ACE/ace/Init_ACE.h
index dbf06ead97b..e1fe7427174 100644
--- a/ACE/ace/Init_ACE.h
+++ b/ACE/ace/Init_ACE.h
@@ -37,7 +37,7 @@ namespace ACE
    * @return Returns 0 on success, -1 on failure, and 1 if it had
    * already been called.
    */
-  extern ACE_Export int init (void);
+  extern ACE_Export int init ();
 
   /**
    * Finalize the ACE library services and releases ACE's internal
@@ -48,7 +48,7 @@ namespace ACE
    * @return Returns 0 on success, -1 on failure, and 1 if it had already been
    * called.
    */
-  extern ACE_Export int fini (void);
+  extern ACE_Export int fini ();
 
   // private:
   //  Used internally, so not exported.
diff --git a/ACE/ace/LOCK_SOCK_Acceptor.cpp b/ACE/ace/LOCK_SOCK_Acceptor.cpp
index 65a5512ba80..400517cf40b 100644
--- a/ACE/ace/LOCK_SOCK_Acceptor.cpp
+++ b/ACE/ace/LOCK_SOCK_Acceptor.cpp
@@ -23,7 +23,7 @@ ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::accept (ACE_SOCK_Stream &stream,
 }
 
 template <class ACE_LOCK> ACE_LOCK &
-ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::lock (void)
+ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::lock ()
 {
   return this->lock_;
 }
diff --git a/ACE/ace/LSOCK_Acceptor.h b/ACE/ace/LSOCK_Acceptor.h
index 330101fcc75..8459ba4806e 100644
--- a/ACE/ace/LSOCK_Acceptor.h
+++ b/ACE/ace/LSOCK_Acceptor.h
@@ -40,7 +40,7 @@ class ACE_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor
 {
 public:
   /// Default constructor.
-  ACE_LSOCK_Acceptor (void);
+  ACE_LSOCK_Acceptor ();
 
   /// Initiate a passive mode socket.
   ACE_LSOCK_Acceptor (const ACE_Addr &local_sap,
@@ -65,7 +65,7 @@ public:
 
   /// Close down the ACE_LSOCK and remove the rendezvous point from the
   /// file system.
-  int remove (void);
+  int remove ();
 
   /// Return the local endpoint address.
   int get_local_addr (ACE_Addr &) const;
diff --git a/ACE/ace/LSOCK_Dgram.h b/ACE/ace/LSOCK_Dgram.h
index 4c859a516b1..79d52e0ecb8 100644
--- a/ACE/ace/LSOCK_Dgram.h
+++ b/ACE/ace/LSOCK_Dgram.h
@@ -35,7 +35,7 @@ class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK
 {
 public:
   /// Default constructor.
-  ACE_LSOCK_Dgram (void);
+  ACE_LSOCK_Dgram ();
 
   /// Initiate a local dgram.
   ACE_LSOCK_Dgram (const ACE_Addr &local,
diff --git a/ACE/ace/Local_Memory_Pool.h b/ACE/ace/Local_Memory_Pool.h
index ecf5e38ec0f..0df0631a9be 100644
--- a/ACE/ace/Local_Memory_Pool.h
+++ b/ACE/ace/Local_Memory_Pool.h
@@ -52,7 +52,7 @@ public:
   ACE_Local_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
                          const OPTIONS *options = 0);
 
-  virtual ~ACE_Local_Memory_Pool (void);
+  virtual ~ACE_Local_Memory_Pool ();
 
   /// Ask system for initial chunk of local memory.
   virtual void *init_acquire (size_t nbytes,
diff --git a/ACE/ace/Local_Name_Space.h b/ACE/ace/Local_Name_Space.h
index ea7845baa8f..b2bf2948b9f 100644
--- a/ACE/ace/Local_Name_Space.h
+++ b/ACE/ace/Local_Name_Space.h
@@ -39,7 +39,7 @@ class ACE_Export ACE_NS_String
 public:
   // = Initialization.
   /// Default "no-op" constructor.
-  ACE_NS_String (void);
+  ACE_NS_String ();
 
   /// Initialization method.
   ACE_NS_String (ACE_WCHAR_T *dst,
@@ -50,7 +50,7 @@ public:
   ACE_NS_String (const ACE_NS_WString &);
 
   /// Destructor
-  ~ACE_NS_String (void);
+  ~ACE_NS_String ();
 
   /// Converts an ACE_NS_String to fresh copy of an ACE_NS_WString;
   operator ACE_NS_WString () const;
@@ -98,7 +98,7 @@ class ACE_Export ACE_NS_Internal
 {
 public:
   /// No-op constructor.
-  ACE_NS_Internal (void);
+  ACE_NS_Internal ();
 
   /// Constructor.
   ACE_NS_Internal (ACE_NS_String &value, const char *type);
@@ -107,10 +107,10 @@ public:
   bool operator == (const ACE_NS_Internal &) const;
 
   /// Return value.
-  ACE_NS_String value (void);
+  ACE_NS_String value ();
 
   /// Return type.
-  const char *type (void);
+  const char *type ();
 
 private:
   /// Contains the value of the string.
diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp
index 6b568ab0798..0ebce658148 100644
--- a/ACE/ace/Local_Name_Space_T.cpp
+++ b/ACE/ace/Local_Name_Space_T.cpp
@@ -358,7 +358,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::open (
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK>
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space (void)
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space ()
   : allocator_ (0),
     name_space_map_ (0),
     name_options_ (0)
@@ -381,7 +381,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space (
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK>
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Local_Name_Space (void)
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Local_Name_Space ()
 {
   ACE_TRACE ("ACE_Local_Name_Space::~ACE_Local_Name_Space");
 
@@ -393,7 +393,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Local_Name_Space (void)
 ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Local_Name_Space)
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager (void)
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager ()
 {
   // Note that we *must* use structured exception handling here
   // because (1) we may need to commit virtual memory pages and (2)
@@ -411,7 +411,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager (void)
 
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i ()
 {
   ACE_TRACE ("ACE_Local_Name_Space::create_manager_i");
   // Get directory name
diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h
index 531e2a3e18e..6a65c22448e 100644
--- a/ACE/ace/Local_Name_Space_T.h
+++ b/ACE/ace/Local_Name_Space_T.h
@@ -122,7 +122,7 @@ public:
 
   /// Destructor, do some cleanup :TBD: last dtor should "compress"
   /// file
-  ~ACE_Local_Name_Space (void);
+  ~ACE_Local_Name_Space ();
 
   /// Bind a new name to a naming context (Wide character strings).
   virtual int bind (const ACE_NS_WString &name,
@@ -229,8 +229,8 @@ private:
 
   /// Allocate the appropriate type of map manager that stores the
   /// key/value binding.
-  int create_manager (void);
-  int create_manager_i (void);
+  int create_manager ();
+  int create_manager_i ();
 
   /// Pointer to the allocator
   ALLOCATOR *allocator_;
diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp
index 85fe6d8bb67..215517c3157 100644
--- a/ACE/ace/Local_Tokens.cpp
+++ b/ACE/ace/Local_Tokens.cpp
@@ -28,7 +28,7 @@ ACE_Tokens::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Tokens::ACE_Tokens (void)
+ACE_Tokens::ACE_Tokens ()
   : visited_ (0),
     reference_count_ (0)
 {
@@ -114,7 +114,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy,
     }
 }
 
-ACE_TPQ_Entry::ACE_TPQ_Entry (void)
+ACE_TPQ_Entry::ACE_TPQ_Entry ()
   : cond_var_ (lock_),
     proxy_ (0),
     nesting_level_ (0),
@@ -130,7 +130,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_TPQ_Entry &rhs)
   *this = rhs;
 }
 
-ACE_TPQ_Entry::~ACE_TPQ_Entry (void)
+ACE_TPQ_Entry::~ACE_TPQ_Entry ()
 {
   ACE_TRACE ("ACE_TPQ_Entry::~ACE_TPQ_Entry");
 }
@@ -196,7 +196,7 @@ ACE_TSS_TPQ_Entry::make_TSS_TYPE () const
   return temp;
 }
 
-ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * (void)
+ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * ()
 {
 #if !defined (ACE_NO_TSS_TOKENS)
   return  (ACE_TPQ_Entry *) (*((ACE_TSS<ACE_TPQ_Entry> *) this));
@@ -236,7 +236,7 @@ ACE_TPQ_Iterator::done () const
 }
 
 void
-ACE_TPQ_Iterator::advance (void)
+ACE_TPQ_Iterator::advance ()
 {
   ACE_TRACE ("ACE_TPQ_Iterator::advance");
 
@@ -276,7 +276,7 @@ ACE_Token_Proxy_Queue::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Token_Proxy_Queue::ACE_Token_Proxy_Queue (void)
+ACE_Token_Proxy_Queue::ACE_Token_Proxy_Queue ()
   : head_ (0),
     tail_ (0),
     size_ (0)
@@ -337,7 +337,7 @@ ACE_Token_Proxy_Queue::enqueue (ACE_TPQ_Entry *tpq,
 }
 
 void
-ACE_Token_Proxy_Queue::dequeue (void)
+ACE_Token_Proxy_Queue::dequeue ()
 {
   ACE_TRACE ("ACE_Token_Proxy_Queue::dequeue");
 
@@ -447,7 +447,7 @@ ACE_Mutex_Token::ACE_Mutex_Token (const ACE_TCHAR *name)
                     ACE_MAXTOKENNAMELEN);
 }
 
-ACE_Mutex_Token::~ACE_Mutex_Token (void)
+ACE_Mutex_Token::~ACE_Mutex_Token ()
 {
   ACE_TRACE ("ACE_Mutex_Token::~ACE_Mutex_Token");
 }
@@ -704,7 +704,7 @@ ACE_RW_Token::ACE_RW_Token (const ACE_TCHAR *name)
                     ACE_MAXTOKENNAMELEN);
 }
 
-ACE_RW_Token::~ACE_RW_Token (void)
+ACE_RW_Token::~ACE_RW_Token ()
 {
   ACE_TRACE ("ACE_RW_Token::~ACE_RW_Token");
 }
@@ -1103,7 +1103,7 @@ ACE_Token_Proxy::client_id (const ACE_TCHAR *client_id)
 }
 
 const ACE_TCHAR *
-ACE_Token_Proxy::owner_id (void)
+ACE_Token_Proxy::owner_id ()
 {
   ACE_TRACE ("ACE_Token_Proxy::owner_id");
   return this->token_->owner_id ();
@@ -1120,7 +1120,7 @@ ACE_Token_Proxy::name () const
 #  pragma warning (push)
 #  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
 #endif
-ACE_Token_Proxy::ACE_Token_Proxy (void)
+ACE_Token_Proxy::ACE_Token_Proxy ()
 : token_ (0),
   waiter_ (this, 0)
 {
@@ -1142,7 +1142,7 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &)
 #endif
 
 // @@ should I do a mutex_->release ()?
-ACE_Token_Proxy::~ACE_Token_Proxy (void)
+ACE_Token_Proxy::~ACE_Token_Proxy ()
 {
   ACE_TRACE ("ACE_Token_Proxy::~ACE_Token_Proxy");
 
@@ -1407,7 +1407,7 @@ ACE_Token_Proxy::remove (ACE_Synch_Options &)
 }
 
 void
-ACE_Token_Proxy::sleep_hook (void)
+ACE_Token_Proxy::sleep_hook ()
 {
   ACE_TRACE ("ACE_Token_Proxy::sleep_hook");
   // Somebody wants our token!  (Let'em wait...)
@@ -1522,13 +1522,13 @@ ACE_Local_Mutex::create_token (const ACE_TCHAR *name)
   return temp;
 }
 
-ACE_Local_Mutex::~ACE_Local_Mutex (void)
+ACE_Local_Mutex::~ACE_Local_Mutex ()
 {
 }
 
 // ************************************************************
 
-ACE_Local_RLock::~ACE_Local_RLock (void)
+ACE_Local_RLock::~ACE_Local_RLock ()
 {
 }
 
@@ -1562,7 +1562,7 @@ ACE_Local_RLock::clone () const
 
 // ************************************************************
 
-ACE_Local_WLock::~ACE_Local_WLock (void)
+ACE_Local_WLock::~ACE_Local_WLock ()
 {
 }
 
diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h
index 6b137152143..fcfe7766c3e 100644
--- a/ACE/ace/Local_Tokens.h
+++ b/ACE/ace/Local_Tokens.h
@@ -109,7 +109,7 @@ public:
   typedef void (*PTVF) (void *);
 
   /// Null constructor.
-  ACE_TPQ_Entry (void);
+  ACE_TPQ_Entry ();
 
   /// Constructor.
   ACE_TPQ_Entry (const ACE_Token_Proxy *proxy,
@@ -119,7 +119,7 @@ public:
   ACE_TPQ_Entry (const ACE_TPQ_Entry &rhs);
 
   /// Destructor.
-  ~ACE_TPQ_Entry (void);
+  ~ACE_TPQ_Entry ();
 
   /// Copy operator use by the queue.
   void operator= (const ACE_TPQ_Entry &rhs);
@@ -155,7 +155,7 @@ public:
   PTVF sleep_hook () const;
 
   /// Call the sleep hook function or method passing arg.
-  void call_sleep_hook (void);
+  void call_sleep_hook ();
 
   /// Dump the state of the class.
   void dump () const;
@@ -222,13 +222,13 @@ public:
   virtual ACE_TPQ_Entry *make_TSS_TYPE () const;
 
   /// Operator overloading and inheritance don't mix.
-  operator ACE_TPQ_Entry *(void);
+  operator ACE_TPQ_Entry *();
 
   /// Dump the state of the class.
   void dump () const;
 
 #if defined (ACE_NO_TSS_TOKENS)
-  ACE_TPQ_Entry *operator-> (void)
+  ACE_TPQ_Entry *operator-> ()
     {
       return (ACE_TPQ_Entry *) this;
     }
@@ -274,7 +274,7 @@ public:
   int done () const;
 
   /// Move forward by one element in the queue.
-  void advance (void);
+  void advance ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -304,7 +304,7 @@ public:
   friend class ACE_TPQ_Iterator;
 
   /// Constructor.
-  ACE_Token_Proxy_Queue (void);
+  ACE_Token_Proxy_Queue ();
 
   /// Destructor.
   ~ACE_Token_Proxy_Queue () = default;
@@ -318,19 +318,19 @@ public:
                 int position);
 
   /// Top of the queue.
-  const ACE_TPQ_Entry* head (void);
+  const ACE_TPQ_Entry* head ();
 
 //  int member (const ACE_TCHAR *id);
   // Is this id in the waiter list?
 
   /// Remove the top waiter.
-  void dequeue (void);
+  void dequeue ();
 
   /// Remove the waiter whose proxy ref matches @a remove_me.
   void remove (const ACE_TPQ_Entry *remove_me);
 
   /// The number of waiters.
-  int size (void);
+  int size ();
 
   /// Dump the state of the class.
   void dump () const;
@@ -412,22 +412,22 @@ public:
   virtual int is_owner (const ACE_TCHAR *id) = 0;
 
   /// Return the queue of waiters.
-  virtual ACE_Token_Proxy_Queue *waiters (void);
+  virtual ACE_Token_Proxy_Queue *waiters ();
 
   /// Return the number of proxies that are currently waiting to get
   /// the token.
-  virtual int no_of_waiters (void);
+  virtual int no_of_waiters ();
 
   /// The current owner.
-  const ACE_TCHAR *owner_id (void);
+  const ACE_TCHAR *owner_id ();
 
   /// Token name.
-  const ACE_TCHAR* name (void);
+  const ACE_TCHAR* name ();
 
   // = Reference counting.  These are only called by the
   // Token_Manager.
-  void inc_reference (void);
-  int dec_reference (void);
+  void inc_reference ();
+  int dec_reference ();
 
   /// Dump the state of the class.
   void dump () const;
@@ -453,10 +453,10 @@ public:
   void visit (int v);
 
   /// Check if the token has been visited.
-  int visited (void);
+  int visited ();
 
   /// All the data of the current owner.
-  ACE_TPQ_Entry *owner (void);
+  ACE_TPQ_Entry *owner ();
 
 protected:
   /// For the deadlock detection algorithm.
@@ -497,7 +497,7 @@ public:
   explicit ACE_Mutex_Token (const ACE_TCHAR* name);
 
   /// Destructor
-  virtual ~ACE_Mutex_Token (void);
+  virtual ~ACE_Mutex_Token ();
 
   // = Synchronization operations.
   // With acquire, renew, and release, the caller must be specified so
@@ -592,7 +592,7 @@ public:
   explicit ACE_RW_Token (const ACE_TCHAR* name);
 
   /// Destructor.
-  virtual ~ACE_RW_Token (void);
+  virtual ~ACE_RW_Token ();
 
   // = Synchronization operations.
   // With acquire, renew, and release, the caller must be specified so
@@ -695,7 +695,7 @@ public:
   ACE_Token_Name (const ACE_Token_Name &rhs);
 
   /// Destructor.
-  virtual ~ACE_Token_Name (void);
+  virtual ~ACE_Token_Name ();
 
   /// Copy.
   void operator= (const ACE_Token_Name &rhs);
@@ -751,10 +751,10 @@ public:
 
   // Initialization and termination methods.
   /// Construction.
-  ACE_Token_Proxy (void);
+  ACE_Token_Proxy ();
 
   /// Destructor.
-  virtual ~ACE_Token_Proxy (void);
+  virtual ~ACE_Token_Proxy ();
 
   /**
    * Open the <ACE_Token>.
@@ -846,14 +846,14 @@ public:
    * by ACE_Token_xx's when another proxy enters the waiting list and
    * requests that the current token holder be notified.
    */
-  virtual void sleep_hook (void);
+  virtual void sleep_hook ();
 
   /// This is called when a queued (waiting) proxy is removed from the
   /// waiters list and given the token.
   virtual void token_acquired (ACE_TPQ_Entry *);
 
   /// The client id of the current token holder
-  virtual const ACE_TCHAR *owner_id (void);
+  virtual const ACE_TCHAR *owner_id ();
 
   /// Return a dynamically allocated clone of the derived class.
   virtual ACE_Token_Proxy *clone () const = 0;
@@ -975,7 +975,7 @@ public:
                    int debug = 0);
 
   /// Destructor
-  ~ACE_Local_Mutex (void);
+  ~ACE_Local_Mutex ();
 
   /// Dump the state of the class.
   void dump () const;
@@ -1027,7 +1027,7 @@ public:
                    int debug = 0);
 
   /// Destructor
-  ~ACE_Local_RLock (void);
+  ~ACE_Local_RLock ();
 
   /// Dump the state of the class.
   void dump () const;
diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h
index dcf8cabaa0d..2ee834409cf 100644
--- a/ACE/ace/MEM_Acceptor.h
+++ b/ACE/ace/MEM_Acceptor.h
@@ -53,10 +53,10 @@ class ACE_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor
 {
 public:
   /// Default constructor.
-  ACE_MEM_Acceptor (void);
+  ACE_MEM_Acceptor ();
 
   /// Destructor.
-  ~ACE_MEM_Acceptor (void);
+  ~ACE_MEM_Acceptor ();
 
   /// Initiate a passive mode socket.
   ACE_MEM_Acceptor (const ACE_MEM_Addr &remote_sap,
diff --git a/ACE/ace/MEM_Connector.h b/ACE/ace/MEM_Connector.h
index 1182198fa74..334ab605901 100644
--- a/ACE/ace/MEM_Connector.h
+++ b/ACE/ace/MEM_Connector.h
@@ -36,7 +36,7 @@ class ACE_Export ACE_MEM_Connector : public ACE_SOCK_Connector
 {
 public:
   /// Default constructor.
-  ACE_MEM_Connector (void);
+  ACE_MEM_Connector ();
 
   /**
    * Actively connect to a peer, producing a connected @c ACE_MEM_Stream
diff --git a/ACE/ace/MEM_IO.h b/ACE/ace/MEM_IO.h
index a7a582e1f07..9f9b4787c59 100644
--- a/ACE/ace/MEM_IO.h
+++ b/ACE/ace/MEM_IO.h
@@ -32,9 +32,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP
 {
 public:
-  ACE_Reactive_MEM_IO (void);
+  ACE_Reactive_MEM_IO ();
 
-  virtual ~ACE_Reactive_MEM_IO (void);
+  virtual ~ACE_Reactive_MEM_IO ();
 
   /**
    * Initialize the MEM_SAP object.
@@ -85,14 +85,14 @@ public:
   class Simple_Queue
   {
   public:
-    Simple_Queue (void);
+    Simple_Queue ();
     Simple_Queue (MQ_Struct *mq);
 
     int init (MQ_Struct *mq, ACE_MEM_SAP::MALLOC_TYPE *malloc);
 
     int write (ACE_MEM_SAP_Node *new_msg);
 
-    ACE_MEM_SAP_Node *read (void);
+    ACE_MEM_SAP_Node *read ();
   private:
     MQ_Struct *mq_;
     ACE_MEM_SAP::MALLOC_TYPE *malloc_;
@@ -105,9 +105,9 @@ public:
     Simple_Queue queue_;
   } Channel;
 
-  ACE_MT_MEM_IO (void);
+  ACE_MT_MEM_IO ();
 
-  virtual ~ACE_MT_MEM_IO (void);
+  virtual ~ACE_MT_MEM_IO ();
 
   /**
    * Initialize the MEM_SAP object.
@@ -171,10 +171,10 @@ class ACE_Export ACE_MEM_IO : public ACE_SOCK
 {
 public:
   /// Constructor.
-  ACE_MEM_IO (void);
+  ACE_MEM_IO ();
 
   /// Destructor.
-  ~ACE_MEM_IO (void);
+  ~ACE_MEM_IO ();
 
   typedef enum
   {
@@ -193,7 +193,7 @@ public:
    * Finalizing the MEM_IO object.  This method doesn't invoke
    * the <remove> method.
    */
-  int fini (void);
+  int fini ();
 
   /// Send an @a n byte buffer to the other process using shm_malloc_
   /// connected thru the socket.
diff --git a/ACE/ace/MEM_SAP.h b/ACE/ace/MEM_SAP.h
index 295beec2c17..7b19e8da1ae 100644
--- a/ACE/ace/MEM_SAP.h
+++ b/ACE/ace/MEM_SAP.h
@@ -76,7 +76,7 @@ public:
   typedef ACE_MMAP_Memory_Pool_Options MALLOC_OPTIONS;
 
   /// Destructor.
-  virtual ~ACE_MEM_SAP (void);
+  virtual ~ACE_MEM_SAP ();
 
   /**
    * Initialize the MEM_SAP object.
@@ -136,7 +136,7 @@ protected:
 
   /// Close down the share memory pool.  Clean up the
   /// mmap file if we are the last one using it.
-  int close_shm_malloc (void);
+  int close_shm_malloc ();
 
   ACE_HANDLE handle_;
 
@@ -144,7 +144,7 @@ protected:
   MALLOC_TYPE *shm_malloc_;
 
   /// Constructor.  Prevent this class from being instantiated.
-  ACE_MEM_SAP (void);
+  ACE_MEM_SAP ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/MEM_Stream.h b/ACE/ace/MEM_Stream.h
index 55f8db9c23a..c9e6e5a2330 100644
--- a/ACE/ace/MEM_Stream.h
+++ b/ACE/ace/MEM_Stream.h
@@ -59,13 +59,13 @@ public:
 
   // Initialization and termination methods.
   /// Constructor.
-  ACE_MEM_Stream (void);
+  ACE_MEM_Stream ();
 
   /// Constructor (sets the underlying ACE_HANDLE with <h>).
   ACE_MEM_Stream (ACE_HANDLE h);
 
   /// Destructor.
-  ~ACE_MEM_Stream (void);
+  ~ACE_MEM_Stream ();
 
   //= The following two methods use write and read system calls.
   /// Send n bytes, keep trying until n are sent.
@@ -82,17 +82,17 @@ public:
   // = Selectively close endpoints.
 
   /// Close down the reader.
-  int close_reader (void);
+  int close_reader ();
 
   /// Close down the writer.
-  int close_writer (void);
+  int close_writer ();
 
   /**
    * Close down the socket (we need this to make things work correctly
    * on Win32, which requires use to do a <close_writer> before doing
    * the close to avoid losing data).
    */
-  int close (void);
+  int close ();
 
   // = Meta-type info
   typedef ACE_Addr PEER_ADDR;
diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h
index c150243e150..d53c43574bd 100644
--- a/ACE/ace/MMAP_Memory_Pool.h
+++ b/ACE/ace/MMAP_Memory_Pool.h
@@ -140,7 +140,7 @@ public:
                         const OPTIONS *options = 0);
 
   /// Destructor.
-  virtual ~ACE_MMAP_Memory_Pool (void);
+  virtual ~ACE_MMAP_Memory_Pool ();
 
   /// Ask system for initial chunk of shared memory.
   virtual void *init_acquire (size_t nbytes,
@@ -219,7 +219,7 @@ public:
   ACE_Mem_Map const & mmap () const;
 
   /// Get reference to underlying ACE_Mem_Map object.
-  ACE_Mem_Map & mmap (void);
+  ACE_Mem_Map & mmap ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -320,7 +320,7 @@ public:
                              const OPTIONS *options = 0);
 
   /// Destructor.
-  virtual ~ACE_Lite_MMAP_Memory_Pool (void);
+  virtual ~ACE_Lite_MMAP_Memory_Pool ();
 
   /// Overwrite the default sync behavior with no-op
   virtual int sync (size_t len, int flags = MS_SYNC);
diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp
index c61b0151cfd..de9f79aad1d 100644
--- a/ACE/ace/Malloc.cpp
+++ b/ACE/ace/Malloc.cpp
@@ -145,7 +145,7 @@ ACE_Control_Block::ACE_Name_Node::dump () const
 
 
 #if defined (ACE_HAS_MALLOC_STATS)
-ACE_Malloc_Stats::ACE_Malloc_Stats (void)
+ACE_Malloc_Stats::ACE_Malloc_Stats ()
   : nchunks_ (0),
     nblocks_ (0),
     ninuse_ (0)
diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h
index e7c28760a8c..c519caff0ed 100644
--- a/ACE/ace/Malloc_T.h
+++ b/ACE/ace/Malloc_T.h
@@ -416,9 +416,9 @@ class ACE_Malloc_FIFO_Iterator_T;
  *   - constructor (const ACE_TCHAR *pool_name, const MEMORY_POOL_OPTIONS *options)
  *   - void dump () const (needed if ACE is built with ACE_HAS_DUMP defined)
  *   - void *init_acquire (size_t nbytes, size_t &rounded_bytes, int &first_time);
- *   - int release (void)
+ *   - int release ()
  *   - void *acquire (size_t nbytes, size_t &rounded_bytes)
- *   - void *base_addr (void)
+ *   - void *base_addr ()
  *   - seh_selector() (only needed on Windows)
  *
  * Note that the ACE_Allocator_Adapter class can be used to integrate allocator
diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp
index c2222bb4279..9b5e9052e44 100644
--- a/ACE/ace/Map_Manager.cpp
+++ b/ACE/ace/Map_Manager.cpp
@@ -133,7 +133,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::next_free (ACE_UINT32 &free_slot)
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::move_all_free_slots_from_occupied_list (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::move_all_free_slots_from_occupied_list ()
 {
   //
   // In the case of lazy map managers, the movement of free slots from
diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h
index d559d00ef8a..0fa8735c88e 100644
--- a/ACE/ace/Map_Manager.h
+++ b/ACE/ace/Map_Manager.h
@@ -389,7 +389,7 @@ protected:
    * free slots in the free list. This function goes through the
    * entire occupied list, moving free slots to the free list.
    */
-  void move_all_free_slots_from_occupied_list (void);
+  void move_all_free_slots_from_occupied_list ();
 
 #endif /* ACE_HAS_LAZY_MAP_MANAGER */
 
diff --git a/ACE/ace/Mem_Map.h b/ACE/ace/Mem_Map.h
index b44241b064d..9f728fa2e09 100644
--- a/ACE/ace/Mem_Map.h
+++ b/ACE/ace/Mem_Map.h
@@ -40,7 +40,7 @@ class ACE_Export ACE_Mem_Map : private ACE_Copy_Disabled
 {
 public:
   /// Default constructor.
-  ACE_Mem_Map (void);
+  ACE_Mem_Map ();
 
   /// Map a file from an open file descriptor @a handle.  This function
   /// will lookup the length of the file if it is not given.
diff --git a/ACE/ace/Message_Queue_NT.cpp b/ACE/ace/Message_Queue_NT.cpp
index 0273fe9f841..e3d82e10ea2 100644
--- a/ACE/ace/Message_Queue_NT.cpp
+++ b/ACE/ace/Message_Queue_NT.cpp
@@ -38,7 +38,7 @@ ACE_Message_Queue_NT::open (DWORD max_threads)
 }
 
 int
-ACE_Message_Queue_NT::close (void)
+ACE_Message_Queue_NT::close ()
 {
   ACE_TRACE ("ACE_Message_Queue_NT::close");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
@@ -46,7 +46,7 @@ ACE_Message_Queue_NT::close (void)
   return (::CloseHandle (this->completion_port_) ? 0 : -1 );
 }
 
-ACE_Message_Queue_NT::~ACE_Message_Queue_NT (void)
+ACE_Message_Queue_NT::~ACE_Message_Queue_NT ()
 {
   ACE_TRACE ("ACE_Message_Queue_NT::~ACE_Message_Queue_NT");
   this->close ();
@@ -131,7 +131,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item,
 }
 
 int
-ACE_Message_Queue_NT::deactivate (void)
+ACE_Message_Queue_NT::deactivate ()
 {
   ACE_TRACE ("ACE_Message_Queue_NT::deactivate");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
@@ -155,7 +155,7 @@ ACE_Message_Queue_NT::deactivate (void)
 }
 
 int
-ACE_Message_Queue_NT::activate (void)
+ACE_Message_Queue_NT::activate ()
 {
   ACE_TRACE ("ACE_Message_Queue_NT::activate");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
@@ -165,7 +165,7 @@ ACE_Message_Queue_NT::activate (void)
 }
 
 int
-ACE_Message_Queue_NT::pulse (void)
+ACE_Message_Queue_NT::pulse ()
 {
   ACE_TRACE ("ACE_Message_Queue_NT::pulse");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h
index 0cde39ca08a..60a20242d39 100644
--- a/ACE/ace/Message_Queue_NT.h
+++ b/ACE/ace/Message_Queue_NT.h
@@ -167,7 +167,7 @@ public:
   // = Not currently implemented...
   int peek_dequeue_head (ACE_Message_Block *&first_item,
                          ACE_Time_Value *timeout = 0);
-  ACE_Notification_Strategy *notification_strategy (void);
+  ACE_Notification_Strategy *notification_strategy ();
   void notification_strategy (ACE_Notification_Strategy *s);
 
   // = Notification hook.
diff --git a/ACE/ace/Message_Queue_Vx.cpp b/ACE/ace/Message_Queue_Vx.cpp
index 5136bb58538..ae7a1b1df18 100644
--- a/ACE/ace/Message_Queue_Vx.cpp
+++ b/ACE/ace/Message_Queue_Vx.cpp
@@ -69,7 +69,7 @@ ACE_Message_Queue_Vx::ACE_Message_Queue_Vx (size_t max_messages,
     ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("open")));
 }
 
-ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void)
+ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx");
 
@@ -113,7 +113,7 @@ ACE_Message_Queue_Vx::open (size_t max_messages,
 
 // Clean up the queue if we have not already done so!
 int
-ACE_Message_Queue_Vx::close (void)
+ACE_Message_Queue_Vx::close ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::close");
   // Don't lock, because we don't have a lock.  It shouldn't be
@@ -129,14 +129,14 @@ ACE_Message_Queue_Vx::close (void)
 }
 
 bool
-ACE_Message_Queue_Vx::is_empty_i (void)
+ACE_Message_Queue_Vx::is_empty_i ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::is_empty_i");
   return ::msgQNumMsgs (msgq ()) == 0;
 }
 
 bool
-ACE_Message_Queue_Vx::is_full_i (void)
+ACE_Message_Queue_Vx::is_full_i ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::is_full_i");
   return ::msgQNumMsgs (msgq ()) >= max_messages_;
diff --git a/ACE/ace/Metrics_Cache_T.cpp b/ACE/ace/Metrics_Cache_T.cpp
index c2611b921d3..a9967e460ac 100644
--- a/ACE/ace/Metrics_Cache_T.cpp
+++ b/ACE/ace/Metrics_Cache_T.cpp
@@ -105,7 +105,7 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::is_event (const ACE_Metrics_Timeprob
 
 template <class ACE_LOCK, class ALLOCATOR>
 const char *
-ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (void)
+ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name ()
 {
    return name_;
 }
@@ -131,7 +131,7 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (char * name)
 
 template <class ACE_LOCK, class ALLOCATOR>
 u_int
-ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_id (void)
+ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_id ()
 {
   return id_;
 }
@@ -206,7 +206,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::~ACE_Metrics_Cache ()
 // the singleton allocator in the current process is used.
 
 template <class ACE_LOCK, class ALLOCATOR> ALLOCATOR *
-ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::allocator (void)
+ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::allocator ()
 {
   ALLOCATOR * alloc = allocator_;
   return alloc
diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h
index 254cba424f3..46ba0333fe2 100644
--- a/ACE/ace/Metrics_Cache_T.h
+++ b/ACE/ace/Metrics_Cache_T.h
@@ -80,11 +80,11 @@ public:
                 ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::event_id id);
 
   /// Accessor and mutator for probe name.
-  const char * probe_name (void);
+  const char * probe_name ();
   void probe_name (char * name);
 
   /// Accessor for probe id.
-  u_int probe_id (void);
+  u_int probe_id ();
 
   /// Mutator for probe id.
   void probe_id (u_int id);
@@ -164,7 +164,7 @@ protected:
   /// Obtain an allocator pointer correctly thunked for the current
   /// address space.  If there is no allocator stored in the instance,
   /// the singleton allocator in the current process is used.
-  ALLOCATOR * allocator (void);
+  ALLOCATOR * allocator ();
 
   // = Implementation members.
 
diff --git a/ACE/ace/Monitor_Admin_Manager.h b/ACE/ace/Monitor_Admin_Manager.h
index 5b4f04c2302..f3c27214bf5 100644
--- a/ACE/ace/Monitor_Admin_Manager.h
+++ b/ACE/ace/Monitor_Admin_Manager.h
@@ -42,10 +42,10 @@ namespace ACE
     {
     public:
       /// Access the admin instance.
-      ACE::Monitor_Control::Monitor_Admin& admin (void);
+      ACE::Monitor_Control::Monitor_Admin& admin ();
 
       /// Used to force initialization of the MC service.
-      static int Initializer (void);
+      static int Initializer ();
 
     private:
       Monitor_Admin admin_;
diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp
index e65e4f2ec97..ad603b39aa1 100644
--- a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp
+++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp
@@ -12,12 +12,12 @@ namespace ACE
 {
   namespace Monitor_Control
   {
-    Auto_Update_Starter::Auto_Update_Starter (void)
+    Auto_Update_Starter::Auto_Update_Starter ()
     {
     }
 
     int
-    Auto_Update_Starter::svc (void)
+    Auto_Update_Starter::svc ()
     {
       MC_ADMINMANAGER* mgr =
         ACE_Dynamic_Service<MC_ADMINMANAGER>::instance ("MC_ADMINMANAGER");
diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.h b/ACE/ace/Monitor_Control/Auto_Update_Starter.h
index 7a488d5370f..f773b24217c 100644
--- a/ACE/ace/Monitor_Control/Auto_Update_Starter.h
+++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.h
@@ -43,9 +43,9 @@ namespace ACE
     class MONITOR_CONTROL_Export Auto_Update_Starter : public ACE_Task_Base
     {
     public:
-      Auto_Update_Starter (void);
+      Auto_Update_Starter ();
 
-      int svc (void);
+      int svc ();
     };
   }
 }
diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
index 1e8a99d2876..718e603d911 100644
--- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
@@ -27,20 +27,20 @@ namespace ACE
     }
 
     void
-    BSD_Network_Interface_Monitor::update_i (void)
+    BSD_Network_Interface_Monitor::update_i ()
     {
       this->fetch(this->value_);
       this->value_ -= this->start_;
     }
 
     void
-    BSD_Network_Interface_Monitor::clear_impl (void)
+    BSD_Network_Interface_Monitor::clear_impl ()
     {
       this->init();
     }
 
     void
-    BSD_Network_Interface_Monitor::init (void)
+    BSD_Network_Interface_Monitor::init ()
     {
       this->fetch(this->start_);
       this->value_ = 0UL;
diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp
index 0cca617c78f..9ed53f08b30 100644
--- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp
@@ -30,7 +30,7 @@ namespace ACE
     {}
 
     void
-    Bytes_Received_Monitor::update (void)
+    Bytes_Received_Monitor::update ()
     {
       this->update_i ();
 
@@ -39,13 +39,13 @@ namespace ACE
     }
 
     const char*
-    Bytes_Received_Monitor::default_name (void)
+    Bytes_Received_Monitor::default_name ()
     {
       return Bytes_Received_Monitor::default_name_;
     }
 
     void
-    Bytes_Received_Monitor::clear_i (void)
+    Bytes_Received_Monitor::clear_i ()
     {
       this->clear_impl ();
       this->Monitor_Base::clear_i ();
diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
index eabb99399ca..cecc79da264 100644
--- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
+++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
@@ -68,14 +68,14 @@ namespace ACE
       Bytes_Received_Monitor (const char* name);
 
       /// Implementation of the pure virtual method.
-      virtual void update (void);
+      virtual void update ();
 
       /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
+      static const char* default_name ();
 
     private:
       /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
     private:
       static const char* default_name_;
diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
index 7e1e408a5f9..98a05b365ed 100644
--- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
@@ -30,7 +30,7 @@ namespace ACE
     {}
 
     void
-    Bytes_Sent_Monitor::update (void)
+    Bytes_Sent_Monitor::update ()
     {
       this->update_i ();
 
@@ -39,13 +39,13 @@ namespace ACE
     }
 
     const char*
-    Bytes_Sent_Monitor::default_name (void)
+    Bytes_Sent_Monitor::default_name ()
     {
       return Bytes_Sent_Monitor::default_name_;
     }
 
     void
-    Bytes_Sent_Monitor::clear_i (void)
+    Bytes_Sent_Monitor::clear_i ()
     {
       this->clear_impl ();
       this->Monitor_Base::clear_i ();
diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
index 7cf0def29da..132b6d74004 100644
--- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
+++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
@@ -68,14 +68,14 @@ namespace ACE
       Bytes_Sent_Monitor (const char* name);
 
       /// Implementation of the pure virtual method.
-      virtual void update (void);
+      virtual void update ();
 
       /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
+      static const char* default_name ();
 
     private:
       /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
     private:
       static const char* default_name_;
diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
index 5aa5b944bf2..60ca87f76c4 100644
--- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
@@ -47,7 +47,7 @@ namespace ACE
     }
 
     void
-    CPU_Load_Monitor::update (void)
+    CPU_Load_Monitor::update ()
     {
 #if defined (ACE_HAS_WIN32_PDH)
       this->update_i ();
@@ -82,13 +82,13 @@ namespace ACE
     }
 
     const char*
-    CPU_Load_Monitor::default_name (void)
+    CPU_Load_Monitor::default_name ()
     {
       return CPU_Load_Monitor::default_name_;
     }
 
     void
-    CPU_Load_Monitor::clear_i (void)
+    CPU_Load_Monitor::clear_i ()
     {
 #if defined (ACE_HAS_WIN32_PDH)
       this->clear_impl ();
@@ -99,7 +99,7 @@ namespace ACE
     }
 
     void
-    CPU_Load_Monitor::init (void)
+    CPU_Load_Monitor::init ()
     {
 #if defined (ACE_LINUX)
       /// All data in this file are stored as running 'jiffy' totals, so we
diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h
index 7ae6dda69d5..037cb5d19b2 100644
--- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h
+++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h
@@ -50,17 +50,17 @@ namespace ACE
       CPU_Load_Monitor (const char* name);
 
       /// Implementation of the pure virtual method.
-      virtual void update (void);
+      virtual void update ();
 
       /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
+      static const char* default_name ();
 
     private:
       /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
       /// Common code to the constructor and to clear_i().
-      void init (void);
+      void init ();
 
     private:
 #if defined (ACE_LINUX)
diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp
index f6b4f685958..7cd1922fd3a 100644
--- a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp
+++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp
@@ -14,11 +14,11 @@ namespace ACE
 {
   namespace Monitor_Control
   {
-    Constraint_Interpreter::Constraint_Interpreter (void)
+    Constraint_Interpreter::Constraint_Interpreter ()
     {
     }
 
-    Constraint_Interpreter::~Constraint_Interpreter (void)
+    Constraint_Interpreter::~Constraint_Interpreter ()
     {
     }
 
diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.h b/ACE/ace/Monitor_Control/Constraint_Interpreter.h
index d63bf35f816..e867c72ef0d 100644
--- a/ACE/ace/Monitor_Control/Constraint_Interpreter.h
+++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.h
@@ -44,9 +44,9 @@ namespace ACE
       : public ETCL_Interpreter
     {
     public:
-      Constraint_Interpreter (void);
+      Constraint_Interpreter ();
 
-      virtual ~Constraint_Interpreter (void);
+      virtual ~Constraint_Interpreter ();
 
       /**
        * This method builds an expression tree representing the
diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
index 1348f6a21c6..e793a54d722 100644
--- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
@@ -28,20 +28,20 @@ namespace ACE
     }
 
     void
-    FreeBSD_Network_Interface_Monitor::update_i (void)
+    FreeBSD_Network_Interface_Monitor::update_i ()
     {
       this->fetch(this->value_);
       this->value_ -= this->start_;
     }
 
     void
-    FreeBSD_Network_Interface_Monitor::clear_impl (void)
+    FreeBSD_Network_Interface_Monitor::clear_impl ()
     {
       this->init();
     }
 
     void
-    FreeBSD_Network_Interface_Monitor::init (void)
+    FreeBSD_Network_Interface_Monitor::init ()
     {
       this->fetch(this->start_);
       this->value_ = 0UL;
diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
index 61a650c4c56..521f746df81 100644
--- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
@@ -41,16 +41,16 @@ namespace ACE
       FreeBSD_Network_Interface_Monitor (const ACE_TCHAR *lookup_str);
 
       /// Platform-specific implementation.
-      void update_i (void);
+      void update_i ();
 
       /// Platform-specific reset.
-      void clear_impl (void);
+      void clear_impl ();
 
     protected:
       ACE_UINT64 value_;
 
     private:
-      void init (void);
+      void init ();
       void fetch (ACE_UINT64& value) const;
 
       ACE_UINT64 start_;
diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
index a92f82b8816..b0534ca00be 100644
--- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
@@ -21,7 +21,7 @@ namespace ACE
     }
 
     void
-    Linux_Network_Interface_Monitor::update_i (void)
+    Linux_Network_Interface_Monitor::update_i ()
     {
       char buf[1024];
       FILE* fp = ACE_OS::fopen (ACE_TEXT ("/proc/net/dev"),
@@ -66,13 +66,13 @@ namespace ACE
     }
 
     void
-    Linux_Network_Interface_Monitor::clear_impl (void)
+    Linux_Network_Interface_Monitor::clear_impl ()
     {
       this->init ();
     }
 
     void
-    Linux_Network_Interface_Monitor::init (void)
+    Linux_Network_Interface_Monitor::init ()
     {
       for (unsigned long i = 0UL; i < MAX_INTERFACES; ++i)
         {
diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
index 0320bfa3f8c..5622c7138f3 100644
--- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
@@ -44,17 +44,17 @@ namespace ACE
       Linux_Network_Interface_Monitor (const char *scan_format);
 
       /// Platform-specific implementation.
-      void update_i (void);
+      void update_i ();
 
       /// Platform-specific reset.
-      void clear_impl (void);
+      void clear_impl ();
 
     protected:
       ACE_UINT64 value_;
 
     private:
       /// Common code.
-      void init (void);
+      void init ();
 
     private:
       static const unsigned long MAX_INTERFACES = 10UL;
diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
index 73b29f73abd..49593fee95c 100644
--- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
@@ -24,7 +24,7 @@ namespace ACE
     }
 
     void
-    Memory_Usage_Monitor::update (void)
+    Memory_Usage_Monitor::update ()
     {
 #if defined (ACE_HAS_WIN32_PDH)
       this->update_i ();
@@ -54,13 +54,13 @@ namespace ACE
     }
 
     const char*
-    Memory_Usage_Monitor::default_name (void)
+    Memory_Usage_Monitor::default_name ()
     {
       return Memory_Usage_Monitor::default_name_;
     }
 
     void
-    Memory_Usage_Monitor::clear_i (void)
+    Memory_Usage_Monitor::clear_i ()
     {
 #if defined (ACE_HAS_WIN32_PDH)
       this->clear_impl ();
diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h
index c8eb730767b..064b5e74e2d 100644
--- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h
+++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h
@@ -50,14 +50,14 @@ namespace ACE
       Memory_Usage_Monitor (const char* name);
 
       /// Implementation of the pure virtual method.
-      virtual void update (void);
+      virtual void update ();
 
       /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
+      static const char* default_name ();
 
     private:
       /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
     private:
       static const char* default_name_;
diff --git a/ACE/ace/Monitor_Control/Monitor_Group.cpp b/ACE/ace/Monitor_Control/Monitor_Group.cpp
index 77cc456797f..42c8b824bb5 100644
--- a/ACE/ace/Monitor_Control/Monitor_Group.cpp
+++ b/ACE/ace/Monitor_Control/Monitor_Group.cpp
@@ -19,7 +19,7 @@ namespace ACE
     }
 
     void
-    Monitor_Group::update (void)
+    Monitor_Group::update ()
     {
       for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ())
         {
@@ -48,7 +48,7 @@ namespace ACE
     }
 
     void
-    Monitor_Group::clear (void)
+    Monitor_Group::clear ()
     {
       for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ())
         {
diff --git a/ACE/ace/Monitor_Control/Monitor_Group.h b/ACE/ace/Monitor_Control/Monitor_Group.h
index 2ce370c860b..6aa62894936 100644
--- a/ACE/ace/Monitor_Control/Monitor_Group.h
+++ b/ACE/ace/Monitor_Control/Monitor_Group.h
@@ -41,14 +41,14 @@ namespace ACE
 
       void add_member (Monitor_Base* member);
 
-      virtual void update (void);
+      virtual void update ();
 
       /// These are overridden to be no-ops.
       virtual void receive (double data);
       virtual void receive (size_t data);
       virtual void receive (const Monitor_Control_Types::NameList& data);
 
-      virtual void clear (void);
+      virtual void clear ();
 
     private:
       typedef ACE_Unbounded_Queue<Monitor_Base *>
diff --git a/ACE/ace/Monitor_Control/Monitor_Query.cpp b/ACE/ace/Monitor_Control/Monitor_Query.cpp
index 6de953b1619..e51595c3545 100644
--- a/ACE/ace/Monitor_Control/Monitor_Query.cpp
+++ b/ACE/ace/Monitor_Control/Monitor_Query.cpp
@@ -48,7 +48,7 @@ namespace ACE
     }
 
     void
-    Monitor_Query::query (void)
+    Monitor_Query::query ()
     {
       if (this->monitor_ == 0)
         {
diff --git a/ACE/ace/Monitor_Control/Monitor_Query.h b/ACE/ace/Monitor_Control/Monitor_Query.h
index 5c24c7f4ab4..2cfe0461b9d 100644
--- a/ACE/ace/Monitor_Control/Monitor_Query.h
+++ b/ACE/ace/Monitor_Control/Monitor_Query.h
@@ -59,7 +59,7 @@ namespace ACE
     public:
       Monitor_Query (const char* monitor_name);
 
-      void query (void);
+      void query ();
 
     private:
       Monitor_Base* monitor_;
diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
index ad554ca17cd..4a52c001503 100644
--- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
@@ -6,19 +6,19 @@ namespace ACE
 {
   namespace Monitor_Control
   {
-    Null_Network_Interface_Monitor::Null_Network_Interface_Monitor (void)
+    Null_Network_Interface_Monitor::Null_Network_Interface_Monitor ()
       : value_ (0UL)
     {
     }
 
     void
-    Null_Network_Interface_Monitor::update_i (void)
+    Null_Network_Interface_Monitor::update_i ()
     {
       /// No-op.
     }
 
     void
-    Null_Network_Interface_Monitor::clear_impl (void)
+    Null_Network_Interface_Monitor::clear_impl ()
     {
       /// No-op.
     }
diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h
index 82fd3170784..568a1ed2a34 100644
--- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h
@@ -38,13 +38,13 @@ namespace ACE
     class MONITOR_CONTROL_Export Null_Network_Interface_Monitor
     {
     protected:
-      Null_Network_Interface_Monitor (void);
+      Null_Network_Interface_Monitor ();
 
       /// Platform-specific implementation.
-      void update_i (void);
+      void update_i ();
 
       /// Platform-specific reset.
-      void clear_impl (void);
+      void clear_impl ();
 
     protected:
       ACE_UINT64 value_;
diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
index f4a33708133..c42fac4f098 100644
--- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
@@ -30,7 +30,7 @@ namespace ACE
     }
 
     void
-    Num_Threads_Monitor::update (void)
+    Num_Threads_Monitor::update ()
     {
 #if defined (ACE_HAS_WIN32_PDH)
       this->update_i ();
@@ -75,13 +75,13 @@ namespace ACE
     }
 
     const char*
-    Num_Threads_Monitor::default_name (void)
+    Num_Threads_Monitor::default_name ()
     {
       return Num_Threads_Monitor::default_name_;
     }
 
     void
-    Num_Threads_Monitor::clear_i (void)
+    Num_Threads_Monitor::clear_i ()
     {
 #if defined (ACE_HAS_WIN32_PDH)
       this->clear_impl ();
diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h
index 2c44c0e7f4a..422a71c79ea 100644
--- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h
+++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h
@@ -56,14 +56,14 @@ namespace ACE
       Num_Threads_Monitor (const char* name);
 
       /// Implementation of the pure virtual method.
-      virtual void update (void);
+      virtual void update ();
 
       /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
+      static const char* default_name ();
 
     private:
       /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
     private:
       static const char* default_name_;
diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
index f0029acd6a8..c01091eacce 100644
--- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
@@ -30,7 +30,7 @@ namespace ACE
     {}
 
     void
-    Packets_Received_Monitor::update (void)
+    Packets_Received_Monitor::update ()
     {
       this->update_i ();
 
@@ -39,13 +39,13 @@ namespace ACE
     }
 
     const char*
-    Packets_Received_Monitor::default_name (void)
+    Packets_Received_Monitor::default_name ()
     {
       return Packets_Received_Monitor::default_name_;
     }
 
     void
-    Packets_Received_Monitor::clear_i (void)
+    Packets_Received_Monitor::clear_i ()
     {
       this->clear_impl ();
       this->Monitor_Base::clear_i ();
diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
index bb0e7d0763f..d7f80a1491d 100644
--- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
+++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
@@ -68,14 +68,14 @@ namespace ACE
       Packets_Received_Monitor (const char* name);
 
       /// Implementation of the pure virtual method.
-      virtual void update (void);
+      virtual void update ();
 
       /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
+      static const char* default_name ();
 
     private:
       /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
     private:
       static const char* default_name_;
diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp
index de5cfd37813..fc880ed7ae0 100644
--- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp
@@ -30,7 +30,7 @@ namespace ACE
     {}
 
     void
-    Packets_Sent_Monitor::update (void)
+    Packets_Sent_Monitor::update ()
     {
       this->update_i ();
 
@@ -39,13 +39,13 @@ namespace ACE
     }
 
     const char*
-    Packets_Sent_Monitor::default_name (void)
+    Packets_Sent_Monitor::default_name ()
     {
       return Packets_Sent_Monitor::default_name_;
     }
 
     void
-    Packets_Sent_Monitor::clear_i (void)
+    Packets_Sent_Monitor::clear_i ()
     {
       this->clear_impl ();
       this->Monitor_Base::clear_i ();
diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
index 1ad0a2d9a6c..c547434b46a 100644
--- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
+++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
@@ -68,14 +68,14 @@ namespace ACE
       Packets_Sent_Monitor (const char* name);
 
       /// Implementation of the pure virtual method.
-      virtual void update (void);
+      virtual void update ();
 
       /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
+      static const char* default_name ();
 
     private:
       /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
     private:
       static const char* default_name_;
diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
index d57dc88ad37..a3e09a8afa2 100644
--- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
@@ -21,20 +21,20 @@ namespace ACE
     }
 
     void
-    Solaris_Network_Interface_Monitor::update_i (void)
+    Solaris_Network_Interface_Monitor::update_i ()
     {
       this->access_kstats (this->value_);
       this->value_ -= this->start_;
     }
 
     void
-    Solaris_Network_Interface_Monitor::clear_impl (void)
+    Solaris_Network_Interface_Monitor::clear_impl ()
     {
       this->init ();
     }
 
     void
-    Solaris_Network_Interface_Monitor::init (void)
+    Solaris_Network_Interface_Monitor::init ()
     {
       unsigned long i;
 
diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
index 83f02f71e05..15dbc9c50e1 100644
--- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
@@ -46,10 +46,10 @@ namespace ACE
       Solaris_Network_Interface_Monitor (const ACE_TCHAR *lookup_str);
 
       /// Platform-specific implementation.
-      void update_i (void);
+      void update_i ();
 
       /// Platform-specific reset.
-      void clear_impl (void);
+      void clear_impl ();
 
     protected:
       ACE_UINT64 value_;
@@ -57,7 +57,7 @@ namespace ACE
     private:
       /// Common code.
 
-      void init (void);
+      void init ();
       void access_kstats (ACE_UINT64 &which_member);
       int check_ks_module (const unsigned long ks_instance,
                            const unsigned long which_max,
diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Monitor.cpp
index d44f7e58a24..2759ee6c2a0 100644
--- a/ACE/ace/Monitor_Control/Windows_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Windows_Monitor.cpp
@@ -21,7 +21,7 @@ namespace ACE
     }
 
     void
-    Windows_Monitor::update_i (void)
+    Windows_Monitor::update_i ()
     {
       PdhCollectQueryData (this->query_);
       PDH_FMT_COUNTERVALUE pdh_value;
@@ -35,13 +35,13 @@ namespace ACE
     }
 
     void
-    Windows_Monitor::clear_impl (void)
+    Windows_Monitor::clear_impl ()
     {
       this->init ();
     }
 
     void
-    Windows_Monitor::init (void)
+    Windows_Monitor::init ()
     {
       /// Create a query and a counter here so it doesn't have
       /// to be done with each update.
diff --git a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
index 7d3b68d5c0e..8a38444b76a 100644
--- a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
@@ -60,7 +60,7 @@ namespace ACE
       GlobalFree (paths);
     }
 
-    Windows_Multi_Instance_Monitor::~Windows_Multi_Instance_Monitor (void)
+    Windows_Multi_Instance_Monitor::~Windows_Multi_Instance_Monitor ()
     {
       Windows_Monitor *instance = 0;
 
@@ -72,7 +72,7 @@ namespace ACE
     }
 
     void
-    Windows_Multi_Instance_Monitor::update_i (void)
+    Windows_Multi_Instance_Monitor::update_i ()
     {
       Windows_Monitor **current_instance = 0;
 
@@ -88,7 +88,7 @@ namespace ACE
     }
 
     void
-    Windows_Multi_Instance_Monitor::clear_impl (void)
+    Windows_Multi_Instance_Monitor::clear_impl ()
     {
       Windows_Monitor **current_instance = 0;
 
diff --git a/ACE/ace/Monitor_Control_Action.h b/ACE/ace/Monitor_Control_Action.h
index aea10b43b46..8f061459ffb 100644
--- a/ACE/ace/Monitor_Control_Action.h
+++ b/ACE/ace/Monitor_Control_Action.h
@@ -44,8 +44,8 @@ namespace ACE
       virtual void execute (const char* command = 0) = 0;
 
       /// Refcounting methods.
-      void add_ref (void);
-      void remove_ref (void);
+      void add_ref ();
+      void remove_ref ();
 
     protected:
       Control_Action ();
diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp
index b4488bb6e7d..57682de44f3 100644
--- a/ACE/ace/Msg_WFMO_Reactor.cpp
+++ b/ACE/ace/Msg_WFMO_Reactor.cpp
@@ -22,7 +22,7 @@ ACE_Msg_WFMO_Reactor::ACE_Msg_WFMO_Reactor (size_t size,
 {
 }
 
-ACE_Msg_WFMO_Reactor::~ACE_Msg_WFMO_Reactor (void)
+ACE_Msg_WFMO_Reactor::~ACE_Msg_WFMO_Reactor ()
 {
 }
 
@@ -43,7 +43,7 @@ ACE_Msg_WFMO_Reactor::wait_for_multiple_events (int timeout,
 }
 
 int
-ACE_Msg_WFMO_Reactor::dispatch_window_messages (void)
+ACE_Msg_WFMO_Reactor::dispatch_window_messages ()
 {
   int number_of_messages = 0;
   MSG msg;
diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h
index 6adb3d5d433..3381da09d5d 100644
--- a/ACE/ace/Msg_WFMO_Reactor.h
+++ b/ACE/ace/Msg_WFMO_Reactor.h
@@ -55,7 +55,7 @@ public:
                         ACE_Timer_Queue * = 0);
 
   /// Close down the ACE_Msg_WFMO_Reactor and release all of its resources.
-  virtual ~ACE_Msg_WFMO_Reactor (void);
+  virtual ~ACE_Msg_WFMO_Reactor ();
 
   /**
    * This event loop driver blocks for up to @a max_wait_time before
@@ -102,7 +102,7 @@ protected:
   virtual DWORD poll_remaining_handles (DWORD index);
 
   /// Dispatches window messages.
-  virtual int dispatch_window_messages (void);
+  virtual int dispatch_window_messages ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Multihomed_INET_Addr.h b/ACE/ace/Multihomed_INET_Addr.h
index 496efc73bc6..58879c62632 100644
--- a/ACE/ace/Multihomed_INET_Addr.h
+++ b/ACE/ace/Multihomed_INET_Addr.h
@@ -34,7 +34,7 @@ class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr
 {
 public:
   /// Default constructor.
-  ACE_Multihomed_INET_Addr (void);
+  ACE_Multihomed_INET_Addr ();
 
   /**
    * Initializes an ACE_Multihomed_INET_Addr from the @a address,
@@ -102,7 +102,7 @@ public:
   /// Use compiler-generated assignment operator.
 
   /// Default destructor.
-  ~ACE_Multihomed_INET_Addr (void);
+  ~ACE_Multihomed_INET_Addr ();
 
   // = Direct initialization methods.
 
diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp
index 3af1814f415..cdc6ecc5bc8 100644
--- a/ACE/ace/NT_Service.cpp
+++ b/ACE/ace/NT_Service.cpp
@@ -17,7 +17,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_NT_Service)
 
 // ACE_NT_Service destructor.
 
-ACE_NT_Service::~ACE_NT_Service (void)
+ACE_NT_Service::~ACE_NT_Service ()
 {
   if (this->svc_sc_handle_ != 0)
     {
@@ -236,7 +236,7 @@ ACE_NT_Service::insert (DWORD start_type,
 }
 
 int
-ACE_NT_Service::remove (void)
+ACE_NT_Service::remove ()
 {
   if (this->svc_sc_handle () == 0)
     return -1;
@@ -275,7 +275,7 @@ ACE_NT_Service::startup (DWORD startup)
 // Returns the current startup type.
 
 DWORD
-ACE_NT_Service::startup (void)
+ACE_NT_Service::startup ()
 {
   // The query buffer will hold strings as well as the defined struct.
   // The string pointers in the struct point to other areas in the
@@ -516,7 +516,7 @@ ACE_NT_Service::report_status (DWORD new_status,
 }
 
 SC_HANDLE
-ACE_NT_Service::svc_sc_handle (void)
+ACE_NT_Service::svc_sc_handle ()
 {
   if (this->svc_sc_handle_ == 0)
     {
diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h
index cca6f82600c..5c9f282884f 100644
--- a/ACE/ace/NT_Service.h
+++ b/ACE/ace/NT_Service.h
@@ -110,7 +110,7 @@ public:
                   DWORD service_type = SERVICE_WIN32_OWN_PROCESS,
                   DWORD controls_mask = SERVICE_ACCEPT_STOP);
 
-  virtual ~ACE_NT_Service (void);
+  virtual ~ACE_NT_Service ();
 
   // = Functions to operate the service
 
@@ -225,7 +225,7 @@ public:
    * first method called to be sure that any logging done is incorporated
    * correctly into the process's established logging setup.
    */
-  void inherit_log_msg_attributes (void);
+  void inherit_log_msg_attributes ();
 
   // = Methods which control the service's execution.
 
@@ -323,7 +323,7 @@ protected:
    * retrieves the handle from the Service Control Manager and caches
    * it.
    */
-  SC_HANDLE svc_sc_handle (void);
+  SC_HANDLE svc_sc_handle ();
 
   /**
    * Waits for the service to reach @a desired_state or get
diff --git a/ACE/ace/Name_Request_Reply.h b/ACE/ace/Name_Request_Reply.h
index ec49d3679c4..0dcfeb7a240 100644
--- a/ACE/ace/Name_Request_Reply.h
+++ b/ACE/ace/Name_Request_Reply.h
@@ -67,7 +67,7 @@ public:
   };
 
   /// Default constructor.
-  ACE_Name_Request (void);
+  ACE_Name_Request ();
 
   /// Create a ACE_Name_Request message.
   ACE_Name_Request (ACE_INT32 msg_type, // Type of request.
@@ -81,7 +81,7 @@ public:
 
   /// Initialize length_ in order to ensure correct byte ordering
   /// before a request is sent.
-  void init (void);
+  void init ();
 
   // = Set/get the length of the encoded/decoded message.
   ACE_UINT32 length () const;
@@ -127,7 +127,7 @@ public:
   int encode (void *&);
 
   /// Decode message after reception.
-  int decode (void);
+  int decode ();
 
   /// Print out the values of the message for debugging purposes.
   void dump () const;
@@ -201,14 +201,14 @@ public:
   };
 
   /// Default constructor.
-  ACE_Name_Reply (void);
+  ACE_Name_Reply ();
 
   /// Create a ACE_Name_Reply message.
   ACE_Name_Reply (ACE_UINT32 type, ACE_UINT32 err); // Type of reply.
 
   /// Initialize length_ in order to ensure correct byte ordering
   /// before a reply is sent.
-  void init (void);
+  void init ();
 
   // = Set/get the length of the encoded/decoded message.
   ACE_UINT32 length () const;
@@ -230,7 +230,7 @@ public:
   int encode (void *&);
 
   /// Decode a message after reception.
-  int decode (void);
+  int decode ();
 
   /// Print out the values of the message for debugging purposes.
   void dump () const;
diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h
index c7b7969678f..e109bfa58ff 100644
--- a/ACE/ace/Naming_Context.h
+++ b/ACE/ace/Naming_Context.h
@@ -87,14 +87,14 @@ public:
 
   /// Deletes the instance of Name Space. Must be called before
   /// switching name spaces.
-  int close (void);
+  int close ();
 
   /// Release all resources. Gets called by destructor and fini.
-  int close_down (void);
+  int close_down ();
 
   /// destructor, do some cleanup :TBD: last dtor should "compress"
   /// file
-  ~ACE_Naming_Context (void);
+  ~ACE_Naming_Context ();
 
   // = Dynamic initialization hooks.
   /// Initialize name options and naming context when dynamically
@@ -108,7 +108,7 @@ public:
   virtual int info (ACE_TCHAR **strp, size_t length) const;
 
   /// Returns the ACE_Name_Options associated with the Naming_Context
-  ACE_Name_Options *name_options (void);
+  ACE_Name_Options *name_options ();
 
   /// Bind a new name to a naming context (Wide character strings).
   int bind (const ACE_NS_WString &name_in,
@@ -246,7 +246,7 @@ public:
                                  const char *pattern_in);
 
   /// Dump the state of the object.
-  void dump (void);
+  void dump ();
 
 private:
   /// Keep track of the options such as database name etc per Naming Context
@@ -265,7 +265,7 @@ private:
   int netnameserver_port_;
 
   /// 1 if we're on the same local machine as the name server, else 0.
-  int local (void);
+  int local ();
 };
 
 /**
@@ -276,8 +276,8 @@ private:
 class ACE_Export ACE_Name_Options
 {
 public:
-  ACE_Name_Options (void);
-  ~ACE_Name_Options (void);
+  ACE_Name_Options ();
+  ~ACE_Name_Options ();
 
   /// Parse arguments.
   void parse_args (int argc,
@@ -287,10 +287,10 @@ public:
   void nameserver_port (int port);
 
   /// Get the port number
-  int nameserver_port (void);
+  int nameserver_port ();
 
   /// Get the context
-  ACE_Naming_Context::Context_Scope_Type context (void);
+  ACE_Naming_Context::Context_Scope_Type context ();
 
   /// Set the context
   void context (ACE_Naming_Context::Context_Scope_Type);
@@ -299,31 +299,31 @@ public:
   void nameserver_host (const ACE_TCHAR *host);
 
   /// Get the host name
-  const ACE_TCHAR *nameserver_host (void);
+  const ACE_TCHAR *nameserver_host ();
 
   /// Set name space directory
   void namespace_dir (const ACE_TCHAR *dir);
 
   /// Get name space directory
-  const ACE_TCHAR *namespace_dir (void);
+  const ACE_TCHAR *namespace_dir ();
 
   /// Set process name
   void process_name (const ACE_TCHAR *dir);
 
   /// Get process name
-  const ACE_TCHAR *process_name (void);
+  const ACE_TCHAR *process_name ();
 
   /// Set database name
   void database (const ACE_TCHAR *);
 
   /// Get database name
-  const ACE_TCHAR *database (void);
+  const ACE_TCHAR *database ();
 
   /// Set base address of the underlying allocator
   void base_address (char *address);
 
   /// Get base address of the underlying allocator
-  char *base_address (void);
+  char *base_address ();
 
   /// Get use of registry in naming
   bool use_registry () const;
@@ -332,10 +332,10 @@ public:
   void use_registry (bool x);
 
   /// Return debug status
-  bool debug (void);
+  bool debug ();
 
   /// Return verbose status
-  bool verbose (void);
+  bool verbose ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ace/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h
index 9d53b94e8da..a2bbb238ee8 100644
--- a/ACE/ace/Netlink_Addr.h
+++ b/ACE/ace/Netlink_Addr.h
@@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Netlink_Addr : public ACE_Addr {
 public:
   /// Default constructor.
-  ACE_Netlink_Addr (void);
+  ACE_Netlink_Addr ();
 
   /// Copy constructor.
   ACE_Netlink_Addr (const ACE_Netlink_Addr &);
@@ -93,7 +93,7 @@ private:
   /**
    * set nl_  @see nl_ to zero and sets address family to default value
    */
-  void reset (void);
+  void reset ();
 
   sockaddr_nl  nl_;
 };
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index 1d454befb1b..a99cdd35ef2 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -346,7 +346,7 @@ ACE_TSS_Ref::ACE_TSS_Ref (ACE_thread_t id)
   ACE_OS_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref");
 }
 
-ACE_TSS_Ref::ACE_TSS_Ref (void)
+ACE_TSS_Ref::ACE_TSS_Ref ()
 {
   ACE_OS_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref");
 }
@@ -386,7 +386,7 @@ ACE_TSS_Info::ACE_TSS_Info (ACE_thread_key_t key,
   ACE_OS_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
 }
 
-ACE_TSS_Info::ACE_TSS_Info (void)
+ACE_TSS_Info::ACE_TSS_Info ()
   : key_ (ACE_OS::NULL_key),
     destructor_ (0),
     thread_count_ (-1)
@@ -413,7 +413,7 @@ ACE_TSS_Info::operator != (const ACE_TSS_Info &info) const
 }
 
 void
-ACE_TSS_Info::dump (void)
+ACE_TSS_Info::dump ()
 {
 # if defined (ACE_HAS_DUMP)
   //  ACE_OS_TRACE ("ACE_TSS_Info::dump");
@@ -430,7 +430,7 @@ ACE_TSS_Info::dump (void)
 // Moved class ACE_TSS_Keys declaration to OS.h so it can be visible
 // to the single file of template instantiations.
 
-ACE_TSS_Keys::ACE_TSS_Keys (void)
+ACE_TSS_Keys::ACE_TSS_Keys ()
 {
   for (u_int i = 0; i < ACE_WORDS; ++i)
     {
@@ -518,10 +518,10 @@ public:
 
   /// Cleanup the thread-specific objects.  Does _NOT_ exit the thread.
   /// For each used key perform the same actions as free_key.
-  void thread_exit (void);
+  void thread_exit ();
 
 private:
-  void dump (void);
+  void dump ();
 
   /// Release a key used by this thread
   /// @param info reference to the info for this key
@@ -546,8 +546,8 @@ private:
   ACE_TSS_Keys *tss_keys ();
 
   /// Ensure singleton.
-  ACE_TSS_Cleanup (void);
-  ~ACE_TSS_Cleanup (void);
+  ACE_TSS_Cleanup ();
+  ~ACE_TSS_Cleanup ();
 
   /// ACE_TSS_Cleanup access only via TSS_Cleanup_Instance
   friend class TSS_Cleanup_Instance;
@@ -671,7 +671,7 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose)
   }
 }
 
-TSS_Cleanup_Instance::~TSS_Cleanup_Instance (void)
+TSS_Cleanup_Instance::~TSS_Cleanup_Instance ()
 {
   // Variable to hold the mutex_ to delete outside the scope of the
   // guard.
@@ -735,12 +735,12 @@ ACE_TSS_Cleanup * TSS_Cleanup_Instance::instance_ = 0;
 ACE_Thread_Mutex* TSS_Cleanup_Instance::mutex_ = 0;
 ACE_Condition_Thread_Mutex* TSS_Cleanup_Instance::condition_ = 0;
 
-ACE_TSS_Cleanup::~ACE_TSS_Cleanup (void)
+ACE_TSS_Cleanup::~ACE_TSS_Cleanup ()
 {
 }
 
 void
-ACE_TSS_Cleanup::thread_exit (void)
+ACE_TSS_Cleanup::thread_exit ()
 {
   ACE_OS_TRACE ("ACE_TSS_Cleanup::thread_exit");
   // variables to hold the destructors, keys
@@ -822,7 +822,7 @@ ACE_TSS_Cleanup_keys_destroyer (void *tss_keys)
   delete static_cast <ACE_TSS_Keys *> (tss_keys);
 }
 
-ACE_TSS_Cleanup::ACE_TSS_Cleanup (void)
+ACE_TSS_Cleanup::ACE_TSS_Cleanup ()
   : in_use_ (ACE_OS::NULL_key)
 {
   ACE_OS_TRACE ("ACE_TSS_Cleanup::ACE_TSS_Cleanup");
@@ -975,7 +975,7 @@ ACE_TSS_Cleanup::thread_use_key (ACE_thread_key_t key)
 }
 
 void
-ACE_TSS_Cleanup::dump (void)
+ACE_TSS_Cleanup::dump ()
 {
 # if defined (ACE_HAS_DUMP)
   // Iterate through all the thread-specific items and dump them all.
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
index 9a0bfecc5d4..8ae8f7141aa 100644
--- a/ACE/ace/OS_NS_Thread.h
+++ b/ACE/ace/OS_NS_Thread.h
@@ -926,7 +926,7 @@ public:
   ACE_TSS_Ref (ACE_thread_t id);
 
   /// Default constructor
-  ACE_TSS_Ref (void);
+  ACE_TSS_Ref ();
 
   /// Check for equality.
   bool operator== (const ACE_TSS_Ref &) const;
@@ -957,7 +957,7 @@ public:
                 Destructor dest = 0);
 
   /// Default constructor
-  ACE_TSS_Info (void);
+  ACE_TSS_Info ();
 
   /// Returns 1 if the key is in use, 0 if not.
   int key_in_use () const { return thread_count_ != -1; }
@@ -973,7 +973,7 @@ public:
   bool operator!= (const ACE_TSS_Info &) const;
 
   /// Dump the state.
-  void dump (void);
+  void dump ();
 
 private:
   /// Key to the thread-specific storage item.
@@ -1006,7 +1006,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Default constructor, to initialize all bits to zero (unused).
-  ACE_TSS_Keys (void);
+  ACE_TSS_Keys ();
 
   /// Mark the specified key as being in use, if it was not already so marked.
   /// Returns 1 if the had already been marked, 0 if not.
diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp
index ad949935525..e60ac8a418e 100644
--- a/ACE/ace/OS_NS_netdb.cpp
+++ b/ACE/ace/OS_NS_netdb.cpp
@@ -563,7 +563,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-ACE_OS::netdb_acquire (void)
+ACE_OS::netdb_acquire ()
 {
   return ACE_OS::thread_mutex_lock ((ACE_thread_mutex_t *)
     ACE_OS_Object_Manager::preallocated_object[
@@ -571,7 +571,7 @@ ACE_OS::netdb_acquire (void)
 }
 
 int
-ACE_OS::netdb_release (void)
+ACE_OS::netdb_release ()
 {
   return ACE_OS::thread_mutex_unlock ((ACE_thread_mutex_t *)
     ACE_OS_Object_Manager::preallocated_object[
diff --git a/ACE/ace/OS_NS_netdb.h b/ACE/ace/OS_NS_netdb.h
index 3cc5720173e..bcf82cf22bc 100644
--- a/ACE/ace/OS_NS_netdb.h
+++ b/ACE/ace/OS_NS_netdb.h
@@ -134,10 +134,10 @@ namespace ACE_OS
 
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
   extern ACE_Export
-  int netdb_acquire (void);
+  int netdb_acquire ();
 
   extern ACE_Export
-  int netdb_release (void);
+  int netdb_release ();
 # endif /* defined (ACE_MT_SAFE) && ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
 
 } /* namespace ACE_OS */
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index 68c06a014ef..3a4e6bdf91c 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -339,14 +339,14 @@ namespace ACE_OS {
   // = Win32 OS version determination function.
   /// Return the win32 OSVERSIONINFO structure.
   ACE_NAMESPACE_INLINE_FUNCTION
-  const ACE_TEXT_OSVERSIONINFO &get_win32_versioninfo (void);
+  const ACE_TEXT_OSVERSIONINFO &get_win32_versioninfo ();
 
   // = A pair of functions for modifying ACE's Win32 resource usage.
   /// Return the handle of the module containing ACE's resources. By
   /// default, for a DLL build of ACE this is a handle to the ACE DLL
   /// itself, and for a static build it is a handle to the executable.
   ACE_NAMESPACE_INLINE_FUNCTION
-  HINSTANCE get_win32_resource_module (void);
+  HINSTANCE get_win32_resource_module ();
 
   /// Allow an application to modify which module contains ACE's
   /// resources. This is mainly useful for a static build of ACE where
diff --git a/ACE/ace/OS_Thread_Adapter.h b/ACE/ace/OS_Thread_Adapter.h
index 536d06079ef..af0ea6aa94e 100644
--- a/ACE/ace/OS_Thread_Adapter.h
+++ b/ACE/ace/OS_Thread_Adapter.h
@@ -55,13 +55,13 @@ public:
    * @c this, thereby rendering the object useless after the call
    * returns.
    */
-  virtual ACE_THR_FUNC_RETURN invoke (void);
+  virtual ACE_THR_FUNC_RETURN invoke ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Ensure that this object is allocated on the heap.
-  ~ACE_OS_Thread_Adapter (void);
+  ~ACE_OS_Thread_Adapter ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h
index 5f90e56b2c2..982875accbb 100644
--- a/ACE/ace/OS_main.h
+++ b/ACE/ace/OS_main.h
@@ -238,7 +238,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Main_Base
 {
 public:
-  virtual ~ACE_Main_Base (void);
+  virtual ~ACE_Main_Base ();
   int run (HINSTANCE, HINSTANCE, LPWSTR, int);
   virtual int run_i (int, ACE_TCHAR *[]) = 0;
 };
diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp
index a98f62fab27..0a1c0767186 100644
--- a/ACE/ace/Object_Manager_Base.cpp
+++ b/ACE/ace/Object_Manager_Base.cpp
@@ -78,7 +78,7 @@ ACE_Object_Manager_Base::shutting_down_i ()
 
 extern "C"
 void
-ACE_OS_Object_Manager_Internal_Exit_Hook (void)
+ACE_OS_Object_Manager_Internal_Exit_Hook ()
 {
   if (ACE_OS_Object_Manager::instance_)
     ACE_OS_Object_Manager::instance ()->fini ();
@@ -137,7 +137,7 @@ ACE_OS_Object_Manager::thread_hook ()
 
 #if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS)
 ACE_SEH_EXCEPT_HANDLER
-ACE_OS_Object_Manager::seh_except_selector (void)
+ACE_OS_Object_Manager::seh_except_selector ()
 {
   return ACE_OS_Object_Manager::instance ()->seh_except_selector_;
 }
@@ -154,7 +154,7 @@ ACE_OS_Object_Manager::seh_except_selector (ACE_SEH_EXCEPT_HANDLER n)
 }
 
 ACE_SEH_EXCEPT_HANDLER
-ACE_OS_Object_Manager::seh_except_handler (void)
+ACE_OS_Object_Manager::seh_except_handler ()
 {
   return ACE_OS_Object_Manager::instance ()->seh_except_handler_;
 }
diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h
index 22fa9d20602..fe4b9285d77 100644
--- a/ACE/ace/Object_Manager_Base.h
+++ b/ACE/ace/Object_Manager_Base.h
@@ -116,7 +116,7 @@ private:
 };
 
 extern "C"
-void ACE_OS_Object_Manager_Internal_Exit_Hook (void);
+void ACE_OS_Object_Manager_Internal_Exit_Hook ();
 
 // @@ This forward declaration should go away.
 class ACE_Log_Msg;
diff --git a/ACE/ace/PI_Malloc.h b/ACE/ace/PI_Malloc.h
index db21328abf5..804bdec0bf8 100644
--- a/ACE/ace/PI_Malloc.h
+++ b/ACE/ace/PI_Malloc.h
@@ -59,7 +59,7 @@ public:
   class ACE_Export ACE_Malloc_Header
   {
   public:
-    ACE_Malloc_Header (void);
+    ACE_Malloc_Header ();
 
     /// Points to next block if on free list.
     MALLOC_HEADER_PTR next_block_;
@@ -109,10 +109,10 @@ public:
     ACE_Name_Node (const ACE_Name_Node &);
 
     /// Constructor.
-    ACE_Name_Node (void);
+    ACE_Name_Node ();
 
     /// Constructor.
-    ~ACE_Name_Node (void);
+    ~ACE_Name_Node ();
 
     /// Initialize a name node pointer.
     static void init_ptr (NAME_NODE_PTR *ptr,
@@ -146,7 +146,7 @@ public:
   };
 
   /// Print out a bunch of size info for debugging.
-  static void print_alignment_info (void);
+  static void print_alignment_info ();
 
   /// Reference counter.
   int ref_counter_;
diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h
index e06557c67ce..13a5e8e47ca 100644
--- a/ACE/ace/POSIX_Asynch_IO.h
+++ b/ACE/ace/POSIX_Asynch_IO.h
@@ -103,7 +103,7 @@ public:
   int post_completion (ACE_Proactor_Impl *proactor);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Result (void);
+  virtual ~ACE_POSIX_Asynch_Result ();
 
   /// Simulate error value to use in the post_completion ()
   void set_error (u_long errcode);
@@ -170,7 +170,7 @@ public:
             ACE_Proactor *proactor = 0);
 
   /// Check the documentation for ACE_Asynch_Operation::cancel.
-  int cancel (void);
+  int cancel ();
 
   // = Access methods.
 
@@ -185,7 +185,7 @@ protected:
   ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Operation (void);
+  virtual ~ACE_POSIX_Asynch_Operation ();
 
   // This call is for the POSIX implementation. This method is used by
   // ACE_Asynch_Operation to store some information with the
@@ -259,7 +259,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Read_Stream_Result (void);
+  virtual ~ACE_POSIX_Asynch_Read_Stream_Result ();
 
   // aiocb::aio_nbytes
   // Bytes requested when the asynchronous read was initiated.
@@ -293,7 +293,7 @@ public:
             int signal_number = 0);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Read_Stream (void);
+  virtual ~ACE_POSIX_Asynch_Read_Stream ();
 };
 
 
@@ -346,7 +346,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Write_Stream_Result (void);
+  virtual ~ACE_POSIX_Asynch_Write_Stream_Result ();
 
 protected:
   // aiocb::aio_nbytes
@@ -382,7 +382,7 @@ public:
              int signal_number = 0);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Write_Stream (void);
+  virtual ~ACE_POSIX_Asynch_Write_Stream ();
 };
 
 /**
@@ -421,7 +421,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Read_File_Result (void);
+  virtual ~ACE_POSIX_Asynch_Read_File_Result ();
 };
 
 /**
@@ -461,7 +461,7 @@ public:
             int signal_number = 0);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Read_File (void);
+  virtual ~ACE_POSIX_Asynch_Read_File ();
 
 private:
   /**
@@ -524,7 +524,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Write_File_Result (void);
+  virtual ~ACE_POSIX_Asynch_Write_File_Result ();
 };
 
 /**
@@ -556,7 +556,7 @@ public:
              int signal_number = 0);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Write_File (void);
+  virtual ~ACE_POSIX_Asynch_Write_File ();
 
 private:
   /**
@@ -625,7 +625,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Accept_Result (void);
+  virtual ~ACE_POSIX_Asynch_Accept_Result ();
 
   // aiocb::aio_nbytes
   // Bytes requested when the asynchronous read was initiated.
@@ -658,7 +658,7 @@ public:
   ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Accept (void);
+  virtual ~ACE_POSIX_Asynch_Accept ();
 
  /**
    * This <open> belongs to ACE_POSIX_Asynch_Operation. We forward
@@ -693,7 +693,7 @@ public:
    *  Cancel all pending pseudo-asynchronus requests
    *  Behavior as usual AIO request
    */
-  int cancel (void);
+  int cancel ();
 
   /**
    *  Close performs cancellation of all pending requests
@@ -779,7 +779,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Connect_Result (void);
+  virtual ~ACE_POSIX_Asynch_Connect_Result ();
 
   // aiocb::aio_filedes
   // I/O handle for the new connection.
@@ -800,7 +800,7 @@ public:
   ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Connect (void);
+  virtual ~ACE_POSIX_Asynch_Connect ();
 
  /**
    * This belongs to ACE_POSIX_Asynch_Operation. We forward
@@ -831,12 +831,12 @@ public:
    *  Cancel all pending pseudo-asynchronus requests
    *  Behavior as usual AIO request
    */
-  int cancel (void);
+  int cancel ();
 
   /**
    *  Close performs cancellation of all pending requests.
    */
-  int close (void);
+  int close ();
 
   /// virtual from ACE_Event_Handler
   ACE_HANDLE get_handle () const;
@@ -956,7 +956,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Transmit_File_Result (void);
+  virtual ~ACE_POSIX_Asynch_Transmit_File_Result ();
 
   /// Network I/O handle.
   ACE_HANDLE socket_;
@@ -1015,7 +1015,7 @@ public:
                      int signal_number = 0);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Transmit_File (void);
+  virtual ~ACE_POSIX_Asynch_Transmit_File ();
 };
 
 
@@ -1037,7 +1037,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dg
 public:
   /// Constructor.
   ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *posix_proactor);
-  virtual ~ACE_POSIX_Asynch_Read_Dgram (void);
+  virtual ~ACE_POSIX_Asynch_Read_Dgram ();
 
   /** This method queues an asynchronous read.  Up to
    * @a message_block->total_size() bytes will be read and stored in the
@@ -1070,7 +1070,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_POSIX_Asynch_Read_Dgram (void);
+  ACE_POSIX_Asynch_Read_Dgram ();
 };
 
 /**
@@ -1122,7 +1122,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Write_Dgram_Result (void);
+  virtual ~ACE_POSIX_Asynch_Write_Dgram_Result ();
 
   /// The number of bytes which were requested at the start of the
   /// asynchronous write.
@@ -1160,7 +1160,7 @@ public:
   ACE_POSIX_Asynch_Write_Dgram (ACE_POSIX_Proactor *posix_proactor);
 
   /// Destructor
-  virtual ~ACE_POSIX_Asynch_Write_Dgram (void);
+  virtual ~ACE_POSIX_Asynch_Write_Dgram ();
 
   /** This method queues an asynchronous send.  Up to
    * @a message_block->total_length bytes will be sent, beginning at the
@@ -1193,7 +1193,7 @@ public:
 
 protected:
   /// Do-nothing constructor.
-  ACE_POSIX_Asynch_Write_Dgram (void);
+  ACE_POSIX_Asynch_Write_Dgram ();
 };
 
 
@@ -1254,7 +1254,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Read_Dgram_Result (void);
+  virtual ~ACE_POSIX_Asynch_Read_Dgram_Result ();
 
   /// Bytes requested when the asynchronous read was initiated.
   size_t bytes_to_read_;
diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h
index 75a43c409f9..7ded14c5643 100644
--- a/ACE/ace/POSIX_Proactor.h
+++ b/ACE/ace/POSIX_Proactor.h
@@ -96,13 +96,13 @@ public:
     ACE_OPCODE_WRITE = 2
   };
 
-  virtual Proactor_Type  get_impl_type (void);
+  virtual Proactor_Type  get_impl_type ();
 
   /// Virtual destructor.
-  virtual ~ACE_POSIX_Proactor (void);
+  virtual ~ACE_POSIX_Proactor ();
 
   /// Close down the Proactor.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Dispatch a single set of events.  If @a wait_time elapses before
@@ -142,7 +142,7 @@ public:
                                const void *completion_key);
 
   /// @@ This is a no-op on POSIX platforms. Returns 0.
-  int wake_up_dispatch_threads (void);
+  int wake_up_dispatch_threads ();
 
   /// @@ This is a no-op on POSIX platforms. Returns 0.
   int close_dispatch_threads (int wait);
@@ -157,7 +157,7 @@ public:
   // Methods used to create Asynch IO factory and result objects. We
   // create the right objects here in these methods.
 
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
+  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream ();
   virtual ACE_Asynch_Read_Stream_Result_Impl *
     create_asynch_read_stream_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
@@ -168,7 +168,7 @@ public:
                                       int priority = 0,
                                       int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
+  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream ();
   virtual ACE_Asynch_Write_Stream_Result_Impl *
     create_asynch_write_stream_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
@@ -179,7 +179,7 @@ public:
                                        int priority = 0,
                                        int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
+  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file ();
   virtual ACE_Asynch_Read_File_Result_Impl *
     create_asynch_read_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                     ACE_HANDLE handle,
@@ -192,7 +192,7 @@ public:
                                     int priority = 0,
                                     int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
+  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file ();
   virtual ACE_Asynch_Write_File_Result_Impl *
     create_asynch_write_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
@@ -205,7 +205,7 @@ public:
                                      int priority = 0,
                                      int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void);
+  virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram ();
   virtual ACE_Asynch_Read_Dgram_Result_Impl *
     create_asynch_read_dgram_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
@@ -218,7 +218,7 @@ public:
                                      int priority = 0,
                                      int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void);
+  virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram ();
   virtual ACE_Asynch_Write_Dgram_Result_Impl *
     create_asynch_write_dgram_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
@@ -230,7 +230,7 @@ public:
                                       int priority = 0,
                                       int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
+  virtual ACE_Asynch_Accept_Impl *create_asynch_accept ();
   virtual ACE_Asynch_Accept_Result_Impl *
     create_asynch_accept_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                  ACE_HANDLE listen_handle,
@@ -242,7 +242,7 @@ public:
                                  int priority = 0,
                                  int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void);
+  virtual ACE_Asynch_Connect_Impl *create_asynch_connect ();
   virtual ACE_Asynch_Connect_Result_Impl *
     create_asynch_connect_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE connect_handle,
@@ -251,7 +251,7 @@ public:
                                   int priority = 0,
                                   int signal_number = ACE_SIGRTMIN);
 
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
+  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file ();
   virtual ACE_Asynch_Transmit_File_Result_Impl *
     create_asynch_transmit_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy,
                                         ACE_HANDLE socket,
@@ -279,7 +279,7 @@ public:
 
 protected:
   /// Constructor.
-  ACE_POSIX_Proactor (void);
+  ACE_POSIX_Proactor ();
 
   /**
    * Protect against structured exceptions caused by user code when
@@ -338,13 +338,13 @@ public:
   /// which can be started at the same time
   ACE_POSIX_AIOCB_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE);
 
-  virtual Proactor_Type  get_impl_type (void);
+  virtual Proactor_Type  get_impl_type ();
 
   /// Destructor.
-  virtual ~ACE_POSIX_AIOCB_Proactor (void);
+  virtual ~ACE_POSIX_AIOCB_Proactor ();
 
   /// Close down the Proactor.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Dispatch a single set of events.  If @a wait_time elapses before
@@ -361,7 +361,7 @@ public:
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
    */
-  virtual int handle_events (void);
+  virtual int handle_events ();
 
   /// Post a result to the completion port of the Proactor.
   virtual int post_completion (ACE_POSIX_Asynch_Result *result);
@@ -395,16 +395,16 @@ protected:
                                  size_t &transfer_count);
 
   /// Create aiocb list
-  int create_result_aiocb_list (void);
+  int create_result_aiocb_list ();
 
   /// Call this method from derived class when virtual table is
   /// built.
-  int delete_result_aiocb_list (void);
+  int delete_result_aiocb_list ();
 
   /// Call these methods from derived class when virtual table is
   /// built.
-  void create_notify_manager (void);
-  void delete_notify_manager (void);
+  void create_notify_manager ();
+  void delete_notify_manager ();
 
   /// Define the maximum number of asynchronous I/O requests
   /// for the current OS
@@ -421,7 +421,7 @@ protected:
   int handle_events_i (u_long milli_seconds);
 
   /// Start deferred AIO if necessary
-  int start_deferred_aio (void);
+  int start_deferred_aio ();
 
   /// Cancel running or deferred AIO
   virtual int cancel_aiocb (ACE_POSIX_Asynch_Result * result);
@@ -446,13 +446,13 @@ protected:
   int  putq_result (ACE_POSIX_Asynch_Result *result);
 
   /// Get "post_completed" result from the internal queue
-  ACE_POSIX_Asynch_Result * getq_result (void);
+  ACE_POSIX_Asynch_Result * getq_result ();
 
   /// Clear the internal results queue
-  int clear_result_queue (void);
+  int clear_result_queue ();
 
   /// Process the internal results queue
-  int process_result_queue (void);
+  int process_result_queue ();
 
 
   /// This class takes care of doing <accept> when we use
@@ -517,7 +517,7 @@ public:
    */
   ACE_POSIX_SIG_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE);
 
-  virtual Proactor_Type get_impl_type (void);
+  virtual Proactor_Type get_impl_type ();
 
   /**
    * This constructor should be used to tell the Proactor to mask and
@@ -529,7 +529,7 @@ public:
                           size_t nmaxop = ACE_AIO_DEFAULT_SIZE);
 
   /// Destructor.
-  virtual ~ACE_POSIX_SIG_Proactor (void);
+  virtual ~ACE_POSIX_SIG_Proactor ();
 
   /**
    * Dispatch a single set of events.  If @a wait_time elapses before
@@ -546,7 +546,7 @@ public:
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
    */
-  virtual int handle_events (void);
+  virtual int handle_events ();
 
   /// Post a result to the completion port of the Proactor.
   /// now it is implemented in base ACE_POSIX_AIOCB_Proactor class
diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp
index c69ea82f806..19516cea601 100644
--- a/ACE/ace/Pagefile_Memory_Pool.cpp
+++ b/ACE/ace/Pagefile_Memory_Pool.cpp
@@ -183,7 +183,7 @@ ACE_Pagefile_Memory_Pool::remap (void *addr)
 }
 
 int
-ACE_Pagefile_Memory_Pool::unmap (void)
+ACE_Pagefile_Memory_Pool::unmap ()
 {
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
   ACE_BASED_POINTER_REPOSITORY::instance ()->unbind
diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h
index bc650da1e76..254a5a7ad8a 100644
--- a/ACE/ace/Pagefile_Memory_Pool.h
+++ b/ACE/ace/Pagefile_Memory_Pool.h
@@ -127,7 +127,7 @@ protected:
   int map (int &firstTime, size_t appendBytes = 0);
 
   /// Release the mapping.
-  int unmap (void);
+  int unmap ();
 
 private:
   /**
diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h
index 930073987e5..2fac713694e 100644
--- a/ACE/ace/Parse_Node.h
+++ b/ACE/ace/Parse_Node.h
@@ -45,9 +45,9 @@ class ACE_Service_Type;
 class ACE_Parse_Node
 {
 public:
-  ACE_Parse_Node (void);
+  ACE_Parse_Node ();
   explicit ACE_Parse_Node (const ACE_TCHAR *name);
-  virtual ~ACE_Parse_Node (void);
+  virtual ~ACE_Parse_Node ();
 
   ACE_Parse_Node *link () const;
   void link (ACE_Parse_Node *);
@@ -86,7 +86,7 @@ class ACE_Suspend_Node : public ACE_Parse_Node
 {
 public:
   ACE_Suspend_Node (const ACE_TCHAR *name);
-  ~ACE_Suspend_Node (void);
+  ~ACE_Suspend_Node ();
 
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
@@ -114,7 +114,7 @@ class ACE_Resume_Node : public ACE_Parse_Node
 {
 public:
   ACE_Resume_Node (const ACE_TCHAR *name);
-  ~ACE_Resume_Node (void);
+  ~ACE_Resume_Node ();
 
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
@@ -142,7 +142,7 @@ class ACE_Remove_Node : public ACE_Parse_Node
 {
 public:
   ACE_Remove_Node (const ACE_TCHAR *name);
-  ~ACE_Remove_Node (void);
+  ~ACE_Remove_Node ();
 
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
@@ -170,7 +170,7 @@ class ACE_Static_Node : public ACE_Parse_Node
 {
 public:
   ACE_Static_Node (const ACE_TCHAR *name, ACE_TCHAR *params = 0);
-  virtual ~ACE_Static_Node (void);
+  virtual ~ACE_Static_Node ();
 
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
   virtual const ACE_Service_Type *record (const ACE_Service_Gestalt *g) const;
@@ -209,7 +209,7 @@ class ACE_Dynamic_Node : public ACE_Static_Node
 public:
   ACE_Dynamic_Node (ACE_Service_Type_Factory const *, ACE_TCHAR *params);
 
-  virtual ~ACE_Dynamic_Node (void);
+  virtual ~ACE_Dynamic_Node ();
 
   //  virtual const ACE_Service_Type *record () const;
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
@@ -242,7 +242,7 @@ class ACE_Stream_Node : public ACE_Parse_Node
 {
 public:
   ACE_Stream_Node (const ACE_Static_Node *, const ACE_Parse_Node *);
-  virtual ~ACE_Stream_Node (void);
+  virtual ~ACE_Stream_Node ();
 
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
@@ -274,7 +274,7 @@ class ACE_Dummy_Node : public ACE_Parse_Node
 {
 public:
   ACE_Dummy_Node (const ACE_Static_Node *, const ACE_Parse_Node *);
-  ~ACE_Dummy_Node (void);
+  ~ACE_Dummy_Node ();
 
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
@@ -306,13 +306,13 @@ private:
 class ACE_Location_Node
 {
 public:
-  ACE_Location_Node (void);
-  const ACE_DLL &dll (void);
+  ACE_Location_Node ();
+  const ACE_DLL &dll ();
   const ACE_TCHAR *pathname () const;
   void pathname (const ACE_TCHAR *h);
   int dispose () const;
 
-  virtual ~ACE_Location_Node (void);
+  virtual ~ACE_Location_Node ();
   virtual void set_symbol (void *h);
 
   /// Will update the yyerrno member and/or corresponding configuration
@@ -367,7 +367,7 @@ public:
   virtual void *symbol (ACE_Service_Gestalt *config,
                         int &yyerrno,
                         ACE_Service_Object_Exterminator * = 0);
-  virtual ~ACE_Object_Node (void);
+  virtual ~ACE_Object_Node ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -400,7 +400,7 @@ public:
   virtual void *symbol (ACE_Service_Gestalt *config,
                         int &yyerrno,
                         ACE_Service_Object_Exterminator *gobbler = 0);
-  virtual ~ACE_Function_Node (void);
+  virtual ~ACE_Function_Node ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -455,7 +455,7 @@ public:
   virtual void *symbol (ACE_Service_Gestalt *config,
                         int &yyerrno,
                         ACE_Service_Object_Exterminator * = 0);
-  virtual ~ACE_Static_Function_Node (void);
+  virtual ~ACE_Static_Function_Node ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -483,7 +483,7 @@ public:
                             ACE_Location_Node *location,
                             bool active);
 
-  ~ACE_Service_Type_Factory (void);
+  ~ACE_Service_Type_Factory ();
 
   ACE_Service_Type *make_service_type (ACE_Service_Gestalt *pcfg) const;
 
diff --git a/ACE/ace/Ping_Socket.h b/ACE/ace/Ping_Socket.h
index 08a5fa4bbee..59faff255b5 100644
--- a/ACE/ace/Ping_Socket.h
+++ b/ACE/ace/Ping_Socket.h
@@ -40,14 +40,14 @@ class ACE_Export ACE_Ping_Socket : public ACE_ICMP_Socket
   typedef ACE_ICMP_Socket inherited;
 public:
   /// Default constructor.
-  ACE_Ping_Socket (void);
+  ACE_Ping_Socket ();
 
   ACE_Ping_Socket (ACE_Addr const & local,
                    int protocol    = IPPROTO_ICMP,
                    int reuse_addr  = 0);
 
   /// Destructor.
-  ~ACE_Ping_Socket (void);
+  ~ACE_Ping_Socket ();
 
   /// Wrapper around the BSD-style @c socket system call (no QoS).
   int open (ACE_Addr const & local = ACE_Addr::sap_any,
@@ -67,7 +67,7 @@ public:
                        bool to_connect = false,
                        ACE_Time_Value const * timeout = &time_default_);
 
-  char * icmp_recv_buff (void);
+  char * icmp_recv_buff ();
 
   /// Dump the state of an object.
   void dump () const;
diff --git a/ACE/ace/Pipe.h b/ACE/ace/Pipe.h
index c257341b356..c615f8870cc 100644
--- a/ACE/ace/Pipe.h
+++ b/ACE/ace/Pipe.h
@@ -43,7 +43,7 @@ class ACE_Export ACE_Pipe
 {
 public:
   /// Default constructor (does nothing...).
-  ACE_Pipe (void);
+  ACE_Pipe ();
 
   /// Open the pipe and initialize the handles.
   ACE_Pipe (ACE_HANDLE handles[2]);
@@ -52,7 +52,7 @@ public:
   ACE_Pipe (ACE_HANDLE read, ACE_HANDLE write);
 
   /// Default dtor.  It doesn't close the handles for you.
-  ~ACE_Pipe (void);
+  ~ACE_Pipe ();
 
   /// Open the pipe and initialize the handles.
   int open (ACE_HANDLE handles[2]);
@@ -61,9 +61,9 @@ public:
   int open (int buffer_size = ACE_DEFAULT_MAX_SOCKET_BUFSIZ);
 
   /// Close down the pipe HANDLEs;
-  int close (void);
-  int close_read (void);
-  int close_write (void);
+  int close ();
+  int close_read ();
+  int close_write ();
 
   // = Accessors.
 
diff --git a/ACE/ace/Priority_Reactor.h b/ACE/ace/Priority_Reactor.h
index 0ff760895bd..7368579d702 100644
--- a/ACE/ace/Priority_Reactor.h
+++ b/ACE/ace/Priority_Reactor.h
@@ -46,7 +46,7 @@ public:
                         ACE_Timer_Queue * = 0);
 
   /// Close down the select_reactor and release all of its resources.
-  virtual ~ACE_Priority_Reactor (void);
+  virtual ~ACE_Priority_Reactor ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -68,7 +68,7 @@ protected:
 
 private:
   /// A small helper to initialize the bucket.
-  void init_bucket (void);
+  void init_bucket ();
 
   /// Build the bucket from the given dispatch_mask.  Return -1 on
   /// failure, 0 otherwise.
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 61b7b9debe7..3d4206e0010 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -1135,12 +1135,12 @@ ACE_Proactor::instance (ACE_Proactor *)
 }
 
 void
-ACE_Proactor::close_singleton (void)
+ACE_Proactor::close_singleton ()
 {
 }
 
 int
-ACE_Proactor::run_event_loop (void)
+ACE_Proactor::run_event_loop ()
 {
   // not implemented
   return -1;
@@ -1154,14 +1154,14 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &)
 }
 
 int
-ACE_Proactor::end_event_loop (void)
+ACE_Proactor::end_event_loop ()
 {
   // not implemented
   return -1;
 }
 
 sig_atomic_t
-ACE_Proactor::event_loop_done (void)
+ACE_Proactor::event_loop_done ()
 {
   return sig_atomic_t (1);
 }
diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h
index 7ddaf92696a..19bc982853c 100644
--- a/ACE/ace/Proactor.h
+++ b/ACE/ace/Proactor.h
@@ -59,7 +59,7 @@ class ACE_Export ACE_Proactor_Handle_Timeout_Upcall
 
 public:
   /// Constructor.
-  ACE_Proactor_Handle_Timeout_Upcall (void);
+  ACE_Proactor_Handle_Timeout_Upcall ();
 
   /// This method is called when a timer is registered.
   int registration (ACE_Proactor_Timer_Queue &timer_queue,
@@ -174,7 +174,7 @@ public:
                 ACE_Proactor_Timer_Queue *tq = 0);
 
   /// Destruction.
-  ~ACE_Proactor (void);
+  ~ACE_Proactor ();
 
   /// Get pointer to a process-wide ACE_Proactor.  @a threads should
   /// be part of another method.
@@ -186,23 +186,23 @@ public:
                                  bool delete_proactor = false);
 
   /// Delete the dynamically allocated Singleton.
-  static void close_singleton (void);
+  static void close_singleton ();
 
   /// Cleanup method, used by the ACE_Object_Manager to destroy the
   /// singleton.
   static void cleanup (void *instance, void *arg);
 
   /// Name of dll in which the singleton instance lives.
-  static const ACE_TCHAR *dll_name (void);
+  static const ACE_TCHAR *dll_name ();
 
   /// Name of component--ACE_Proactor in this case.
-  static const ACE_TCHAR *name (void);
+  static const ACE_TCHAR *name ();
 
   // = Proactor event loop management methods.
 
   /// Run the event loop until the <ACE_Proactor::handle_events> method
   /// returns -1 or the <end_event_loop> method is invoked.
-  static int run_event_loop (void);
+  static int run_event_loop ();
 
   /**
    * Run the event loop until the <ACE_Proactor::handle_events> method
@@ -217,13 +217,13 @@ public:
    * This method wakes up all the threads blocked on waiting for
    * completions and end the event loop.
    */
-  static int end_event_loop (void);
+  static int end_event_loop ();
 
   /**
    * Resets the <ACE_Proactor::end_event_loop_> static so that the
    * <run_event_loop> method can be restarted.
    */
-  static int reset_event_loop (void);
+  static int reset_event_loop ();
 
   /**
    * The singleton proactor is used by the ACE_Service_Config.
@@ -233,14 +233,14 @@ public:
   static int check_reconfiguration (ACE_Proactor *);
 
   /// Report if the <ACE_Proactor::instance> event loop is finished.
-  static int event_loop_done (void);
+  static int event_loop_done ();
 
   /// Close the associated @c ACE_Proactor_Impl implementation object.
   /**
    * If @arg delete_implementation was specified to the @c open() method,
    * the implementation object is also deleted.
    */
-  int close (void);
+  int close ();
 
    /**
    * You can add a hook to various run_event methods and the hook will
@@ -274,14 +274,14 @@ public:
    * and notifies the ACE_Proactor so that it can wake up
    * and close down gracefully.
    */
-  int proactor_end_event_loop (void);
+  int proactor_end_event_loop ();
 
   /// Report if the ACE_Proactor event loop is finished.
-  int proactor_event_loop_done (void);
+  int proactor_event_loop_done ();
 
   /// Resets the <ACE_Proactor::end_event_loop_> static so that the
   /// <run_event_loop> method can be restarted.
-  int proactor_reset_event_loop (void);
+  int proactor_reset_event_loop ();
 
 
   /// This method adds the @a handle to the I/O completion port. This
@@ -354,10 +354,10 @@ public:
    * @return Returns 1 when a completion is dispatched. On error, returns -1
    * and sets errno accordingly.
    */
-  int handle_events (void);
+  int handle_events ();
 
   /// Add wakeup dispatch threads (reinit).
-  int wake_up_dispatch_threads (void);
+  int wake_up_dispatch_threads ();
 
   /// Close all dispatch threads.
   int close_dispatch_threads (int wait);
@@ -391,37 +391,37 @@ public:
 
   /// Create the correct implementation class for doing
   /// Asynch_Read_Stream.
-  ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
+  ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream ();
 
   /// Create the correct implementation class for doing
   /// Asynch_Write_Stream.
-  ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
+  ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream ();
 
   /// Create the correct implementation class for doing
   /// Asynch_Read_File.
-  ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
+  ACE_Asynch_Read_File_Impl *create_asynch_read_file ();
 
   /// Create the correct implementation class for doing
   /// Asynch_Write_File.
-  ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
+  ACE_Asynch_Write_File_Impl *create_asynch_write_file ();
 
   /// Create the correct implementation class for doing Asynch_Accept.
-  ACE_Asynch_Accept_Impl *create_asynch_accept (void);
+  ACE_Asynch_Accept_Impl *create_asynch_accept ();
 
   /// Create the correct implementation class for doing Asynch_Connect.
-  ACE_Asynch_Connect_Impl *create_asynch_connect (void);
+  ACE_Asynch_Connect_Impl *create_asynch_connect ();
 
   /// Create the correct implementation class for doing
   /// Asynch_Transmit_File.
-  ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
+  ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file ();
 
   /// Create the correct implementation class for doing
   /// Asynch_Read_Dgram.
-  ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void);
+  ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram ();
 
   /// Create the correct implementation class for doing
   /// Asynch_Write_Dgram.
-  ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void);
+  ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram ();
 
   // = Factory methods for the results
 
@@ -652,19 +652,19 @@ public:
   static ACE_Proactor *instance (ACE_Proactor *);
 
   /// Placeholder to enable compilation on non-Win32 platforms
-  static void close_singleton (void);
+  static void close_singleton ();
 
   /// Placeholder to enable compilation on non-Win32 platforms
-  static int run_event_loop (void);
+  static int run_event_loop ();
 
   /// Placeholder to enable compilation on non-Win32 platforms
   static int run_event_loop (ACE_Time_Value &tv);
 
   /// Placeholder to enable compilation on non-Win32 platforms
-  static int end_event_loop (void);
+  static int end_event_loop ();
 
   /// Placeholder to enable compilation on non-Win32 platforms
-  static sig_atomic_t event_loop_done (void);
+  static sig_atomic_t event_loop_done ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index 73547b9976b..9459e3dbb3f 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -910,7 +910,7 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
 #if !defined (ACE_HAS_WINCE)
 #if defined (ACE_WIN32)
 void
-ACE_Process_Options::inherit_environment (void)
+ACE_Process_Options::inherit_environment ()
 {
   // Ensure only once execution.
   if (environment_inherited_)
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 6ddf5215231..21b3f065e7a 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -307,7 +307,7 @@ public:
   // = Non-portable accessors for when you "just have to use them."
 
   /// Used for setting and getting.
-  ACE_TEXT_STARTUPINFO *startup_info (void);
+  ACE_TEXT_STARTUPINFO *startup_info ();
 
   /// Get the process_attributes.  Returns NULL if
   /// set_process_attributes has not been set.
@@ -315,7 +315,7 @@ public:
 
   /// If this is called, a non-null process attributes is sent to
   /// CreateProcess.
-  LPSECURITY_ATTRIBUTES set_process_attributes (void);
+  LPSECURITY_ATTRIBUTES set_process_attributes ();
 
   /// Get the thread_attributes.  Returns NULL if set_thread_attributes
   /// has not been set.
@@ -323,7 +323,7 @@ public:
 
   /// If this is called, a non-null thread attributes is sent to
   /// CreateProcess.
-  LPSECURITY_ATTRIBUTES set_thread_attributes (void);
+  LPSECURITY_ATTRIBUTES set_thread_attributes ();
 
   /// Get user token. Return ACE_INVALID_HANDLE if it has not been set.
   HANDLE get_user_token () const;
@@ -384,7 +384,7 @@ protected:
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   /// Helper function to grab win32 environment and stick it in
   /// environment_buf_ using this->setenv_i.
-  void inherit_environment (void);
+  void inherit_environment ();
 
   /// Ensures once only call to inherit environment.
   int environment_inherited_;
@@ -637,7 +637,7 @@ public:
   void close_passed_handles ();
 
 #if defined (ACE_WIN32)
-  PROCESS_INFORMATION process_info (void);
+  PROCESS_INFORMATION process_info ();
 #endif /* ACE_WIN32 */
 
 private:
diff --git a/ACE/ace/Process_Mutex.h b/ACE/ace/Process_Mutex.h
index aacf8700d39..c68638f7d26 100644
--- a/ACE/ace/Process_Mutex.h
+++ b/ACE/ace/Process_Mutex.h
@@ -126,7 +126,7 @@ public:
    * @note The destructor will not release an acquired mutex except
    * on Windows.
    */
-  ~ACE_Process_Mutex (void);
+  ~ACE_Process_Mutex ();
 
   /**
    * Explicitly destroy the mutex.  Note that only one thread should
@@ -135,14 +135,14 @@ public:
    *
    * @return 0 on success; -1 on failure.
    */
-  int remove (void);
+  int remove ();
 
   /**
    * Acquire lock ownership (wait on queue if necessary).
    *
    * @return 0 on success; -1 on failure.
    */
-  int acquire (void);
+  int acquire ();
 
   /**
    * Acquire lock ownership, but timeout if lock if hasn't been
@@ -161,37 +161,37 @@ public:
    * @return 0 on success; -1 on failure.  If the lock could not be acquired
    * because someone else already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Release lock and unblock a thread at head of queue.
-  int release (void);
+  int release ();
 
   /// Acquire lock ownership (wait on queue if necessary).
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Acquire lock ownership (wait on queue if necessary).
-  int acquire_write (void);
+  int acquire_write ();
 
   /**
    * Conditionally acquire a lock (i.e., won't block).  Returns -1 on
    * failure.  If we "failed" because someone else already had the
    * lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /**
    * Conditionally acquire a lock (i.e., won't block).  Returns -1 on
    * failure.  If we "failed" because someone else already had the
    * lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /**
    * This is only here for consistency with the other synchronization
    * APIs and usability with Lock adapters. Assumes the caller already has
    * acquired the mutex and returns 0 in all cases.
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
 #if !defined (_ACE_USE_SV_SEM)
   /// Return the underlying mutex.
@@ -217,7 +217,7 @@ private:
   ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN];
 
   /// Create and return the unique name.
-  const ACE_TCHAR *unique_name (void);
+  const ACE_TCHAR *unique_name ();
 
 #if defined (_ACE_USE_SV_SEM)
   /// We need this to get the right semantics...
diff --git a/ACE/ace/Process_Semaphore.h b/ACE/ace/Process_Semaphore.h
index 8d6860fa2ad..e8fed85e7c4 100644
--- a/ACE/ace/Process_Semaphore.h
+++ b/ACE/ace/Process_Semaphore.h
@@ -51,11 +51,11 @@ public:
    * should call this method since it doesn't protect against race
    * conditions.
    */
-  int remove (void);
+  int remove ();
 
   /// Block the thread until the semaphore count becomes greater than
   /// 0, then decrement it.
-  int acquire (void);
+  int acquire ();
 
   /**
    * Conditionally decrement the semaphore if count is greater than 0
@@ -63,24 +63,24 @@ public:
    * because someone else already had the lock, @c errno is set to
    * @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Increment the semaphore, potentially unblocking a waiting thread.
-  int release (void);
+  int release ();
 
   /**
    * Acquire semaphore ownership.  This calls acquire() and is only
    * here to make the ACE_Process_Semaphore interface consistent
    * with the other synchronization APIs.
    */
-  int acquire_read (void);
+  int acquire_read ();
 
   /**
    * Acquire semaphore ownership.  This calls acquire() and is only
    * here to make the ACE_Process_Semaphore interface consistent
    * with the other synchronization APIs.
    */
-  int acquire_write (void);
+  int acquire_write ();
 
   /**
    * Conditionally acquire semaphore (i.e., won't block).  This calls
@@ -89,7 +89,7 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /**
    * Conditionally acquire semaphore (i.e., won't block).  This calls
@@ -98,7 +98,7 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /**
    * This is only here to make the ACE_Process_Semaphore
@@ -106,7 +106,7 @@ public:
    * Assumes the caller has already acquired the semaphore using one of
    * the above calls, and returns 0 (success) always.
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
 #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)
   /// Return the underlying lock.
diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp
index 1dd78c0accb..8893443c98a 100644
--- a/ACE/ace/Profile_Timer.cpp
+++ b/ACE/ace/Profile_Timer.cpp
@@ -283,7 +283,7 @@ ACE_Profile_Timer::dump () const
 }
 
 // Initialize interval timer.
-ACE_Profile_Timer::ACE_Profile_Timer (void)
+ACE_Profile_Timer::ACE_Profile_Timer ()
   : timer_ ()
 {
   ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer");
@@ -394,7 +394,7 @@ ACE_Profile_Timer::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Profile_Timer::ACE_Profile_Timer (void)
+ACE_Profile_Timer::ACE_Profile_Timer ()
   : timer_ ()
 {
   ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer");
diff --git a/ACE/ace/Profile_Timer.h b/ACE/ace/Profile_Timer.h
index f26e173fd1e..6d682b72c50 100644
--- a/ACE/ace/Profile_Timer.h
+++ b/ACE/ace/Profile_Timer.h
@@ -61,10 +61,10 @@ public:
 
   // = Timer methods.
   /// Activate the timer.
-  int start (void);
+  int start ();
 
   /// Stop the timer.
-  int stop (void);
+  int stop ();
 
   // = Resource utilization methods.
   /// Compute the time elapsed between calls to @c start() and @c stop().
diff --git a/ACE/ace/QoS/QoS_Decorator.cpp b/ACE/ace/QoS/QoS_Decorator.cpp
index 13ee649acb9..3cbe77a40d4 100644
--- a/ACE/ace/QoS/QoS_Decorator.cpp
+++ b/ACE/ace/QoS/QoS_Decorator.cpp
@@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_QOS_DECORATOR)
 
 // Constructor.
-ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (void)
+ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base ()
 {}
 
 // Constructor.
@@ -17,7 +17,7 @@ ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (ACE_Event_Handler
 }
 
 // Destructor.
-ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base (void)
+ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base ()
 {
 }
 
@@ -43,7 +43,7 @@ ACE_QoS_Decorator_Base::handle_qos (ACE_HANDLE fd)
 }
 
 // Constructor.
-ACE_QoS_Decorator::ACE_QoS_Decorator (void)
+ACE_QoS_Decorator::ACE_QoS_Decorator ()
 {}
 
 // Constructor.
@@ -61,7 +61,7 @@ ACE_QoS_Decorator::ACE_QoS_Decorator (ACE_Event_Handler *event_handler,
 }
 
 // Destructor.
-ACE_QoS_Decorator::~ACE_QoS_Decorator (void)
+ACE_QoS_Decorator::~ACE_QoS_Decorator ()
 {
   delete this->decorator_base_;
   delete this->qos_event_handler_;
@@ -98,7 +98,7 @@ ACE_QoS_Decorator::handle_qos (ACE_HANDLE fd)
 // if the application is using RAPI. Note that it is a no-op for GQoS
 // because an extra socket for handling QoS events is not required.
 int
-ACE_QoS_Decorator::init (void)
+ACE_QoS_Decorator::init ()
 {
 #if defined (ACE_HAS_RAPI)
 
@@ -113,7 +113,7 @@ ACE_QoS_Decorator::init (void)
 }
 
 // Constructor.
-ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (void)
+ACE_QoS_Event_Handler::ACE_QoS_Event_Handler ()
 {
 }
 
@@ -125,7 +125,7 @@ ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base
 }
 
 // Destructor.
-ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler (void)
+ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler ()
 {
 }
 
diff --git a/ACE/ace/QoS/QoS_Decorator.h b/ACE/ace/QoS/QoS_Decorator.h
index a15d3654bdc..4b578cec30f 100644
--- a/ACE/ace/QoS/QoS_Decorator.h
+++ b/ACE/ace/QoS/QoS_Decorator.h
@@ -43,13 +43,13 @@ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler
 public:
   // Initialization and termination methods.
   /// Constructor.
-  ACE_QoS_Decorator_Base (void);
+  ACE_QoS_Decorator_Base ();
 
   /// Constructor.
   ACE_QoS_Decorator_Base (ACE_Event_Handler *event_handler);
 
   /// Destructor.
-  ~ACE_QoS_Decorator_Base (void);
+  ~ACE_QoS_Decorator_Base ();
 
   /// Forwards the request to its event_handler_ component.
   virtual ACE_HANDLE get_handle () const;
@@ -78,7 +78,7 @@ private:
 class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler
 {
   /// Destructor.
-  ~ACE_QoS_Event_Handler (void);
+  ~ACE_QoS_Event_Handler ();
 
   /// Returns the RAPI file descriptor for receiving QoS events.
   virtual ACE_HANDLE get_handle () const;
@@ -94,7 +94,7 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler
 private:
   /// Constructor is private because only ACE_QoS_Decorator should
   /// create this object.
-  ACE_QoS_Event_Handler (void);
+  ACE_QoS_Event_Handler ();
 
   /// The QoS Decorator passes in its base for this handler to use.
   ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base *decorator_base);
@@ -120,7 +120,7 @@ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base
 public:
   // Initialization and termination methods.
   /// Constructor.
-  ACE_QoS_Decorator (void);
+  ACE_QoS_Decorator ();
 
   /// Constructor.
   ACE_QoS_Decorator (ACE_Event_Handler *event_handler,
@@ -128,7 +128,7 @@ public:
                      ACE_Reactor *reactor = ACE_Reactor::instance ());
 
   /// Destructor.
-  ~ACE_QoS_Decorator (void);
+  ~ACE_QoS_Decorator ();
 
   /// Calls the base class get_handle ().
   virtual ACE_HANDLE get_handle () const;
@@ -141,7 +141,7 @@ public:
 
   /// This method registers the QoS Event Handler with the Reactor
   /// to receive RAPI events.
-  int init (void);
+  int init ();
 
 private:
   /// Requests on the class are forwarded to this base class;
diff --git a/ACE/ace/QoS/QoS_Manager.cpp b/ACE/ace/QoS/QoS_Manager.cpp
index c7bbbb09182..d5437c91896 100644
--- a/ACE/ace/QoS/QoS_Manager.cpp
+++ b/ACE/ace/QoS/QoS_Manager.cpp
@@ -6,10 +6,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_QOS_MANAGER)
 
-ACE_QoS_Manager::ACE_QoS_Manager (void)
+ACE_QoS_Manager::ACE_QoS_Manager ()
 {}
 
-ACE_QoS_Manager::~ACE_QoS_Manager (void)
+ACE_QoS_Manager::~ACE_QoS_Manager ()
 {}
 
 // Adds the given session to the list of session objects joined by
@@ -29,7 +29,7 @@ ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session)
 // Returns the QoS session set for this socket.
 
 ACE_Unbounded_Set <ACE_QoS_Session *>
-ACE_QoS_Manager::qos_session_set (void)
+ACE_QoS_Manager::qos_session_set ()
 {
   return this->qos_session_set_;
 }
diff --git a/ACE/ace/QoS/QoS_Manager.h b/ACE/ace/QoS/QoS_Manager.h
index 81f331b4ae2..5b2b863a552 100644
--- a/ACE/ace/QoS/QoS_Manager.h
+++ b/ACE/ace/QoS/QoS_Manager.h
@@ -42,10 +42,10 @@ class ACE_QoS_Export ACE_QoS_Manager
 {
 public:
   /// Default constructor.
-  ACE_QoS_Manager (void);
+  ACE_QoS_Manager ();
 
   /// Default destructor.
-  ~ACE_QoS_Manager (void);
+  ~ACE_QoS_Manager ();
 
   /**
    * Join the given QoS session. A socket can join multiple QoS
@@ -57,7 +57,7 @@ public:
   typedef ACE_Unbounded_Set <ACE_QoS_Session *> ACE_QOS_SESSION_SET;
 
   /// Get the QoS session set.
-  ACE_QOS_SESSION_SET qos_session_set (void);
+  ACE_QOS_SESSION_SET qos_session_set ();
 
 private:
   /// Set of QoS sessions that this socket has joined.
diff --git a/ACE/ace/QoS/QoS_Session_Factory.cpp b/ACE/ace/QoS/QoS_Session_Factory.cpp
index a726a5fefb2..3ff403db99d 100644
--- a/ACE/ace/QoS/QoS_Session_Factory.cpp
+++ b/ACE/ace/QoS/QoS_Session_Factory.cpp
@@ -17,12 +17,12 @@ const enum ACE_QoS_Session_Factory::ACE_QoS_Session_Type
 #  error "QoS type not supported.  Cannot build."
 #endif /* ACE_HAS_RAPI */
 
-ACE_QoS_Session_Factory::ACE_QoS_Session_Factory (void)
+ACE_QoS_Session_Factory::ACE_QoS_Session_Factory ()
 {
   ACE_TRACE ("ACE_QoS_Session_Factory::ACE_QoS_Session_Factory");
 }
 
-ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory (void)
+ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory ()
 {
   ACE_TRACE ("ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory");
 }
diff --git a/ACE/ace/QoS/QoS_Session_Factory.h b/ACE/ace/QoS/QoS_Session_Factory.h
index f3d8de8cf05..db5b9e624ad 100644
--- a/ACE/ace/QoS/QoS_Session_Factory.h
+++ b/ACE/ace/QoS/QoS_Session_Factory.h
@@ -40,10 +40,10 @@ class ACE_QoS_Export ACE_QoS_Session_Factory
 {
 public :
   /// Default constructor.
-  ACE_QoS_Session_Factory (void);
+  ACE_QoS_Session_Factory ();
 
   /// Default destructor.
-  ~ACE_QoS_Session_Factory (void);
+  ~ACE_QoS_Session_Factory ();
 
   /// Types of sessions for this factory to manage.
   enum ACE_QoS_Session_Type
diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp
index dd247f68339..f552755488e 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.cpp
+++ b/ACE/ace/QoS/QoS_Session_Impl.cpp
@@ -222,7 +222,7 @@ rsvp_callback (rapi_sid_t /* sid */,
 }
 
 // Constructor.
-ACE_RAPI_Session::ACE_RAPI_Session (void)
+ACE_RAPI_Session::ACE_RAPI_Session ()
 {
   ACE_TRACE ("ACE_RAPI_Session::ACE_RAPI_Session");
   //this->source_port (DEFAULT_SOURCE_SENDER_PORT);
@@ -269,7 +269,7 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr,
 
 // Close the RAPI QoS Session.
 int
-ACE_RAPI_Session::close (void)
+ACE_RAPI_Session::close ()
 {
   this->rsvp_error = rapi_release(this->session_id_);
 
@@ -287,7 +287,7 @@ ACE_RAPI_Session::close (void)
 
 //Get the most recent RSVP event that occurred
 ACE_QoS_Session::RSVP_Event_Type
-ACE_RAPI_Session::rsvp_event_type (void)
+ACE_RAPI_Session::rsvp_event_type ()
 {
   return this->rsvp_event_type_;
 }
@@ -523,7 +523,7 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos)
 }
 
 int
-ACE_RAPI_Session::update_qos (void)
+ACE_RAPI_Session::update_qos ()
 {
   // Update the session QoS Parameters based on the RSVP Event Received.
   if ((rsvp_error = rapi_dispatch ()) != 0)
@@ -624,7 +624,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 int ACE_GQoS_Session::GQoS_session_id = 0;
 
 // Constructor.
-ACE_GQoS_Session::ACE_GQoS_Session (void)
+ACE_GQoS_Session::ACE_GQoS_Session ()
 {
   ACE_TRACE ("ACE_GQoS_Session::ACE_GQoS_Session");
 }
@@ -644,7 +644,7 @@ ACE_GQoS_Session::open (ACE_INET_Addr dest_addr,
 
 // Close the GQoS Session.
 int
-ACE_GQoS_Session::close (void)
+ACE_GQoS_Session::close ()
 {
   // TBD.
   return 0;
@@ -687,7 +687,7 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket,
 }
 
 int
-ACE_GQoS_Session::update_qos (void)
+ACE_GQoS_Session::update_qos ()
 {
   // WSAIoctl (GET_QOS) call goes here...
   return 0;
@@ -695,7 +695,7 @@ ACE_GQoS_Session::update_qos (void)
 
 //Get the most recent RSVP event that occurred
 ACE_QoS_Session::RSVP_Event_Type
-ACE_GQoS_Session::rsvp_event_type (void)
+ACE_GQoS_Session::rsvp_event_type ()
 {
   return this->rsvp_event_type_;
 }
diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h
index 284980b5d26..d87af62f6bc 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.h
+++ b/ACE/ace/QoS/QoS_Session_Impl.h
@@ -38,7 +38,7 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session
 {
 public:
   /// Default destructor.
-  ~ACE_RAPI_Session (void);
+  ~ACE_RAPI_Session ();
 
   /// Error handling for RSVP callback
   static int rsvp_error;
@@ -48,7 +48,7 @@ public:
                     ACE_Protocol_ID protocol_id);
 
   /// Close the RAPI QoS Session.
-  virtual int close (void);
+  virtual int close ();
 
   /// Returns the QoS for this RAPI session.
   virtual ACE_QoS qos () const;
@@ -73,7 +73,7 @@ public:
    * It is a mechanism of updating the QoS for this session asynchronously, as
    * RSVP events occur.
    */
-  virtual int update_qos (void);
+  virtual int update_qos ();
 
   /// Get methods for the flags_.
   virtual ACE_End_Point_Type flags () const;
@@ -88,13 +88,13 @@ public:
   virtual void session_id (const int session_id);
 
   /// Get the RAPI file descriptor for RSVP events.
-  virtual ACE_HANDLE rsvp_events_handle (void);
+  virtual ACE_HANDLE rsvp_events_handle ();
 
   ///Set the RAPI event that last occurred
   virtual void  rsvp_event_type (RSVP_Event_Type event_type);
 
   ///Get the RAPI event that last occurred
-  virtual RSVP_Event_Type rsvp_event_type (void);
+  virtual RSVP_Event_Type rsvp_event_type ();
 
   /// Get the destination address for this RAPI session.
   virtual ACE_INET_Addr dest_addr () const;
@@ -124,7 +124,7 @@ public:
 private:
   /// Default constuctor. Constructor is defined private so that only
   /// the friend factory can instantiate this class.
-  ACE_RAPI_Session (void);
+  ACE_RAPI_Session ();
 
   /// Construct a simplified RAPI Sender TSpec object
   /// from an ACE_Flow_Spec object. Used internally by this class.
@@ -159,7 +159,7 @@ class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session
 {
 public:
   /// Default destructor.
-  ~ACE_GQoS_Session (void);
+  ~ACE_GQoS_Session ();
 
   /// This is a session ID generator. It does a lot more than expected
   /// from an int!.
@@ -170,7 +170,7 @@ public:
                     ACE_Protocol_ID protocol_id);
 
   /// Close the GQoS Session.
-  virtual int close (void);
+  virtual int close ();
 
   /// Returns the QoS for this GQoS session.
   virtual ACE_QoS qos () const;
@@ -192,7 +192,7 @@ public:
 
   /// Calls the ioctl (ACE_SIO_GET_QOS). It is a mechanism of updating the
   /// QoS for this session asynchronously, as RSVP events occur.
-  virtual int update_qos (void);
+  virtual int update_qos ();
 
   /// Get/Set methods for the flags_.
   virtual ACE_End_Point_Type flags () const;
@@ -223,12 +223,12 @@ public:
   virtual void session_id (const int session_id);
 
   /// Get the file descriptor of the underlying socket.
-  virtual ACE_HANDLE rsvp_events_handle (void);
+  virtual ACE_HANDLE rsvp_events_handle ();
 
   virtual void  rsvp_event_type (RSVP_Event_Type event_type);
   ///Set the RAPI event that last occurred
 
-  virtual RSVP_Event_Type rsvp_event_type (void);
+  virtual RSVP_Event_Type rsvp_event_type ();
   ///Get the RAPI event that last occurred
 
   /// GQoS version.
diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
index 3d1ca20e881..86fc8bfa36a 100644
--- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
@@ -40,7 +40,7 @@ public:
   // use <ACE_SOCK_Dgram> or <ACE_SOCK_CODgram> instead.
 
   /// Default dtor.
-  ~ACE_SOCK_Dgram_Mcast_QoS (void);
+  ~ACE_SOCK_Dgram_Mcast_QoS ();
 
   // = Multicast group management routines.
   /**
@@ -96,7 +96,7 @@ public:
                 ACE_OVERLAPPED_COMPLETION_FUNC func) const;
 
   /// Returns the QoS manager for this socket.
-  ACE_QoS_Manager qos_manager (void);
+  ACE_QoS_Manager qos_manager ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp
index 4e1e38f0938..35a87df9a4e 100644
--- a/ACE/ace/QtReactor/QtReactor.cpp
+++ b/ACE/ace/QtReactor/QtReactor.cpp
@@ -67,7 +67,7 @@ void ACE_QtReactor::reopen_notification_pipe( void)
 #endif /* ACE_MT_SAFE */
 }
 
-ACE_QtReactor::~ACE_QtReactor (void)
+ACE_QtReactor::~ACE_QtReactor ()
 {
     // iterate over QSocketNotifiers for read and release them
     MAP::ITERATOR iter = this->read_notifier_.begin ();
@@ -114,7 +114,7 @@ ACE_QtReactor::qapplication (QApplication *qapp)
 }
 
 void
-ACE_QtReactor::timeout_event (void)
+ACE_QtReactor::timeout_event ()
 {
   // Deal with any timer events
   ACE_Select_Reactor_Handle_Set handle_set;
@@ -508,7 +508,7 @@ ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles,
 // first timeout in the Reactor's Timer_Queue.
 
 void
-ACE_QtReactor::reset_timeout (void)
+ACE_QtReactor::reset_timeout ()
 {
   if (this->qtime_ != 0)
     {
diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h
index 6bafe3c7f4c..25fed71affb 100644
--- a/ACE/ace/QtReactor/QtReactor.h
+++ b/ACE/ace/QtReactor/QtReactor.h
@@ -120,7 +120,7 @@ public:
         bool mask_signals = true,
         int s_queue = ACE_SELECT_TOKEN::FIFO);
 
-    virtual ~ACE_QtReactor (void);
+    virtual ~ACE_QtReactor ();
 
     void qapplication (QApplication *qapp);
 
@@ -197,9 +197,9 @@ protected:
 private:
     /// This method ensures there's an Qt timeout for the first timeout
     /// in the Reactor's Timer_Queue.
-    void reset_timeout (void);
+    void reset_timeout ();
     /// reopens notification pipe to create SocketNotifier for it
-    void reopen_notification_pipe(void);
+    void reopen_notification_pipe();
 
 #ifdef ACE_HAS_QT5
     /// Recover the socket's ACE_HANDLE based on the sender of the Qt signal.
@@ -223,7 +223,7 @@ private slots:
     void exception_event (ACE_QT_HANDLE_TYPE p_handle);
 
     /// Dispatch a timeout event
-    void timeout_event (void);
+    void timeout_event ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h
index 83404fe0e3d..03fb77f2a60 100644
--- a/ACE/ace/RB_Tree.h
+++ b/ACE/ace/RB_Tree.h
@@ -742,7 +742,7 @@ public:
    * be declared and defined in both the derived forward and
    * reverse iterator classes rather than in the base iterator
    * class because of a method signature resolution problem
-   * caused by the existence of the deprecated next (void)
+   * caused by the existence of the deprecated next ()
    * method in the derived forward iterator class.  When that
    * deprecated method is removed, this method should be removed
    * from the derived classes and placed in the base class.
@@ -857,7 +857,7 @@ public:
    * be declared and defined in both the derived forward and
    * reverse iterator classes rather than in the base iterator
    * class because of a method signature resolution problem
-   * caused by the existence of the deprecated next (void)
+   * caused by the existence of the deprecated next ()
    * method in the derived forward iterator class.  When that
    * deprecated method is removed, this method should be removed
    * from the derived classes and placed in the base class.
diff --git a/ACE/ace/RW_Process_Mutex.h b/ACE/ace/RW_Process_Mutex.h
index 71244548ddc..193c88eb273 100644
--- a/ACE/ace/RW_Process_Mutex.h
+++ b/ACE/ace/RW_Process_Mutex.h
@@ -47,19 +47,19 @@ public:
                         int flags = O_CREAT|O_RDWR,
                         mode_t mode =  ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS);
 
-  ~ACE_RW_Process_Mutex (void);
+  ~ACE_RW_Process_Mutex ();
 
   /**
    * Explicitly destroy the mutex.  Note that only one thread should
    * call this method since it doesn't protect against race
    * conditions.
    */
-  int remove (void);
+  int remove ();
 
   /// Same as acquire_write().
   /// Acquire lock ownership; blocks until the lock is acquired or the
   /// operation fails.
-  int acquire (void);
+  int acquire ();
 
   /**
    * Same as tryacquire_write().
@@ -69,18 +69,18 @@ public:
    * @retval -1 on failure. If the lock is already held, @c errno is set
    *         to @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Release lock.
-  int release (void);
+  int release ();
 
   /// Acquire read lock; blocks until the lock is acquired or the
   /// operation fails.
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Acquire write lock; blocks until the lock is acquired or the
   /// operation fails.
-  int acquire_write (void);
+  int acquire_write ();
 
   /**
    * Try to acquire the read lock, but do not block if the lock is not
@@ -89,7 +89,7 @@ public:
    * @retval -1 on failure. If the lock is already held, @c errno is set
    *         to @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /**
    * Try to acquire the write lock, but do not block if the lock is not
@@ -98,11 +98,11 @@ public:
    * @retval -1 on failure. If the lock is already held, @c errno is set
    *         to @c EBUSY.
    */
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /// Attempt to upgrade a read lock to a write lock. Returns 0 on
   /// success, -1 on failure.
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   /// Return the underlying lock.
   const ACE_File_Lock &lock () const;
@@ -119,7 +119,7 @@ private:
   ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN];
 
   /// Create and return the unique name.
-  const ACE_TCHAR *unique_name (void);
+  const ACE_TCHAR *unique_name ();
 
   /// We need this to get the readers/writer semantics...
   ACE_File_Lock lock_;
diff --git a/ACE/ace/Reactor_Notification_Strategy.h b/ACE/ace/Reactor_Notification_Strategy.h
index 93f58051d24..26288543a8d 100644
--- a/ACE/ace/Reactor_Notification_Strategy.h
+++ b/ACE/ace/Reactor_Notification_Strategy.h
@@ -36,14 +36,14 @@ public:
                                      ACE_Reactor_Mask mask);
 
   /// Default destructor.
-  virtual ~ACE_Reactor_Notification_Strategy (void);
+  virtual ~ACE_Reactor_Notification_Strategy ();
 
-  virtual int notify (void);
+  virtual int notify ();
 
   virtual int notify (ACE_Event_Handler *eh, ACE_Reactor_Mask mask);
 
   /// Get the reactor
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
   /// Set the reactor
   void reactor (ACE_Reactor *r);
diff --git a/ACE/ace/Reactor_Token_T.cpp b/ACE/ace/Reactor_Token_T.cpp
index 827aefcc64a..01898945b8e 100644
--- a/ACE/ace/Reactor_Token_T.cpp
+++ b/ACE/ace/Reactor_Token_T.cpp
@@ -38,13 +38,13 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::ACE_Reactor_Token_T (int s_queue)
 }
 
 template <class ACE_TOKEN_TYPE>
-ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::~ACE_Reactor_Token_T (void)
+ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::~ACE_Reactor_Token_T ()
 {
   ACE_TRACE ("ACE_Reactor_Token_T::~ACE_Reactor_Token_T");
 }
 
 template <class ACE_TOKEN_TYPE> ACE_Reactor_Impl &
-ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::reactor (void)
+ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::reactor ()
 {
   return *this->reactor_;
 }
@@ -58,7 +58,7 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::reactor (ACE_Reactor_Impl &reactor)
 // Used to wakeup the reactor.
 
 template <class ACE_TOKEN_TYPE> void
-ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void)
+ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook ()
 {
   ACE_TRACE ("ACE_Reactor_Token_T::sleep_hook");
   ACE_Time_Value ping (ACE_Time_Value::zero);
diff --git a/ACE/ace/Reactor_Token_T.h b/ACE/ace/Reactor_Token_T.h
index 0f92ec7206c..3f9adec8e80 100644
--- a/ACE/ace/Reactor_Token_T.h
+++ b/ACE/ace/Reactor_Token_T.h
@@ -55,14 +55,14 @@ public:
   ACE_Reactor_Token_T (ACE_Reactor_Impl &r,
                        int s_queue = ACE_TOKEN_TYPE::FIFO);
   ACE_Reactor_Token_T (int s_queue = ACE_TOKEN_TYPE::FIFO);
-  virtual ~ACE_Reactor_Token_T (void);
+  virtual ~ACE_Reactor_Token_T ();
 
   /// Called just before a token waiter goes to sleep.
   /// @see ACE_Token::sleep_hook
-  virtual void sleep_hook (void);
+  virtual void sleep_hook ();
 
   /// Get the reactor implementation
-  ACE_Reactor_Impl &reactor (void);
+  ACE_Reactor_Impl &reactor ();
 
   /// Set the reactor implementation
   void reactor (ACE_Reactor_Impl &);
diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h
index ea5cbb0c004..d91adb95f37 100644
--- a/ACE/ace/Read_Buffer.h
+++ b/ACE/ace/Read_Buffer.h
@@ -59,7 +59,7 @@ public:
 #endif  // ACE_HAS_WINCE
 
   /// Closes the FILE *.
-  ~ACE_Read_Buffer (void);
+  ~ACE_Read_Buffer ();
 
   /**
    * Returns a pointer dynamically allocated with
diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp
index 9e63c4421f6..4e7a2aa78e2 100644
--- a/ACE/ace/Registry.cpp
+++ b/ACE/ace/Registry.cpp
@@ -100,7 +100,7 @@ ACE_Registry::Binding::name (ACE_TString &name)
 // Name accessors
 // (String version)
 ACE_TString
-ACE_Registry::Binding::name (void)
+ACE_Registry::Binding::name ()
 {
   return this->name_;
 }
@@ -108,7 +108,7 @@ ACE_Registry::Binding::name (void)
 
 // Type accessor
 ACE_Registry::Binding_Type
-ACE_Registry::Binding::type (void)
+ACE_Registry::Binding::type ()
 {
   return this->type_;
 }
@@ -168,7 +168,7 @@ ACE_Registry::Object::type () const
 
 
 // Simple context constructor
-ACE_Registry::Naming_Context::Naming_Context (void)
+ACE_Registry::Naming_Context::Naming_Context ()
   : key_ ((HKEY) 0),
     parent_key_ ((HKEY) 0),
     name_ ()
@@ -575,7 +575,7 @@ ACE_Registry::Naming_Context::resolve_context (const ACE_TString &name,
 
 // Same as unbind_context() with <this> as naming_context
 int
-ACE_Registry::Naming_Context::destroy (void)
+ACE_Registry::Naming_Context::destroy ()
 {
   // hopefully the parent_key_ is still open
   long result = ACE_TEXT_RegDeleteKey (this->parent_key_,
@@ -587,7 +587,7 @@ ACE_Registry::Naming_Context::destroy (void)
 
 // Sync content of context to disk
 int
-ACE_Registry::Naming_Context::flush (void)
+ACE_Registry::Naming_Context::flush ()
 {
   long result = ::RegFlushKey (this->key_);
   ACE_REGISTRY_CALL_RETURN (result);
@@ -596,7 +596,7 @@ ACE_Registry::Naming_Context::flush (void)
 
 // Close the handle of the context
 int
-ACE_Registry::Naming_Context::close (void)
+ACE_Registry::Naming_Context::close ()
 {
   long result = this->key_ ? ::RegCloseKey (this->key_) : ERROR_SUCCESS;
   ACE_REGISTRY_CALL_RETURN (result);
@@ -676,7 +676,7 @@ ACE_Registry::Naming_Context::key (HKEY key)
 
 // Get key
 HKEY
-ACE_Registry::Naming_Context::key (void)
+ACE_Registry::Naming_Context::key ()
 {
   return this->key_;
 }
@@ -692,7 +692,7 @@ ACE_Registry::Naming_Context::parent (HKEY parent)
 
 // Get parent
 HKEY
-ACE_Registry::Naming_Context::parent (void)
+ACE_Registry::Naming_Context::parent ()
 {
   return this->parent_key_;
 }
@@ -728,7 +728,7 @@ ACE_Registry::Naming_Context::name (const ACE_TString &name)
 // Get name
 // (String version)
 ACE_TString
-ACE_Registry::Naming_Context::name (void)
+ACE_Registry::Naming_Context::name ()
 {
   return this->name_;
 }
@@ -836,12 +836,12 @@ ACE_Registry::Binding_Iterator::Iteration_State::iterator (Binding_Iterator *ite
 }
 
 
-ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (void)
+ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State ()
   : index_ (0)
 {
 }
 
-ACE_Registry::Binding_Iterator::Iteration_State::~Iteration_State (void)
+ACE_Registry::Binding_Iterator::Iteration_State::~Iteration_State ()
 {
 }
 
@@ -877,7 +877,7 @@ ACE_Registry::Binding_Iterator::next_n (u_long how_many,
 
 // Destroy iterator
 int
-ACE_Registry::Binding_Iterator::destroy (void)
+ACE_Registry::Binding_Iterator::destroy ()
 {
   this->reset ();
   return 0;
@@ -893,7 +893,7 @@ ACE_Registry::Binding_Iterator::naming_context (Naming_Context &naming_context)
 
 
 ACE_Registry::Naming_Context &
-ACE_Registry::Binding_Iterator::naming_context (void)
+ACE_Registry::Binding_Iterator::naming_context ()
 {
   return *this->naming_context_;
 }
@@ -908,7 +908,7 @@ ACE_Registry::Binding_Iterator::current_enumeration (Iteration_State &current_en
 
 
 ACE_Registry::Binding_Iterator::Iteration_State &
-ACE_Registry::Binding_Iterator::current_enumeration (void)
+ACE_Registry::Binding_Iterator::current_enumeration ()
 {
   return *this->current_enumeration_;
 }
diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h
index 1878c304fe7..8d5e613116e 100644
--- a/ACE/ace/Registry.h
+++ b/ACE/ace/Registry.h
@@ -73,7 +73,7 @@ public:
   struct ACE_Export Binding
   {
     /// Empty (default) constructor
-    Binding (void);
+    Binding ();
 
     /// Constructor
     /// (Name version)
@@ -97,10 +97,10 @@ public:
     void name (ACE_TString &name);
 
     /// Get Name (String version)
-    ACE_TString name (void);
+    ACE_TString name ();
 
     /// Type accessor
-    Binding_Type type (void);
+    Binding_Type type ();
 
   private:
     /// A binding has a name
@@ -188,13 +188,13 @@ public:
     };
 
     /// Empty constructor: keys will be NULL
-    Naming_Context (void);
+    Naming_Context ();
 
     /// Constructor: key_ will be set to @a key
     Naming_Context (const HKEY &key);
 
     /// Destructor will call <Naming_Context::close>.
-    ~Naming_Context (void);
+    ~Naming_Context ();
 
     // The following interfaces are for objects
 
@@ -327,7 +327,7 @@ public:
     int unbind_context (const ACE_TString &name);
 
     /// Same as <unbind_context> with @c this as naming_context
-    int destroy (void);
+    int destroy ();
 
     /**
      * listing function: iterator creator
@@ -347,20 +347,20 @@ public:
     // not part of the CORBA interface
 
     /// Sync content of context to disk
-    int flush (void);
+    int flush ();
 
     /// Close the handle of the context
     /// @note <close> does not call <flush>
-    int close (void);
+    int close ();
 
     // Accessors
 
     /// Get key
-    HKEY key (void);
+    HKEY key ();
 
     // void parent (HKEY parent);
     /// Get parent
-    HKEY parent (void);
+    HKEY parent ();
 
     /// Get name
     /// (Name version)
@@ -370,7 +370,7 @@ public:
     void name (ACE_TString &name);
 
     /// Get name (String version)
-    ACE_TString name (void);
+    ACE_TString name ();
 
   protected:
     /// Set key
@@ -418,7 +418,7 @@ public:
     friend class Naming_Context;
 
     /// Default constructor
-    Binding_Iterator (void);
+    Binding_Iterator ();
 
     /// Next entry
     int next_one (Binding &binding);
@@ -428,13 +428,13 @@ public:
                 Binding_List &list);
 
     /// Cleanup
-    int destroy (void);
+    int destroy ();
 
     /// Reset the internal state of the iterator
-    void reset (void);
+    void reset ();
 
     /// Get naming_context that the iterator is iterating over
-    Naming_Context &naming_context (void);
+    Naming_Context &naming_context ();
 
   private:
     /// Set naming_context that the iterator is iterating over
@@ -456,10 +456,10 @@ public:
       {
       public:
         /// Constructor
-        Iteration_State (void);
+        Iteration_State ();
 
         /// Destructor
-        virtual ~Iteration_State (void);
+        virtual ~Iteration_State ();
 
         /// Set the iterator reference.
         void iterator (Binding_Iterator *iterator);
@@ -469,7 +469,7 @@ public:
                             Binding_List &list) = 0;
 
         /// Reset state
-        void reset (void);
+        void reset ();
 
       protected:
         /// Pointer to parent iterator
@@ -520,7 +520,7 @@ public:
     void current_enumeration (Iteration_State& current_enumeration);
 
     /// Get current_enumeration
-    Iteration_State &current_enumeration (void);
+    Iteration_State &current_enumeration ();
   };
 };
 
diff --git a/ACE/ace/Remote_Name_Space.h b/ACE/ace/Remote_Name_Space.h
index cdda6074e68..3db871764c8 100644
--- a/ACE/ace/Remote_Name_Space.h
+++ b/ACE/ace/Remote_Name_Space.h
@@ -46,7 +46,7 @@ class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space
 {
 public:
   /// "Do-nothing" constructor.
-  ACE_Remote_Name_Space (void);
+  ACE_Remote_Name_Space ();
 
   /**
    * Specifies the scope of this namespace, opens and memory-maps the
@@ -64,7 +64,7 @@ public:
 
   /// destructor, do some cleanup :TBD: last dtor should "compress"
   /// file
-  ~ACE_Remote_Name_Space (void);
+  ~ACE_Remote_Name_Space ();
 
   /// Bind a new name to a naming context (Wide character strings).
   virtual int bind (const ACE_NS_WString &name_in,
diff --git a/ACE/ace/Remote_Tokens.cpp b/ACE/ace/Remote_Tokens.cpp
index 866f7916201..315b464f0bf 100644
--- a/ACE/ace/Remote_Tokens.cpp
+++ b/ACE/ace/Remote_Tokens.cpp
@@ -32,18 +32,18 @@ ACE_TSS_Connection::set_server_address (const ACE_INET_Addr &server_address)
 }
 
 // Necessary to make some compilers work...
-ACE_TSS_Connection::ACE_TSS_Connection (void)
+ACE_TSS_Connection::ACE_TSS_Connection ()
 {
   ACE_TRACE ("ACE_TSS_Connection::ACE_TSS_Connection");
 }
 
-ACE_TSS_Connection::~ACE_TSS_Connection (void)
+ACE_TSS_Connection::~ACE_TSS_Connection ()
 {
   ACE_TRACE ("ACE_TSS_Connection::~ACE_TSS_Connection");
 }
 
 ACE_SOCK_Stream *
-ACE_TSS_Connection::get_connection (void)
+ACE_TSS_Connection::get_connection ()
 {
   return ACE_TSS<ACE_SOCK_Stream>::operator-> ();
 }
@@ -71,7 +71,7 @@ ACE_TSS_Connection::make_TSS_TYPE () const
   return stream;
 }
 
-ACE_TSS_Connection::operator ACE_SOCK_Stream *(void)
+ACE_TSS_Connection::operator ACE_SOCK_Stream *()
 {
   return this->get_connection ();
 }
@@ -91,12 +91,12 @@ ACE_TSS_Connection::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy (void)
+ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy ()
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy");
 }
 
-ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void)
+ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy ()
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy");
 }
@@ -119,7 +119,7 @@ ACE_Remote_Token_Proxy::set_server_address (const ACE_INET_Addr &server_address)
 }
 
 int
-ACE_Remote_Token_Proxy::initiate_connection (void)
+ACE_Remote_Token_Proxy::initiate_connection ()
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::initiate_connection");
   if (token_ == 0)
@@ -377,7 +377,7 @@ ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *)
 }
 
 const ACE_TCHAR*
-ACE_Remote_Token_Proxy::owner_id (void)
+ACE_Remote_Token_Proxy::owner_id ()
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
   ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("owner_id called\n")));
diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h
index 3e6e52a25c8..0b8a3a80394 100644
--- a/ACE/ace/Remote_Tokens.h
+++ b/ACE/ace/Remote_Tokens.h
@@ -70,7 +70,7 @@ public:
    * is, every thread has only one connection that is used for all
    * remote tokens.
    */
-  int initiate_connection (void);
+  int initiate_connection ();
 
   /**
    * Acquire the distributed token.  If notify is specified and the
@@ -126,7 +126,7 @@ public:
   virtual void token_acquired (ACE_TPQ_Entry *);
 
   /// The client id of the current token holder
-  virtual const ACE_TCHAR* owner_id (void);
+  virtual const ACE_TCHAR* owner_id ();
 
   /**
    * Sets the server address for all instances of ACE_Remote_Token_Proxy
@@ -166,7 +166,7 @@ class ACE_Export ACE_Remote_Mutex : public ACE_Remote_Token_Proxy
 {
 public:
   /// Null creation.  Remote_Token_Proxy::open must be called.
-  ACE_Remote_Mutex (void);
+  ACE_Remote_Mutex ();
 
   /// Calls Remote_Token_Proxy::open for you.
   ACE_Remote_Mutex (const ACE_TCHAR *token_name,
@@ -201,7 +201,7 @@ protected:
 class ACE_Export ACE_Remote_RLock : public ACE_Remote_Token_Proxy
 {
 public:
-  ACE_Remote_RLock (void);
+  ACE_Remote_RLock ();
 
   ACE_Remote_RLock (const ACE_TCHAR *token_name,
                     int ignore_deadlock = 0,
@@ -239,7 +239,7 @@ protected:
 class ACE_Export ACE_Remote_WLock : public ACE_Remote_Token_Proxy
 {
 public:
-  ACE_Remote_WLock (void);
+  ACE_Remote_WLock ();
 
   ACE_Remote_WLock (const ACE_TCHAR *token_name,
                     int ignore_deadlock = 0,
@@ -275,18 +275,18 @@ class ACE_Export ACE_TSS_Connection : public ACE_TSS<ACE_SOCK_Stream>
 {
 public:
   // Necessary to make some compilers work...
-  ACE_TSS_Connection (void);
-  ~ACE_TSS_Connection (void);
+  ACE_TSS_Connection ();
+  ~ACE_TSS_Connection ();
 
   /// Retrieve the thread's connection
-  ACE_SOCK_Stream *get_connection (void);
+  ACE_SOCK_Stream *get_connection ();
 
   /// Factory Method that creates a new SOCK Stream.
   virtual ACE_SOCK_Stream *make_TSS_TYPE () const;
 
   /// Inheritance and operator overloading don't mix.  Redefine this
   /// from ACE_TSS so that we can use it.
-  operator ACE_SOCK_Stream *(void);
+  operator ACE_SOCK_Stream *();
 
   /// Set the server address.
   static void set_server_address (const ACE_INET_Addr &server_address);
diff --git a/ACE/ace/SOCK_CODgram.h b/ACE/ace/SOCK_CODgram.h
index bbe37f29623..c52f33f538f 100644
--- a/ACE/ace/SOCK_CODgram.h
+++ b/ACE/ace/SOCK_CODgram.h
@@ -35,7 +35,7 @@ class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO
 {
 public:
   /// Default constructor.
-  ACE_SOCK_CODgram (void);
+  ACE_SOCK_CODgram ();
 
   /**
    * Constructor with addresses specified. Calls open().
@@ -78,7 +78,7 @@ public:
                     int reuse_addr = 0);
 
   /// Default dtor.
-  ~ACE_SOCK_CODgram (void);
+  ~ACE_SOCK_CODgram ();
 
   // Initiate a connected dgram.
 
diff --git a/ACE/ace/SOCK_Dgram_Bcast.h b/ACE/ace/SOCK_Dgram_Bcast.h
index cff20421437..9a53c4f3dac 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.h
+++ b/ACE/ace/SOCK_Dgram_Bcast.h
@@ -58,7 +58,7 @@ class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram
 {
 public:
   /// Default constructor.
-  ACE_SOCK_Dgram_Bcast (void);
+  ACE_SOCK_Dgram_Bcast ();
 
   ACE_SOCK_Dgram_Bcast (const ACE_Addr &local,
                         int protocol_family = PF_INET,
@@ -67,7 +67,7 @@ public:
                         const ACE_TCHAR *host_name = 0);
 
   /// Default dtor.
-  ~ACE_SOCK_Dgram_Bcast (void);
+  ~ACE_SOCK_Dgram_Bcast ();
 
   // Initiate a connectionless datagram broadcast endpoint.
 
@@ -79,7 +79,7 @@ public:
             const ACE_TCHAR *host_name = 0);
 
   /// Close up and release dynamically allocated resources.
-  int close (void);
+  int close ();
 
   /// Broadcast the datagram to every interface.  Returns the average
   /// number of bytes sent.
diff --git a/ACE/ace/SOCK_Netlink.h b/ACE/ace/SOCK_Netlink.h
index d9a8b965b17..f08b5a361a1 100644
--- a/ACE/ace/SOCK_Netlink.h
+++ b/ACE/ace/SOCK_Netlink.h
@@ -41,8 +41,8 @@ class ACE_Export ACE_SOCK_Netlink : public ACE_SOCK
 {
 public:
   /// Default constructor.
-  ACE_SOCK_Netlink(void);
-  ~ACE_SOCK_Netlink(void);
+  ACE_SOCK_Netlink();
+  ~ACE_SOCK_Netlink();
   ACE_SOCK_Netlink (ACE_Netlink_Addr &local,
                     int protocol_family,
                     int protocol);
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.h b/ACE/ace/SOCK_SEQPACK_Acceptor.h
index 16e936127d7..2095e222e32 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.h
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.h
@@ -44,7 +44,7 @@ class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK
 {
 public:
   /// Default constructor.
-  ACE_SOCK_SEQPACK_Acceptor (void);
+  ACE_SOCK_SEQPACK_Acceptor ();
 
   /**
    * Initialize a passive-mode BSD-style acceptor socket (no QoS).
@@ -111,10 +111,10 @@ public:
             int protocol = 132);
 
   /// Close the socket.  Returns 0 on success and -1 on failure.
-  int close (void);
+  int close ();
 
   /// Default dtor.
-  ~ACE_SOCK_SEQPACK_Acceptor (void);
+  ~ACE_SOCK_SEQPACK_Acceptor ();
 
   // = Passive connection <accept> methods.
   /**
diff --git a/ACE/ace/SOCK_SEQPACK_Association.h b/ACE/ace/SOCK_SEQPACK_Association.h
index a9a0a80cc6e..9e2265d5984 100644
--- a/ACE/ace/SOCK_SEQPACK_Association.h
+++ b/ACE/ace/SOCK_SEQPACK_Association.h
@@ -77,13 +77,13 @@ class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO
 public:
   // Initialization and termination methods.
   /// Constructor.
-  ACE_SOCK_SEQPACK_Association (void);
+  ACE_SOCK_SEQPACK_Association ();
 
   /// Constructor (sets the underlying ACE_HANDLE with <h>).
   ACE_SOCK_SEQPACK_Association (ACE_HANDLE h);
 
   /// Destructor.
-  ~ACE_SOCK_SEQPACK_Association (void);
+  ~ACE_SOCK_SEQPACK_Association ();
 
   /**
    * Return local endpoint addresses in the referenced array of
@@ -161,22 +161,22 @@ public:
 
   // = Selectively close endpoints.
   /// Close down the reader.
-  int close_reader (void);
+  int close_reader ();
 
   /// Close down the writer.
-  int close_writer (void);
+  int close_writer ();
 
   /**
    * Close down the socket (we need this to make things work correctly
    * on Win32, which requires use to do a <close_writer> before doing
    * the close to avoid losing data).  */
-  int close (void);
+  int close ();
 
   /**
    * Abort the association according to RFC 2960 9.1 through the API
    * in draft-ietf-tsvwg-sctpsocket-09 7.1.4.
    */
-  int abort (void);
+  int abort ();
 
   // = Meta-type info
   typedef ACE_Multihomed_INET_Addr PEER_ADDR;
diff --git a/ACE/ace/SOCK_SEQPACK_Connector.h b/ACE/ace/SOCK_SEQPACK_Connector.h
index 59db01155c8..23e3475c9ee 100644
--- a/ACE/ace/SOCK_SEQPACK_Connector.h
+++ b/ACE/ace/SOCK_SEQPACK_Connector.h
@@ -49,7 +49,7 @@ class ACE_Export ACE_SOCK_SEQPACK_Connector
 {
 public:
   /// Default constructor.
-  ACE_SOCK_SEQPACK_Connector (void);
+  ACE_SOCK_SEQPACK_Connector ();
 
   /**
    * Actively connect to a peer, producing a connected @c ACE_SOCK_SEQPACK_Association
@@ -251,7 +251,7 @@ public:
                int protocol = 132);
 
   /// Default dtor.
-  ~ACE_SOCK_SEQPACK_Connector (void);
+  ~ACE_SOCK_SEQPACK_Connector ();
 
   // = Completion routine.
   /**
diff --git a/ACE/ace/SPIPE.h b/ACE/ace/SPIPE.h
index 485e866274d..a8b83666738 100644
--- a/ACE/ace/SPIPE.h
+++ b/ACE/ace/SPIPE.h
@@ -51,7 +51,7 @@ public:
    * @return 0 for success; -1 for failure. If a failure occurs, further
    * error information is available from ACE_OS::last_error().
    */
-  int close (void);
+  int close ();
 
   /// Close down the SPIPE and remove the rendezvous point from
   /// the file system.
@@ -59,7 +59,7 @@ public:
    * @return 0 for success; -1 for failure. If a failure occurs, further
    * error information is available from ACE_OS::last_error().
    */
-  int remove (void);
+  int remove ();
 
   /// Return the local address of this endpoint.
   /**
diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h
index 0f95a384706..2f0af3aee8c 100644
--- a/ACE/ace/SPIPE_Acceptor.h
+++ b/ACE/ace/SPIPE_Acceptor.h
@@ -46,7 +46,7 @@ class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE
 {
 public:
   /// Default constructor.
-  ACE_SPIPE_Acceptor (void);
+  ACE_SPIPE_Acceptor ();
 
   /// Initiate a passive-mode STREAM pipe listener.
   /**
@@ -96,10 +96,10 @@ public:
             int pipe_mode = PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE);
 
   /// Close down the passive-mode STREAM pipe listener.
-  int close (void);
+  int close ();
 
   /// Remove the underlying mounted pipe from the file system.
-  int remove (void);
+  int remove ();
 
   // = Passive connection acceptance method.
   /**
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp
index 40bdb2869a2..a673b6f371a 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp
@@ -127,7 +127,7 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream (
      ));
 }
 
-ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void)
+ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream ()
 {
   ACE_TRACE ("ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream");
 
@@ -162,7 +162,7 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void)
 // ************************************************************
 
 int
-ACE_SSL_Asynch_Stream::close (void)
+ACE_SSL_Asynch_Stream::close ()
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1));
 
@@ -184,7 +184,7 @@ ACE_SSL_Asynch_Stream::close (void)
 //    cancel
 // ************************************************************
 int
-ACE_SSL_Asynch_Stream::cancel (void)
+ACE_SSL_Asynch_Stream::cancel ()
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1));
 
@@ -401,7 +401,7 @@ ACE_SSL_Asynch_Stream::write (ACE_Message_Block & message_block,
 //  Main SSL engine
 // ************************************************************
 int
-ACE_SSL_Asynch_Stream::do_SSL_state_machine (void)
+ACE_SSL_Asynch_Stream::do_SSL_state_machine ()
 {
   // this protected member should be called
   // with locked mutex_
@@ -434,7 +434,7 @@ ACE_SSL_Asynch_Stream::do_SSL_state_machine (void)
 // -1  failure
 // ************************************************************
 int
-ACE_SSL_Asynch_Stream::do_SSL_shutdown (void)
+ACE_SSL_Asynch_Stream::do_SSL_shutdown ()
 {
   if (this->flags_ & SF_SHUTDOWN_DONE) // already done
     return 1;
@@ -485,7 +485,7 @@ ACE_SSL_Asynch_Stream::do_SSL_shutdown (void)
 // -1  failure
 // ************************************************************
 int
-ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
+ACE_SSL_Asynch_Stream::do_SSL_handshake ()
 {
   if (SSL_is_init_finished (this->ssl_))
     {
@@ -550,7 +550,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
 }
 
 bool
-ACE_SSL_Asynch_Stream::post_handshake_check (void)
+ACE_SSL_Asynch_Stream::post_handshake_check ()
 {
   return true;
 }
@@ -559,7 +559,7 @@ ACE_SSL_Asynch_Stream::post_handshake_check (void)
 // Perform SSL_read call if necessary and notify user
 // ************************************************************
 int
-ACE_SSL_Asynch_Stream::do_SSL_read (void)
+ACE_SSL_Asynch_Stream::do_SSL_read ()
 {
   if (this->ext_read_result_ == 0)  // nothing to do
     {
@@ -621,7 +621,7 @@ ACE_SSL_Asynch_Stream::do_SSL_read (void)
 // Perform SSL_write call if necessary  and notify user
 // ************************************************************
 int
-ACE_SSL_Asynch_Stream::do_SSL_write (void)
+ACE_SSL_Asynch_Stream::do_SSL_write ()
 {
   if (this->ext_write_result_ == 0)  // nothing to do
     {
@@ -681,7 +681,7 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void)
 //  2  - unable to notify       NOT NOTIFIED
 // ************************************************************
 int
-ACE_SSL_Asynch_Stream::notify_close (void)
+ACE_SSL_Asynch_Stream::notify_close ()
 {
   if (this->flags_ & SF_CLOSE_NTF_SENT)  // already sent
     return 1;
@@ -1041,7 +1041,7 @@ ACE_SSL_Asynch_Stream::handle_read_stream (
 }
 
 void
-ACE_SSL_Asynch_Stream::handle_wakeup (void)
+ACE_SSL_Asynch_Stream::handle_wakeup ()
 {
   ACE_Handler * user_handler = 0;
 
@@ -1058,7 +1058,7 @@ ACE_SSL_Asynch_Stream::handle_wakeup (void)
 }
 
 int
-ACE_SSL_Asynch_Stream::pending_BIO_count (void)
+ACE_SSL_Asynch_Stream::pending_BIO_count ()
 {
   int ret = 0;
 
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h
index 082c022f209..39fb2bb46e2 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.h
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.h
@@ -176,11 +176,11 @@ public:
                          ACE_SSL_Context * context = 0);
 
   /// Destructor
-  virtual ~ACE_SSL_Asynch_Stream (void);
+  virtual ~ACE_SSL_Asynch_Stream ();
 
-  int cancel (void);
+  int cancel ();
 
-  int close (void);
+  int close ();
 
   /// Return a pointer to the underlying SSL structure.
   SSL *ssl () const;
@@ -292,7 +292,7 @@ protected:
 
   /// This method is called when all SSL sessions are closed and no
   /// more pending AIOs exist.  It also calls users handle_wakeup().
-  virtual void handle_wakeup (void);
+  virtual void handle_wakeup ();
 
   /**
    * This method will be called after a successful SSL handshake indicating
@@ -326,23 +326,23 @@ protected:
    *
    * true  - Proceed with connection.  The default implementation returns true.
    */
-  virtual bool post_handshake_check (void);
+  virtual bool post_handshake_check ();
 
   /**
    * @name SSL State Machine
    */
   //@{
-  int do_SSL_state_machine (void);
-  int do_SSL_handshake (void);
-  int do_SSL_read (void);
-  int do_SSL_write(void);
-  int do_SSL_shutdown(void);
+  int do_SSL_state_machine ();
+  int do_SSL_handshake ();
+  int do_SSL_read ();
+  int do_SSL_write();
+  int do_SSL_shutdown();
   //@}
 
   void print_error (int err_ssl,
                     const ACE_TCHAR *pText);
 
-  int pending_BIO_count (void);
+  int pending_BIO_count ();
 
   /// This method is called to notify user handler when user's read in
   /// done.
@@ -355,7 +355,7 @@ protected:
   /// This method is called to notify ourself that SSL session is
   /// shutdown and that there is no more I/O activity now and in the
   /// future.
-  int notify_close(void);
+  int notify_close();
 
   /**
    * @name BIO Helpers
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp
index ebc883ed93a..09020466e73 100644
--- a/ACE/ace/SSL/SSL_Context.cpp
+++ b/ACE/ace/SSL/SSL_Context.cpp
@@ -89,7 +89,7 @@ extern "C"
   // Return the current thread ID.  OpenSSL uses this on platforms
   // that need it.
   unsigned long
-  ACE_SSL_THREAD_ID_NAME (void)
+  ACE_SSL_THREAD_ID_NAME ()
   {
     return (unsigned long) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::thr_self ();
   }
@@ -105,7 +105,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_SSL_Context::lock_type * ACE_SSL_Context::locks_ = 0;
 #endif  /* ACE_HAS_THREADS  && (OPENSSL_VERSION_NUMBER < 0x10100000L) */
 
-ACE_SSL_Context::ACE_SSL_Context (void)
+ACE_SSL_Context::ACE_SSL_Context ()
   : context_ (0),
     mode_ (-1),
     default_verify_mode_ (SSL_VERIFY_NONE),
@@ -117,7 +117,7 @@ ACE_SSL_Context::ACE_SSL_Context (void)
   ACE_SSL_Context::ssl_library_init ();
 }
 
-ACE_SSL_Context::~ACE_SSL_Context (void)
+ACE_SSL_Context::~ACE_SSL_Context ()
 {
   ACE_TRACE ("ACE_SSL_Context::~ACE_SSL_Context");
 
@@ -131,7 +131,7 @@ ACE_SSL_Context::~ACE_SSL_Context (void)
 }
 
 ACE_SSL_Context *
-ACE_SSL_Context::instance (void)
+ACE_SSL_Context::instance ()
 {
   ACE_TRACE ("ACE_SSL_Context::instance");
 
@@ -139,7 +139,7 @@ ACE_SSL_Context::instance (void)
 }
 
 void
-ACE_SSL_Context::close (void)
+ACE_SSL_Context::close ()
 {
   ACE_TRACE ("ACE_SSL_Context::close");
 
@@ -147,7 +147,7 @@ ACE_SSL_Context::close (void)
 }
 
 void
-ACE_SSL_Context::ssl_library_init (void)
+ACE_SSL_Context::ssl_library_init ()
 {
   ACE_TRACE ("ACE_SSL_Context::ssl_library_init");
 
@@ -214,7 +214,7 @@ ACE_SSL_Context::ssl_library_init (void)
 }
 
 void
-ACE_SSL_Context::ssl_library_fini (void)
+ACE_SSL_Context::ssl_library_fini ()
 {
   ACE_TRACE ("ACE_SSL_Context::ssl_library_fini");
 
@@ -575,7 +575,7 @@ ACE_SSL_Context::private_key (const char *file_name,
 }
 
 int
-ACE_SSL_Context::verify_private_key (void)
+ACE_SSL_Context::verify_private_key ()
 {
   ACE_TRACE ("ACE_SSL_Context::verify_private_key");
 
diff --git a/ACE/ace/SSL/SSL_Initializer.cpp b/ACE/ace/SSL/SSL_Initializer.cpp
index d1b82afd359..7f1fcf96684 100644
--- a/ACE/ace/SSL/SSL_Initializer.cpp
+++ b/ACE/ace/SSL/SSL_Initializer.cpp
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-ACE_SSL_Initializer::static_init (void)
+ACE_SSL_Initializer::static_init ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_ACE_SSL_Initializer);
   return 0;
@@ -22,7 +22,7 @@ ACE_SSL_Initializer::init (int, ACE_TCHAR *[])
 }
 
 int
-ACE_SSL_Initializer::fini (void)
+ACE_SSL_Initializer::fini ()
 {
   // Explicitly close the ACE_SSL_Context singleton.
   ACE_SSL_Context::close ();
diff --git a/ACE/ace/SSL/SSL_Initializer.h b/ACE/ace/SSL/SSL_Initializer.h
index a19b780523b..240be859fcc 100644
--- a/ACE/ace/SSL/SSL_Initializer.h
+++ b/ACE/ace/SSL/SSL_Initializer.h
@@ -29,7 +29,7 @@ class ACE_SSL_Export ACE_SSL_Initializer
 {
 public:
   /// Used to force the initialization of ACE_SSL.
-  static int static_init (void);
+  static int static_init ();
 
   /// Create ACE_SSL_Context singleton.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/ACE/ace/SSL/SSL_SOCK.cpp b/ACE/ace/SSL/SSL_SOCK.cpp
index b82ec7d556f..1b39192757e 100644
--- a/ACE/ace/SSL/SSL_SOCK.cpp
+++ b/ACE/ace/SSL/SSL_SOCK.cpp
@@ -9,12 +9,12 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_SSL_SOCK::ACE_SSL_SOCK (void)
+ACE_SSL_SOCK::ACE_SSL_SOCK ()
 {
   ACE_TRACE ("ACE_SSL_SOCK::ACE_SSL_SOCK");
 }
 
-ACE_SSL_SOCK::~ACE_SSL_SOCK (void)
+ACE_SSL_SOCK::~ACE_SSL_SOCK ()
 {
   ACE_TRACE ("ACE_SSL_SOCK::~ACE_SSL_SOCK");
 }
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp
index 3bedfc4276d..2fcd75c2c95 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor)
 
-ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void)
+ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor");
 }
diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp
index b628cae9822..7d8a4623227 100644
--- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp
+++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector)
 
-ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector (void)
+ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector");
 }
diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.h b/ACE/ace/SSL/SSL_SOCK_Connector.h
index 40a46779053..41ba382d6c1 100644
--- a/ACE/ace/SSL/SSL_SOCK_Connector.h
+++ b/ACE/ace/SSL/SSL_SOCK_Connector.h
@@ -55,7 +55,7 @@ class ACE_SSL_Export ACE_SSL_SOCK_Connector
 {
 public:
   /// Default constructor.
-  ACE_SSL_SOCK_Connector (void);
+  ACE_SSL_SOCK_Connector ();
 
   /**
    * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream
@@ -160,7 +160,7 @@ public:
                           int perms = 0);
 
   /// Default dtor.
-  virtual ~ACE_SSL_SOCK_Connector (void);
+  virtual ~ACE_SSL_SOCK_Connector ();
 
   /**
    * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp
index 961b889afb6..7216dce8685 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp
@@ -37,7 +37,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
     }
 }
 
-ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void)
+ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream");
 
diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp
index e257cc22e70..6caf2858d67 100644
--- a/ACE/ace/SUN_Proactor.cpp
+++ b/ACE/ace/SUN_Proactor.cpp
@@ -23,7 +23,7 @@ ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations)
 }
 
 // Destructor.
-ACE_SUN_Proactor::~ACE_SUN_Proactor (void)
+ACE_SUN_Proactor::~ACE_SUN_Proactor ()
 {
   this->close ();
 }
@@ -37,7 +37,7 @@ ACE_SUN_Proactor::handle_events (ACE_Time_Value &wait_time)
 }
 
 int
-ACE_SUN_Proactor::handle_events (void)
+ACE_SUN_Proactor::handle_events ()
 {
   return this->handle_events_i (0);
 }
@@ -304,7 +304,7 @@ ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result)
 }
 
 ACE_POSIX_Proactor::Proactor_Type
-ACE_SUN_Proactor::get_impl_type (void)
+ACE_SUN_Proactor::get_impl_type ()
 {
   return PROACTOR_SUN;
 }
diff --git a/ACE/ace/SV_Message.h b/ACE/ace/SV_Message.h
index a75ace4d2ac..7b1f5fa352f 100644
--- a/ACE/ace/SV_Message.h
+++ b/ACE/ace/SV_Message.h
@@ -34,7 +34,7 @@ public:
   ACE_SV_Message (long type = 0);
 
   /// Destructor
-  ~ACE_SV_Message (void);
+  ~ACE_SV_Message ();
 
   /// Get the message type.
   long type () const;
diff --git a/ACE/ace/SV_Message_Queue.h b/ACE/ace/SV_Message_Queue.h
index 8ded7d84362..83cbd399ded 100644
--- a/ACE/ace/SV_Message_Queue.h
+++ b/ACE/ace/SV_Message_Queue.h
@@ -44,7 +44,7 @@ public:
   };
 
   /// Open a message queue using the <external_id>.
-  ACE_SV_Message_Queue (void);
+  ACE_SV_Message_Queue ();
   ACE_SV_Message_Queue (key_t external_id,
                         int create = ACE_SV_Message_Queue::ACE_OPEN,
                         int perms = ACE_DEFAULT_FILE_PERMS);
@@ -52,14 +52,14 @@ public:
             int create = ACE_SV_Message_Queue::ACE_OPEN,
             int perms = ACE_DEFAULT_FILE_PERMS);
 
-  ~ACE_SV_Message_Queue (void);
+  ~ACE_SV_Message_Queue ();
 
   /// Close down this instance of the message queue without removing it
   /// from the system.
-  int close (void);
+  int close ();
 
   /// Close down and remove the message queue from the system.
-  int remove (void);
+  int remove ();
 
   // = Message transfer methods.
   ssize_t recv (ACE_SV_Message &mb,
diff --git a/ACE/ace/SV_Semaphore_Complex.h b/ACE/ace/SV_Semaphore_Complex.h
index b94932ac66b..a5e4084220f 100644
--- a/ACE/ace/SV_Semaphore_Complex.h
+++ b/ACE/ace/SV_Semaphore_Complex.h
@@ -58,7 +58,7 @@ public:
     ACE_OPEN   = 0
   };
 
-  ACE_SV_Semaphore_Complex (void);
+  ACE_SV_Semaphore_Complex ();
   ACE_SV_Semaphore_Complex (key_t key,
                             short create = ACE_SV_Semaphore_Complex::ACE_CREATE,
                             int initial_value = 1,
@@ -69,7 +69,7 @@ public:
                             int initial_value = 1,
                             u_short nsems = 1,
                             mode_t perms = ACE_DEFAULT_FILE_PERMS);
-  ~ACE_SV_Semaphore_Complex (void);
+  ~ACE_SV_Semaphore_Complex ();
 
   /// Open or create an array of SV_Semaphores.  We return 0 if all is
   /// OK, else -1.
@@ -94,7 +94,7 @@ public:
    * processes using the ACE_SV_Semaphore, and if this was the last
    * one, we can remove the ACE_SV_Semaphore.
    */
-  int close (void);
+  int close ();
 
   // = Semaphore acquire and release methods.
 
diff --git a/ACE/ace/SV_Semaphore_Simple.h b/ACE/ace/SV_Semaphore_Simple.h
index 0b33c59bbd9..600f29488a9 100644
--- a/ACE/ace/SV_Semaphore_Simple.h
+++ b/ACE/ace/SV_Semaphore_Simple.h
@@ -55,7 +55,7 @@ public:
     ACE_OPEN = 0
   };
 
-  ACE_SV_Semaphore_Simple (void);
+  ACE_SV_Semaphore_Simple ();
   ACE_SV_Semaphore_Simple (key_t key,
                            short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
                            int initial_value = 1,
@@ -74,7 +74,7 @@ public:
                            mode_t perms = ACE_DEFAULT_FILE_PERMS);
 #endif /* ACE_HAS_WCHAR */
 
-  ~ACE_SV_Semaphore_Simple (void);
+  ~ACE_SV_Semaphore_Simple ();
 
   int open (const char *name,
             short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
@@ -100,7 +100,7 @@ public:
 
   /// Close a ACE_SV_Semaphore, marking it as invalid for subsequent
   /// operations...
-  int close (void);
+  int close ();
 
   /**
    * Remove all SV_Semaphores associated with a particular key.  This
diff --git a/ACE/ace/SV_Shared_Memory.h b/ACE/ace/SV_Shared_Memory.h
index a6734bb075b..3813212446b 100644
--- a/ACE/ace/SV_Shared_Memory.h
+++ b/ACE/ace/SV_Shared_Memory.h
@@ -39,7 +39,7 @@ public:
     ACE_OPEN   = 0
   };
 
-  ACE_SV_Shared_Memory (void);
+  ACE_SV_Shared_Memory ();
   ACE_SV_Shared_Memory (key_t external_id,
                         size_t size,
                         int create,
@@ -66,10 +66,10 @@ public:
   int  attach (void *virtual_addr = 0, int flags = 0);
 
   /// Detach this shared memory segment.
-  int  detach (void);
+  int  detach ();
 
   /// Remove this shared memory segment.
-  int  remove (void);
+  int  remove ();
 
   /// Forward to underlying System V <shmctl>.
   int  control (int cmd, void *buf);
diff --git a/ACE/ace/Sample_History.h b/ACE/ace/Sample_History.h
index fea5384037e..4c930057a50 100644
--- a/ACE/ace/Sample_History.h
+++ b/ACE/ace/Sample_History.h
@@ -46,7 +46,7 @@ public:
   ACE_Sample_History (size_t max_samples);
 
   /// Destructor
-  ~ACE_Sample_History (void);
+  ~ACE_Sample_History ();
 
   /// Record one sample.
   /**
diff --git a/ACE/ace/Sbrk_Memory_Pool.h b/ACE/ace/Sbrk_Memory_Pool.h
index ed7eaad69a0..5c38cc3713a 100644
--- a/ACE/ace/Sbrk_Memory_Pool.h
+++ b/ACE/ace/Sbrk_Memory_Pool.h
@@ -54,7 +54,7 @@ public:
   ACE_Sbrk_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
                         const OPTIONS *options = 0);
 
-  virtual ~ACE_Sbrk_Memory_Pool (void);
+  virtual ~ACE_Sbrk_Memory_Pool ();
 
   // = Implementor operations.
   /// Ask system for initial chunk of local memory.
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index aab32a0fa39..0019a949a05 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -90,7 +90,7 @@ class ACE_Event_Tuple
 {
 public:
   /// Default constructor.
-  ACE_Event_Tuple (void);
+  ACE_Event_Tuple ();
 
   /// Constructor.
   ACE_Event_Tuple (ACE_Event_Handler *eh, ACE_HANDLE h);
@@ -128,10 +128,10 @@ class ACE_Export ACE_Select_Reactor_Notify : public ACE_Reactor_Notify
 {
 public:
   /// Constructor.
-  ACE_Select_Reactor_Notify (void);
+  ACE_Select_Reactor_Notify ();
 
   /// Destructor.
-  virtual ~ACE_Select_Reactor_Notify (void);
+  virtual ~ACE_Select_Reactor_Notify ();
 
   /// Initialize.
   virtual int open (ACE_Reactor_Impl *,
@@ -139,7 +139,7 @@ public:
                     int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT);
 
   /// Destroy.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Called by a thread when it wants to unblock the
@@ -164,7 +164,7 @@ public:
   /// Returns the ACE_HANDLE of the notify pipe on which the reactor
   /// is listening for notifications so that other threads can unblock
   /// the Select_Reactor
-  virtual ACE_HANDLE notify_handle (void);
+  virtual ACE_HANDLE notify_handle ();
 
   /// Handle one of the notify call on the @c handle. This could be
   /// because of a thread trying to unblock the Reactor_Impl
@@ -206,7 +206,7 @@ public:
    * dispatch the ACE_Event_Handlers that are passed in via the
    * notify pipe before breaking out of its recv loop.
    */
-  virtual int max_notify_iterations (void);
+  virtual int max_notify_iterations ();
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -327,7 +327,7 @@ public:
   int open (size_type size);
 
   /// Close down the repository.
-  int close (void);
+  int close ();
 
   // = Search structure operations.
 
@@ -347,7 +347,7 @@ public:
               ACE_Reactor_Mask mask);
 
   /// Remove all the <ACE_HANDLE, ACE_Event_Handler> tuples.
-  int unbind_all (void);
+  int unbind_all ();
 
   // = Sanity checking.
 
@@ -425,7 +425,7 @@ public:
 
   /// Move forward by one element in the set.  Returns @c false when
   /// all the items in the set have been seen, else @c true.
-  bool advance (void);
+  bool advance ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -475,7 +475,7 @@ public:
   /// its own ie. can it pass on the control of handle resumption to
   /// the application.  The select reactor has no handlers that can be
   /// resumed by the  application. So return 0;
-  virtual int resumable_handler (void);
+  virtual int resumable_handler ();
 
 protected:
   /// Allow manipulation of the <wait_set_> mask and <ready_set_> mask.
@@ -572,7 +572,7 @@ protected:
 
   /// Controls/access whether the notify handler should renew the
   /// Select_Reactor's token or not.
-  bool supress_notify_renew (void);
+  bool supress_notify_renew ();
   void supress_notify_renew (bool sr);
 
 private:
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index d8bce72fa15..d9f02176e6c 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -90,7 +90,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i (int signum,
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> bool
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::initialized (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::initialized ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::initialized");
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false));
@@ -125,7 +125,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t *t_id)
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> bool
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart ()
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false));
   return this->restart_;
@@ -155,7 +155,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::requeue_position (int rp)
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::requeue_position (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::requeue_position ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::requeue_position");
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
@@ -172,7 +172,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations (int itera
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::max_notify_iterations");
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
@@ -181,7 +181,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations (void)
 
 // Enqueue ourselves into the list of waiting threads.
 template <class ACE_SELECT_REACTOR_TOKEN> void
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::renew (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::renew ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::renew");
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@@ -225,7 +225,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handler (ACE_HANDLE hand
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handlers (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handlers ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::suspend_handlers");
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
@@ -243,7 +243,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handlers (void)
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_handlers (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_handlers ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::resume_handlers");
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
@@ -557,7 +557,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
 // event loop thread...
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::close");
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
@@ -606,7 +606,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::current_info
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN>
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::~ACE_Select_Reactor_T (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::~ACE_Select_Reactor_T ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::~ACE_Select_Reactor_T");
   this->close ();
@@ -770,7 +770,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_error (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_error ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::handle_error");
 #if defined (ACE_LINUX) && defined (ERESTARTNOHAND)
@@ -1384,7 +1384,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::release_token (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::release_token ()
 {
 #if defined (ACE_WIN32)
   this->token_.release ();
@@ -1468,7 +1468,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events_i
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles ()
 {
   ACE_TRACE ("ACE_Select_Reactor_T::check_handles");
 
diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h
index dc0fc72a762..2b53af44ea1 100644
--- a/ACE/ace/Select_Reactor_T.h
+++ b/ACE/ace/Select_Reactor_T.h
@@ -123,10 +123,10 @@ public:
   virtual ACE_Timer_Queue *timer_queue () const;
 
   /// Close down the select_reactor and release all of its resources.
-  virtual int close (void);
+  virtual int close ();
 
   /// Close down the select_reactor and release all of its resources.
-  virtual ~ACE_Select_Reactor_T (void);
+  virtual ~ACE_Select_Reactor_T ();
 
   // = Event loop drivers.
 
@@ -182,7 +182,7 @@ public:
    * actively handling events.  If it returns non-zero, <handling_events> and
    * <handle_alertable_events> return -1 immediately.
    */
-  virtual int deactivated (void);
+  virtual int deactivated ();
 
   /**
    * Control whether the Reactor will handle any more incoming events or not.
@@ -304,7 +304,7 @@ public:
   virtual int suspend_handler (const ACE_Handle_Set &handles);
 
   /// Suspend all the <Event_Handlers> in the Select_Reactor.
-  virtual int suspend_handlers (void);
+  virtual int suspend_handlers ();
 
   /// Resume a temporarily suspend Event_Handler associated with
   /// @a eh.
@@ -318,7 +318,7 @@ public:
   virtual int resume_handler (const ACE_Handle_Set &handles);
 
   /// Resume all the <Event_Handlers> in the Select_Reactor.
-  virtual int resume_handlers (void);
+  virtual int resume_handlers ();
 
   /**
    * Return true if we any event associations were made by the reactor
@@ -326,7 +326,7 @@ public:
    * Select_Reactor does not do any event associations, this function
    * always return false.
    */
-  virtual bool uses_event_associations (void);
+  virtual bool uses_event_associations ();
 
   // = Timer management.
   /**
@@ -437,10 +437,10 @@ public:
    * dispatch the ACE_Event_Handlers that are passed in via the
    * notify pipe before breaking out of its recv loop.
    */
-  virtual int max_notify_iterations (void);
+  virtual int max_notify_iterations ();
 
   /// Get the existing restart value.
-  virtual bool restart (void);
+  virtual bool restart ();
 
   /// Set a new value for restart and return the original value.
   virtual bool restart (bool r);
@@ -451,7 +451,7 @@ public:
 
   /// Get position that the main ACE_Select_Reactor thread is requeued in the
   /// list of waiters during a <notify> callback.
-  virtual int requeue_position (void);
+  virtual int requeue_position ();
 
   // = Low-level wait_set mask manipulation methods.
   /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the @a eh and
@@ -478,7 +478,7 @@ public:
                          int ops);
 
   /// Wake up all threads in waiting in the event loop
-  virtual void wakeup_all_threads (void);
+  virtual void wakeup_all_threads ();
 
   // = Only the owner thread can perform a <handle_events>.
 
@@ -514,7 +514,7 @@ public:
                        ACE_Event_Handler ** = 0);
 
   /// Returns true if we've been successfully initialized, else false.
-  virtual bool initialized (void);
+  virtual bool initialized ();
 
   /// Returns the current size of the Reactor's internal descriptor
   /// table.
@@ -527,7 +527,7 @@ public:
    * deadlock efficiently when ACE_Event_Handlers are used in
    * multiple threads.
    */
-  virtual ACE_Lock &lock (void);
+  virtual ACE_Lock &lock ();
 
   /// Dump the state of an object.
   virtual void dump () const;
@@ -594,10 +594,10 @@ protected:
   virtual int any_ready_i (ACE_Select_Reactor_Handle_Set &handle_set);
 
   /// Take corrective action when errors occur.
-  virtual int handle_error (void);
+  virtual int handle_error ();
 
   /// Make sure the handles are all valid.
-  virtual int check_handles (void);
+  virtual int check_handles ();
 
   /// Wait for events to occur.
   virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
@@ -667,7 +667,7 @@ protected:
 
   /// Enqueue ourselves into the list of waiting threads at the
   /// appropriate point specified by <requeue_position_>.
-  virtual void renew (void);
+  virtual void renew ();
 
   /// Synchronization token for the MT_SAFE ACE_Select_Reactor.
   ACE_SELECT_REACTOR_TOKEN token_;
@@ -676,7 +676,7 @@ protected:
   ACE_Lock_Adapter<ACE_SELECT_REACTOR_TOKEN> lock_adapter_;
 
   /// Release the token lock when a Win32 structured exception occurs.
-  int release_token (void);
+  int release_token ();
 
   /// Stops the VC++ compiler from bitching about exceptions and destructors
   int handle_events_i (ACE_Time_Value *max_wait_time = 0);
diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h
index 45c527484ba..51161d5746b 100644
--- a/ACE/ace/Service_Manager.h
+++ b/ACE/ace/Service_Manager.h
@@ -51,10 +51,10 @@ class ACE_Export ACE_Service_Manager : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  ACE_Service_Manager (void);
+  ACE_Service_Manager ();
 
   /// Destructor.
-  virtual ~ACE_Service_Manager (void);
+  virtual ~ACE_Service_Manager ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -64,11 +64,11 @@ protected:
 
   /// Trigger a reconfiguration of the Service Configurator by
   /// re-reading its local <svc.conf> file.
-  virtual int reconfigure_services (void);
+  virtual int reconfigure_services ();
 
   /// Determine all the services offered by this daemon and return the
   /// information back to the client.
-  virtual int list_services (void);
+  virtual int list_services ();
 
   // = Dynamic linking hooks.
   virtual int init (int argc, ACE_TCHAR *argv[]);
@@ -76,8 +76,8 @@ protected:
   virtual int fini ();
 
   // = Scheduling hooks.
-  virtual int suspend (void);
-  virtual int resume (void);
+  virtual int suspend ();
+  virtual int resume ();
 
   /// Dump the state of an object.
   void dump () const;
diff --git a/ACE/ace/Shared_Memory.h b/ACE/ace/Shared_Memory.h
index 4b10a004d47..82d2934350d 100644
--- a/ACE/ace/Shared_Memory.h
+++ b/ACE/ace/Shared_Memory.h
@@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Shared_Memory
 {
 public:
-  virtual ~ACE_Shared_Memory (void);
+  virtual ~ACE_Shared_Memory ();
 
   // = Note that all the following methods are pure virtual.
   virtual int close (void) = 0;
diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h
index b3dc8f72fd6..77f9b12db9f 100644
--- a/ACE/ace/Shared_Memory_MM.h
+++ b/ACE/ace/Shared_Memory_MM.h
@@ -76,10 +76,10 @@ public:
   const ACE_TCHAR *filename () const;
 
   /// Close down the shared memory segment.
-  virtual int close (void);
+  virtual int close ();
 
   /// Remove the shared memory segment and the underlying file.
-  virtual int remove (void);
+  virtual int remove ();
 
   // = Allocation and deallocation methods.
   /// Create a new chuck of memory containing @a size bytes.
diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h
index 4e8adcf8cfb..4b5f09ca357 100644
--- a/ACE/ace/Shared_Memory_SV.h
+++ b/ACE/ace/Shared_Memory_SV.h
@@ -40,7 +40,7 @@ public:
       ACE_OPEN = 0
     };
 
-  ACE_Shared_Memory_SV (void);
+  ACE_Shared_Memory_SV ();
   ACE_Shared_Memory_SV (key_t id,
                         size_t length,
                         int create = ACE_Shared_Memory_SV::ACE_OPEN,
@@ -56,10 +56,10 @@ public:
             int flags = 0);
 
   /// Close down the shared memory segment.
-  virtual int close (void);
+  virtual int close ();
 
   /// Remove the underlying shared memory segment.
-  virtual int remove (void);
+  virtual int remove ();
 
   // = Allocation and deallocation methods.
   /// Create a new chuck of memory containing @a size bytes.
diff --git a/ACE/ace/Stats.h b/ACE/ace/Stats.h
index 17ac7127138..5aaacb4e356 100644
--- a/ACE/ace/Stats.h
+++ b/ACE/ace/Stats.h
@@ -172,7 +172,7 @@ public:
                      ) const;
 
   /// Initialize internal state.
-  void reset (void);
+  void reset ();
 
   /// Utility division function, for ACE_UINT64 dividend.
   static void quotient (const ACE_UINT64 dividend,
diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp
index 0079d50883a..d799bc3bc4d 100644
--- a/ACE/ace/Stream.cpp
+++ b/ACE/ace/Stream.cpp
@@ -540,7 +540,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::link (ACE_Stream<ACE_SYNCH_USE, TIME_POL
 // Must be called with locks held...
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i (void)
+ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i ()
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i");
 
@@ -584,7 +584,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink (void)
+ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink ()
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
@@ -612,7 +612,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream (void * a,
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream (void)
+ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream ()
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream");
 
diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h
index 35fb3645d4c..3e7998b68cd 100644
--- a/ACE/ace/Stream.h
+++ b/ACE/ace/Stream.h
@@ -154,7 +154,7 @@ public:
                        void *args);
 
   /// Synchronize with the final close of the stream.
-  virtual int wait (void);
+  virtual int wait ();
 
   /// Dump the state of an object.
   virtual void dump () const;
@@ -190,7 +190,7 @@ protected:
 private:
   /// Actually perform the unlinking of two Streams (must be called
   /// with locks held).
-  int unlink_i (void);
+  int unlink_i ();
 
   /// Actually perform the linking of two Streams (must be called with
   /// locks held).
@@ -224,7 +224,7 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
 private:
   /// Next ACE_Module that we haven't yet seen.
diff --git a/ACE/ace/Svc_Conf.h b/ACE/ace/Svc_Conf.h
index 7c47a5e5a7e..4dc2ed13b8d 100644
--- a/ACE/ace/Svc_Conf.h
+++ b/ACE/ace/Svc_Conf.h
@@ -35,7 +35,7 @@ int ace_yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int ace_yyparse (void);
+int ace_yyparse ();
 #else
 int ace_yyparse ();
 #endif
diff --git a/ACE/ace/Svc_Conf_Param.h b/ACE/ace/Svc_Conf_Param.h
index fff69f2dcb7..18c285a9290 100644
--- a/ACE/ace/Svc_Conf_Param.h
+++ b/ACE/ace/Svc_Conf_Param.h
@@ -85,7 +85,7 @@ public:
     source.directive = directive;
   }
 
-  ~ACE_Svc_Conf_Param (void)
+  ~ACE_Svc_Conf_Param ()
   {
     ace_yy_delete_buffer (this->buffer);
   }
diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp
index bd9a781b839..a95c7f2d1fd 100644
--- a/ACE/ace/Svc_Conf_y.cpp
+++ b/ACE/ace/Svc_Conf_y.cpp
@@ -1133,7 +1133,7 @@ int ace_yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int ace_yyparse (void);
+int ace_yyparse ();
 #else
 int ace_yyparse ();
 #endif
@@ -1161,7 +1161,7 @@ ace_yyparse (YYPARSE_PARAM)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 int
-ace_yyparse (void)
+ace_yyparse ()
 #else
 int
 ace_yyparse ()
diff --git a/ACE/ace/System_Time.h b/ACE/ace/System_Time.h
index dca30ec97ea..3f77c031029 100644
--- a/ACE/ace/System_Time.h
+++ b/ACE/ace/System_Time.h
@@ -57,7 +57,7 @@ public:
   ACE_System_Time (const ACE_TCHAR *poolname = 0);
 
   /// Default destructor.
-  ~ACE_System_Time (void);
+  ~ACE_System_Time ();
 
   /// Get the local system time, i.e., the value returned by
   /// ACE_OS::time().
diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp
index 72489c64a30..cdfa1db8514 100644
--- a/ACE/ace/TLI.cpp
+++ b/ACE/ace/TLI.cpp
@@ -27,7 +27,7 @@ ACE_TLI::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_TLI::ACE_TLI (void)
+ACE_TLI::ACE_TLI ()
 {
   ACE_TRACE ("ACE_TLI::ACE_TLI");
 #if defined (ACE_HAS_SVR4_TLI)
@@ -62,7 +62,7 @@ ACE_TLI::open (const char device[], int oflag, struct t_info *info)
   return this->get_handle ();
 }
 
-ACE_TLI::~ACE_TLI (void)
+ACE_TLI::~ACE_TLI ()
 {
   ACE_TRACE ("ACE_TLI::~ACE_TLI");
 #if defined (ACE_HAS_SVR4_TLI)
@@ -101,7 +101,7 @@ ACE_TLI::get_local_addr (ACE_Addr &sa) const
 }
 
 int
-ACE_TLI::close (void)
+ACE_TLI::close ()
 {
   ACE_TRACE ("ACE_TLI::close");
   int result = 0; // Geisler: result must be int
diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp
index d46865728b6..1075346b0d4 100644
--- a/ACE/ace/TLI_Acceptor.cpp
+++ b/ACE/ace/TLI_Acceptor.cpp
@@ -24,7 +24,7 @@ public:
   ACE_TLI_Request_Queue ();
 
   ACE_HANDLE open (ACE_HANDLE fd, int size);
-  int close (void);
+  int close ();
 
   int enqueue (const char device[], bool restart, int rwflag);
   int dequeue (ACE_TLI_Request *&ptr);
@@ -88,7 +88,7 @@ ACE_TLI_Request_Queue::free (ACE_TLI_Request *node)
 // Remove a node from the free list stack.
 
 ACE_TLI_Request *
-ACE_TLI_Request_Queue::alloc (void)
+ACE_TLI_Request_Queue::alloc ()
 {
   ACE_TRACE ("ACE_TLI_Request_Queue::alloc");
   ACE_TLI_Request *temp = this->free_list_;
@@ -106,7 +106,7 @@ ACE_TLI_Acceptor::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_TLI_Acceptor::ACE_TLI_Acceptor (void)
+ACE_TLI_Acceptor::ACE_TLI_Acceptor ()
   : queue_ (0)
 {
   ACE_TRACE ("ACE_TLI_Acceptor::ACE_TLI_Acceptor");
@@ -168,7 +168,7 @@ open_new_endpoint (ACE_HANDLE listen_handle,
 // Close down the acceptor and release resources.
 
 int
-ACE_TLI_Request_Queue::close (void)
+ACE_TLI_Request_Queue::close ()
 {
   ACE_TRACE ("ACE_TLI_Request_Queue::close");
   int res = 0;
@@ -219,7 +219,7 @@ ACE_TLI_Request_Queue::open (ACE_HANDLE f, int sz)
   return 0;
 }
 
-ACE_TLI_Request_Queue::ACE_TLI_Request_Queue (void)
+ACE_TLI_Request_Queue::ACE_TLI_Request_Queue ()
   : size_ (0),
     current_count_ (0),
     base_ (0),
@@ -402,7 +402,7 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap,
 }
 
 int
-ACE_TLI_Acceptor::close (void)
+ACE_TLI_Acceptor::close ()
 {
   ACE_TRACE ("ACE_TLI_Acceptor::close");
   if (this->device_ != 0)
diff --git a/ACE/ace/TLI_Connector.cpp b/ACE/ace/TLI_Connector.cpp
index 60fb793a9bc..c8781000a78 100644
--- a/ACE/ace/TLI_Connector.cpp
+++ b/ACE/ace/TLI_Connector.cpp
@@ -23,7 +23,7 @@ ACE_TLI_Connector::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_TLI_Connector::ACE_TLI_Connector (void)
+ACE_TLI_Connector::ACE_TLI_Connector ()
 {
   ACE_TRACE ("ACE_TLI_Connector::ACE_TLI_Connector");
 }
diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h
index 3b2a99e09a3..4ad528ce2f8 100644
--- a/ACE/ace/TLI_Connector.h
+++ b/ACE/ace/TLI_Connector.h
@@ -33,7 +33,7 @@ class ACE_Export ACE_TLI_Connector
 {
 public:
   /// Default constructor.
-  ACE_TLI_Connector (void);
+  ACE_TLI_Connector ();
 
   /**
    * Actively connect and produce a <new_stream> if things go well.
diff --git a/ACE/ace/TLI_Stream.cpp b/ACE/ace/TLI_Stream.cpp
index 34e5ab2ae80..9acc4a0a1fe 100644
--- a/ACE/ace/TLI_Stream.cpp
+++ b/ACE/ace/TLI_Stream.cpp
@@ -23,7 +23,7 @@ ACE_TLI_Stream::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_TLI_Stream::ACE_TLI_Stream (void)
+ACE_TLI_Stream::ACE_TLI_Stream ()
   : rwflag_ (0)
 {
   ACE_TRACE ("ACE_TLI_Stream::ACE_TLI_Stream");
@@ -47,7 +47,7 @@ ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const
 // Send a release and then await the release from the other side.
 
 int
-ACE_TLI_Stream::active_close (void)
+ACE_TLI_Stream::active_close ()
 {
   ACE_TRACE ("ACE_TLI_Stream::active_close");
   char buf;
@@ -72,7 +72,7 @@ ACE_TLI_Stream::active_close (void)
 // release to the other side.
 
 int
-ACE_TLI_Stream::passive_close (void)
+ACE_TLI_Stream::passive_close ()
 {
   ACE_TRACE ("ACE_TLI_Stream::passive_close");
 
@@ -85,7 +85,7 @@ ACE_TLI_Stream::passive_close (void)
 }
 
 int
-ACE_TLI_Stream::close (void)
+ACE_TLI_Stream::close ()
 {
   ACE_TRACE ("ACE_TLI_Stream::close");
 
diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h
index bb576733de2..24e0f3209c9 100644
--- a/ACE/ace/TP_Reactor.h
+++ b/ACE/ace/TP_Reactor.h
@@ -47,7 +47,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_EH_Dispatch_Info
 {
 public:
-  ACE_EH_Dispatch_Info (void);
+  ACE_EH_Dispatch_Info ();
 
   void set (ACE_HANDLE handle,
             ACE_Event_Handler *event_handler,
@@ -92,14 +92,14 @@ public:
 
   /// Destructor. This will release the token if it hasnt been
   /// released till this point
-  ~ACE_TP_Token_Guard (void);
+  ~ACE_TP_Token_Guard ();
 
   /// Release the token ..
-  void release_token (void);
+  void release_token ();
 
   /// Returns whether the thread that created this object ownes the
   /// token or not.
-  bool is_owner (void);
+  bool is_owner ();
 
   /// A helper method that grabs the token for us, after which the
   /// thread that owns that can do some actual work.
@@ -216,7 +216,7 @@ public:
   /// its own ie. can it pass on the control of handle resumption to
   /// the application.  The TP reactor has can allow applications to
   /// resume handles.  So return a positive value.
-  virtual int resumable_handler (void);
+  virtual int resumable_handler ();
 
   /// Called from handle events
   static void no_op_sleep_hook (void *);
@@ -281,7 +281,7 @@ protected:
 private:
   /// Get the handle of the notify pipe from the ready set if there is
   /// an event in the notify pipe.
-  ACE_HANDLE get_notify_handle (void);
+  ACE_HANDLE get_notify_handle ();
 
   /// Get socket event dispatch information.
   int get_socket_event_info (ACE_EH_Dispatch_Info &info);
diff --git a/ACE/ace/Task_Ex_T.cpp b/ACE/ace/Task_Ex_T.cpp
index 8f48df6775c..f770aff028f 100644
--- a/ACE/ace/Task_Ex_T.cpp
+++ b/ACE/ace/Task_Ex_T.cpp
@@ -69,7 +69,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::ACE_Task_Ex (ACE_Thre
 }
 
 template<ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY>
-ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex (void)
+ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex ()
 {
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex");
   if (this->delete_msg_queue_)
@@ -81,7 +81,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex (void)
 }
 
 template<ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY> ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::sibling (void)
+ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::sibling ()
 {
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::sibling");
   /// @todo FIXME Need to impl ACE_Moudle to support ACE_Task as well.
diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h
index 905090dee5c..70cd1d7d9e7 100644
--- a/ACE/ace/Task_Ex_T.h
+++ b/ACE/ace/Task_Ex_T.h
@@ -75,10 +75,10 @@ public:
             MESSAGE_QUEUE_EX *mq = 0);
 
   /// Destructor.
-  virtual ~ACE_Task_Ex (void);
+  virtual ~ACE_Task_Ex ();
 
   /// Gets the message queue associated with this task.
-  MESSAGE_QUEUE_EX *msg_queue (void);
+  MESSAGE_QUEUE_EX *msg_queue ();
 
   /// Sets the message queue associated with this task.
   void msg_queue (MESSAGE_QUEUE_EX *);
@@ -131,13 +131,13 @@ public: // Should be protected:
 
   // = Pointers to next ACE_Task_Base (if ACE is part of an ACE_Stream).
   /// Get next Task pointer.
-  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next (void);
+  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next ();
 
   /// Set next Task pointer.
   void next (ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *);
 
   /// Alwasy return 0. @todo FIXME
-  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling (void);
+  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling ();
 
   /// Return the Task's Module if there is one, else returns 0.
   ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module () const;
diff --git a/ACE/ace/Thread_Hook.h b/ACE/ace/Thread_Hook.h
index dcb6d396eab..0d342a3f43a 100644
--- a/ACE/ace/Thread_Hook.h
+++ b/ACE/ace/Thread_Hook.h
@@ -33,10 +33,10 @@ class ACE_Export ACE_Thread_Hook
 {
 public:
   /// Default constructor
-  ACE_Thread_Hook (void);
+  ACE_Thread_Hook ();
 
   /// Destructor.
-  virtual ~ACE_Thread_Hook (void);
+  virtual ~ACE_Thread_Hook ();
 
   /**
    * This method can be overridden in a subclass to customize this
@@ -54,7 +54,7 @@ public:
   static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *hook);
 
   /// Returns the current system thread hook.
-  static ACE_Thread_Hook *thread_hook (void);
+  static ACE_Thread_Hook *thread_hook ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Timeprobe_T.cpp b/ACE/ace/Timeprobe_T.cpp
index c67edb60607..a89375d753a 100644
--- a/ACE/ace/Timeprobe_T.cpp
+++ b/ACE/ace/Timeprobe_T.cpp
@@ -70,7 +70,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex<
 }
 
 template <class ACE_LOCK, class ALLOCATOR>
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::~ACE_Timeprobe_Ex (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::~ACE_Timeprobe_Ex ()
 {
   ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *) (this->timeprobes_),
                       this->max_size_,
@@ -127,7 +127,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobe (const char *event)
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::reset (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::reset ()
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
@@ -172,37 +172,37 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::increase_size (u_long size)
 }
 
 template <class ACE_LOCK, class ALLOCATOR> ACE_Unbounded_Set<ACE_Event_Descriptions> &
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::event_descriptions (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::event_descriptions ()
 {
   return this->event_descriptions_;
 }
 
 template <class ACE_LOCK, class ALLOCATOR> ACE_Unbounded_Set<ACE_Event_Descriptions> &
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sorted_event_descriptions (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sorted_event_descriptions ()
 {
   return this->sorted_event_descriptions_;
 }
 
 template <class ACE_LOCK, class ALLOCATOR> ACE_timeprobe_t *
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobes (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobes ()
 {
   return this->timeprobes_;
 }
 
 template <class ACE_LOCK, class ALLOCATOR> ACE_LOCK &
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::lock (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::lock ()
 {
   return this->lock_;
 }
 
 template <class ACE_LOCK, class ALLOCATOR> u_long
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::max_size (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::max_size ()
 {
   return this->max_size_;
 }
 
 template <class ACE_LOCK, class ALLOCATOR> u_long
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::current_size (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::current_size ()
 {
   return this->current_size_;
 }
@@ -223,7 +223,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::event_descriptions (const char **descript
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times ()
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
@@ -309,7 +309,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void)
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times ()
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
@@ -375,7 +375,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::find_description_i (u_long i)
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sort_event_descriptions_i (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sort_event_descriptions_i ()
 {
   size_t total_elements = this->event_descriptions_.size ();
 
@@ -398,7 +398,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sort_event_descriptions_i (void)
 }
 
 template <class ACE_LOCK, class ALLOCATOR> ALLOCATOR *
-ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::allocator (void)
+ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::allocator ()
 {
   return allocator_ ? allocator_ : ACE_Singleton<ALLOCATOR, ACE_LOCK>::instance ();
 }
@@ -413,7 +413,7 @@ ACE_Function_Timeprobe<Timeprobe>::ACE_Function_Timeprobe (Timeprobe &timeprobe,
 }
 
 template <class Timeprobe>
-ACE_Function_Timeprobe<Timeprobe>::~ACE_Function_Timeprobe (void)
+ACE_Function_Timeprobe<Timeprobe>::~ACE_Function_Timeprobe ()
 {
   this->timeprobe_.timeprobe (this->event_ + 1);
 }
diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h
index 9277897b5a3..0c0a670841f 100644
--- a/ACE/ace/Timeprobe_T.h
+++ b/ACE/ace/Timeprobe_T.h
@@ -80,7 +80,7 @@ public:
   ACE_Timeprobe_Ex (ALLOCATOR *allocator,
                  u_long size = ACE_DEFAULT_TIMEPROBE_TABLE_SIZE);
   /// Destructor.
-  ~ACE_Timeprobe_Ex (void);
+  ~ACE_Timeprobe_Ex ();
 
   /// Record a time. @a event is used to describe this time probe.
   void timeprobe (u_long event);
@@ -93,13 +93,13 @@ public:
                           u_long minimum_id);
 
   /// Print the time probes.
-  void print_times (void);
+  void print_times ();
 
   /// Print the time probes.
-  void print_absolute_times (void);
+  void print_absolute_times ();
 
   /// Reset the slots.  All old time probes will be lost.
-  void reset (void);
+  void reset ();
 
   void increase_size (u_long size);
 
@@ -109,33 +109,33 @@ public:
   // = (Somewhat private) Accessors
 
   /// Event Descriptions
-  ACE_Unbounded_Set<ACE_Event_Descriptions> &event_descriptions (void);
+  ACE_Unbounded_Set<ACE_Event_Descriptions> &event_descriptions ();
 
   /// Sorted Event Descriptions.
-  ACE_Unbounded_Set<ACE_Event_Descriptions> &sorted_event_descriptions (void);
+  ACE_Unbounded_Set<ACE_Event_Descriptions> &sorted_event_descriptions ();
 
   /// Find description of event @a i
   const char *find_description_i (u_long i);
 
   /// Sort event descriptions
-  void sort_event_descriptions_i (void);
+  void sort_event_descriptions_i ();
 
   /// Time probe slots
-  ACE_timeprobe_t *timeprobes (void);
+  ACE_timeprobe_t *timeprobes ();
 
   /// Synchronization variable.
-  ACE_LOCK &lock (void);
+  ACE_LOCK &lock ();
 
   /// Max size of timestamp table
-  u_long max_size (void);
+  u_long max_size ();
 
   /// Current size of timestamp table
-  u_long current_size (void);
+  u_long current_size ();
 
 protected:
   /// Obtain an allocator pointer.  If there is no allocator stored in
   /// the instance, the singleton allocator in the current process is used.
-  ALLOCATOR * allocator (void);
+  ALLOCATOR * allocator ();
 
   /// Event Descriptions
   EVENT_DESCRIPTIONS event_descriptions_;
@@ -191,7 +191,7 @@ public:
   ACE_Function_Timeprobe (Timeprobe &timeprobe, u_long event);
 
   /// Destructor.
-  ~ACE_Function_Timeprobe (void);
+  ~ACE_Function_Timeprobe ();
 
 protected:
   /// Reference to timeprobe.
diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp
index b04a034c977..680d9ae4707 100644
--- a/ACE/ace/Timer_Hash_T.cpp
+++ b/ACE/ace/Timer_Hash_T.cpp
@@ -26,7 +26,7 @@ public:
   {
   }
 
-  Hash_Token<TYPE> *get_next (void)
+  Hash_Token<TYPE> *get_next ()
   {
     return this->next_;
   }
@@ -59,7 +59,7 @@ public:
 // Default constructor
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
-ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Hash_Upcall (void)
+ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Hash_Upcall ()
   : timer_hash_ (0)
 {
   // Nothing
@@ -191,7 +191,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Ti
 // Positions the iterator at the first node in the timing hash table
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> void
-ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::first (void)
+ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::first ()
 {
   for (this->position_ = 0;
        this->position_ < this->timer_hash_.table_size_;
@@ -214,7 +214,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::first (
 // bucket
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> void
-ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::next (void)
+ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::next ()
 {
   if (this->isdone ())
     return;
@@ -254,7 +254,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::isdone
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY>
 ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::item (void)
+ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::item ()
 {
   if (this->isdone ())
     return 0;
@@ -264,7 +264,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::item (v
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY>
 ACE_Timer_Queue_Iterator_T<TYPE> &
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::iter (void)
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::iter ()
 {
   this->iterator_->first ();
   return *this->iterator_;
@@ -346,7 +346,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::ACE_Timer_Hash_T
 // Remove all remaining items in the Queue.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY>
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Timer_Hash_T (void)
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Timer_Hash_T ()
 {
   ACE_TRACE ("ACE_Timer_Hash_T::~ACE_Timer_Hash_T");
   ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
@@ -365,7 +365,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Timer_Hash_
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> int
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::close (void)
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::close ()
 {
   ACE_TRACE ("ACE_Timer_Hash_T::close");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
@@ -709,7 +709,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::cancel (const TY
 // Removes the earliest node and finds the new earliest position
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::remove_first (void)
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::remove_first ()
 {
   if (this->is_empty ())
     return 0;
@@ -727,7 +727,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::remove_first (vo
 // Finds a new earliest position
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> void
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::find_new_earliest (void)
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::find_new_earliest ()
 {
   for (size_t i = 0; i < this->table_size_; ++i)
     if (!this->table_[i]->is_empty ())
@@ -740,7 +740,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::find_new_earlies
 // Returns the earliest node without removing it
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::get_first (void)
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::get_first ()
 {
   ACE_TRACE ("ACE_Timer_Hash_T::get_first");
 
diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp
index 5705da077ff..4935c1d821d 100644
--- a/ACE/ace/Timer_List_T.cpp
+++ b/ACE/ace/Timer_List_T.cpp
@@ -20,14 +20,14 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_List_
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_Iterator_T (void)
+ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_Iterator_T ()
 {
 }
 
 // Positions the iterator at the node right after the dummy node
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
+ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first ()
 {
   this->current_node_ = this->list_.get_first();
 }
@@ -35,7 +35,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
 // Positions the iterator at the next node in the Timer Queue
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void)
+ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next ()
 {
   // Make sure that if we are at the end, we don't wrap around
   if (! this->isdone())
@@ -55,7 +55,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const
 // Returns the node at <position_> or 0 if we are at the end
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void)
+ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item ()
 {
   if (! this->isdone())
     return this->current_node_;
@@ -68,7 +68,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void)
 // Return our instance of the iterator
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Queue_Iterator_T<TYPE> &
-ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
+ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter ()
 {
   this->iterator_->first ();
   return *this->iterator_;
@@ -119,7 +119,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time () const
 // Remove all remaining items in the list.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_T (void)
+ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_T ()
 {
   ACE_TRACE ("ACE_Timer_List_T::~ACE_Timer_List_T");
   ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
@@ -133,7 +133,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_T (void)
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
-ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void)
+ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close ()
 {
   ACE_TRACE ("ACE_Timer_List_T::close");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
@@ -396,7 +396,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::cancel_i (ACE_Timer_Node
 
 // Reads the first node on the list and returns it.
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first (void)
+ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first ()
 {
   ACE_TRACE ("ACE_Timer_List_T::get_first");
   return this->get_first_i();
@@ -416,7 +416,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i () const
 // Removes the first node on the list and returns it.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first (void)
+ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first ()
 {
   ACE_TRACE ("ACE_Timer_List_T::remove_first");
   ACE_Timer_Node_T<TYPE>* first = this->get_first();
diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h
index ecac32eeafa..133d48b21c6 100644
--- a/ACE/ace/Timer_List_T.h
+++ b/ACE/ace/Timer_List_T.h
@@ -40,19 +40,19 @@ public:
   ACE_Timer_List_Iterator_T (List& lst);
 
   /// Destructor.
-  virtual ~ACE_Timer_List_Iterator_T (void);
+  virtual ~ACE_Timer_List_Iterator_T ();
 
   /// Positions the iterator at the earliest node in the Timer Queue
-  virtual void first (void);
+  virtual void first ();
 
   /// Positions the iterator at the next node in the Timer Queue
-  virtual void next (void);
+  virtual void next ();
 
   /// Returns true when there are no more nodes in the sequence
   virtual bool isdone () const;
 
   /// Returns the node at the current position in the sequence
-  virtual ACE_Timer_Node_T<TYPE> *item (void);
+  virtual ACE_Timer_Node_T<TYPE> *item ();
 
 protected:
   /// Pointer to the ACE_Timer_List that we are iterating over.
@@ -104,7 +104,7 @@ public:
                     TIME_POLICY const & time_policy = TIME_POLICY());
 
   /// Destructor
-  virtual ~ACE_Timer_List_T (void);
+  virtual ~ACE_Timer_List_T ();
 
   /// True if queue is empty, else false.
   virtual bool is_empty () const;
@@ -147,13 +147,13 @@ public:
   /**
    * Destroy timer queue. Cancels all timers.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /// Returns a pointer to this ACE_Timer_Queue's iterator.
-  virtual ACE_Timer_Queue_Iterator_T<TYPE>& iter (void);
+  virtual ACE_Timer_Queue_Iterator_T<TYPE>& iter ();
 
   /// Removes the earliest node from the queue and returns it
-  virtual ACE_Timer_Node_T<TYPE>* remove_first (void);
+  virtual ACE_Timer_Node_T<TYPE>* remove_first ();
 
   /// Dump the state of an object.
   virtual void dump () const;
@@ -163,7 +163,7 @@ public:
   virtual void reschedule (ACE_Timer_Node_T<TYPE> *);
 
   /// Reads the earliest node from the queue and returns it.
-  virtual ACE_Timer_Node_T<TYPE>* get_first (void);
+  virtual ACE_Timer_Node_T<TYPE>* get_first ();
 
 private:
   /**
diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp
index d440e4ca2bc..d69bfd24f27 100644
--- a/ACE/ace/Timer_Queue_Adapters.cpp
+++ b/ACE/ace/Timer_Queue_Adapters.cpp
@@ -23,7 +23,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TQ, class TYPE> TQ &
-ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::timer_queue (void)
+ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::timer_queue ()
 {
   return this->timer_queue_;
 }
@@ -40,7 +40,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::cancel (long timer_id,
 }
 
 template <class TQ, class TYPE> int
-ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::expire (void)
+ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::expire ()
 {
   // Block designated signals.
   ACE_Sig_Guard sg (&this->mask_);
@@ -50,7 +50,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::expire (void)
 }
 
 template <class TQ, class TYPE> int
-ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::schedule_ualarm (void)
+ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::schedule_ualarm ()
 {
   ACE_Time_Value tv = this->timer_queue_.earliest_time ()
     - this->timer_queue_.gettimeofday ();
@@ -170,7 +170,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::ACE_Thread_Timer_Queue_Adapter (ACE_Th
 }
 
 template<class TQ, class TYPE>
-ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::~ACE_Thread_Timer_Queue_Adapter (void)
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::~ACE_Thread_Timer_Queue_Adapter ()
 {
   if (this->delete_timer_queue_)
     {
@@ -186,7 +186,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::~ACE_Thread_Timer_Queue_Adapter (void)
 }
 
 template<class TQ, class TYPE> ACE_SYNCH_RECURSIVE_MUTEX &
-ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::mutex (void)
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::mutex ()
 {
   return this->mutex_;
 }
@@ -217,7 +217,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::cancel (long timer_id,
 }
 
 template<class TQ, class TYPE> void
-ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::deactivate (void)
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::deactivate ()
 {
   ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_);
 
@@ -226,7 +226,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::deactivate (void)
 }
 
 template<class TQ, class TYPE> int
-ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void)
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1);
 
@@ -347,7 +347,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::enqueue_command (ACE_Command_Base *cmd
 // handler context.
 
 template<class TQ, class TYPE> int
-ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::dispatch_commands (void)
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::dispatch_commands ()
 {
   // Serialize access to the command queue.
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->command_mutex_, -1);
diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h
index 94f41f1333c..0cd15c970c7 100644
--- a/ACE/ace/Timer_Queue_Adapters.h
+++ b/ACE/ace/Timer_Queue_Adapters.h
@@ -79,14 +79,14 @@ public:
 
   /// Dispatch all timers with expiry time at or before the current time.
   /// Returns the number of timers expired.
-  int expire (void);
+  int expire ();
 
   /// Return a reference to the underlying timer queue.
-  TQ &timer_queue (void);
+  TQ &timer_queue ();
 
 private:
   /// Perform the logic to compute the new ualarm(2) setting.
-  virtual int schedule_ualarm (void);
+  virtual int schedule_ualarm ();
 
   /// Called back by @c SIGALRM handler.
   virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
@@ -138,7 +138,7 @@ public:
                                   TQ* timer_queue = 0);
 
   /// Destructor.
-  virtual ~ACE_Thread_Timer_Queue_Adapter (void);
+  virtual ~ACE_Thread_Timer_Queue_Adapter ();
 
   /// Schedule the timer according to the semantics of the <TQ>; wakes
   /// up the dispatching thread.
@@ -155,10 +155,10 @@ public:
   virtual int svc ();
 
   /// Inform the dispatching thread that it should terminate.
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Access the locking mechanism, useful for iteration.
-  ACE_SYNCH_RECURSIVE_MUTEX &mutex (void);
+  ACE_SYNCH_RECURSIVE_MUTEX &mutex ();
 
   /// Set a user-specified timer queue.
   int timer_queue (TQ *tq);
@@ -204,7 +204,7 @@ private:
 # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
   /// Dispatches all command objects enqueued in the most
   /// recent event handler context.
-  int dispatch_commands (void);
+  int dispatch_commands ();
 
   /// Queue of commands for deferred execution.
   ACE_Unbounded_Queue<ACE_Command_Base *> command_queue_;
diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp
index f35692e77af..d283481324b 100644
--- a/ACE/ace/Timer_Wheel_T.cpp
+++ b/ACE/ace/Timer_Wheel_T.cpp
@@ -164,7 +164,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::open_i
 
 /// Destructor just cleans up its memory
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Wheel_T (void)
+ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Wheel_T ()
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T");
 
@@ -182,7 +182,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Wheel_T (voi
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
-ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void)
+ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close ()
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::close");
 
@@ -707,7 +707,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const
 * @return The earliest timer node.
 */
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first (void)
+ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first ()
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::remove_first");
   return remove_first_expired (ACE_Time_Value::max_time);
@@ -744,7 +744,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first_expired (c
 */
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 ACE_Timer_Node_T<TYPE>*
-ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first (void)
+ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first ()
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::get_first");
   return this->get_first_i ();
@@ -767,7 +767,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i () const
 */
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 ACE_Timer_Queue_Iterator_T<TYPE> &
-ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
+ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter ()
 {
   this->iterator_->first ();
   return *this->iterator_;
@@ -858,7 +858,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::ACE_Timer_Wheel_I
 * Destructor, at this level does nothing.
 */
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::~ACE_Timer_Wheel_Iterator_T (void)
+ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::~ACE_Timer_Wheel_Iterator_T ()
 {
 }
 
@@ -872,7 +872,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::~ACE_Timer_Wheel_
 * current_node_ would be 0.
 */
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
+ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first ()
 {
   this->goto_next(0);
 }
@@ -882,7 +882,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
 * Positions the iterator at the next node.
 */
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void)
+ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next ()
 {
   if (this->isdone())
     return;
@@ -931,7 +931,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () cons
 *         is empty
 */
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void)
+ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item ()
 {
   return this->current_node_;
 }
diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h
index ccedf514bb6..5f0acf957c0 100644
--- a/ACE/ace/Timer_Wheel_T.h
+++ b/ACE/ace/Timer_Wheel_T.h
@@ -144,12 +144,12 @@ public:
   /**
    * Destroy timer queue. Cancels all timers.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /// Run the <functor> for all timers whose values are <=
   /// <ACE_OS::gettimeofday>.  Also accounts for <timer_skew>.  Returns
   /// the number of timers canceled.
-  virtual int expire (void);
+  virtual int expire ();
 
   // Run the <functor> for all timers whose values are <= @a current_time.
   // This does not account for <timer_skew>.  Returns the number of
diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor/TkReactor.cpp
index be79fff1826..3baaa718061 100644
--- a/ACE/ace/TkReactor/TkReactor.cpp
+++ b/ACE/ace/TkReactor/TkReactor.cpp
@@ -32,7 +32,7 @@ ACE_TkReactor::ACE_TkReactor (size_t size,
 #endif /* ACE_MT_SAFE */
 }
 
-ACE_TkReactor::~ACE_TkReactor (void)
+ACE_TkReactor::~ACE_TkReactor ()
 {
   // Delete the remaining items in the linked list.
 
@@ -341,7 +341,7 @@ ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles,
 // first timeout in the Reactor's Timer_Queue.
 
 void
-ACE_TkReactor::reset_timeout (void)
+ACE_TkReactor::reset_timeout ()
 {
   if (this->timeout_)
     ::Tk_DeleteTimerHandler (this->timeout_);
diff --git a/ACE/ace/TkReactor/TkReactor.h b/ACE/ace/TkReactor/TkReactor.h
index 5632ba67a73..489c7a9ce08 100644
--- a/ACE/ace/TkReactor/TkReactor.h
+++ b/ACE/ace/TkReactor/TkReactor.h
@@ -63,7 +63,7 @@ public:
                  bool restart = false,
                  ACE_Sig_Handler * = 0);
 
-  virtual ~ACE_TkReactor (void);
+  virtual ~ACE_TkReactor ();
 
   // = Timer operations.
   virtual long schedule_timer (ACE_Event_Handler *event_handler,
@@ -116,7 +116,7 @@ protected:
 private:
   /// This method ensures there's a Tk timeout for the first timeout in
   /// the Reactor's Timer_Queue.
-  void reset_timeout (void);
+  void reset_timeout ();
 
   // = Integrate with the X callback function mechanism.
   static void TimerCallbackProc (ClientData cd);
diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h
index 3191db3bb06..da4fbcd6ffe 100644
--- a/ACE/ace/Token.h
+++ b/ACE/ace/Token.h
@@ -89,12 +89,12 @@ public:
   ACE_Token (const ACE_TCHAR *name = 0, void * = 0);
 
   /// Destructor
-  virtual ~ACE_Token (void);
+  virtual ~ACE_Token ();
 
   // = Strategies
 
   /// Retrieve the current queueing strategy.
-  int queueing_strategy (void);
+  int queueing_strategy ();
 
   /// Set the queueing strategy.
   void queueing_strategy (int queueing_strategy);
@@ -131,7 +131,7 @@ public:
    * behavior before <acquire> goes to sleep.  By default, this is a
    * no-op...
    */
-  virtual void sleep_hook (void);
+  virtual void sleep_hook ();
 
   /**
    * An optimized method that efficiently reacquires the token if no
@@ -156,20 +156,20 @@ public:
 
   /// Become interface-compliant with other lock mechanisms (implements
   /// a non-blocking <acquire>).
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Shuts down the ACE_Token instance.
-  int remove (void);
+  int remove ();
 
   /// Relinquish the token.  If there are any waiters then the next one
   /// in line gets it.
-  int release (void);
+  int release ();
 
   /// Behaves like acquire() but at a lower priority.  It should probably
   /// be called acquire_yield() since the semantics aren't really
   /// what's commonly expected for readers/writer locks.  See the class
   /// documentation above for more details.
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Behaves like acquire() but at a lower priority.  It should probably
   /// be called acquire_yield() since the semantics aren't really
@@ -180,7 +180,7 @@ public:
                     ACE_Time_Value *timeout = 0);
 
   /// Calls acquire().
-  int acquire_write (void);
+  int acquire_write ();
 
   /// Calls acquire().
   int acquire_write (void (*sleep_hook)(void *),
@@ -188,22 +188,22 @@ public:
                      ACE_Time_Value *timeout = 0);
 
   /// Lower priority try_acquire().
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /// Just calls <tryacquire>.
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /// Assumes the caller has acquired the token and returns 0.
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   // = Accessor methods.
 
   /// Return the number of threads that are currently waiting to get
   /// the token.
-  int waiters (void);
+  int waiters ();
 
   /// Return the id of the current thread that owns the token.
-  ACE_thread_t current_owner (void);
+  ACE_thread_t current_owner ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -228,7 +228,7 @@ public:
     int wait (ACE_Time_Value *timeout, ACE_Thread_Mutex &lock);
 
     /// Notify (unblock) the entry.
-    int signal (void);
+    int signal ();
 
     /// Pointer to next waiter.
     ACE_Token_Queue_Entry *next_;
@@ -258,7 +258,7 @@ private:
   struct ACE_Token_Queue
   {
     /// Constructor
-    ACE_Token_Queue (void);
+    ACE_Token_Queue ();
 
     /// Remove a waiter from the queue.
     void remove_entry (ACE_Token_Queue_Entry *);
@@ -281,7 +281,7 @@ private:
                       ACE_Token_Op_Type op_type);
 
   /// Wake next in line for ownership.
-  void wakeup_next_waiter (void);
+  void wakeup_next_waiter ();
 
   /// A queue of writer threads.
   ACE_Token_Queue writers_;
@@ -346,7 +346,7 @@ public:
   };
 
   /// Get queueing strategy.
-  int queueing_strategy (void);
+  int queueing_strategy ();
 
   /// Set queueing strategy.
   void queueing_strategy (int queueing_strategy);
diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp
index 031c8ab66ef..7ab8347dd01 100644
--- a/ACE/ace/Token_Collection.cpp
+++ b/ACE/ace/Token_Collection.cpp
@@ -236,7 +236,7 @@ ACE_Token_Collection::release (const ACE_TCHAR *token_name,
   return temp->release (options);
 }
 
-ACE_Token_Collection::~ACE_Token_Collection (void)
+ACE_Token_Collection::~ACE_Token_Collection ()
 {
   ACE_TRACE ("ACE_Token_Collection::~ACE_Token_Collection");
   COLLECTION::ITERATOR iterator (collection_);
diff --git a/ACE/ace/Token_Collection.h b/ACE/ace/Token_Collection.h
index 83b0ecbf49d..86bd8f77db8 100644
--- a/ACE/ace/Token_Collection.h
+++ b/ACE/ace/Token_Collection.h
@@ -183,7 +183,7 @@ public:
                        ACE_Synch_Options &options =
                        ACE_Synch_Options::defaults);
 
-  ~ACE_Token_Collection (void);
+  ~ACE_Token_Collection ();
 
   /// Dump the state of the class.
   void dump () const;
diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp
index 9d2f1a48c91..7360a94a7db 100644
--- a/ACE/ace/Token_Invariants.cpp
+++ b/ACE/ace/Token_Invariants.cpp
@@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_Token_Invariant_Manager *ACE_Token_Invariant_Manager::instance_ = 0;
 
 ACE_Token_Invariant_Manager *
-ACE_Token_Invariant_Manager::instance (void)
+ACE_Token_Invariant_Manager::instance ()
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::instance");
 
@@ -202,7 +202,7 @@ ACE_Token_Invariant_Manager::get_rwlock (const ACE_TCHAR *token_name,
 }
 
 
-ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager (void)
+ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager ()
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager");
 
@@ -258,7 +258,7 @@ ACE_Mutex_Invariants::dump () const
 // **************************************************
 
 int
-ACE_RWLock_Invariants::writer_acquired (void)
+ACE_RWLock_Invariants::writer_acquired ()
 {
   if (readers_ > 0)
     {
@@ -275,7 +275,7 @@ ACE_RWLock_Invariants::writer_acquired (void)
 }
 
 int
-ACE_RWLock_Invariants::reader_acquired (void)
+ACE_RWLock_Invariants::reader_acquired ()
 {
   if (writers_ > 0)
     {
@@ -290,7 +290,7 @@ ACE_RWLock_Invariants::reader_acquired (void)
 }
 
 void
-ACE_RWLock_Invariants::releasing (void)
+ACE_RWLock_Invariants::releasing ()
 {
   if (writers_ == 1)
     writers_ = 0;
diff --git a/ACE/ace/Token_Invariants.h b/ACE/ace/Token_Invariants.h
index 959281cbb37..f5ec3f5e3ec 100644
--- a/ACE/ace/Token_Invariants.h
+++ b/ACE/ace/Token_Invariants.h
@@ -127,7 +127,7 @@ class ACE_Export ACE_Token_Invariant_Manager : public ACE_Cleanup
 {
 public:
   /// Singleton access point.
-  static ACE_Token_Invariant_Manager *instance (void);
+  static ACE_Token_Invariant_Manager *instance ();
 
   // = Polymorphic methods.  Just pass in the proxy and the method
   // figures out the type of the token.
@@ -166,10 +166,10 @@ public:
   // = The following two method should be in the protected part of the
   //   class.  Bugs with certain compilers preclude this.
   /// Prevent non-singleton construction.
-  ACE_Token_Invariant_Manager (void);
+  ACE_Token_Invariant_Manager ();
 
   /// Destruction.
-  virtual ~ACE_Token_Invariant_Manager (void);
+  virtual ~ACE_Token_Invariant_Manager ();
 
 protected:
   /// Return or create.
diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp
index 32ec131f4ff..052a900db0e 100644
--- a/ACE/ace/Token_Manager.cpp
+++ b/ACE/ace/Token_Manager.cpp
@@ -37,7 +37,7 @@ ACE_Token_Manager::~ACE_Token_Manager ()
 }
 
 ACE_Token_Manager *
-ACE_Token_Manager::instance (void)
+ACE_Token_Manager::instance ()
 {
   ACE_TRACE ("ACE_Token_Manager::instance");
 
diff --git a/ACE/ace/Token_Manager.h b/ACE/ace/Token_Manager.h
index 6ce6e0913d8..c2c597e7c65 100644
--- a/ACE/ace/Token_Manager.h
+++ b/ACE/ace/Token_Manager.h
@@ -49,11 +49,11 @@ class ACE_Export ACE_Token_Manager : public ACE_Cleanup
   //   derivation of ACE_Token_Manager.  You will only need to
   //   redefine make_mutex.
 public:
-  ACE_Token_Manager (void);
-  virtual ~ACE_Token_Manager (void);
+  ACE_Token_Manager ();
+  virtual ~ACE_Token_Manager ();
 
   /// Get the pointer to token manager singleton.
-  static ACE_Token_Manager *instance (void);
+  static ACE_Token_Manager *instance ();
 
   /// Set the pointer to token manager singleton.
   void instance (ACE_Token_Manager *);
@@ -89,7 +89,7 @@ public:
    * This is necessary since safe_acquire is implemented in terms of
    * the Token queues.
    */
-  ACE_TOKEN_CONST::MUTEX &mutex (void);
+  ACE_TOKEN_CONST::MUTEX &mutex ();
 
   /// Dump the state of the class.
   void dump () const;
diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp
index b584ad3b4d1..e7aeb291371 100644
--- a/ACE/ace/Token_Request_Reply.cpp
+++ b/ACE/ace/Token_Request_Reply.cpp
@@ -42,7 +42,7 @@ ACE_Token_Request::encode (void *&buf)
 // so that it can be used by the server.
 
 int
-ACE_Token_Request::decode (void)
+ACE_Token_Request::decode ()
 {
   this->token_name_ = this->transfer_.data_;
 
@@ -152,7 +152,7 @@ ACE_Token_Reply::encode (void *&buf)
 // so that it can be used by the client.
 
 int
-ACE_Token_Reply::decode (void)
+ACE_Token_Reply::decode ()
 {
   return 0;
 }
diff --git a/ACE/ace/Tokenizer_T.cpp b/ACE/ace/Tokenizer_T.cpp
index 5be90545efa..8df674e3455 100644
--- a/ACE/ace/Tokenizer_T.cpp
+++ b/ACE/ace/Tokenizer_T.cpp
@@ -113,7 +113,7 @@ ACE_Tokenizer_T<ACE_CHAR_T>::is_preserve_designator (ACE_CHAR_T start,
 
 template <class ACE_CHAR_T>
 ACE_CHAR_T *
-ACE_Tokenizer_T<ACE_CHAR_T>::next (void)
+ACE_Tokenizer_T<ACE_CHAR_T>::next ()
 {
   // Check if the previous pass was the last one in the buffer.
   if (index_ == -1)
diff --git a/ACE/ace/Tokenizer_T.h b/ACE/ace/Tokenizer_T.h
index 68600487336..6172520f4cf 100644
--- a/ACE/ace/Tokenizer_T.h
+++ b/ACE/ace/Tokenizer_T.h
@@ -140,7 +140,7 @@ public:
   int preserve_designators (ACE_CHAR_T start, ACE_CHAR_T stop, int strip=1);
 
   /// Returns the next token.
-  ACE_CHAR_T *next (void);
+  ACE_CHAR_T *next ();
 
   enum {
     MAX_DELIMITERS=16,
diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h
index 503f1ceefb0..d46d5c1e250 100644
--- a/ACE/ace/Typed_SV_Message.h
+++ b/ACE/ace/Typed_SV_Message.h
@@ -39,7 +39,7 @@ public:
                         long type = 0,
                         int length = sizeof (T),
                         int max_size = sizeof (T));
-  ~ACE_Typed_SV_Message (void);
+  ~ACE_Typed_SV_Message ();
 
   /// Get the type of the message.
   long type () const;
@@ -60,7 +60,7 @@ public:
   void max_size (int m);
 
   /// Get a pointer to the data in the message.
-  T &data (void);
+  T &data ();
 
   /// Set a pointer to the data in the message.
   void data (const T &data);
diff --git a/ACE/ace/Typed_SV_Message_Queue.cpp b/ACE/ace/Typed_SV_Message_Queue.cpp
index 09c213dfd72..4c22a82f1be 100644
--- a/ACE/ace/Typed_SV_Message_Queue.cpp
+++ b/ACE/ace/Typed_SV_Message_Queue.cpp
@@ -27,7 +27,7 @@ ACE_Typed_SV_Message_Queue<T>::dump () const
 }
 
 template <class T>
-ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue (void)
+ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue ()
 {
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue");
 }
@@ -44,7 +44,7 @@ ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue (key_t external_id,
 }
 
 template <class T>
-ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue (void)
+ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue ()
 {
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue");
 }
diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h
index 3fdb92bd7ef..4d83cea4e9f 100644
--- a/ACE/ace/Typed_SV_Message_Queue.h
+++ b/ACE/ace/Typed_SV_Message_Queue.h
@@ -38,16 +38,16 @@ public:
     ACE_NOWAIT = IPC_NOWAIT
   };
 
-  ACE_Typed_SV_Message_Queue (void);
+  ACE_Typed_SV_Message_Queue ();
   ACE_Typed_SV_Message_Queue (key_t external_id,
                               int create = ACE_OPEN,
                               int perms = ACE_DEFAULT_FILE_PERMS);
   int open (key_t external_id,
             int create = ACE_OPEN,
             int perms = ACE_DEFAULT_FILE_PERMS);
-  int close (void);
-  int remove (void);
-  ~ACE_Typed_SV_Message_Queue (void);
+  int close ();
+  int remove ();
+  ~ACE_Typed_SV_Message_Queue ();
 
   /// Send method.
   int send (const ACE_Typed_SV_Message<T> &mb, int mflags = 0);
diff --git a/ACE/ace/UPIPE_Connector.h b/ACE/ace/UPIPE_Connector.h
index 85f744468aa..8af83097814 100644
--- a/ACE/ace/UPIPE_Connector.h
+++ b/ACE/ace/UPIPE_Connector.h
@@ -33,7 +33,7 @@ class ACE_Export ACE_UPIPE_Connector
 {
 public:
   /// Default constructor.
-  ACE_UPIPE_Connector (void);
+  ACE_UPIPE_Connector ();
 
   /**
    * Actively connect and produce a @a new_stream if things go well.
diff --git a/ACE/ace/UPIPE_Stream.h b/ACE/ace/UPIPE_Stream.h
index 44c9f2df1dc..5e911ca1cd4 100644
--- a/ACE/ace/UPIPE_Stream.h
+++ b/ACE/ace/UPIPE_Stream.h
@@ -41,12 +41,12 @@ public:
 
   typedef ACE_Stream<ACE_SYNCH> MT_Stream;
 
-  ACE_UPIPE_Stream (void);
+  ACE_UPIPE_Stream ();
 
-  virtual ~ACE_UPIPE_Stream (void);
+  virtual ~ACE_UPIPE_Stream ();
 
   /// Shut down the UPIPE and release resources.
-  int close (void);
+  int close ();
 
   /// Return the underlying I/O handle.
   ACE_HANDLE get_handle () const;
diff --git a/ACE/ace/UTF16_Encoding_Converter.cpp b/ACE/ace/UTF16_Encoding_Converter.cpp
index b1455d3b5f9..3934167a9de 100644
--- a/ACE/ace/UTF16_Encoding_Converter.cpp
+++ b/ACE/ace/UTF16_Encoding_Converter.cpp
@@ -79,7 +79,7 @@ ACE_UTF16_Encoding_Converter::ACE_UTF16_Encoding_Converter (bool swap)
 {
 }
 
-ACE_UTF16_Encoding_Converter::~ACE_UTF16_Encoding_Converter (void)
+ACE_UTF16_Encoding_Converter::~ACE_UTF16_Encoding_Converter ()
 {
 }
 
@@ -323,37 +323,37 @@ ACE_UTF16_Encoding_Converter::encoded (const ACE_Byte* source,
 }
 
 ACE_UINT32
-ACE_UTF16_Encoding_Converter::get_UNI_SUR_HIGH_START (void)
+ACE_UTF16_Encoding_Converter::get_UNI_SUR_HIGH_START ()
 {
   return UNI_SUR_HIGH_START;
 }
 
 ACE_UINT32
-ACE_UTF16_Encoding_Converter::get_UNI_SUR_LOW_END (void)
+ACE_UTF16_Encoding_Converter::get_UNI_SUR_LOW_END ()
 {
   return UNI_SUR_LOW_END;
 }
 
 ACE_UINT32
-ACE_UTF16_Encoding_Converter::get_UNI_REPLACEMENT_CHAR (void)
+ACE_UTF16_Encoding_Converter::get_UNI_REPLACEMENT_CHAR ()
 {
   return UNI_REPLACEMENT_CHAR;
 }
 
 const ACE_Byte*
-ACE_UTF16_Encoding_Converter::get_first_byte_mark (void)
+ACE_UTF16_Encoding_Converter::get_first_byte_mark ()
 {
   return firstByteMark;
 }
 
 const ACE_Byte*
-ACE_UTF16_Encoding_Converter::get_trailing_bytes_for_utf8 (void)
+ACE_UTF16_Encoding_Converter::get_trailing_bytes_for_utf8 ()
 {
   return trailingBytesForUTF8;
 }
 
 const ACE_UINT32*
-ACE_UTF16_Encoding_Converter::get_offsets_from_utf8 (void)
+ACE_UTF16_Encoding_Converter::get_offsets_from_utf8 ()
 {
   return offsetsFromUTF8;
 }
diff --git a/ACE/ace/UTF16_Encoding_Converter.h b/ACE/ace/UTF16_Encoding_Converter.h
index 0097b7bb8d2..36826cd1f2f 100644
--- a/ACE/ace/UTF16_Encoding_Converter.h
+++ b/ACE/ace/UTF16_Encoding_Converter.h
@@ -32,7 +32,7 @@ public:
   ACE_UTF16_Encoding_Converter (bool swap = false);
 
   /// This is a do nothing destructor.
-  virtual ~ACE_UTF16_Encoding_Converter (void);
+  virtual ~ACE_UTF16_Encoding_Converter ();
 
   /// Convert the source from UTF-16 to UTF-8 and store it in the
   /// provided target buffer.
@@ -61,12 +61,12 @@ protected:
   bool is_legal_utf8 (const ACE_Byte* source,
                       size_t length) const;
 
-  static ACE_UINT32 get_UNI_SUR_HIGH_START (void);
-  static ACE_UINT32 get_UNI_SUR_LOW_END (void);
-  static ACE_UINT32 get_UNI_REPLACEMENT_CHAR (void);
-  static const ACE_Byte* get_first_byte_mark (void);
-  static const ACE_Byte* get_trailing_bytes_for_utf8 (void);
-  static const ACE_UINT32* get_offsets_from_utf8 (void);
+  static ACE_UINT32 get_UNI_SUR_HIGH_START ();
+  static ACE_UINT32 get_UNI_SUR_LOW_END ();
+  static ACE_UINT32 get_UNI_REPLACEMENT_CHAR ();
+  static const ACE_Byte* get_first_byte_mark ();
+  static const ACE_Byte* get_trailing_bytes_for_utf8 ();
+  static const ACE_UINT32* get_offsets_from_utf8 ();
 
   bool swap_;
 };
diff --git a/ACE/ace/UTF32_Encoding_Converter.cpp b/ACE/ace/UTF32_Encoding_Converter.cpp
index 22bd9fac000..9312fbe4acb 100644
--- a/ACE/ace/UTF32_Encoding_Converter.cpp
+++ b/ACE/ace/UTF32_Encoding_Converter.cpp
@@ -34,7 +34,7 @@ ACE_UTF32_Encoding_Converter::ACE_UTF32_Encoding_Converter (bool swap)
 {
 }
 
-ACE_UTF32_Encoding_Converter::~ACE_UTF32_Encoding_Converter (void)
+ACE_UTF32_Encoding_Converter::~ACE_UTF32_Encoding_Converter ()
 {
 }
 
diff --git a/ACE/ace/UTF32_Encoding_Converter.h b/ACE/ace/UTF32_Encoding_Converter.h
index ab7b9d14e9f..22b20cc68c6 100644
--- a/ACE/ace/UTF32_Encoding_Converter.h
+++ b/ACE/ace/UTF32_Encoding_Converter.h
@@ -32,7 +32,7 @@ public:
   ACE_UTF32_Encoding_Converter (bool swap = false);
 
   /// This is a do nothing destructor.
-  virtual ~ACE_UTF32_Encoding_Converter (void);
+  virtual ~ACE_UTF32_Encoding_Converter ();
 
   /// Convert the source from UTF-32 to UTF-8 and store it in the
   /// provided target buffer.
diff --git a/ACE/ace/UTF8_Encoding_Converter.cpp b/ACE/ace/UTF8_Encoding_Converter.cpp
index a618ba40317..f515f3f1bfd 100644
--- a/ACE/ace/UTF8_Encoding_Converter.cpp
+++ b/ACE/ace/UTF8_Encoding_Converter.cpp
@@ -8,7 +8,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter (void)
+ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter ()
  : native_ (0)
 {
   // Choose a converter for the ASCII or UTF-8 string to a wide character
@@ -25,7 +25,7 @@ ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter (void)
     }
 }
 
-ACE_UTF8_Encoding_Converter::~ACE_UTF8_Encoding_Converter (void)
+ACE_UTF8_Encoding_Converter::~ACE_UTF8_Encoding_Converter ()
 {
   delete native_;
 }
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 193f1a9a8f0..30f664ba6ab 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -60,7 +60,7 @@ ACE_WFMO_Reactor_Handler_Repository::open (size_t size)
   return 0;
 }
 
-ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void)
+ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository ()
 {
   // Free up dynamically allocated space
   delete [] this->current_handles_;
@@ -577,7 +577,7 @@ ACE_WFMO_Reactor_Handler_Repository::resume_handler_i (ACE_HANDLE handle,
 }
 
 void
-ACE_WFMO_Reactor_Handler_Repository::unbind_all (void)
+ACE_WFMO_Reactor_Handler_Repository::unbind_all ()
 {
   {
     ACE_GUARD (ACE_Process_Mutex, ace_mon, this->wfmo_reactor_.lock_);
@@ -666,7 +666,7 @@ ACE_WFMO_Reactor_Handler_Repository::bind_i (bool io_entry,
 }
 
 int
-ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void)
+ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos ()
 {
   // Go through the entire valid array and check for all handles that
   // have been schedule for deletion
@@ -778,7 +778,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void)
 }
 
 int
-ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void)
+ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos ()
 {
   // Go through the <suspended_handle> array
   if (this->handles_to_be_deleted_ > 0 || this->handles_to_be_resumed_ > 0)
@@ -886,7 +886,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void)
 }
 
 int
-ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos (void)
+ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos ()
 {
   // Go through the <to_be_added_*> arrays
   for (size_t i = 0; i < this->handles_to_be_added_; ++i)
@@ -1295,7 +1295,7 @@ ACE_WFMO_Reactor::timer_queue (ACE_Timer_Queue *tq)
 }
 
 int
-ACE_WFMO_Reactor::close (void)
+ACE_WFMO_Reactor::close ()
 {
   // This GUARD is necessary since we are updating shared state.
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
@@ -1343,7 +1343,7 @@ ACE_WFMO_Reactor::close (void)
   return 0;
 }
 
-ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void)
+ACE_WFMO_Reactor::~ACE_WFMO_Reactor ()
 {
   // Assumption: No threads are left in the Reactor when this method
   // is called (i.e., active_threads_ == 0)
@@ -2264,7 +2264,7 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
 
 
 int
-ACE_WFMO_Reactor::update_state (void)
+ACE_WFMO_Reactor::update_state ()
 {
   // This GUARD is necessary since we are updating shared state.
   ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1);
@@ -2366,7 +2366,7 @@ ACE_WFMO_Reactor_Notify::is_dispatchable (ACE_Notification_Buffer & /*buffer*/)
 }
 
 ACE_HANDLE
-ACE_WFMO_Reactor_Notify::notify_handle (void)
+ACE_WFMO_Reactor_Notify::notify_handle ()
 {
   return ACE_INVALID_HANDLE;
 }
@@ -2385,7 +2385,7 @@ ACE_WFMO_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &)
 }
 
 int
-ACE_WFMO_Reactor_Notify::close (void)
+ACE_WFMO_Reactor_Notify::close ()
 {
   return -1;
 }
@@ -2572,7 +2572,7 @@ ACE_WFMO_Reactor_Notify::max_notify_iterations (int iterations)
 }
 
 int
-ACE_WFMO_Reactor_Notify::max_notify_iterations (void)
+ACE_WFMO_Reactor_Notify::max_notify_iterations ()
 {
   ACE_TRACE ("ACE_WFMO_Reactor_Notify::max_notify_iterations");
   return this->max_notify_iterations_;
@@ -2702,7 +2702,7 @@ ACE_WFMO_Reactor::max_notify_iterations (int iterations)
 }
 
 int
-ACE_WFMO_Reactor::max_notify_iterations (void)
+ACE_WFMO_Reactor::max_notify_iterations ()
 {
   ACE_TRACE ("ACE_WFMO_Reactor::max_notify_iterations");
   ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1);
@@ -2722,7 +2722,7 @@ ACE_WFMO_Reactor::purge_pending_notifications (ACE_Event_Handler *eh,
 }
 
 int
-ACE_WFMO_Reactor::resumable_handler (void)
+ACE_WFMO_Reactor::resumable_handler ()
 {
   ACE_TRACE ("ACE_WFMO_Reactor::resumable_handler");
   return 0;
diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h
index 85dd128a1ab..05ebf813b9f 100644
--- a/ACE/ace/WFMO_Reactor.h
+++ b/ACE/ace/WFMO_Reactor.h
@@ -154,10 +154,10 @@ public:
     ACE_Reactor_Mask close_masks_;
 
     /// Constructor used for initializing the structure
-    Common_Info (void);
+    Common_Info ();
 
     /// Reset the state of the structure
-    void reset (void);
+    void reset ();
 
     /// Set the structure to these new values
     void set (bool io_entry,
@@ -297,13 +297,13 @@ public:
   ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor);
 
   /// Destructor.
-  virtual ~ACE_WFMO_Reactor_Handler_Repository (void);
+  virtual ~ACE_WFMO_Reactor_Handler_Repository ();
 
   /// Initialize the repository of the appropriate @a size.
   int open (size_t size);
 
   /// Close down the handler repository.
-  int close (void);
+  int close ();
 
   // = Search structure operations.
 
@@ -326,7 +326,7 @@ public:
                 bool &changes_required);
 
   /// Remove all bindings of <ACE_HANDLE, ACE_Event_Handler> tuples.
-  void unbind_all (void);
+  void unbind_all ();
 
   // = Sanity checking.
 
@@ -346,10 +346,10 @@ public:
   Current_Info *current_info () const;
 
   /// Check if changes to the handle set are required.
-  virtual bool changes_required (void);
+  virtual bool changes_required ();
 
   /// Make changes to the handle set
-  virtual int make_changes (void);
+  virtual int make_changes ();
 
   /// Check to see if @a slot has been scheduled for deletion
   int scheduled_for_deletion (size_t slot) const;
@@ -383,14 +383,14 @@ public:
                         bool &changes_required);
 
   /// Deletions and suspensions in current_info_
-  int make_changes_in_current_infos (void);
+  int make_changes_in_current_infos ();
 
   /// Deletions and resumptions in current_suspended_info_
-  int make_changes_in_suspension_infos (void);
+  int make_changes_in_suspension_infos ();
 
   /// Deletions in to_be_added_info_, or transfers to current_info_ or
   /// current_suspended_info_ from to_be_added_info_
-  int make_changes_in_to_be_added_infos (void);
+  int make_changes_in_to_be_added_infos ();
 
   /// Removes the ACE_Event_Handler at @a slot from the table.
   int remove_handler_i (size_t slot,
@@ -498,7 +498,7 @@ public:
                     int disable_notify = 0);
 
   /// No-op.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Special trick to unblock <WaitForMultipleObjects> when updates
@@ -523,7 +523,7 @@ public:
   /// Returns the ACE_HANDLE of the notify pipe on which the reactor
   /// is listening for notifications so that other threads can unblock
   /// the <Reactor_Impl>
-  virtual ACE_HANDLE notify_handle (void);
+  virtual ACE_HANDLE notify_handle ();
 
   /// Handle one of the notify call on the <handle>. This could be
   /// because of a thread trying to unblock the <Reactor_Impl>
@@ -558,7 +558,7 @@ public:
    * notify queue before breaking out of its
    * ACE_Message_Queue::dequeue() loop.
    */
-  int max_notify_iterations (void);
+  int max_notify_iterations ();
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -706,10 +706,10 @@ public:
   virtual ACE_Timer_Queue *timer_queue () const;
 
   /// Close down the ACE_WFMO_Reactor and release all of its resources.
-  virtual int close (void);
+  virtual int close ();
 
   /// Close down the ACE_WFMO_Reactor and release all of its resources.
-  virtual ~ACE_WFMO_Reactor (void);
+  virtual ~ACE_WFMO_Reactor ();
 
   // = Event loop drivers.
 
@@ -766,7 +766,7 @@ public:
    * actively handling events.  If it returns non-zero, <handling_events> and
    * <handle_alertable_events> return -1 immediately.
    */
-  virtual int deactivated (void);
+  virtual int deactivated ();
 
   /**
    * Control whether the Reactor will handle any more incoming events or not.
@@ -909,7 +909,7 @@ public:
   virtual int suspend_handler (const ACE_Handle_Set &handles);
 
   /// Suspend all handles temporarily.
-  virtual int suspend_handlers (void);
+  virtual int suspend_handlers ();
 
   /// Resume @a event_handler. Use <ACE_Event_Handler::get_handle> to
   /// get the handle.
@@ -922,13 +922,13 @@ public:
   virtual int resume_handler (const ACE_Handle_Set &handles);
 
   /// Resume all <handles>.
-  virtual int resume_handlers (void);
+  virtual int resume_handlers ();
 
   /// Does the reactor allow the application to resume the handle on
   /// its own ie. can it pass on the control of handle resumption to
   /// the application. A positive value indicates that the handlers
   /// are application resumable. A value of 0 indicates otherwise.
-  virtual int resumable_handler (void);
+  virtual int resumable_handler ();
 
   /**
    * Return true if we any event associations were made by the reactor
@@ -936,7 +936,7 @@ public:
    * WFMO_Reactor does use event associations, this function always
    * return true.
    */
-  virtual bool uses_event_associations (void);
+  virtual bool uses_event_associations ();
 
   // Timer management.
 
@@ -1058,7 +1058,7 @@ public:
    * notify queue before breaking out of its
    * <ACE_Message_Queue::dequeue> loop.
    */
-  virtual int max_notify_iterations (void);
+  virtual int max_notify_iterations ();
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -1095,18 +1095,18 @@ public:
 
   /// Returns true if WFMO_Reactor has been successfully initialized, else
   /// false.
-  virtual bool initialized (void);
+  virtual bool initialized ();
 
   /// Returns the current size of the WFMO_Reactor's internal
   /// descriptor table.
   virtual size_t size () const;
 
   /// Returns a reference to the WFMO_Reactor's internal lock.
-  virtual ACE_Lock &lock (void);
+  virtual ACE_Lock &lock ();
 
   /// Wake up all threads in WaitForMultipleObjects so that they can
   /// reconsult the handle set
-  virtual void wakeup_all_threads (void);
+  virtual void wakeup_all_threads ();
 
   /**
    * Transfers ownership of the WFMO_Reactor to the @a new_owner. The
@@ -1119,7 +1119,7 @@ public:
   virtual int owner (ACE_thread_t *owner);
 
   /// Get the existing restart value.
-  virtual bool restart (void);
+  virtual bool restart ();
 
   /// Set a new value for restart and return the original value.
   virtual bool restart (bool r);
@@ -1128,7 +1128,7 @@ public:
   virtual void requeue_position (int);
 
   /// Not implemented
-  virtual int requeue_position (void);
+  virtual int requeue_position ();
 
   // = Low-level wait_set mask manipulation methods.
 
@@ -1185,7 +1185,7 @@ protected:
                           int operation);
 
   /// Return the ID of the "owner" thread. Does not do any locking.
-  virtual ACE_thread_t owner_i (void);
+  virtual ACE_thread_t owner_i ();
 
   /// Wait up to @a max_wait_time until it's ok to enter
   /// WaitForMultipleObjects. Returns 1 (and holding lock_) if ok to wait;
@@ -1202,7 +1202,7 @@ protected:
 
   /// Expire timers. Only the owner thread does useful stuff in this
   /// function.
-  virtual int expire_timers (void);
+  virtual int expire_timers ();
 
   /// Dispatches the timers and I/O handlers.
   virtual int dispatch (DWORD wait_status);
@@ -1234,7 +1234,7 @@ protected:
                                         ACE_HANDLE event_handle);
 
   /// Dispatches window messages. Noop for WFMO_Reactor.
-  virtual int dispatch_window_messages (void);
+  virtual int dispatch_window_messages ();
 
   virtual ACE_Reactor_Mask upcall (ACE_Event_Handler *event_handler,
                                    ACE_HANDLE io_handle,
@@ -1244,13 +1244,13 @@ protected:
   virtual int calculate_timeout (ACE_Time_Value *time);
 
   /// Update the state of the handler repository
-  virtual int update_state (void);
+  virtual int update_state ();
 
   /// Check to see if we have a new owner
-  virtual int new_owner (void);
+  virtual int new_owner ();
 
   /// Set owner to new owner
-  virtual int change_owner (void);
+  virtual int change_owner ();
 
   /// Handle signals without requiring global/static variables.
   ACE_Sig_Handler *signal_handler_;
diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp
index 838f2196186..d445397f90e 100644
--- a/ACE/ace/WIN32_Asynch_IO.cpp
+++ b/ACE/ace/WIN32_Asynch_IO.cpp
@@ -103,7 +103,7 @@ ACE_WIN32_Asynch_Result::set_error (u_long errcode)
   this->error_ = errcode;
 }
 
-ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result (void)
+ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result ()
 {
 }
 
@@ -166,7 +166,7 @@ ACE_WIN32_Asynch_Operation::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_WIN32_Asynch_Operation::cancel (void)
+ACE_WIN32_Asynch_Operation::cancel ()
 {
 #if defined (ACE_HAS_CANCEL_IO)
   // All I/O operations that are canceled will complete with the error
@@ -203,7 +203,7 @@ ACE_WIN32_Asynch_Operation::ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win3
 {
 }
 
-ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation (void)
+ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation ()
 {
 }
 
@@ -294,7 +294,7 @@ ACE_WIN32_Asynch_Read_Stream_Result::complete (size_t bytes_transferred,
     handler->handle_read_stream (result);
 }
 
-ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result (void)
+ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result ()
 {
 }
 
@@ -562,7 +562,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
 #endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */
 }
 
-ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream (void)
+ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream ()
 {
 }
 
@@ -632,7 +632,7 @@ ACE_WIN32_Asynch_Read_Stream::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_WIN32_Asynch_Read_Stream::cancel (void)
+ACE_WIN32_Asynch_Read_Stream::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
@@ -723,7 +723,7 @@ ACE_WIN32_Asynch_Write_Stream_Result::complete (size_t bytes_transferred,
     handler->handle_write_stream (result);
 }
 
-ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result (void)
+ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result ()
 {
 }
 
@@ -1039,7 +1039,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
 #endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */
 }
 
-ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream (void)
+ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream ()
 {
 }
 
@@ -1060,7 +1060,7 @@ ACE_WIN32_Asynch_Write_Stream::open (const ACE_Handler::Proxy_Ptr &handler_proxy
 }
 
 int
-ACE_WIN32_Asynch_Write_Stream::cancel (void)
+ACE_WIN32_Asynch_Write_Stream::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
@@ -1147,7 +1147,7 @@ ACE_WIN32_Asynch_Read_File_Result::complete (size_t bytes_transferred,
     handler->handle_read_file (result);
 }
 
-ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result (void)
+ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result ()
 {
 }
 
@@ -1413,7 +1413,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block,
 }
 
 
-ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File (void)
+ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File ()
 {
 }
 
@@ -1462,7 +1462,7 @@ ACE_WIN32_Asynch_Read_File::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_WIN32_Asynch_Read_File::cancel (void)
+ACE_WIN32_Asynch_Read_File::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
@@ -1550,7 +1550,7 @@ ACE_WIN32_Asynch_Write_File_Result::complete (size_t bytes_transferred,
     handler->handle_write_file (result);
 }
 
-ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result  (void)
+ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result  ()
 {
 }
 
@@ -1858,7 +1858,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
 }
 
 
-ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File (void)
+ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File ()
 {
 }
 
@@ -1909,7 +1909,7 @@ ACE_WIN32_Asynch_Write_File::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_WIN32_Asynch_Write_File::cancel (void)
+ACE_WIN32_Asynch_Write_File::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
@@ -2000,7 +2000,7 @@ ACE_WIN32_Asynch_Accept_Result::complete (size_t bytes_transferred,
     handler->handle_accept (result);
 }
 
-ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void)
+ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result ()
 {
 }
 
@@ -2205,7 +2205,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
 #endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
 }
 
-ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void)
+ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept ()
 {
 }
 
@@ -2226,7 +2226,7 @@ ACE_WIN32_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_WIN32_Asynch_Accept::cancel (void)
+ACE_WIN32_Asynch_Accept::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
@@ -2288,7 +2288,7 @@ ACE_WIN32_Asynch_Connect_Result::complete (size_t bytes_transferred,
     handler->handle_connect (result);
 }
 
-ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result (void)
+ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result ()
 {
 }
 
@@ -2371,7 +2371,7 @@ ACE_WIN32_Asynch_Connect::ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_p
 {
 }
 
-ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect (void)
+ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect ()
 {
   this->close ();
   this->reactor (0); // to avoid purge_pending_notifications
@@ -2677,7 +2677,7 @@ ACE_WIN32_Asynch_Connect::cancel_uncompleted (bool flg_notify,
 }
 
 int
-ACE_WIN32_Asynch_Connect::cancel (void)
+ACE_WIN32_Asynch_Connect::cancel ()
 {
   ACE_TRACE ("ACE_WIN32_Asynch_Connect::cancel");
 
@@ -2706,7 +2706,7 @@ ACE_WIN32_Asynch_Connect::cancel (void)
 }
 
 int
-ACE_WIN32_Asynch_Connect::close (void)
+ACE_WIN32_Asynch_Connect::close ()
 {
   ACE_TRACE ("ACE_WIN32_Asynch_Connect::close");
 
@@ -2911,7 +2911,7 @@ ACE_WIN32_Asynch_Transmit_File_Result::complete (size_t bytes_transferred,
     handler->handle_transmit_file (result);
 }
 
-ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result (void)
+ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result ()
 {
 }
 
@@ -3086,7 +3086,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
 #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_WINSOCK2 */
 }
 
-ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void)
+ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File ()
 {
 }
 
@@ -3107,7 +3107,7 @@ ACE_WIN32_Asynch_Transmit_File::open (const ACE_Handler::Proxy_Ptr &handler_prox
 }
 
 int
-ACE_WIN32_Asynch_Transmit_File::cancel (void)
+ACE_WIN32_Asynch_Transmit_File::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
@@ -3300,14 +3300,14 @@ ACE_WIN32_Asynch_Read_Dgram_Result::complete (size_t bytes_transferred,
     handler->handle_read_dgram (result);
 }
 
-ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result (void)
+ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result ()
 {
   delete this->remote_address_;
 }
 
 //***************************************************************************
 
-ACE_WIN32_Asynch_Read_Dgram::~ACE_WIN32_Asynch_Read_Dgram (void)
+ACE_WIN32_Asynch_Read_Dgram::~ACE_WIN32_Asynch_Read_Dgram ()
 {
 }
 
@@ -3460,7 +3460,7 @@ ACE_WIN32_Asynch_Read_Dgram::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_WIN32_Asynch_Read_Dgram::cancel (void)
+ACE_WIN32_Asynch_Read_Dgram::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
@@ -3632,14 +3632,14 @@ ACE_WIN32_Asynch_Write_Dgram_Result::complete (size_t bytes_transferred,
     handler->handle_write_dgram (result);
 }
 
-ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result (void)
+ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result ()
 {
 }
 
 
 //***********************************************
 
-ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram (void)
+ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram ()
 {
 }
 
@@ -3785,7 +3785,7 @@ ACE_WIN32_Asynch_Write_Dgram::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_WIN32_Asynch_Write_Dgram::cancel (void)
+ACE_WIN32_Asynch_Write_Dgram::cancel ()
 {
   return ACE_WIN32_Asynch_Operation::cancel ();
 }
diff --git a/ACE/ace/WIN32_Asynch_IO.h b/ACE/ace/WIN32_Asynch_IO.h
index 29871120ab0..b9607e06f4d 100644
--- a/ACE/ace/WIN32_Asynch_IO.h
+++ b/ACE/ace/WIN32_Asynch_IO.h
@@ -105,7 +105,7 @@ public:
   int post_completion (ACE_Proactor_Impl *proactor);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Result (void);
+  virtual ~ACE_WIN32_Asynch_Result ();
 
   /// Simulate error value to use in the post_completion()
   void set_error (u_long errcode);
@@ -167,7 +167,7 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   // = Access methods.
 
@@ -179,7 +179,7 @@ protected:
   ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win32_proactor);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Operation (void);
+  virtual ~ACE_WIN32_Asynch_Operation ();
 
   /// Win32 Proactor.
   ACE_WIN32_Proactor *win32_proactor_;
@@ -284,7 +284,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Read_Stream_Result (void);
+  virtual ~ACE_WIN32_Asynch_Read_Stream_Result ();
 
   /// Bytes requested when the asynchronous read was initiated.
   size_t bytes_to_read_;
@@ -337,7 +337,7 @@ public:
              int signal_number = 0);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Read_Stream (void);
+  virtual ~ACE_WIN32_Asynch_Read_Stream ();
 
   // Methods belong to ACE_WIN32_Asynch_Operation base class. These
   // methods are defined here to avoid VC++ warnings. They route the
@@ -359,7 +359,7 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
@@ -460,7 +460,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Write_Stream_Result (void);
+  virtual ~ACE_WIN32_Asynch_Write_Stream_Result ();
 
   /// The number of bytes which were requested at the start of the
   /// asynchronous write.
@@ -514,7 +514,7 @@ public:
               int signal_number = 0);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Write_Stream (void);
+  virtual ~ACE_WIN32_Asynch_Write_Stream ();
 
   // = Methods belonging to <ACE_WIN32_Asynch_Operation> base class.
 
@@ -537,7 +537,7 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
@@ -638,7 +638,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Read_File_Result (void);
+  virtual ~ACE_WIN32_Asynch_Read_File_Result ();
 };
 
 /**
@@ -693,7 +693,7 @@ public:
 
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Read_File (void);
+  virtual ~ACE_WIN32_Asynch_Read_File ();
 
   // = Methods belong to ACE_WIN32_Asynch_Operation base class. These
   //   methods are defined here to avoid VC++ warnings. They route the
@@ -715,7 +715,7 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
@@ -848,7 +848,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Write_File_Result (void);
+  virtual ~ACE_WIN32_Asynch_Write_File_Result ();
 };
 
 /**
@@ -899,7 +899,7 @@ public:
               int signal_number = 0);
 
   /// Destrcutor.
-  virtual ~ACE_WIN32_Asynch_Write_File (void);
+  virtual ~ACE_WIN32_Asynch_Write_File ();
 
   // = Methods belong to ACE_WIN32_Asynch_Operation base class. These
   //   methods are defined here to avoid VC++ warnings. They route the
@@ -921,7 +921,7 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
@@ -1043,7 +1043,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Accept_Result (void);
+  virtual ~ACE_WIN32_Asynch_Accept_Result ();
 
   /// Bytes requested when the asynchronous read was initiated.
   size_t bytes_to_read_;
@@ -1097,7 +1097,7 @@ public:
               int addr_family = AF_INET);
 
   /// Destructor.
-  ~ACE_WIN32_Asynch_Accept (void);
+  ~ACE_WIN32_Asynch_Accept ();
 
   // Methods belong to ACE_WIN32_Asynch_Operation base class. These
   // methods are defined here to avoid VC++ warnings. They route the
@@ -1119,7 +1119,7 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
@@ -1206,7 +1206,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Connect_Result (void);
+  virtual ~ACE_WIN32_Asynch_Connect_Result ();
 
   /// Set the I/O handle for the new connection.
   void  connect_handle (ACE_HANDLE handle);
@@ -1228,7 +1228,7 @@ public:
   ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_proactor);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Connect (void);
+  virtual ~ACE_WIN32_Asynch_Connect ();
 
  /**
    * This open belongs to ACE_WIN32_Asynch_Operation. We forward
@@ -1261,13 +1261,13 @@ public:
    *  Cancel all pending pseudo-asynchronus requests
    *  Behavior as usual AIO request
    */
-  int cancel (void);
+  int cancel ();
 
   /**
    *  Close performs cancellation of all pending requests
    *  and close the connect handle
    */
-  int close (void);
+  int close ();
 
   /// Virtual from ACE_Event_Handler
   ACE_HANDLE get_handle () const;
@@ -1435,7 +1435,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Transmit_File_Result (void);
+  virtual ~ACE_WIN32_Asynch_Transmit_File_Result ();
 
   /// Network I/O handle.
   ACE_HANDLE socket_;
@@ -1507,7 +1507,7 @@ public:
                      int signal_number = 0);
 
   /// Destructor.
-  ~ACE_WIN32_Asynch_Transmit_File (void);
+  ~ACE_WIN32_Asynch_Transmit_File ();
 
   // Methods belong to ACE_WIN32_Asynch_Operation base class. These
   // methods are defined here to avoid VC++ warnings. They route the
@@ -1529,7 +1529,7 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
@@ -1631,7 +1631,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Read_Dgram_Result (void);
+  virtual ~ACE_WIN32_Asynch_Read_Dgram_Result ();
 
   /// Bytes requested when the asynchronous read was initiated.
   size_t bytes_to_read_;
@@ -1671,7 +1671,7 @@ public:
   ACE_WIN32_Asynch_Read_Dgram (ACE_WIN32_Proactor *win32_proactor);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Read_Dgram (void);
+  virtual ~ACE_WIN32_Asynch_Read_Dgram ();
 
    /** This starts off an asynchronous read.  Upto
    * <message_block->total_size()> will be read and stored in the
@@ -1718,14 +1718,14 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
 
 protected:
   /// Do-nothing constructor.
-  ACE_WIN32_Asynch_Read_Dgram (void);
+  ACE_WIN32_Asynch_Read_Dgram ();
 };
 
 /**
@@ -1818,7 +1818,7 @@ protected:
                          u_long error);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Write_Dgram_Result (void);
+  virtual ~ACE_WIN32_Asynch_Write_Dgram_Result ();
 
   /// The number of bytes which were requested at the start of the
   /// asynchronous write.
@@ -1854,7 +1854,7 @@ public:
   ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor *win32_proactor);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Asynch_Write_Dgram (void);
+  virtual ~ACE_WIN32_Asynch_Write_Dgram ();
 
   /** This starts off an asynchronous send.  Upto
    * <message_block->total_length()> will be sent.  @a message_block's
@@ -1902,14 +1902,14 @@ public:
    * the calling thread.  The function does not cancel asynchronous
    * operations issued by other threads.
    */
-  int cancel (void);
+  int cancel ();
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor () const;
 
 protected:
   /// Do-nothing constructor.
-  ACE_WIN32_Asynch_Write_Dgram (void);
+  ACE_WIN32_Asynch_Write_Dgram ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp
index bee6b0d3a8a..f697edf8f6b 100644
--- a/ACE/ace/WIN32_Proactor.cpp
+++ b/ACE/ace/WIN32_Proactor.cpp
@@ -30,7 +30,7 @@ public:
                                int signal_number = ACE_SIGRTMIN);
 
   /// Destructor.
-  virtual ~ACE_WIN32_Wakeup_Completion (void);
+  virtual ~ACE_WIN32_Wakeup_Completion ();
 
   /// This method calls the <handler>'s <handle_wakeup> method.
   virtual void complete (size_t bytes_transferred = 0,
@@ -59,7 +59,7 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads,
   this->get_asynch_pseudo_task ().start ();
 }
 
-ACE_WIN32_Proactor::~ACE_WIN32_Proactor (void)
+ACE_WIN32_Proactor::~ACE_WIN32_Proactor ()
 {
   this->get_asynch_pseudo_task ().stop ();
 
@@ -73,7 +73,7 @@ ACE_WIN32_Proactor::get_asynch_pseudo_task ()
 }
 
 int
-ACE_WIN32_Proactor::close (void)
+ACE_WIN32_Proactor::close ()
 {
   // Close the completion port
   if (this->completion_port_ != 0)
@@ -142,7 +142,7 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle,
 }
 
 ACE_Asynch_Read_Stream_Impl *
-ACE_WIN32_Proactor::create_asynch_read_stream (void)
+ACE_WIN32_Proactor::create_asynch_read_stream ()
 {
   ACE_Asynch_Read_Stream_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -152,7 +152,7 @@ ACE_WIN32_Proactor::create_asynch_read_stream (void)
 }
 
 ACE_Asynch_Write_Stream_Impl *
-ACE_WIN32_Proactor::create_asynch_write_stream (void)
+ACE_WIN32_Proactor::create_asynch_write_stream ()
 {
   ACE_Asynch_Write_Stream_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -162,7 +162,7 @@ ACE_WIN32_Proactor::create_asynch_write_stream (void)
 }
 
 ACE_Asynch_Read_Dgram_Impl *
-ACE_WIN32_Proactor::create_asynch_read_dgram (void)
+ACE_WIN32_Proactor::create_asynch_read_dgram ()
 {
   ACE_Asynch_Read_Dgram_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -172,7 +172,7 @@ ACE_WIN32_Proactor::create_asynch_read_dgram (void)
 }
 
 ACE_Asynch_Write_Dgram_Impl *
-ACE_WIN32_Proactor::create_asynch_write_dgram (void)
+ACE_WIN32_Proactor::create_asynch_write_dgram ()
 {
   ACE_Asynch_Write_Dgram_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -182,7 +182,7 @@ ACE_WIN32_Proactor::create_asynch_write_dgram (void)
 }
 
 ACE_Asynch_Read_File_Impl *
-ACE_WIN32_Proactor::create_asynch_read_file (void)
+ACE_WIN32_Proactor::create_asynch_read_file ()
 {
   ACE_Asynch_Read_File_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -192,7 +192,7 @@ ACE_WIN32_Proactor::create_asynch_read_file (void)
 }
 
 ACE_Asynch_Write_File_Impl *
-ACE_WIN32_Proactor::create_asynch_write_file (void)
+ACE_WIN32_Proactor::create_asynch_write_file ()
 {
   ACE_Asynch_Write_File_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -202,7 +202,7 @@ ACE_WIN32_Proactor::create_asynch_write_file (void)
 }
 
 ACE_Asynch_Accept_Impl *
-ACE_WIN32_Proactor::create_asynch_accept (void)
+ACE_WIN32_Proactor::create_asynch_accept ()
 {
   ACE_Asynch_Accept_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -212,7 +212,7 @@ ACE_WIN32_Proactor::create_asynch_accept (void)
 }
 
 ACE_Asynch_Connect_Impl *
-ACE_WIN32_Proactor::create_asynch_connect (void)
+ACE_WIN32_Proactor::create_asynch_connect ()
 {
   ACE_Asynch_Connect_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -222,7 +222,7 @@ ACE_WIN32_Proactor::create_asynch_connect (void)
 }
 
 ACE_Asynch_Transmit_File_Impl *
-ACE_WIN32_Proactor::create_asynch_transmit_file (void)
+ACE_WIN32_Proactor::create_asynch_transmit_file ()
 {
   ACE_Asynch_Transmit_File_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -549,7 +549,7 @@ ACE_WIN32_Proactor::handle_events (ACE_Time_Value &wait_time)
 }
 
 int
-ACE_WIN32_Proactor::handle_events (void)
+ACE_WIN32_Proactor::handle_events ()
 {
   return this->handle_events (ACE_INFINITE);
 }
@@ -721,7 +721,7 @@ ACE_WIN32_Proactor::post_wakeup_completions (int how_many)
 }
 
 int
-ACE_WIN32_Proactor::wake_up_dispatch_threads (void)
+ACE_WIN32_Proactor::wake_up_dispatch_threads ()
 {
   return 0;
 }
@@ -781,7 +781,7 @@ ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion
 {
 }
 
-ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion (void)
+ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion ()
 {
 }
 
diff --git a/ACE/ace/XML_Svc_Conf.cpp b/ACE/ace/XML_Svc_Conf.cpp
index a3b08247330..3c044406957 100644
--- a/ACE/ace/XML_Svc_Conf.cpp
+++ b/ACE/ace/XML_Svc_Conf.cpp
@@ -4,7 +4,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf (void)
+ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf ()
 {
 }
 
diff --git a/ACE/ace/XML_Svc_Conf.h b/ACE/ace/XML_Svc_Conf.h
index a45fa662aae..b27044c5a62 100644
--- a/ACE/ace/XML_Svc_Conf.h
+++ b/ACE/ace/XML_Svc_Conf.h
@@ -37,13 +37,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * ACE applications can link to dynamically using the ACE_DLL class.
  * This DLL should include an operation as follow:
  *
- *   extern "C" ACE_XML_Svc_Conf_Parser * _ACEXML_create_XML_Svc_Conf_Object (void);
+ *   extern "C" ACE_XML_Svc_Conf_Parser * _ACEXML_create_XML_Svc_Conf_Object ();
  */
 
 class ACE_Export ACE_XML_Svc_Conf
 {
 public:
-  typedef ACE_XML_Svc_Conf *(*Factory)(void);
+  typedef ACE_XML_Svc_Conf *(*Factory)();
 
   virtual ~ACE_XML_Svc_Conf (void) = 0;
 
diff --git a/ACE/ace/XML_Utils/XML_Schema_Resolver.h b/ACE/ace/XML_Utils/XML_Schema_Resolver.h
index d073425c98a..8587494f5f9 100644
--- a/ACE/ace/XML_Utils/XML_Schema_Resolver.h
+++ b/ACE/ace/XML_Utils/XML_Schema_Resolver.h
@@ -48,7 +48,7 @@ namespace XML
     virtual InputSource * resolveEntity (const XMLCh *const publicId,
                                          const XMLCh *const systemId);
 
-    Resolver &get_resolver (void);
+    Resolver &get_resolver ();
 
   private:
     XML_Schema_Resolver (XML_Schema_Resolver<Resolver> &);
diff --git a/ACE/ace/XML_Utils/XercesString.cpp b/ACE/ace/XML_Utils/XercesString.cpp
index 0aedaab1273..002368b091d 100644
--- a/ACE/ace/XML_Utils/XercesString.cpp
+++ b/ACE/ace/XML_Utils/XercesString.cpp
@@ -126,7 +126,7 @@ namespace XML
     return _wstr[i];
   }
 
-  XMLCh * XStr::release (void)
+  XMLCh * XStr::release ()
   {
     XMLCh* tmp = _wstr;
     this->_wstr = 0;
@@ -134,7 +134,7 @@ namespace XML
   }
 
   void
-  XStr::reset (void)
+  XStr::reset ()
   {
     if (_wstr)
       XMLString::release(&_wstr);
diff --git a/ACE/ace/XML_Utils/XercesString.h b/ACE/ace/XML_Utils/XercesString.h
index 8e7ebd84ea8..48bed5715c0 100644
--- a/ACE/ace/XML_Utils/XercesString.h
+++ b/ACE/ace/XML_Utils/XercesString.h
@@ -57,10 +57,10 @@ namespace XML
 
     operator const XMLCh* () const { return _wstr; };
 
-    XMLCh * release (void);
+    XMLCh * release ();
 
     /// Release the held string and free its memory.
-    void reset (void);
+    void reset ();
   private:
     XMLCh* _wstr; // Internal representation
   };
diff --git a/ACE/ace/XTI_ATM_Mcast.cpp b/ACE/ace/XTI_ATM_Mcast.cpp
index 4e1b848a102..329b0a30f6f 100644
--- a/ACE/ace/XTI_ATM_Mcast.cpp
+++ b/ACE/ace/XTI_ATM_Mcast.cpp
@@ -18,7 +18,7 @@ ACE_XTI_ATM_Mcast::dump () const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (void)
+ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast ()
 {
   ACE_TRACE ("ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast");
 }
diff --git a/ACE/ace/XTI_ATM_Mcast.h b/ACE/ace/XTI_ATM_Mcast.h
index b62ba08e67d..91cfa938d88 100644
--- a/ACE/ace/XTI_ATM_Mcast.h
+++ b/ACE/ace/XTI_ATM_Mcast.h
@@ -36,7 +36,7 @@ class ACE_Export ACE_XTI_ATM_Mcast : public ACE_TLI_Connector
 {
 public:
   /// Default constructor.
-  ACE_XTI_ATM_Mcast (void);
+  ACE_XTI_ATM_Mcast ();
 
   /**
    * Actively connect and produce a @a new_stream if things go well.
diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp
index c1d690e0fe6..3be96043882 100644
--- a/ACE/ace/XtReactor/XtReactor.cpp
+++ b/ACE/ace/XtReactor/XtReactor.cpp
@@ -34,7 +34,7 @@ ACE_XtReactor::ACE_XtReactor (XtAppContext context,
 #endif /* ACE_MT_SAFE */
 }
 
-ACE_XtReactor::~ACE_XtReactor (void)
+ACE_XtReactor::~ACE_XtReactor ()
 {
   // Delete the remaining items in the linked list.
 
@@ -366,7 +366,7 @@ ACE_XtReactor::compute_Xt_condition(ACE_HANDLE handle)
 // first timeout in the Reactor's Timer_Queue.
 
 void
-ACE_XtReactor::reset_timeout (void)
+ACE_XtReactor::reset_timeout ()
 {
   // Make sure we have a valid context
   ACE_ASSERT (this->context_ != 0);
diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor/XtReactor.h
index af8ea2f9156..8e5d4bc3e36 100644
--- a/ACE/ace/XtReactor/XtReactor.h
+++ b/ACE/ace/XtReactor/XtReactor.h
@@ -59,7 +59,7 @@ public:
                  size_t size = DEFAULT_SIZE,
                  bool restart = false,
                  ACE_Sig_Handler * = 0);
-  virtual ~ACE_XtReactor (void);
+  virtual ~ACE_XtReactor ();
 
   XtAppContext context () const;
   void context (XtAppContext);
@@ -126,7 +126,7 @@ protected:
 private:
   /// This method ensures there's an Xt timeout for the first timeout
   /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
+  void reset_timeout ();
 
   // = Integrate with the X callback function mechanism.
   static void TimerCallbackProc (XtPointer closure, XtIntervalId *id);
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
index e98ef206875..6ab5f76fbe2 100644
--- a/ACE/ace/os_include/os_signal.h
+++ b/ACE/ace/os_include/os_signal.h
@@ -156,7 +156,7 @@ extern "C"
 #elif defined (ACE_HAS_SVR4_SIGNAL_T)
    // SVR4 Signals are inconsistent (e.g., see struct sigaction)..
    using ACE_SignalHandler = void (*)(int);
-   using ACE_SignalHandlerV = void (*)(void);
+   using ACE_SignalHandlerV = void (*)();
 #elif defined (ACE_WIN32)
    using ACE_SignalHandler = void (__cdecl *)(int);
    using ACE_SignalHandlerV = void (__cdecl *)(int);
diff --git a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
index 4f9ac9bfc52..3aa485921c3 100644
--- a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
+++ b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
@@ -638,7 +638,7 @@ Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
 // from the use of threads, compared with the Reactive solution.
 
 int
-Thr_Consumer_Handler::svc (void)
+Thr_Consumer_Handler::svc ()
 {
   for (in_thread_ = 1;;)
     {
@@ -748,7 +748,7 @@ Thr_Supplier_Handler::open (void *)
 // existing code!).
 
 int
-Thr_Supplier_Handler::svc (void)
+Thr_Supplier_Handler::svc ()
 {
   for (in_thread_ = 1;;)
     {
diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp
index b2bcecbe9a2..f6995bae893 100644
--- a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp
+++ b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp
@@ -42,7 +42,7 @@ Connection_Handler::total_bytes (size_t bytes)
   this->total_bytes_ += bytes;
 }
 
-Connection_Handler::Connection_Handler (void)
+Connection_Handler::Connection_Handler ()
 {
 }
 
@@ -95,7 +95,7 @@ Connection_Handler::timeout (long to)
 // re-calculation).
 
 long
-Connection_Handler::timeout (void)
+Connection_Handler::timeout ()
 {
   long old_timeout = this->timeout_;
   this->timeout_ *= 2;
diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.h b/ACE/apps/Gateway/Gateway/Connection_Handler.h
index baf4a8f46f0..6fb8a9ae14a 100644
--- a/ACE/apps/Gateway/Gateway/Connection_Handler.h
+++ b/ACE/apps/Gateway/Gateway/Connection_Handler.h
@@ -40,7 +40,7 @@ class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
 {
 public:
   /// Default constructor (needed to make <ACE_Connector> happy).
-  Connection_Handler (void);
+  Connection_Handler ();
 
   /// Real constructor.
   Connection_Handler (const Connection_Config_Info &);
@@ -77,7 +77,7 @@ public:
 
   // = Set/get the current retry timeout delay.
   void timeout (long);
-  long timeout (void);
+  long timeout ();
 
   // = Set/get the maximum retry timeout delay.
   void max_timeout (long);
diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
index d140392fbd3..a69dc559bae 100644
--- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
+++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
@@ -1,7 +1,7 @@
 #include "Connection_Handler_Connector.h"
 #include "ace/os_include/os_netdb.h"
 
-Connection_Handler_Connector::Connection_Handler_Connector (void)
+Connection_Handler_Connector::Connection_Handler_Connector ()
 {
 }
 
diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h
index b5ef112aecd..02d458e3f86 100644
--- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h
+++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h
@@ -31,7 +31,7 @@
 class Connection_Handler_Connector : public ACE_Connector<Connection_Handler, ACE_SOCK_CONNECTOR>
 {
 public:
-  Connection_Handler_Connector (void);
+  Connection_Handler_Connector ();
 
   // Initiate (or reinitiate) a connection on the Connection_Handler.
   int initiate_connection (Connection_Handler *,
diff --git a/ACE/apps/Gateway/Gateway/Event.h b/ACE/apps/Gateway/Gateway/Event.h
index 9d7c652dbda..895cd441fd6 100644
--- a/ACE/apps/Gateway/Gateway/Event.h
+++ b/ACE/apps/Gateway/Gateway/Event.h
@@ -132,7 +132,7 @@ public:
   {
   }
 
-  void decode (void)
+  void decode ()
   {
     this->len_ = ntohl (this->len_);
     this->connection_id_ = ntohl (this->connection_id_);
@@ -141,7 +141,7 @@ public:
   }
   // Decode from network byte order to host byte order.
 
-  void encode (void)
+  void encode ()
   {
     this->len_ = htonl (this->len_);
     this->connection_id_ = htonl (this->connection_id_);
@@ -194,7 +194,7 @@ public:
 class Subscription
 {
 public:
-  void decode (void)
+  void decode ()
     {
       this->connection_id_ = ntohl (this->connection_id_);
 
@@ -205,7 +205,7 @@ public:
     }
   // Decode from network byte order to host byte order.
 
-  void encode (void)
+  void encode ()
     {
       this->connection_id_ = htonl (this->connection_id_);
 
diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.cpp b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
index f192bd3a8c8..97ea7f95ddf 100644
--- a/ACE/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_sys_select.h"
 #include "ace/Signal.h"
 
-Event_Channel::~Event_Channel (void)
+Event_Channel::~Event_Channel ()
 {
 }
 
@@ -13,7 +13,7 @@ Event_Channel::~Event_Channel (void)
 #  pragma warning (push)
 #  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
 #  endif
-Event_Channel::Event_Channel (void)
+Event_Channel::Event_Channel ()
   : supplier_acceptor_ (*this, 'S'),
     consumer_acceptor_ (*this, 'C')
 {
@@ -23,7 +23,7 @@ Event_Channel::Event_Channel (void)
 #endif
 
 int
-Event_Channel::compute_performance_statistics (void)
+Event_Channel::compute_performance_statistics ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) doing the performance timeout here...\n"));
   CONNECTION_MAP_ITERATOR cmi (this->connection_map_);
@@ -340,7 +340,7 @@ Event_Channel::cancel_connection_connection (Connection_Handler *connection_hand
 // Initiate active connections with the Consumer and Supplier Peers.
 
 void
-Event_Channel::initiate_connector (void)
+Event_Channel::initiate_connector ()
 {
   if (Options::instance ()->enabled
       (Options::CONSUMER_CONNECTOR | Options::SUPPLIER_CONNECTOR))
@@ -366,7 +366,7 @@ Event_Channel::initiate_connector (void)
 // to accept.
 
 int
-Event_Channel::initiate_acceptors (void)
+Event_Channel::initiate_acceptors ()
 {
   if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR))
     {
diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.h b/ACE/apps/Gateway/Gateway/Event_Channel.h
index 2f4bfcc2a4d..e25d12bfd22 100644
--- a/ACE/apps/Gateway/Gateway/Event_Channel.h
+++ b/ACE/apps/Gateway/Gateway/Event_Channel.h
@@ -33,8 +33,8 @@ typedef ACE_Null_Mutex MAP_MUTEX;
 class ACE_Svc_Export Event_Channel : public ACE_Event_Handler
 {
 public:
-  Event_Channel (void);
-  ~Event_Channel (void);
+  Event_Channel ();
+  ~Event_Channel ();
 
   /// Open the channel.
   virtual int open (void * = 0);
@@ -78,11 +78,11 @@ public:
                    ACE_Time_Value * = 0);
 
   /// Actively initiate connections to the Peers.
-  void initiate_connector (void);
+  void initiate_connector ();
 
   /// Passively initiate the <Peer_Acceptor>s for Consumer and
   /// Suppliers.
-  int initiate_acceptors (void);
+  int initiate_acceptors ();
 
 private:
   /// Parse the command-line arguments.
@@ -98,7 +98,7 @@ private:
   void subscription_event (ACE_Message_Block *data);
 
   /// Perform timer-based performance profiling.
-  int compute_performance_statistics (void);
+  int compute_performance_statistics ();
 
   /// Periodically callback to perform timer-based performance
   /// profiling.
diff --git a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp
index 56c60f9b1c6..3b3e4710fbc 100644
--- a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp
+++ b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp
@@ -53,7 +53,7 @@ Event_Forwarding_Discriminator_Iterator::next (Consumer_Dispatch_Set *&cds)
 }
 
 int
-Event_Forwarding_Discriminator_Iterator::advance (void)
+Event_Forwarding_Discriminator_Iterator::advance ()
 {
   return this->map_iter_.advance ();
 }
diff --git a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
index d4a5fe9dcad..f8f497f3230 100644
--- a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
+++ b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
@@ -57,7 +57,7 @@ class Event_Forwarding_Discriminator_Iterator
 public:
   Event_Forwarding_Discriminator_Iterator (Event_Forwarding_Discriminator &mm);
   int next (Consumer_Dispatch_Set *&);
-  int advance (void);
+  int advance ();
 
 private:
   /// Map we are iterating over.
diff --git a/ACE/apps/Gateway/Gateway/File_Parser.cpp b/ACE/apps/Gateway/Gateway/File_Parser.cpp
index d301b408efc..9145d20e03e 100644
--- a/ACE/apps/Gateway/Gateway/File_Parser.cpp
+++ b/ACE/apps/Gateway/Gateway/File_Parser.cpp
@@ -13,7 +13,7 @@ typedef FPRT::Return_Type FP_RETURN_TYPE;
 // File_Parser stuff.
 
 template <class ENTRY>
-File_Parser<ENTRY>::~File_Parser (void)
+File_Parser<ENTRY>::~File_Parser ()
 {
 }
 
@@ -28,7 +28,7 @@ File_Parser<ENTRY>::open (const ACE_TCHAR filename[])
 }
 
 template <class ENTRY> int
-File_Parser<ENTRY>::close (void)
+File_Parser<ENTRY>::close ()
 {
   return ACE_OS::fclose (this->infile_);
 }
@@ -140,7 +140,7 @@ File_Parser<ENTRY>::comments (char ch)
 }
 
 template <class ENTRY> int
-File_Parser<ENTRY>::skipline (void)
+File_Parser<ENTRY>::skipline ()
 {
   // Skip the remainder of the line.
 
diff --git a/ACE/apps/Gateway/Gateway/File_Parser.h b/ACE/apps/Gateway/Gateway/File_Parser.h
index 2ca3f86e79c..09733640cd2 100644
--- a/ACE/apps/Gateway/Gateway/File_Parser.h
+++ b/ACE/apps/Gateway/Gateway/File_Parser.h
@@ -48,11 +48,11 @@ class File_Parser
 {
 public:
   /// Destructor.
-  virtual ~File_Parser (void);
+  virtual ~File_Parser ();
 
   // = Open and Close the file specified
   int open (const ACE_TCHAR filename[]);
-  int close (void);
+  int close ();
 
   virtual FPRT::Return_Type read_entry (ENTRY &entry,
                                         int &line_number) = 0;
@@ -82,7 +82,7 @@ protected:
 
   /// Skips to the remainder of a line, e.g., when we find a comment
   /// character.
-  int skipline (void);
+  int skipline ();
 
   /// Pointer to the file we're reading.
   FILE *infile_;
diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp
index a711cd4d7a8..e1275482a6d 100644
--- a/ACE/apps/Gateway/Gateway/Gateway.cpp
+++ b/ACE/apps/Gateway/Gateway/Gateway.cpp
@@ -29,10 +29,10 @@ protected:
 
   // = Configuration methods.
   // Parse the proxy configuration file.
-  int parse_connection_config_file (void);
+  int parse_connection_config_file ();
 
   // Parse the consumer configuration file.
-  int parse_consumer_config_file (void);
+  int parse_consumer_config_file ();
 
   // = Lifecycle management methods.
   // Shut down the Gateway when input comes in from the controlling
@@ -135,7 +135,7 @@ Gateway::init (int argc, ACE_TCHAR *argv[])
 // This method is automatically called when the Gateway is shutdown.
 
 int
-Gateway::fini (void)
+Gateway::fini ()
 {
   // Remove the handler that receive events on stdin.  Otherwise, we
   // will crash on shutdown.
@@ -170,7 +170,7 @@ Gateway::info (ACE_TCHAR **strp, size_t length) const
 // Parse and build the proxy table.
 
 int
-Gateway::parse_connection_config_file (void)
+Gateway::parse_connection_config_file ()
 {
   // File that contains the proxy configuration information.
   Connection_Config_File_Parser connection_file;
@@ -256,7 +256,7 @@ Gateway::parse_connection_config_file (void)
 }
 
 int
-Gateway::parse_consumer_config_file (void)
+Gateway::parse_consumer_config_file ()
 {
   // File that contains the consumer event forwarding information.
   Consumer_Config_File_Parser consumer_file;
diff --git a/ACE/apps/Gateway/Gateway/Options.cpp b/ACE/apps/Gateway/Gateway/Options.cpp
index a0f8edcf8ab..d844e0549e8 100644
--- a/ACE/apps/Gateway/Gateway/Options.cpp
+++ b/ACE/apps/Gateway/Gateway/Options.cpp
@@ -14,7 +14,7 @@ Options *Options::instance_ = 0;
 
 // Let's have a usage prompt.
 void
-Options::print_usage (void)
+Options::print_usage ()
 {
   ACE_DEBUG ((LM_INFO,
     "gatewayd [-a {C|S}:acceptor-port] [-c {C|S}:connector-port]"
@@ -36,7 +36,7 @@ Options::print_usage (void)
   ));
 }
 Options *
-Options::instance (void)
+Options::instance ()
 {
   if (Options::instance_ == 0)
     ACE_NEW_RETURN (Options::instance_, Options, 0);
@@ -44,7 +44,7 @@ Options::instance (void)
   return Options::instance_;
 }
 
-Options::Options (void)
+Options::Options ()
   : locking_strategy_ (0),
     performance_window_ (0),
     blocking_semantics_ (ACE_NONBLOCK),
@@ -69,7 +69,7 @@ Options::enabled (int option) const
   return ACE_BIT_ENABLED (this->options_, option);
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   delete this->locking_strategy_;
 }
@@ -93,7 +93,7 @@ Options::performance_window () const
 }
 
 CONNECTION_ID &
-Options::connection_id (void)
+Options::connection_id ()
 {
   return this->connection_id_;
 }
diff --git a/ACE/apps/Gateway/Gateway/Options.h b/ACE/apps/Gateway/Gateway/Options.h
index 5ba13c7a5e8..a6b2aef20fe 100644
--- a/ACE/apps/Gateway/Gateway/Options.h
+++ b/ACE/apps/Gateway/Gateway/Options.h
@@ -49,10 +49,10 @@ public:
   };
 
   /// Return Singleton.
-  static Options *instance (void);
+  static Options *instance ();
 
   /// Termination.
-  ~Options (void);
+  ~Options ();
 
   /// Parse the arguments and set the options.
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -62,7 +62,7 @@ public:
    * = Accessor methods.
    * Determine if an option is enabled.
    */
-  void print_usage(void);
+  void print_usage();
   int enabled (int option) const;
 
   /**
@@ -125,7 +125,7 @@ public:
   long max_queue_size () const;
 
   /// Returns a reference to the next available connection id;
-  CONNECTION_ID &connection_id (void);
+  CONNECTION_ID &connection_id ();
 
 private:
   enum
@@ -138,7 +138,7 @@ private:
   };
 
   /// Initialization.
-  Options (void);
+  Options ();
 
   /// Options Singleton instance.
   static Options *instance_;
diff --git a/ACE/apps/Gateway/Peer/Options.cpp b/ACE/apps/Gateway/Peer/Options.cpp
index 2a849effa2e..8874d671051 100644
--- a/ACE/apps/Gateway/Peer/Options.cpp
+++ b/ACE/apps/Gateway/Peer/Options.cpp
@@ -12,14 +12,14 @@
 Options *Options::instance_ = 0;
 
 void
-Options::print_usage_and_die (void)
+Options::print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n")));
   ACE_OS::exit (1);
 }
 
-Options::Options (void)
+Options::Options ()
   : options_ (0),
     supplier_acceptor_port_ (DEFAULT_PEER_SUPPLIER_PORT),
     consumer_acceptor_port_ (DEFAULT_PEER_CONSUMER_PORT),
@@ -39,7 +39,7 @@ Options::Options (void)
 }
 
 Options *
-Options::instance (void)
+Options::instance ()
 {
   if (Options::instance_ == 0)
     ACE_NEW_RETURN (Options::instance_, Options, 0);
@@ -54,7 +54,7 @@ Options::timeout () const
 }
 
 CONNECTION_ID &
-Options::connection_id (void)
+Options::connection_id ()
 {
   return this->connection_id_;
 }
diff --git a/ACE/apps/Gateway/Peer/Options.h b/ACE/apps/Gateway/Peer/Options.h
index 0d9613f0234..987a69c75b4 100644
--- a/ACE/apps/Gateway/Peer/Options.h
+++ b/ACE/apps/Gateway/Peer/Options.h
@@ -34,7 +34,7 @@ public:
   };
 
   /// Return Singleton.
-  static Options *instance (void);
+  static Options *instance ();
 
   /// Parse the arguments and set the options.
   void parse_args (int argc, ACE_TCHAR *argv[]);
@@ -76,7 +76,7 @@ public:
   long max_queue_size () const;
 
   /// Returns a reference to the connection id.
-  CONNECTION_ID &connection_id (void);
+  CONNECTION_ID &connection_id ();
 
 private:
   enum
@@ -91,10 +91,10 @@ private:
   };
 
   /// Ensure Singleton.
-  Options (void);
+  Options ();
 
   /// Explain usage and exit.
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
 
   /// Singleton.
   static Options *instance_;
diff --git a/ACE/apps/Gateway/Peer/Peer.cpp b/ACE/apps/Gateway/Peer/Peer.cpp
index 56542dca89e..d40348c792f 100644
--- a/ACE/apps/Gateway/Peer/Peer.cpp
+++ b/ACE/apps/Gateway/Peer/Peer.cpp
@@ -6,7 +6,7 @@
 #include "ace/Signal.h"
 #include "Peer.h"
 
-Peer_Handler::Peer_Handler (void)
+Peer_Handler::Peer_Handler ()
   : connection_id_ (-1),  // Maybe it's better than 0.
     msg_frag_ (0),
     total_bytes_ (0)
@@ -106,7 +106,7 @@ Peer_Handler::transmit (ACE_Message_Block *mb,
 // Read events from stdin and send them to the gatewayd.
 
 int
-Peer_Handler::transmit_stdin (void)
+Peer_Handler::transmit_stdin ()
 {
   // If return value is -1, then first_time_ must be reset to 1.
   int result = 0;
@@ -482,7 +482,7 @@ Peer_Handler::handle_input (ACE_HANDLE sd)
 // Action that receives our connection id from the Gateway.
 
 int
-Peer_Handler::await_connection_id (void)
+Peer_Handler::await_connection_id ()
 {
   ssize_t n = this->peer ().recv (&this->connection_id_,
                                   sizeof this->connection_id_);
@@ -543,7 +543,7 @@ Peer_Handler::await_connection_id (void)
 }
 
 int
-Peer_Handler::subscribe (void)
+Peer_Handler::subscribe ()
 {
   ACE_Message_Block *mb = 0;
 
@@ -562,7 +562,7 @@ Peer_Handler::subscribe (void)
 // Action that receives events from the Gateway.
 
 int
-Peer_Handler::await_events (void)
+Peer_Handler::await_events ()
 {
   ACE_Message_Block *mb = 0;
 
@@ -619,7 +619,7 @@ Peer_Handler::handle_timeout (const ACE_Time_Value &,
   return this->handle_close ();
 }
 
-Peer_Handler::~Peer_Handler (void)
+Peer_Handler::~Peer_Handler ()
 {
   // Shut down the handler.
   this->handle_close ();
@@ -692,13 +692,13 @@ Peer_Acceptor::start (u_short port)
   return 0;
 }
 
-Peer_Acceptor::Peer_Acceptor (void)
+Peer_Acceptor::Peer_Acceptor ()
   : peer_handler_ (0)
 {
 }
 
 int
-Peer_Acceptor::close (void)
+Peer_Acceptor::close ()
 {
   // Will trigger a delete.
   if (this->peer_handler_ != 0)
@@ -822,7 +822,7 @@ Peer_Factory::info (ACE_TCHAR **strp, size_t length) const
 // the peer.
 
 int
-Peer_Factory::fini (void)
+Peer_Factory::fini ()
 {
   this->consumer_acceptor_.close ();
   this->supplier_acceptor_.close ();
diff --git a/ACE/apps/Gateway/Peer/Peer.h b/ACE/apps/Gateway/Peer/Peer.h
index 2cc6c0da1b1..7d849384c8a 100644
--- a/ACE/apps/Gateway/Peer/Peer.h
+++ b/ACE/apps/Gateway/Peer/Peer.h
@@ -72,10 +72,10 @@ class ACE_Svc_Export Peer_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_
 {
 public:
   /// Initialize the peer.
-  Peer_Handler (void);
+  Peer_Handler ();
 
   /// Shutdown the Peer.
-  ~Peer_Handler (void);
+  ~Peer_Handler ();
 
   /// Initialize the handler when called by
   /// <ACE_Acceptor::handle_input>.
@@ -118,21 +118,21 @@ protected:
   virtual int nonblk_put (ACE_Message_Block *mb);
 
   /// Register Consumer subscriptions with the gateway.
-  int subscribe (void);
+  int subscribe ();
 
   // = Event/state/action handlers.
   /// Receive a event from stdin and send it to the gateway.
-  int transmit_stdin (void);
+  int transmit_stdin ();
 
   /// Action that receives the route id.
-  int await_connection_id (void);
+  int await_connection_id ();
 
   /// Action that receives events.
-  int await_events (void);
+  int await_events ();
 
   /// Pointer-to-member-function for the current action to run in this
   /// state.  This points to one of the preceding 3 methods.
-  int (Peer_Handler::*do_action_)(void);
+  int (Peer_Handler::*do_action_)();
 
   /// Connection ID of the peer, which is obtained from the gatewayd.
   CONNECTION_ID connection_id_;
@@ -164,13 +164,13 @@ class ACE_Svc_Export Peer_Acceptor : public ACE_Acceptor<Peer_Handler, ACE_SOCK_
 {
 public:
   /// Default initialization.
-  Peer_Acceptor (void);
+  Peer_Acceptor ();
 
   ///  the <Peer_Acceptor>.
   int start (u_short);
 
   /// Terminate the <Peer_Acceptor>.
-  int close (void);
+  int close ();
 
   /// Factory method that creates a <Peer_Handler> just once.
   virtual int make_svc_handler (Peer_Handler *&);
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.cpp b/ACE/apps/JAWS/clients/Blobby/Blob.cpp
index 3ae6c6d4ed6..cfb40893908 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Blob.cpp
@@ -2,11 +2,11 @@
 #include "Blob_Handler.h"
 #include "ace/OS_NS_string.h"
 
-ACE_Blob::ACE_Blob (void)
+ACE_Blob::ACE_Blob ()
 {
 }
 
-ACE_Blob::~ACE_Blob (void)
+ACE_Blob::~ACE_Blob ()
 {
   this->close ();
 }
@@ -56,7 +56,7 @@ ACE_Blob::write (ACE_Message_Block *mb, size_t length, size_t offset)
 // close down the blob
 
 int
-ACE_Blob::close (void)
+ACE_Blob::close ()
 {
   if (filename_)
     {
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.h b/ACE/apps/JAWS/clients/Blobby/Blob.h
index 9b8bb296c93..2d27add07b2 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob.h
+++ b/ACE/apps/JAWS/clients/Blobby/Blob.h
@@ -42,8 +42,8 @@
 class ACE_Blob
 {
 public:
-  ACE_Blob (void);
-  ~ACE_Blob (void);
+  ACE_Blob ();
+  ~ACE_Blob ();
 
   /// initializes the class with the given filename, hostname and port.
   /// it should be called with the filename, before any read/write calls
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index a4de50b048b..bc2bfc507da 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_NS_strings.h"
 
 // Empty constructor for compliance with new Connector behavior.
-ACE_Blob_Handler::ACE_Blob_Handler (void)
+ACE_Blob_Handler::ACE_Blob_Handler ()
 {
 }
 
@@ -21,7 +21,7 @@ ACE_Blob_Handler::ACE_Blob_Handler (ACE_Message_Block * mb,
 {
 }
 
-ACE_Blob_Handler::~ACE_Blob_Handler (void)
+ACE_Blob_Handler::~ACE_Blob_Handler ()
 {
   if (filename_)
     {
@@ -53,14 +53,14 @@ ACE_Blob_Handler::close (u_long flags)
 
 // Always overridden by the derived classes
 int
-ACE_Blob_Handler::send_request (void)
+ACE_Blob_Handler::send_request ()
 {
   return -1;
 }
 
 // Always overridden by the derived classes
 int
-ACE_Blob_Handler::receive_reply (void)
+ACE_Blob_Handler::receive_reply ()
 {
   return -1;
 }
@@ -68,7 +68,7 @@ ACE_Blob_Handler::receive_reply (void)
 // used to retrieve the number of bytes read/written by the
 // last operation on the Blob
 int
-ACE_Blob_Handler::byte_count (void)
+ACE_Blob_Handler::byte_count ()
 {
   return bytecount_;
 }
@@ -89,7 +89,7 @@ ACE_Blob_Reader::ACE_Blob_Reader (ACE_Message_Block * mb,
 
 // Send the HTTP request
 int
-ACE_Blob_Reader::send_request (void)
+ACE_Blob_Reader::send_request ()
 {
   char mesg [MAX_HEADER_SIZE];
 
@@ -115,7 +115,7 @@ ACE_Blob_Reader::send_request (void)
 
 // Recieve the HTTP Reply
 int
-ACE_Blob_Reader::receive_reply (void)
+ACE_Blob_Reader::receive_reply ()
 {
   ssize_t len;
   char buf [MAX_HEADER_SIZE + 1];
@@ -256,7 +256,7 @@ ACE_Blob_Writer::ACE_Blob_Writer (ACE_Message_Block * mb,
 }
 
 int
-ACE_Blob_Writer::send_request (void)
+ACE_Blob_Writer::send_request ()
 {
   // Check for sanity -- check if we have any data to send.
   if (offset_+ length_ > mb_->length ())
@@ -302,7 +302,7 @@ ACE_Blob_Writer::send_request (void)
 }
 
 int
-ACE_Blob_Writer::receive_reply (void)
+ACE_Blob_Writer::receive_reply ()
 {
   // Allocate a buffer big enough to hold the header
   char buf[MAX_HEADER_SIZE];
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h
index 7e5730935af..9d3d5114702 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h
+++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h
@@ -41,7 +41,7 @@ class ACE_Blob_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH
 {
 public:
   /// Null constructor, insures that it works properly with Connector
-  ACE_Blob_Handler (void);
+  ACE_Blob_Handler ();
 
   /// Always use this constructor to make Blob_Handlers
   ACE_Blob_Handler (ACE_Message_Block *mb,
@@ -50,7 +50,7 @@ public:
                     ACE_TCHAR *filename);
 
   /// returns the number of bytes read/written in the last operation.
-  int byte_count (void);
+  int byte_count ();
 
   /// Activate this instance of the <ACE_Blob_Handler>
   virtual int open (void * = 0);
@@ -58,11 +58,11 @@ public:
   /// Close down the Blob
   virtual int close (u_long flags = 0);
 
-  ~ACE_Blob_Handler (void);
+  ~ACE_Blob_Handler ();
 
 protected:
-  virtual int send_request (void);
-  virtual int receive_reply (void);
+  virtual int send_request ();
+  virtual int receive_reply ();
 
   ACE_Message_Block *mb_;
   size_t length_;
@@ -88,8 +88,8 @@ public:
                    const char *request_suffix = "HTTP/1.0\r\n\r\n");
 
 private:
-  int send_request (void);
-  int receive_reply (void);
+  int send_request ();
+  int receive_reply ();
   const char *request_prefix_;
   const char *request_suffix_;
 };
@@ -105,8 +105,8 @@ public:
                    const char *request_suffix = "HTTP/1.0\nContent-length:");
 
 private:
-  int send_request (void);
-  int receive_reply (void);
+  int send_request ();
+  int receive_reply ();
   const char *request_prefix_;
   const char *request_suffix_;
 };
diff --git a/ACE/apps/JAWS/clients/Blobby/Options.cpp b/ACE/apps/JAWS/clients/Blobby/Options.cpp
index 67c8523312b..d80d01d58d7 100644
--- a/ACE/apps/JAWS/clients/Blobby/Options.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Options.cpp
@@ -7,7 +7,7 @@
 Options *Options::instance_ = 0;
 
 Options *
-Options::instance (void)
+Options::instance ()
 {
   if (Options::instance_ == 0)
     Options::instance_ = new Options;
@@ -64,7 +64,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 
 }
 
-Options::Options (void)
+Options::Options ()
   : hostname_ (0),
     port_ (ACE_DEFAULT_HTTP_SERVER_PORT),
     filename_ (0),
diff --git a/ACE/apps/JAWS/clients/Blobby/Options.h b/ACE/apps/JAWS/clients/Blobby/Options.h
index 915762a3e04..7c2ffbb0a34 100644
--- a/ACE/apps/JAWS/clients/Blobby/Options.h
+++ b/ACE/apps/JAWS/clients/Blobby/Options.h
@@ -28,7 +28,7 @@ class Options
 {
 public:
   /// Returns the singleton instance
-  static Options *instance (void);
+  static Options *instance ();
 
   /// parses commandline arguments
   void parse_args (int argc, ACE_TCHAR *argv[]);
@@ -55,7 +55,7 @@ public:
   int debug_;
 
 protected:
-  Options (void);
+  Options ();
   // protected constructor, singleton
 
   /// the singleton
diff --git a/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp b/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp
index db3b186a231..6ff6d9815a4 100644
--- a/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp
+++ b/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp
@@ -39,7 +39,7 @@ ACE_ID_Generator::get_serial_id (time_t &t, size_t &s)
 }
 
 ACE_SYNCH_MUTEX *
-ACE_ID_Generator::get_lock (void)
+ACE_ID_Generator::get_lock ()
 {
 #if defined (ACE_HAS_THREADS)
   if (ACE_ID_Generator::lock_ == 0)
diff --git a/ACE/apps/JAWS/clients/Caching/ID_Generator.h b/ACE/apps/JAWS/clients/Caching/ID_Generator.h
index 827515a9b41..e6d30edce01 100644
--- a/ACE/apps/JAWS/clients/Caching/ID_Generator.h
+++ b/ACE/apps/JAWS/clients/Caching/ID_Generator.h
@@ -42,7 +42,7 @@ private:
   static void get_serial_id (time_t &t, size_t &s);
 
   /// Get the lock instance.
-  static ACE_SYNCH_MUTEX *get_lock (void);
+  static ACE_SYNCH_MUTEX *get_lock ();
 
   /// Record the time last offer ID generated.
   static time_t last_time_;
diff --git a/ACE/apps/JAWS/clients/Caching/Local_Locator.h b/ACE/apps/JAWS/clients/Caching/Local_Locator.h
index 21ab6f79890..72dc4839751 100644
--- a/ACE/apps/JAWS/clients/Caching/Local_Locator.h
+++ b/ACE/apps/JAWS/clients/Caching/Local_Locator.h
@@ -46,7 +46,7 @@ public:
   ACE_URL_Record (ACE_URL_Offer *offer);
 
   /// dtor.
-  ~ACE_URL_Record (void);
+  ~ACE_URL_Record ();
 
   /// Two records are equal if they have the same offer id.
   bool operator== (const ACE_URL_Record &rhs) const;
@@ -58,7 +58,7 @@ public:
 private:
   /// Default ctor.  This is put here to prevent users from
   /// pushing in an invalid record.
-  ACE_URL_Record (void);
+  ACE_URL_Record ();
 
   /// Offer ID in the repository.
   ACE_WString *id_;
@@ -79,7 +79,7 @@ private:
 class ACE_Svc_Export ACE_URL_Local_Locator
 {
   /// Default destructor.
-  virtual ~ACE_URL_Local_Locator (void);
+  virtual ~ACE_URL_Local_Locator ();
 
   /**
    * Query the locator for HTTP with designate properties (none, some,
diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
index 3c236ecab59..263688be3cf 100644
--- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
+++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
@@ -86,7 +86,7 @@ ACE_URL_Locator_Request::modify_offer (const ACE_WString &offer_id,
    LEN += sizeof (ACE_UINT32);
 
 size_t
-ACE_URL_Locator_Request::encode (void)
+ACE_URL_Locator_Request::encode ()
 {
   ACE_TRACE ("ACE_URL_Locator_Request::encode");
 
@@ -192,7 +192,7 @@ ACE_URL_Locator_Request::decode (void *buffer)
 
 
 size_t
-ACE_URL_Locator_Request::size (void)
+ACE_URL_Locator_Request::size ()
 {
   ACE_TRACE ("ACE_URL_Locator_Request::size");
 
@@ -313,7 +313,7 @@ ACE_URL_Locator_Reply::describe_reply (int result,
 }
 
 size_t
-ACE_URL_Locator_Reply::encode (void)
+ACE_URL_Locator_Reply::encode ()
 {
   ACE_TRACE ("ACE_URL_Locator_Reply::encode");
 
@@ -398,7 +398,7 @@ ACE_URL_Locator_Reply::decode (void *buffer)
 }
 
 size_t
-ACE_URL_Locator_Reply::size (void)
+ACE_URL_Locator_Reply::size ()
 {
   ACE_TRACE ("ACE_URL_Locator_Reply:size");
 
diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h
index 56057315af2..4653f3cc74e 100644
--- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h
+++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h
@@ -28,10 +28,10 @@ class ACE_Svc_Export ACE_URL_Locator_Request
 {
 public:
   /// Default ctor.
-  ACE_URL_Locator_Request (void);
+  ACE_URL_Locator_Request ();
 
   /// Default dtor.
-  ~ACE_URL_Locator_Request (void);
+  ~ACE_URL_Locator_Request ();
 
   /**
    * Query the locator for HTTP with designate properties (none, some,
@@ -66,7 +66,7 @@ public:
 
   /// Encode request for network communication.  If succeed,
   /// returns the size of the buffer, otherwise, return 0.
-  size_t encode (void);
+  size_t encode ();
 
   /**
    * Restore from network data.  Returns size of the buffer
@@ -94,7 +94,7 @@ public:
 protected:
   /// Return the size of the buffer required to encode
   /// this request.
-  size_t size (void);
+  size_t size ();
 
   enum {
     VALID_SEQ1 = 0x1,
@@ -147,10 +147,10 @@ class ACE_Svc_Export ACE_URL_Locator_Reply
 {
 public:
   /// Default ctor.
-  ACE_URL_Locator_Reply (void);
+  ACE_URL_Locator_Reply ();
 
   /// Default dtor.
-  ~ACE_URL_Locator_Reply (void);
+  ~ACE_URL_Locator_Reply ();
 
   /// Setup a reply message for EXPORT, WITHDRAW, or MODIFY operations.
   int status_reply (u_int op, int result);
@@ -165,7 +165,7 @@ public:
 
   /// Encode request for network communication.  If succeed,
   /// returns the size of the buffer, otherwise, return 0.
-  size_t encode (void);
+  size_t encode ();
 
   /**
    * Restore from network data.  Returns size of the buffer
@@ -189,7 +189,7 @@ public:
 protected:
   /// Return the size of the buffer required to encode
   /// this request.
-  size_t size (void);
+  size_t size ();
 
   enum {
     VALID_OFFER = 0x1,
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp b/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp
index 920322402b0..e06c5203217 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp
+++ b/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp
@@ -35,12 +35,12 @@ ACE_URL_Locator::err_name[] =
   "unknown error"
 };
 
-ACE_URL_Locator::~ACE_URL_Locator (void)
+ACE_URL_Locator::~ACE_URL_Locator ()
 {
 }
 
 const char *
-ACE_URL_Locator::error_status (void)
+ACE_URL_Locator::error_status ()
 {
   return "Not implemented yet.";
 }
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Locator.h b/ACE/apps/JAWS/clients/Caching/URL_Locator.h
index f705d367fff..972a6543b6f 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Locator.h
+++ b/ACE/apps/JAWS/clients/Caching/URL_Locator.h
@@ -105,7 +105,7 @@ public:
                             const ACE_URL_Property_Seq *modify = 0) = 0;
 
   /// Provide a human readable error status.
-  virtual const char *error_status (void);
+  virtual const char *error_status ();
 };
 
 #endif /* ACE_WEB_LOCATOR_H */
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.h b/ACE/apps/JAWS/clients/Caching/URL_Properties.h
index e3de23cf53f..ad4ec19e919 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.h
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.h
@@ -74,7 +74,7 @@ public:
   ACE_URL_Property (const ACE_URL_Property &p);
 
   /// Destructor.
-  ~ACE_URL_Property (void);
+  ~ACE_URL_Property ();
 
   /// Assignment operator.
   ACE_URL_Property &operator= (const ACE_URL_Property &rhs);
@@ -86,7 +86,7 @@ public:
   bool operator!= (const ACE_URL_Property &rhs) const;
 
   // = Query property name.
-  ACE_WString &name_rep (void);
+  ACE_WString &name_rep ();
   const ACE_WString &name () const;
 
   // = Set property name.
@@ -94,7 +94,7 @@ public:
   void name (const char *n);
 
   // = Query property value.
-  ACE_WString &value_rep (void);
+  ACE_WString &value_rep ();
   const ACE_WString &value () const;
 
   // = Set property value.
@@ -146,7 +146,7 @@ public:
   ACE_URL_Offer (const ACE_URL_Offer &o);
 
   /// Default destructor.
-  ~ACE_URL_Offer (void);
+  ~ACE_URL_Offer ();
 
   /// Assignment operator.
   ACE_URL_Offer &operator= (const ACE_URL_Offer &rhs);
@@ -158,7 +158,7 @@ public:
   bool operator!= (const ACE_URL_Offer &rhs) const;
 
   // = Get URL string.
-  ACE_WString &url_rep (void);
+  ACE_WString &url_rep ();
   const ACE_WString &url () const;
 
   // = Set URL.
@@ -166,7 +166,7 @@ public:
   void url (const ACE_UINT16 *url);
 
   /// Get properties of this offer.
-  ACE_URL_Property_Seq &url_properties (void);
+  ACE_URL_Property_Seq &url_properties ();
 
   /// Set properties of this offer.  This operation virtually get a
   /// copy of the passed in prop.
diff --git a/ACE/apps/JAWS/clients/Caching/http_handler.cpp b/ACE/apps/JAWS/clients/Caching/http_handler.cpp
index fef8203a6ac..8f50f834067 100644
--- a/ACE/apps/JAWS/clients/Caching/http_handler.cpp
+++ b/ACE/apps/JAWS/clients/Caching/http_handler.cpp
@@ -13,7 +13,7 @@
 #include "ace/Filecache.h"
 #include "http_handler.h"
 
-HTTP_Handler::HTTP_Handler (void)
+HTTP_Handler::HTTP_Handler ()
 {
 }
 
@@ -62,7 +62,7 @@ HTTP_Handler::open (void *)
 }
 
 int
-HTTP_Handler::svc (void)
+HTTP_Handler::svc ()
 {
   static char buf[BUFSIZ];
   int count = 0;
diff --git a/ACE/apps/JAWS/clients/Caching/http_handler.h b/ACE/apps/JAWS/clients/Caching/http_handler.h
index 1878ae13537..574e2a22831 100644
--- a/ACE/apps/JAWS/clients/Caching/http_handler.h
+++ b/ACE/apps/JAWS/clients/Caching/http_handler.h
@@ -30,7 +30,7 @@
 class HTTP_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
 public:
-  HTTP_Handler (void);
+  HTTP_Handler ();
   HTTP_Handler (const char * path);
 
   /// Open hook.
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h
index 8934f6247c8..66af7d57648 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h
@@ -229,7 +229,7 @@ extern void rqstat_times(rqst_stats_t *rs, rqst_timer_t *rt);
 void errexit(const char *, ...);
 extern int returnerr(const char *, ...);
 extern int d_printf(const char *, ...);
-extern char *neterrstr(void);
+extern char *neterrstr();
 
 /* routines in get.c */
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h
index 73a3d867c81..32116904800 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h
@@ -89,13 +89,13 @@ typedef struct {
  * cinfo_merge.
  */
 
-void cinfo_init(void);
+void cinfo_init();
 
 /*
  * cinfo_terminate frees the database for shutdown.
  */
 
-void cinfo_terminate(void);
+void cinfo_terminate();
 
 /*
  * cinfo_merge merges the contents of the given filename with the current
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
index 1c0494c14a2..aeb93a43ffa 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
@@ -100,7 +100,7 @@ void daemon_run(int det, void (*child_callback)(Session *), daemon_s *d);
  * the calling thread and not all of them.
  */
 
-pid_t child_fork(void);
+pid_t child_fork();
 
 
 /*
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h
index 2052552a3c0..2cd21b46ca6 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h
@@ -110,9 +110,9 @@ char *ereport_init(char *err_fn, char *email, struct passwd *pw);
 /*
  * log_terminate closes the error and common log file descriptors.
  */
-void ereport_terminate(void);
+void ereport_terminate();
 
 /* For restarts */
-SYS_FILE ereport_getfd(void);
+SYS_FILE ereport_getfd();
 
 #endif
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h
index a7ec3d97321..742bed60d2e 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h
@@ -132,7 +132,7 @@ int system_fread(SYS_FILE fd, char *buf, int sz);
  * This call stops core dumps in a portable way. Returns -1 on error.
  */
 
-int system_nocoredumps(void);
+int system_nocoredumps();
 
 
 #if defined(FILE_STDIO)
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h
index b8191b7bd8a..5ad8155b7f3 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h
@@ -141,7 +141,7 @@ int net_write(SYS_NETFD sd, char *buf, int sz);
 #ifdef DAEMON_NEEDS_SEMAPHORE
 int net_semaccept_init(int port);
 int net_semaccept(int s, struct sockaddr *addr, int *addrlen);
-void net_semaccept_terminate(void);
+void net_semaccept_terminate();
 #endif
 
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h
index e0672366a2a..b557847ad58 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h
@@ -25,7 +25,7 @@
  * Returns 1 on error, 0 on AOK.
  */
 
-int node_init(void);
+int node_init();
 
 /*
  * Check the expiration date against The Now.
@@ -33,13 +33,13 @@ int node_init(void);
  * Returns 1 on error, 0 on AOK.
  */
 
-int node_check(void);
+int node_check();
 
 /*
  * So how we doin, license
  *
  * Returns 1 on error, 0 on AOK
  */
-int node_status(void);
+int node_status();
 
 #endif
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h
index f359b8b9a64..c7593a0296b 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h
@@ -109,7 +109,7 @@ void systhread_init(char *name);
  * between threads, and then use setdata to associate a value with this
  * key for each thread.
  */
-int systhread_newkey(void);
+int systhread_newkey();
 
 /*
  * Get data that has been previously associated with key in this thread.
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h
index 17972cb518a..2ff89e81128 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h
@@ -97,7 +97,7 @@ char *util_env_find(char **env, char *name);
  * You are free to realloc or free this string.
  */
 
-char *util_hostname(void);
+char *util_hostname();
 
 
 /*
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h
index 1ff7f63e459..d42d7b20dd7 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h
@@ -140,7 +140,7 @@ char *conf_init(char *cfn);
  * conf_terminate frees any data the conf routines may be holding.
  */
 
-void conf_terminate(void);
+void conf_terminate();
 
 
 /*
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h
index 7bce6c285ba..a24df4ea4d0 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h
@@ -78,7 +78,7 @@ struct FuncStruct {
  * func_init will only read from the static arrays defined in func.c.
  */
 
-void func_init(void);
+void func_init();
 
 /*
  * func_find returns a pointer to the function named name, or NULL if none
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h
index 35941baab35..8d75b1ffb3e 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h
@@ -105,7 +105,7 @@ httpd_objset *objset_scan_buffer(filebuf *buf, char *errstr, httpd_objset *os);
  * objset_create creates a new object set and returns a pointer to it.
  */
 
-httpd_objset *objset_create(void);
+httpd_objset *objset_create();
 
 /*
  * objset_free will free an object set and any associated objects.
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h
index 820fccc74aa..af27a8764dc 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h
@@ -95,7 +95,7 @@ typedef struct {
  * request_create creates a new request structure.
  */
 
-Request *request_create(void);
+Request *request_create();
 
 /*
  * request_free destroys a request structure.
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
index 147a52ac547..09d13504754 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
@@ -101,7 +101,7 @@ typedef int                             SOCKET;
 
 #ifdef WIN32
 int     getopt(int argc, char ** argv, char *opts);
-int     getpid(void);
+int     getpid();
 int     gettimeofday(struct timeval *curTimeP);
 int     random_number(int max);
 SOCKET  rexec(const char **hostname, NETPORT port, char *username, char *password,
diff --git a/ACE/apps/JAWS/server/HTTP_Config.cpp b/ACE/apps/JAWS/server/HTTP_Config.cpp
index d923142d100..b8670491283 100644
--- a/ACE/apps/JAWS/server/HTTP_Config.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Config.cpp
@@ -8,7 +8,7 @@
 HTTP_Config_Info *HTTP_Config::instance_ = 0;
 
 HTTP_Config_Info *
-HTTP_Config::instance (void)
+HTTP_Config::instance ()
 {
   if (HTTP_Config::instance_ == 0)
     {
@@ -24,7 +24,7 @@ HTTP_Config::instance (void)
   return HTTP_Config::instance_;
 }
 
-HTTP_Config_Info::HTTP_Config_Info (void)
+HTTP_Config_Info::HTTP_Config_Info ()
   : document_root_ (0),
     cgi_path_ (0),
     user_dir_ (0),
@@ -33,7 +33,7 @@ HTTP_Config_Info::HTTP_Config_Info (void)
 {
 }
 
-HTTP_Config_Info::~HTTP_Config_Info (void)
+HTTP_Config_Info::~HTTP_Config_Info ()
 {
 }
 
diff --git a/ACE/apps/JAWS/server/HTTP_Config.h b/ACE/apps/JAWS/server/HTTP_Config.h
index 6a68919c52d..84c8afbcad7 100644
--- a/ACE/apps/JAWS/server/HTTP_Config.h
+++ b/ACE/apps/JAWS/server/HTTP_Config.h
@@ -25,7 +25,7 @@ class HTTP_Config
 {
 public:
   /// Access the Singleton.
-  static HTTP_Config_Info *instance (void);
+  static HTTP_Config_Info *instance ();
 
 private:
   /// Store the Singleton.
@@ -41,8 +41,8 @@ class HTTP_Config_Info
 {
 friend class HTTP_Config;
 public:
-  HTTP_Config_Info (void);
-  ~HTTP_Config_Info (void);
+  HTTP_Config_Info ();
+  ~HTTP_Config_Info ();
 
   // Accessors to the information
 
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.cpp b/ACE/apps/JAWS/server/HTTP_Handler.cpp
index 3b7f935c921..cc4ccfad349 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Handler.cpp
@@ -20,7 +20,7 @@ HTTP_Handler::HTTP_Handler (JAWS_IO &io,
   this->io_.handler (this);
 }
 
-HTTP_Handler::~HTTP_Handler (void)
+HTTP_Handler::~HTTP_Handler ()
 {
   this->request_data_->release ();
   this->request_data_ = 0;
@@ -91,7 +91,7 @@ HTTP_Handler::read_complete (ACE_Message_Block &message_block)
 }
 
 void
-HTTP_Handler::receive_file_complete (void)
+HTTP_Handler::receive_file_complete ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) %s received successfully\n",
               request_.uri ()));
@@ -143,19 +143,19 @@ HTTP_Handler::receive_file_error (int result)
 }
 
 void
-HTTP_Handler::confirmation_message_complete (void)
+HTTP_Handler::confirmation_message_complete ()
 {
   this->done ();
 }
 
 void
-HTTP_Handler::error_message_complete (void)
+HTTP_Handler::error_message_complete ()
 {
   this->done ();
 }
 
 void
-HTTP_Handler::transmit_file_complete (void)
+HTTP_Handler::transmit_file_complete ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) %s transmitted successfully\n",
               request_.uri ()));
@@ -193,14 +193,14 @@ HTTP_Handler::transmit_file_error (int result)
 }
 
 void
-HTTP_Handler::read_error (void)
+HTTP_Handler::read_error ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) error in reading request\n"));
   this->done ();
 }
 
 void
-HTTP_Handler::write_error (void)
+HTTP_Handler::write_error ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) %s error in writing response\n",
               request_.uri ()));
@@ -209,7 +209,7 @@ HTTP_Handler::write_error (void)
 }
 
 void
-HTTP_Handler::timeout (void)
+HTTP_Handler::timeout ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) %s error in reading request\n",
               request_.uri ()));
@@ -220,7 +220,7 @@ HTTP_Handler::timeout (void)
 }
 
 void
-HTTP_Handler::request_too_long (void)
+HTTP_Handler::request_too_long ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) request too long\n"));
   this->response_.
@@ -229,17 +229,17 @@ HTTP_Handler::request_too_long (void)
 }
 
 void
-HTTP_Handler::done (void)
+HTTP_Handler::done ()
 {
   this->factory_.destroy_http_handler (*this, this->io_);
 }
 
-HTTP_Handler_Factory::~HTTP_Handler_Factory (void)
+HTTP_Handler_Factory::~HTTP_Handler_Factory ()
 {
 }
 
 HTTP_Handler *
-Synch_HTTP_Handler_Factory::create_http_handler (void)
+Synch_HTTP_Handler_Factory::create_http_handler ()
 {
   JAWS_Synch_IO *io;
   ACE_NEW_RETURN (io, JAWS_Synch_IO, 0);
@@ -260,7 +260,7 @@ Synch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler,
 //-------------SYNCH IO no Cache
 
 HTTP_Handler *
-No_Cache_Synch_HTTP_Handler_Factory::create_http_handler (void)
+No_Cache_Synch_HTTP_Handler_Factory::create_http_handler ()
 {
   JAWS_Synch_IO_No_Cache *io = 0;
   ACE_NEW_RETURN (io, JAWS_Synch_IO_No_Cache, 0);
@@ -303,7 +303,7 @@ Asynch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler,
 }
 
 HTTP_Handler *
-Asynch_HTTP_Handler_Factory::create_http_handler (void)
+Asynch_HTTP_Handler_Factory::create_http_handler ()
 {
   return 0;
 }
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.h b/ACE/apps/JAWS/server/HTTP_Handler.h
index 4b132f9e770..beaf5c636c7 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.h
+++ b/ACE/apps/JAWS/server/HTTP_Handler.h
@@ -67,20 +67,20 @@ protected:
                 HTTP_Handler_Factory &factory);
 
   /// Destructor
-  virtual ~HTTP_Handler (void);
+  virtual ~HTTP_Handler ();
 
   /// This method is called by the framework when there is a timeout.
-  virtual void timeout (void);
+  virtual void timeout ();
 
   /**
    * This is the termination state of the handler. After successful or
    * unsuccessful completions, the handler will end up in this state
    * (method).
    */
-  virtual void done (void);
+  virtual void done ();
 
   /// Request too long.
-  virtual void request_too_long (void);
+  virtual void request_too_long ();
 
   /// Reference to the creating factory.
   HTTP_Handler_Factory &factory_;
@@ -89,14 +89,14 @@ protected:
   // = Completion methods inherited from <JAWS_IO_Handler>.
 
   virtual void read_complete (ACE_Message_Block &data);
-  virtual void read_error (void);
-  virtual void transmit_file_complete (void);
+  virtual void read_error ();
+  virtual void transmit_file_complete ();
   virtual void transmit_file_error (int result);
-  virtual void receive_file_complete (void);
+  virtual void receive_file_complete ();
   virtual void receive_file_error (int result);
-  virtual void write_error (void);
-  virtual void confirmation_message_complete (void);
-  virtual void error_message_complete (void);
+  virtual void write_error ();
+  virtual void confirmation_message_complete ();
+  virtual void error_message_complete ();
 
 public:
   enum
@@ -132,7 +132,7 @@ class HTTP_Handler_Factory
 {
 public:
   /// Destructor
-  virtual ~HTTP_Handler_Factory (void);
+  virtual ~HTTP_Handler_Factory ();
 
   /// This creates a new HTTP_Handler
   virtual HTTP_Handler *create_http_handler (void) = 0;
@@ -156,7 +156,7 @@ class Synch_HTTP_Handler_Factory : public HTTP_Handler_Factory
 {
 public:
   /// This creates a new HTTP_Handler
-  HTTP_Handler *create_http_handler (void);
+  HTTP_Handler *create_http_handler ();
 
   /**
    * The HTTP handler will call this method from HTTP_Handler::done to
@@ -179,7 +179,7 @@ class No_Cache_Synch_HTTP_Handler_Factory : public HTTP_Handler_Factory
 {
 public:
   /// This creates a new HTTP_Handler
-  HTTP_Handler *create_http_handler (void);
+  HTTP_Handler *create_http_handler ();
 
   /**
    * The HTTP handler will call this method from HTTP_Handler::done to
@@ -226,7 +226,7 @@ private:
    * handlers. New handlers can only be created by the framework when
    * new client connections arrive.
    */
-  HTTP_Handler *create_http_handler (void);
+  HTTP_Handler *create_http_handler ();
 };
 #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 #endif /* HTTP_HANDLER_H */
diff --git a/ACE/apps/JAWS/server/HTTP_Helpers.cpp b/ACE/apps/JAWS/server/HTTP_Helpers.cpp
index a747e9da829..a9f778dda39 100644
--- a/ACE/apps/JAWS/server/HTTP_Helpers.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Helpers.cpp
@@ -106,7 +106,7 @@ HTTP_Helper::HTTP_mktime (const char *httpdate)
 }
 
 const char *
-HTTP_Helper::HTTP_date (void)
+HTTP_Helper::HTTP_date ()
 {
   if (HTTP_Helper::date_string_ == 0)
     {
@@ -378,7 +378,7 @@ HTTP_Helper::fixyear (int year)
 }
 
 const char **
-HTTP_Status_Code::instance (void)
+HTTP_Status_Code::instance ()
 {
   if (HTTP_Status_Code::instance_ == 0)
     {
diff --git a/ACE/apps/JAWS/server/HTTP_Helpers.h b/ACE/apps/JAWS/server/HTTP_Helpers.h
index 132a83f7c6b..bb8e0ad6a89 100644
--- a/ACE/apps/JAWS/server/HTTP_Helpers.h
+++ b/ACE/apps/JAWS/server/HTTP_Helpers.h
@@ -30,7 +30,7 @@ public:
   static time_t HTTP_mktime (const char *httpdate);
 
   // Create today's date
-  static const char *HTTP_date (void);
+  static const char *HTTP_date ();
   static const char *HTTP_date (char *s);
 
   // Month conversions (ascii <--> numeric)
@@ -68,7 +68,7 @@ class HTTP_Status_Code
 {
 public:
   /// Singleton access point.
-  static const char **instance (void);
+  static const char **instance ();
 
   enum STATUS_CODE
   {
diff --git a/ACE/apps/JAWS/server/HTTP_Request.cpp b/ACE/apps/JAWS/server/HTTP_Request.cpp
index 8752095dd1c..457e0b8b0a5 100644
--- a/ACE/apps/JAWS/server/HTTP_Request.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Request.cpp
@@ -36,7 +36,7 @@ HTTP_Request::static_method_strings_[HTTP_Request::NUM_METHOD_STRINGS] =
 // For reasons of efficiency, this class expects buffer to be
 // null-terminated, and buflen does NOT include the \0.
 
-HTTP_Request::HTTP_Request (void)
+HTTP_Request::HTTP_Request ()
   : got_request_line_ (0),
     method_ (0),
     uri_ (0),
@@ -56,7 +56,7 @@ HTTP_Request::HTTP_Request (void)
     this->headers_.recognize (this->header_strings_[i]);
 }
 
-HTTP_Request::~HTTP_Request (void)
+HTTP_Request::~HTTP_Request ()
 {
   ACE_OS::free (this->method_);
   ACE_OS::free (this->uri_);
@@ -274,19 +274,19 @@ HTTP_Request::header_values (int index) const
 }
 
 char *
-HTTP_Request::data (void)
+HTTP_Request::data ()
 {
   return data_;
 }
 
 int
-HTTP_Request::data_length (void)
+HTTP_Request::data_length ()
 {
   return datalen_;
 }
 
 int
-HTTP_Request::content_length (void)
+HTTP_Request::content_length ()
 {
   if (this->content_length_ == -1)
     {
@@ -298,19 +298,19 @@ HTTP_Request::content_length (void)
 }
 
 int
-HTTP_Request::status (void)
+HTTP_Request::status ()
 {
   return this->status_;
 }
 
 const char *
-HTTP_Request::status_string (void)
+HTTP_Request::status_string ()
 {
   return HTTP_Status_Code::instance ()[this->status_];
 }
 
 void
-HTTP_Request::dump (void)
+HTTP_Request::dump ()
 {
   ACE_DEBUG ((LM_DEBUG, "%s command.\n"
               "filename is %s,"
diff --git a/ACE/apps/JAWS/server/HTTP_Request.h b/ACE/apps/JAWS/server/HTTP_Request.h
index e027f4953b0..d3bc789e237 100644
--- a/ACE/apps/JAWS/server/HTTP_Request.h
+++ b/ACE/apps/JAWS/server/HTTP_Request.h
@@ -33,10 +33,10 @@ class HTTP_Request
 {
 public:
   /// Default construction.
-  HTTP_Request (void);
+  HTTP_Request ();
 
   /// Destructor.
-  ~HTTP_Request (void);
+  ~HTTP_Request ();
 
   /// parse an incoming request
   int parse_request (ACE_Message_Block &mb);
@@ -93,22 +93,22 @@ public:
   const char *header_values (int index) const;
 
   /// The buffer into which request data is read
-  char *data (void);
+  char *data ();
 
   /// The length of the request data
-  int data_length (void);
+  int data_length ();
 
   /// The length of incoming content if any
-  int content_length (void);
+  int content_length ();
 
   /// Current status of the incoming request
-  int status (void);
+  int status ();
 
   /// A string describing the state of the incoming request
-  const char *status_string (void);
+  const char *status_string ();
 
   /// Dump the state of the request.
-  void dump (void);
+  void dump ();
 
   enum
   {
diff --git a/ACE/apps/JAWS/server/HTTP_Response.cpp b/ACE/apps/JAWS/server/HTTP_Response.cpp
index a08806f2f04..65924b31cd9 100644
--- a/ACE/apps/JAWS/server/HTTP_Response.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Response.cpp
@@ -27,7 +27,7 @@ HTTP_Response::HTTP_Response (HTTP_Request &request, JAWS_IO &io)
 {
 }
 
-HTTP_Response::~HTTP_Response (void)
+HTTP_Response::~HTTP_Response ()
 {
 #if defined (ACE_JAWS_BASELINE)
   if (this->HTTP_HEADER != EMPTY_HEADER)
@@ -43,7 +43,7 @@ HTTP_Response::process_request(HTTP_Response &response)
 }
 
 void
-HTTP_Response::process_request (void)
+HTTP_Response::process_request ()
 {
   ACE_DEBUG ((LM_DEBUG, "  (%t) processing request: %s\n",
               this->request_.status_string ()));
@@ -141,7 +141,7 @@ HTTP_Response::error_response (int status_code, const char *log_message)
 }
 
 void
-HTTP_Response::normal_response (void)
+HTTP_Response::normal_response ()
 {
   const char *hv = 0;;
 
@@ -221,7 +221,7 @@ HTTP_Response::normal_response (void)
 
 
 void
-HTTP_Response::cgi_response (void)
+HTTP_Response::cgi_response ()
 {
   ACE_Process_Options cgi_options;
 
@@ -313,7 +313,7 @@ HTTP_Response::cgi_response (void)
 }
 
 void
-HTTP_Response::build_headers (void)
+HTTP_Response::build_headers ()
 {
   // At this point, we should really determine the type of request
   // this is, and build the appropriate header.
diff --git a/ACE/apps/JAWS/server/HTTP_Response.h b/ACE/apps/JAWS/server/HTTP_Response.h
index 1fc44e35790..f6e4c3807d2 100644
--- a/ACE/apps/JAWS/server/HTTP_Response.h
+++ b/ACE/apps/JAWS/server/HTTP_Response.h
@@ -31,10 +31,10 @@ public:
   HTTP_Response (JAWS_IO &io,
                  HTTP_Request &request);
   HTTP_Response (HTTP_Request &request, JAWS_IO &io);
-  ~HTTP_Response (void);
+  ~HTTP_Response ();
 
   /// This is called by the handler to initiate a response.
-  void process_request (void);
+  void process_request ();
 
   /// This returns an error response for cases where there is a problem
   /// with the request, logging the log_message.
@@ -43,17 +43,17 @@ public:
 
 private:
   /// Called by process_request when the request is a normal request.
-  void normal_response (void);
+  void normal_response ();
 
   /// Called by process_request when the request is a cgi request.
-  void cgi_response (void);
+  void cgi_response ();
 
 private:
   /// static version of process_request, just in case.
   static void process_request (HTTP_Response &response);
 
   /// creates the appropriate header information for responses.
-  void build_headers (void);
+  void build_headers ();
 
 private:
   /// The IO and Request objects associated with this re
diff --git a/ACE/apps/JAWS/server/HTTP_Server.cpp b/ACE/apps/JAWS/server/HTTP_Server.cpp
index f5964316738..9894cab64bf 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Server.cpp
@@ -174,7 +174,7 @@ HTTP_Server::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-HTTP_Server::fini (void)
+HTTP_Server::fini ()
 {
   this->tm_.close ();
   return 0;
@@ -211,7 +211,7 @@ Synch_Thread_Pool_Task::Synch_Thread_Pool_Task (HTTP_Acceptor &acceptor,
 }
 
 int
-Synch_Thread_Pool_Task::svc (void)
+Synch_Thread_Pool_Task::svc ()
 {
   // Creates a factory of HTTP_Handlers binding to synchronous I/O strategy
   //Synch_HTTP_Handler_Factory factory;
@@ -329,7 +329,7 @@ Thread_Per_Request_Task::open (void *)
 }
 
 int
-Thread_Per_Request_Task::svc (void)
+Thread_Per_Request_Task::svc ()
 {
   ACE_Message_Block *mb = 0;
   ACE_NEW_RETURN (mb, ACE_Message_Block (HTTP_Handler::MAX_REQUEST_SIZE + 1),
@@ -367,7 +367,7 @@ Thread_Per_Request_Task::close (u_long)
 //     ACT.
 
 int
-HTTP_Server::asynch_thread_pool (void)
+HTTP_Server::asynch_thread_pool ()
 {
 // This only works on Win32
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
@@ -409,7 +409,7 @@ Asynch_Thread_Pool_Task::Asynch_Thread_Pool_Task (ACE_Proactor &proactor,
 }
 
 int
-Asynch_Thread_Pool_Task::svc (void)
+Asynch_Thread_Pool_Task::svc ()
 {
   for (;;)
     if (this->proactor_.handle_events () == -1)
diff --git a/ACE/apps/JAWS/server/HTTP_Server.h b/ACE/apps/JAWS/server/HTTP_Server.h
index 9ee7bfb241a..ae212c2bef6 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.h
+++ b/ACE/apps/JAWS/server/HTTP_Server.h
@@ -63,7 +63,7 @@ protected:
   virtual int thread_per_request (HTTP_Handler_Factory &factory);
 
   /// Asynch Thread Pool implementation
-  virtual int asynch_thread_pool (void);
+  virtual int asynch_thread_pool ();
 
   /// Synch Thread Pool implementation
   virtual int synch_thread_pool (HTTP_Handler_Factory &factory);
diff --git a/ACE/apps/JAWS/server/JAWS_Concurrency.cpp b/ACE/apps/JAWS/server/JAWS_Concurrency.cpp
index a248dc61873..eda9d75f8cd 100644
--- a/ACE/apps/JAWS/server/JAWS_Concurrency.cpp
+++ b/ACE/apps/JAWS/server/JAWS_Concurrency.cpp
@@ -1,6 +1,6 @@
 #include "JAWS_Concurrency.h"
 
-JAWS_Concurrency_Base::JAWS_Concurrency_Base (void)
+JAWS_Concurrency_Base::JAWS_Concurrency_Base ()
 {
 }
 
@@ -11,7 +11,7 @@ JAWS_Concurrency_Base::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 }
 
 int
-JAWS_Concurrency_Base::svc (void)
+JAWS_Concurrency_Base::svc ()
 {
   int result = 0;
 
@@ -33,11 +33,11 @@ JAWS_Concurrency_Base::svc (void)
   return 0;
 }
 
-JAWS_Dispatch_Policy::JAWS_Dispatch_Policy (void)
+JAWS_Dispatch_Policy::JAWS_Dispatch_Policy ()
 {
 }
 
-JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy (void)
+JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy ()
 {
 }
 
diff --git a/ACE/apps/JAWS/server/JAWS_Concurrency.h b/ACE/apps/JAWS/server/JAWS_Concurrency.h
index 08c9d88a20f..c895bf1e8be 100644
--- a/ACE/apps/JAWS/server/JAWS_Concurrency.h
+++ b/ACE/apps/JAWS/server/JAWS_Concurrency.h
@@ -22,7 +22,7 @@ class JAWS_Concurrency_Base : public ACE_Task<ACE_SYNCH>
 
 {
 public:
-  JAWS_Concurrency_Base (void);
+  JAWS_Concurrency_Base ();
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
   virtual int svc ();
 };
@@ -36,8 +36,8 @@ class JAWS_Dispatch_Policy
   //     model should be.  (For now, we always return the same model.)
 {
 public:
-  JAWS_Dispatch_Policy (void);
-  virtual ~JAWS_Dispatch_Policy (void);
+  JAWS_Dispatch_Policy ();
+  virtual ~JAWS_Dispatch_Policy ();
   virtual JAWS_Concurrency_Base * update (void *state = 0) = 0;
 };
 
diff --git a/ACE/apps/JAWS/server/JAWS_IO.cpp b/ACE/apps/JAWS/server/JAWS_IO.cpp
index 72acf14c092..a71289ebdde 100644
--- a/ACE/apps/JAWS/server/JAWS_IO.cpp
+++ b/ACE/apps/JAWS/server/JAWS_IO.cpp
@@ -14,12 +14,12 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Basic_Types.h"
 
-JAWS_IO::JAWS_IO (void)
+JAWS_IO::JAWS_IO ()
   : handler_ (0)
 {
 }
 
-JAWS_IO::~JAWS_IO (void)
+JAWS_IO::~JAWS_IO ()
 {
 }
 
@@ -29,16 +29,16 @@ JAWS_IO::handler (JAWS_IO_Handler *handler)
   this->handler_ = handler;
 }
 
-JAWS_IO_Handler::~JAWS_IO_Handler (void)
+JAWS_IO_Handler::~JAWS_IO_Handler ()
 {
 }
 
-JAWS_Synch_IO::JAWS_Synch_IO (void)
+JAWS_Synch_IO::JAWS_Synch_IO ()
   : handle_ (ACE_INVALID_HANDLE)
 {
 }
 
-JAWS_Synch_IO::~JAWS_Synch_IO (void)
+JAWS_Synch_IO::~JAWS_Synch_IO ()
 {
   ACE_OS::closesocket (this->handle_);
 }
@@ -190,11 +190,11 @@ JAWS_Synch_IO::send_message (const char *buffer,
 // This only works on Win32
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
-JAWS_Asynch_IO::JAWS_Asynch_IO (void)
+JAWS_Asynch_IO::JAWS_Asynch_IO ()
 {
 }
 
-JAWS_Asynch_IO::~JAWS_Asynch_IO (void)
+JAWS_Asynch_IO::~JAWS_Asynch_IO ()
 {
   ACE_OS::closesocket (this->handle_);
 }
@@ -418,12 +418,12 @@ JAWS_Asynch_IO::handle_write_stream (const ACE_Asynch_Write_Stream::Result &resu
 
 //-------------------Adding SYNCH IO no Caching
 
-JAWS_Synch_IO_No_Cache::JAWS_Synch_IO_No_Cache (void)
+JAWS_Synch_IO_No_Cache::JAWS_Synch_IO_No_Cache ()
   : handle_ (ACE_INVALID_HANDLE)
 {
 }
 
-JAWS_Synch_IO_No_Cache::~JAWS_Synch_IO_No_Cache (void)
+JAWS_Synch_IO_No_Cache::~JAWS_Synch_IO_No_Cache ()
 {
   ACE_OS::closesocket (this->handle_);
 }
diff --git a/ACE/apps/JAWS/server/JAWS_IO.h b/ACE/apps/JAWS/server/JAWS_IO.h
index 83590805a46..3ac34b88de1 100644
--- a/ACE/apps/JAWS/server/JAWS_IO.h
+++ b/ACE/apps/JAWS/server/JAWS_IO.h
@@ -40,8 +40,8 @@ class JAWS_IO_Handler;
 class JAWS_IO
 {
 public:
-  JAWS_IO (void);
-  virtual ~JAWS_IO (void);
+  JAWS_IO ();
+  virtual ~JAWS_IO ();
   void handler (JAWS_IO_Handler *handler);
 
   virtual void handle (ACE_HANDLE h) = 0;
@@ -85,7 +85,7 @@ class JAWS_IO_Handler
 {
 public:
   /// Destructor.
-  virtual ~JAWS_IO_Handler (void);
+  virtual ~JAWS_IO_Handler ();
 
   /// This method is called by the IO class when new client data shows
   /// up.
@@ -132,9 +132,9 @@ public:
 class JAWS_Synch_IO : public JAWS_IO
 {
 public:
-  JAWS_Synch_IO (void);
+  JAWS_Synch_IO ();
 
-  ~JAWS_Synch_IO (void);
+  ~JAWS_Synch_IO ();
 
   virtual void handle (ACE_HANDLE h);
   virtual ACE_HANDLE handle () const;
@@ -176,9 +176,9 @@ protected:
 class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler
 {
 public:
-  JAWS_Asynch_IO (void);
+  JAWS_Asynch_IO ();
 
-  ~JAWS_Asynch_IO (void);
+  ~JAWS_Asynch_IO ();
 
   virtual void handle (ACE_HANDLE h) { ACE_Handler::handle (h); };
   virtual ACE_HANDLE handle () const { return ACE_Handler::handle (); };
@@ -248,9 +248,9 @@ protected:
 class JAWS_Synch_IO_No_Cache : public JAWS_IO
 {
 public:
-  JAWS_Synch_IO_No_Cache (void);
+  JAWS_Synch_IO_No_Cache ();
 
-  ~JAWS_Synch_IO_No_Cache (void);
+  ~JAWS_Synch_IO_No_Cache ();
 
   virtual void handle (ACE_HANDLE h);
   virtual ACE_HANDLE handle () const;
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline.cpp b/ACE/apps/JAWS/server/JAWS_Pipeline.cpp
index 88b81037d2b..7f947037257 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline.cpp
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline.cpp
@@ -1,6 +1,6 @@
 #include "JAWS_Pipeline.h"
 
-JAWS_Pipeline::JAWS_Pipeline (void)
+JAWS_Pipeline::JAWS_Pipeline ()
 {
 }
 
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline.h b/ACE/apps/JAWS/server/JAWS_Pipeline.h
index a4e64971a02..c8609bcac46 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline.h
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline.h
@@ -22,7 +22,7 @@ class JAWS_Pipeline : public JAWS_Pipeline_Task
   //   Methods that are common to pipeline components
 {
 public:
-  JAWS_Pipeline (void);
+  JAWS_Pipeline ();
   // ACE_Task hooks
 
   virtual int open (void * = 0);
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
index e3a1a38d33b..bd10c10f90a 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
@@ -4,7 +4,7 @@
 #include "JAWS_Pipeline_Handler.h"
 
 template <class TYPE>
-JAWS_Pipeline_Handler<TYPE>::JAWS_Pipeline_Handler (void)
+JAWS_Pipeline_Handler<TYPE>::JAWS_Pipeline_Handler ()
 {
 }
 
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h
index 255c966ea2e..51cde38176e 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h
@@ -10,7 +10,7 @@ class JAWS_Pipeline_Handler : public JAWS_Pipeline_Task
   //   Methods that are common to pipeline components
 {
 public:
-  JAWS_Pipeline_Handler (void);
+  JAWS_Pipeline_Handler ();
   // ACE_Task hooks
 
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
diff --git a/ACE/apps/JAWS/server/Parse_Headers.cpp b/ACE/apps/JAWS/server/Parse_Headers.cpp
index d53a9078db6..6a01e450447 100644
--- a/ACE/apps/JAWS/server/Parse_Headers.cpp
+++ b/ACE/apps/JAWS/server/Parse_Headers.cpp
@@ -12,7 +12,7 @@ Headers::Headers (void) : done_(0)
 {
 }
 
-Headers::~Headers (void)
+Headers::~Headers ()
 {
 }
 
@@ -162,22 +162,22 @@ Headers::end_of_line (char *&line, int &offset) const
 
 // Implementation of class Headers_Map
 
-Headers_Map::Headers_Map (void)
+Headers_Map::Headers_Map ()
   : num_headers_(0)
 {
 }
 
-Headers_Map::~Headers_Map (void)
+Headers_Map::~Headers_Map ()
 {
 }
 
-Headers_Map_Item::Headers_Map_Item (void)
+Headers_Map_Item::Headers_Map_Item ()
   : header_(0),
     value_(0)
 {
 }
 
-Headers_Map_Item::~Headers_Map_Item (void)
+Headers_Map_Item::~Headers_Map_Item ()
 {
   ACE_OS::free ((void *) this->header_);
   ACE_OS::free ((void *) this->value_);
diff --git a/ACE/apps/JAWS/server/Parse_Headers.h b/ACE/apps/JAWS/server/Parse_Headers.h
index 43c33a5a51c..d44ad3b78d4 100644
--- a/ACE/apps/JAWS/server/Parse_Headers.h
+++ b/ACE/apps/JAWS/server/Parse_Headers.h
@@ -24,8 +24,8 @@ friend class Headers_Map;
 friend class Headers;
 
 private:
-  Headers_Map_Item (void);
-  ~Headers_Map_Item (void);
+  Headers_Map_Item ();
+  ~Headers_Map_Item ();
 
   // operator const char * () const;
   Headers_Map_Item &operator= (char *);
@@ -50,8 +50,8 @@ private:
 class Headers_Map
 {
 public:
-  Headers_Map (void);
-  ~Headers_Map (void);
+  Headers_Map ();
+  ~Headers_Map ();
 
   Headers_Map_Item &operator[] (const char *const header);
   const Headers_Map_Item &operator[] (const char *const header) const;
@@ -87,8 +87,8 @@ private:
 class Headers
 {
 public:
-  Headers (void);
-  ~Headers (void);
+  Headers ();
+  ~Headers ();
 
   void recognize (const char *const header);
 
diff --git a/ACE/apps/JAWS/stress_testing/benchd.cpp b/ACE/apps/JAWS/stress_testing/benchd.cpp
index 86da05dad42..d0b8fc575a7 100644
--- a/ACE/apps/JAWS/stress_testing/benchd.cpp
+++ b/ACE/apps/JAWS/stress_testing/benchd.cpp
@@ -35,7 +35,7 @@ public:
                  const char *ip_addr,
                  const char *interface_,
                  ACE_Reactor &reactor);
-  ~Handle_Events (void);
+  ~Handle_Events ();
 
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -101,7 +101,7 @@ Handle_Events::handle_close (ACE_HANDLE h, ACE_Reactor_Mask)
   return 0;
 }
 
-Handle_Events::~Handle_Events (void)
+Handle_Events::~Handle_Events ()
 {
   // ACE_OS::exit on error (bogus)...
 
diff --git a/ACE/apps/JAWS/stress_testing/connection.h b/ACE/apps/JAWS/stress_testing/connection.h
index 324ced456d7..f9aa8286b0a 100644
--- a/ACE/apps/JAWS/stress_testing/connection.h
+++ b/ACE/apps/JAWS/stress_testing/connection.h
@@ -9,8 +9,8 @@ public:
   int write(const void *buffer, size_t maxlen, unsigned int timeout_seconds = 60);
   int write_n(const void *buffer, size_t len, unsigned int timeout_seconds = 60);
   int read_n(void *buffer, size_t maxlen, unsigned int timeout_seconds = 60);
-  int close(void);
-  ~connection(void);
+  int close();
+  ~connection();
 
 private:
   ACE_SOCK_Stream stream_;
diff --git a/ACE/apps/JAWS/stress_testing/http.h b/ACE/apps/JAWS/stress_testing/http.h
index 0ea53bf8c1d..f80da219dc1 100644
--- a/ACE/apps/JAWS/stress_testing/http.h
+++ b/ACE/apps/JAWS/stress_testing/http.h
@@ -8,7 +8,7 @@
 #define ENCODING_TAB "./encoding.tab"
 #define CONTENT_TAB  "./content.tab"
 
-int demime(void);
+int demime();
 int decode(char *encoding);
 int view(char *content);
 
diff --git a/ACE/apps/JAWS/stress_testing/util.h b/ACE/apps/JAWS/stress_testing/util.h
index c9e509baae7..f8de0a4ac16 100644
--- a/ACE/apps/JAWS/stress_testing/util.h
+++ b/ACE/apps/JAWS/stress_testing/util.h
@@ -16,7 +16,7 @@ private:
   char *filename_;
 };
 
-void cleanup(void);
+void cleanup();
 void sigint(int);
 int copier(connection in);
 
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.cpp b/ACE/apps/JAWS2/HTTPU/http_base.cpp
index 847ab4bf357..7af172025ad 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_base.cpp
@@ -161,13 +161,13 @@ HTTP_Base::receive_payload (ACE_Message_Block &mb, long length)
 }
 
 const char *
-HTTP_Base::payload (void)
+HTTP_Base::payload ()
 {
   return this->payload_.rd_ptr ();
 }
 
 unsigned long
-HTTP_Base::payload_size (void)
+HTTP_Base::payload_size ()
 {
   return this->payload_.length ();
 }
@@ -307,7 +307,7 @@ HTTP_Base::extract_line (ACE_Message_Block &mb)
 }
 
 void
-HTTP_Base::dump (void)
+HTTP_Base::dump ()
 {
   ACE_DEBUG ((LM_DEBUG, "%s\n", this->line ()));
   this->info_.dump ();
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.h b/ACE/apps/JAWS2/HTTPU/http_base.h
index eedda2e4af5..98f33aac16c 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.h
+++ b/ACE/apps/JAWS2/HTTPU/http_base.h
@@ -15,8 +15,8 @@
 class HTTPU_Export HTTP_Base : public HTTP_SCode_Base
 {
 public:
-  HTTP_Base (void);
-  virtual ~HTTP_Base (void);
+  HTTP_Base ();
+  virtual ~HTTP_Base ();
 
   virtual int receive (ACE_Message_Block &mb);
   virtual int deliver (ACE_Message_Block &mb);
@@ -24,19 +24,19 @@ public:
   virtual int receive_payload (ACE_Message_Block &mb);
   virtual int receive_payload (ACE_Message_Block &mb, long length);
 
-  const char * payload (void);
-  unsigned long payload_size (void);
+  const char * payload ();
+  unsigned long payload_size ();
 
   int status () const;
   const char *line () const;
-  HTTP_Headers *http_headers (void);
-  JAWS_Headers *headers (void);
+  HTTP_Headers *http_headers ();
+  JAWS_Headers *headers ();
 
   int build_headers (JAWS_Headers *new_headers);
   // takes a set of new headers that will replace existing headers or
   // be added to the header list if there is no corresponding one to replace.
 
-  void dump (void);
+  void dump ();
 
 protected:
   virtual void parse_line (void) = 0;
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.cpp b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
index 6540b3208dc..9ab14ed4d17 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
@@ -83,7 +83,7 @@ HTTP_Hdr_Node HTTP_HCodes::APPLET ("<APPLET", "<APPLET %s>");
 const int &HTTP_HCodes::NUM_HEADER_STRINGS
   = HTTP_Header_Nodes_Singleton::instance ()->num_header_strings_;
 
-HTTP_Header_Nodes::HTTP_Header_Nodes (void)
+HTTP_Header_Nodes::HTTP_Header_Nodes ()
   : num_header_strings_ (0)
 {
 }
@@ -100,12 +100,12 @@ HTTP_Hdr_Node::HTTP_Hdr_Node (const char *token, const char *format)
   header_nodes->num_header_strings_++;
 }
 
-HTTP_HCodes::HTTP_HCodes (void)
+HTTP_HCodes::HTTP_HCodes ()
   : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ())
 {
 }
 
-HTTP_Headers::HTTP_Headers (void)
+HTTP_Headers::HTTP_Headers ()
 {
 }
 
@@ -141,7 +141,7 @@ HTTP_Headers::value_next (int index)
 }
 
 void
-HTTP_Headers::value_reset (void)
+HTTP_Headers::value_reset ()
 {
   this->table ()->iter ().first ();
 }
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h
index 0d4a45133dd..999a9c606a6 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.h
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.h
@@ -51,7 +51,7 @@ class HTTPU_Export HTTP_Header_Nodes : public ACE_RB_Tree<int, const HTTP_Hdr_No
   friend class HTTP_Hdr_Node;
 
 public:
-  HTTP_Header_Nodes (void);
+  HTTP_Header_Nodes ();
 
 private:
   int num_header_strings_;
@@ -63,7 +63,7 @@ typedef ACE_Singleton<HTTP_Header_Nodes, ACE_SYNCH_MUTEX>
 class HTTPU_Export HTTP_HCodes
 {
 public:
-  HTTP_HCodes (void);
+  HTTP_HCodes ();
 
   enum {
     REPLACE_HEADER = 1,  // Remove any existing header that matches first
@@ -148,7 +148,7 @@ public:
   void value_reset ();
 
 public:
-  HTTP_Headers (void);
+  HTTP_Headers ();
 
   const char *header_token (int name) const;
   const char *header_strings (int name) const;
diff --git a/ACE/apps/JAWS2/HTTPU/http_request.cpp b/ACE/apps/JAWS2/HTTPU/http_request.cpp
index a91632d2fcf..f24689aa876 100644
--- a/ACE/apps/JAWS2/HTTPU/http_request.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_request.cpp
@@ -2,7 +2,7 @@
 #include "HTTPU/parse_http_request.h"
 
 void
-HTTP_Request::parse_line (void)
+HTTP_Request::parse_line ()
 {
   this->status_ = STATUS_OK;
 
@@ -24,7 +24,7 @@ HTTP_Request::parse_line (void)
 }
 
 int
-HTTP_Request::espouse_line (void)
+HTTP_Request::espouse_line ()
 {
   int count;
 
@@ -71,7 +71,7 @@ HTTP_Request::espouse_line (void)
 }
 
 void
-HTTP_Request::dump (void)
+HTTP_Request::dump ()
 {
   ACE_DEBUG ((LM_DEBUG, "===== BEGIN entera_HTTP_Request::dump =====\n"));
   HTTP_Base::dump ();
diff --git a/ACE/apps/JAWS2/HTTPU/http_request.h b/ACE/apps/JAWS2/HTTPU/http_request.h
index 82996bf32dc..ba9a705834d 100644
--- a/ACE/apps/JAWS2/HTTPU/http_request.h
+++ b/ACE/apps/JAWS2/HTTPU/http_request.h
@@ -20,23 +20,23 @@
 class HTTPU_Export HTTP_Request : public HTTP_Base
 {
 public:
-  HTTP_Request (void);
-  virtual ~HTTP_Request (void);
+  HTTP_Request ();
+  virtual ~HTTP_Request ();
 
-  Parse_HTTP_Request *request_line (void);
+  Parse_HTTP_Request *request_line ();
   // Returns the parsed request line.
 
   const Parse_HTTP_Request *request_line () const;
   // Returns the parsed request line.
 
-  HTTP_Parse_URL *url (void);
+  HTTP_Parse_URL *url ();
   // Returns the parsed url.
 
-  void dump (void);
+  void dump ();
 
 protected:
-  virtual void parse_line (void);
-  virtual int espouse_line (void);
+  virtual void parse_line ();
+  virtual int espouse_line ();
   virtual void set_status (int);
 
 private:
diff --git a/ACE/apps/JAWS2/HTTPU/http_response.cpp b/ACE/apps/JAWS2/HTTPU/http_response.cpp
index 5599ff28613..3cf450c0b9b 100644
--- a/ACE/apps/JAWS2/HTTPU/http_response.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_response.cpp
@@ -1,7 +1,7 @@
 #include "HTTPU/http_response.h"
 
 void
-HTTP_Response::parse_line (void)
+HTTP_Response::parse_line ()
 {
   this->response_.init (this->line ());
   if (this->response_.error () != Parse_HTTP_Response::HTTPU_OK)
@@ -9,7 +9,7 @@ HTTP_Response::parse_line (void)
 }
 
 int
-HTTP_Response::espouse_line (void)
+HTTP_Response::espouse_line ()
 {
   int count;
   int status;
@@ -35,7 +35,7 @@ HTTP_Response::espouse_line (void)
 }
 
 void
-HTTP_Response::dump (void)
+HTTP_Response::dump ()
 {
   ACE_DEBUG ((LM_DEBUG, "===== BEGIN entera_HTTP_Response::dump =====\n"));
   HTTP_Base::dump ();
diff --git a/ACE/apps/JAWS2/HTTPU/http_response.h b/ACE/apps/JAWS2/HTTPU/http_response.h
index 0d23fbdf7a0..c88ed684603 100644
--- a/ACE/apps/JAWS2/HTTPU/http_response.h
+++ b/ACE/apps/JAWS2/HTTPU/http_response.h
@@ -20,17 +20,17 @@
 class HTTPU_Export HTTP_Response : public HTTP_Base
 {
 public:
-  HTTP_Response (void);
-  ~HTTP_Response (void);
+  HTTP_Response ();
+  ~HTTP_Response ();
 
-  Parse_HTTP_Response *response_line (void);
+  Parse_HTTP_Response *response_line ();
   // Returns the parsed response line.
 
-  void dump (void);
+  void dump ();
 
 protected:
-  virtual void parse_line (void);
-  virtual int espouse_line (void);
+  virtual void parse_line ();
+  virtual int espouse_line ();
 
 private:
   Parse_HTTP_Response response_;
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.cpp b/ACE/apps/JAWS2/HTTPU/http_status.cpp
index b9103f24eb6..35fb95d6d49 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_status.cpp
@@ -53,19 +53,19 @@ HTTP_SCode::operator[] (int i) const
 }
 
 HTTP_SCode *
-HTTP_SCode::instance (void)
+HTTP_SCode::instance ()
 {
   return HTTP_SCode_Singleton::instance ();
 }
 
 void
-HTTP_SCode::dump (void)
+HTTP_SCode::dump ()
 {
   for (int i = 0; i < SC_TABLE_SIZE; i++)
     ACE_DEBUG ((LM_DEBUG, "%s\n", this->table_[i]));
 }
 
-HTTP_SCode::HTTP_SCode (void)
+HTTP_SCode::HTTP_SCode ()
 {
   int i;
   for (i = 0; i < SC_TABLE_SIZE; i++)
@@ -75,7 +75,7 @@ HTTP_SCode::HTTP_SCode (void)
     }
 }
 
-HTTP_SCode::~HTTP_SCode (void)
+HTTP_SCode::~HTTP_SCode ()
 {
 }
 
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.h b/ACE/apps/JAWS2/HTTPU/http_status.h
index 209e5e6092c..bba7be512a4 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.h
+++ b/ACE/apps/JAWS2/HTTPU/http_status.h
@@ -70,14 +70,14 @@ class HTTPU_Export HTTP_SCode : public HTTP_SCode_Base
   friend class ACE_Singleton<HTTP_SCode, ACE_SYNCH_MUTEX>;
 
 protected:
-  HTTP_SCode (void);
-  ~HTTP_SCode (void);
+  HTTP_SCode ();
+  ~HTTP_SCode ();
 
 public:
   const char * operator[] (int) const;
   // Return the reason string corresponding to a status code number.
 
-  static HTTP_SCode *instance (void);
+  static HTTP_SCode *instance ();
   // Return reference to the singleton.
 
   enum
@@ -85,7 +85,7 @@ public:
     SC_TABLE_SIZE = MAX_STATUS_CODE - MIN_STATUS_CODE + 1
   };
 
-  void dump (void);
+  void dump ();
 
 private:
   static const char *table_[SC_TABLE_SIZE];
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp b/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp
index e5407b4c566..cd1eb9ec8f4 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp
@@ -13,7 +13,7 @@ Parse_HTTP_Request::Parse_HTTP_Request (const char *request)
     this->init (request);
 }
 
-Parse_HTTP_Request::~Parse_HTTP_Request (void)
+Parse_HTTP_Request::~Parse_HTTP_Request ()
 {
   if (this->request_)
     ACE_OS::free (this->request_);
@@ -23,7 +23,7 @@ Parse_HTTP_Request::~Parse_HTTP_Request (void)
 }
 
 void
-Parse_HTTP_Request::dump (void)
+Parse_HTTP_Request::dump ()
 {
   ACE_DEBUG ((LM_DEBUG, "%s %s %s\n",
               this->method_str (), this->url (), this->version ()));
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.h b/ACE/apps/JAWS2/HTTPU/parse_http_request.h
index c1af6a84f30..a56b0f64e94 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_request.h
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.h
@@ -13,7 +13,7 @@ class HTTPU_Export Parse_HTTP_Request : public HTTP_HCodes
 {
 public:
   Parse_HTTP_Request (const char *request = 0);
-  ~Parse_HTTP_Request (void);
+  ~Parse_HTTP_Request ();
 
   void init (const char *request);
 
@@ -32,7 +32,7 @@ public:
   int error () const;
   // 0 -> ok
 
-  void dump (void);
+  void dump ();
 
 private:
   HTTP_Hdr_Node *method_;
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp b/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp
index c0959a9daae..9950503f659 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp
@@ -15,7 +15,7 @@ Parse_HTTP_Response::Parse_HTTP_Response (const char *response)
     this->init (response);
 }
 
-Parse_HTTP_Response::~Parse_HTTP_Response (void)
+Parse_HTTP_Response::~Parse_HTTP_Response ()
 {
   if (this->response_)
     ACE_OS::free (this->response_);
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.h b/ACE/apps/JAWS2/HTTPU/parse_http_response.h
index ccbd0a0b5c0..5a85453dc52 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_response.h
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.h
@@ -13,7 +13,7 @@ class HTTPU_Export Parse_HTTP_Response
 {
 public:
   Parse_HTTP_Response (const char *response = 0);
-  ~Parse_HTTP_Response (void);
+  ~Parse_HTTP_Response ();
 
   void init (const char *response);
 
diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.cpp b/ACE/apps/JAWS2/HTTPU/parse_url.cpp
index fa712e6a583..602ded44f82 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_url.cpp
+++ b/ACE/apps/JAWS2/HTTPU/parse_url.cpp
@@ -17,7 +17,7 @@ HTTP_Parse_URL::HTTP_Parse_URL (const char *url)
   this->init (url);
 }
 
-HTTP_Parse_URL::~HTTP_Parse_URL (void)
+HTTP_Parse_URL::~HTTP_Parse_URL ()
 {
   if (this->url_)
     ACE_OS::free (this->url_);
@@ -63,7 +63,7 @@ HTTP_Parse_URL::init( const char *url )
 
 
 void
-HTTP_Parse_URL::parse_url (void)
+HTTP_Parse_URL::parse_url ()
 {
   char *p = this->url_;
 
@@ -242,7 +242,7 @@ HTTP_Parse_URL::parse_host (char *&p)
 }
 
 void
-HTTP_Parse_URL::set_port_from_scheme (void)
+HTTP_Parse_URL::set_port_from_scheme ()
 {
   if (ACE_OS::strcmp (this->scheme_, "ftp") == 0)
     {
diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.h b/ACE/apps/JAWS2/HTTPU/parse_url.h
index 05eed0ae8b5..f0584417389 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_url.h
+++ b/ACE/apps/JAWS2/HTTPU/parse_url.h
@@ -16,7 +16,7 @@ class HTTPU_Export HTTP_Parse_URL
 
 public:
   HTTP_Parse_URL (const char *url = 0);
-  ~HTTP_Parse_URL (void);
+  ~HTTP_Parse_URL ();
 
   void init (const char *url);
 
@@ -36,13 +36,13 @@ public:
   int is_cgi () const;
 
 private:
-  void parse_url (void);
+  void parse_url ();
   void parse_scheme (char *&p);
   void parse_host (char *&p);
   void parse_url_path (char *&p);
   void is_cgi (const char *path);
 
-  void set_port_from_scheme (void);
+  void set_port_from_scheme ();
 
 private:
   char *url_;
diff --git a/ACE/apps/JAWS2/HTTP_10.h b/ACE/apps/JAWS2/HTTP_10.h
index 38cbd6b9778..bd2b61ea65e 100644
--- a/ACE/apps/JAWS2/HTTP_10.h
+++ b/ACE/apps/JAWS2/HTTP_10.h
@@ -18,8 +18,8 @@ class JAWS_HTTP_10_Request;
 class JAWS_HTTP_10_Read_Task : public JAWS_Pipeline_Handler
 {
 public:
-  JAWS_HTTP_10_Read_Task (void);
-  virtual ~JAWS_HTTP_10_Read_Task (void);
+  JAWS_HTTP_10_Read_Task ();
+  virtual ~JAWS_HTTP_10_Read_Task ();
 
   virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv);
 
@@ -31,8 +31,8 @@ private:
 class JAWS_HTTP_10_Parse_Task : public JAWS_Pipeline_Handler
 {
 public:
-  JAWS_HTTP_10_Parse_Task (void);
-  virtual ~JAWS_HTTP_10_Parse_Task (void);
+  JAWS_HTTP_10_Parse_Task ();
+  virtual ~JAWS_HTTP_10_Parse_Task ();
 
   virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv);
 };
@@ -42,8 +42,8 @@ public:
 class JAWS_HTTP_10_Write_Task : public JAWS_Pipeline_Handler
 {
 public:
-  JAWS_HTTP_10_Write_Task (void);
-  virtual ~JAWS_HTTP_10_Write_Task (void);
+  JAWS_HTTP_10_Write_Task ();
+  virtual ~JAWS_HTTP_10_Write_Task ();
 
   virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv);
 
diff --git a/ACE/apps/JAWS2/HTTP_10_Parse.cpp b/ACE/apps/JAWS2/HTTP_10_Parse.cpp
index 54f92bdde75..fe04efc0c51 100644
--- a/ACE/apps/JAWS2/HTTP_10_Parse.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Parse.cpp
@@ -10,11 +10,11 @@
 
 // --------------- PARSE TASK ----------------------
 
-JAWS_HTTP_10_Parse_Task::JAWS_HTTP_10_Parse_Task (void)
+JAWS_HTTP_10_Parse_Task::JAWS_HTTP_10_Parse_Task ()
 {
 }
 
-JAWS_HTTP_10_Parse_Task::~JAWS_HTTP_10_Parse_Task (void)
+JAWS_HTTP_10_Parse_Task::~JAWS_HTTP_10_Parse_Task ()
 {
 }
 
diff --git a/ACE/apps/JAWS2/HTTP_10_Read.cpp b/ACE/apps/JAWS2/HTTP_10_Read.cpp
index 06b73ac74fc..26a8dce820d 100644
--- a/ACE/apps/JAWS2/HTTP_10_Read.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Read.cpp
@@ -8,11 +8,11 @@
 
 // --------------- READ TASK ----------------------
 
-JAWS_HTTP_10_Read_Task::JAWS_HTTP_10_Read_Task (void)
+JAWS_HTTP_10_Read_Task::JAWS_HTTP_10_Read_Task ()
 {
 }
 
-JAWS_HTTP_10_Read_Task::~JAWS_HTTP_10_Read_Task (void)
+JAWS_HTTP_10_Read_Task::~JAWS_HTTP_10_Read_Task ()
 {
 }
 
diff --git a/ACE/apps/JAWS2/HTTP_10_Request.cpp b/ACE/apps/JAWS2/HTTP_10_Request.cpp
index 3f82897994b..66a40a8b0f0 100644
--- a/ACE/apps/JAWS2/HTTP_10_Request.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Request.cpp
@@ -5,12 +5,12 @@
 
 static int dummy;
 
-JAWS_HTTP_10_Request::JAWS_HTTP_10_Request (void)
+JAWS_HTTP_10_Request::JAWS_HTTP_10_Request ()
   : path_ (0)
 {
 }
 
-JAWS_HTTP_10_Request::~JAWS_HTTP_10_Request (void)
+JAWS_HTTP_10_Request::~JAWS_HTTP_10_Request ()
 {
   ACE_OS::free (this->path_);
   this->path_ = 0;
diff --git a/ACE/apps/JAWS2/HTTP_10_Request.h b/ACE/apps/JAWS2/HTTP_10_Request.h
index 780300847c1..f5757aa8cc5 100644
--- a/ACE/apps/JAWS2/HTTP_10_Request.h
+++ b/ACE/apps/JAWS2/HTTP_10_Request.h
@@ -8,8 +8,8 @@
 class JAWS_HTTP_10_Request : public HTTP_Request, public HTTP_HCodes
 {
 public:
-  JAWS_HTTP_10_Request (void);
-  ~JAWS_HTTP_10_Request (void);
+  JAWS_HTTP_10_Request ();
+  ~JAWS_HTTP_10_Request ();
 
   int type () const;
   const char * method () const;
diff --git a/ACE/apps/JAWS2/HTTP_10_Write.cpp b/ACE/apps/JAWS2/HTTP_10_Write.cpp
index d15b740d2ac..a0ff4f9631c 100644
--- a/ACE/apps/JAWS2/HTTP_10_Write.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Write.cpp
@@ -10,11 +10,11 @@
 
 // --------------- WRITE TASK ----------------------
 
-JAWS_HTTP_10_Write_Task::JAWS_HTTP_10_Write_Task (void)
+JAWS_HTTP_10_Write_Task::JAWS_HTTP_10_Write_Task ()
 {
 }
 
-JAWS_HTTP_10_Write_Task::~JAWS_HTTP_10_Write_Task (void)
+JAWS_HTTP_10_Write_Task::~JAWS_HTTP_10_Write_Task ()
 {
 }
 
diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp b/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp
index 193c3ab5059..9db941b9496 100644
--- a/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp
+++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp
@@ -35,7 +35,7 @@ JAWS_Assoc_Array<KEY,DATA>::JAWS_Assoc_Array (int maxsize)
 }
 
 template <class KEY, class DATA>
-JAWS_Assoc_Array<KEY,DATA>::~JAWS_Assoc_Array (void)
+JAWS_Assoc_Array<KEY,DATA>::~JAWS_Assoc_Array ()
 {
   this->clear ();
 
@@ -120,7 +120,7 @@ JAWS_Assoc_Array<KEY,DATA>::remove (const KEY &k)
 }
 
 template <class KEY, class DATA> void
-JAWS_Assoc_Array<KEY,DATA>::clear (void)
+JAWS_Assoc_Array<KEY,DATA>::clear ()
 {
   for (int i = 0; i < this->maxsize_; i++)
     {
@@ -164,24 +164,24 @@ JAWS_Assoc_Array_Iterator (const JAWS_Assoc_Array<KEY, DATA> &aa)
 }
 
 template <class KEY, class DATA>
-JAWS_Assoc_Array_Iterator<KEY,DATA>::~JAWS_Assoc_Array_Iterator (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::~JAWS_Assoc_Array_Iterator ()
 {
 }
 
 template <class KEY, class DATA> KEY *
-JAWS_Assoc_Array_Iterator<KEY,DATA>::key (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::key ()
 {
   return this->aa_.k_array_[this->i_];
 }
 
 template <class KEY, class DATA> DATA *
-JAWS_Assoc_Array_Iterator<KEY,DATA>::data (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::data ()
 {
   return this->aa_.d_array_[this->i_];
 }
 
 template <class KEY, class DATA> int
-JAWS_Assoc_Array_Iterator<KEY,DATA>::first (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::first ()
 {
   this->i_ = 0;
   for (this->j_ = 0; this->j_ < this->aa_.maxsize_; this->j_++)
@@ -193,7 +193,7 @@ JAWS_Assoc_Array_Iterator<KEY,DATA>::first (void)
 }
 
 template <class KEY, class DATA> int
-JAWS_Assoc_Array_Iterator<KEY,DATA>::last (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::last ()
 {
   this->j_ = this->aa_.maxsize_;
   for (this->i_ = this->aa_.maxsize_; this->i_ > 0; this->i_--)
@@ -206,7 +206,7 @@ JAWS_Assoc_Array_Iterator<KEY,DATA>::last (void)
 }
 
 template <class KEY, class DATA> int
-JAWS_Assoc_Array_Iterator<KEY,DATA>::next (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::next ()
 {
   if (this->j_ < this->aa_.maxsize_)
     {
@@ -222,7 +222,7 @@ JAWS_Assoc_Array_Iterator<KEY,DATA>::next (void)
 }
 
 template <class KEY, class DATA> int
-JAWS_Assoc_Array_Iterator<KEY,DATA>::previous (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::previous ()
 {
   if (this->i_ > 0)
     {
@@ -242,7 +242,7 @@ JAWS_Assoc_Array_Iterator<KEY,DATA>::previous (void)
 }
 
 template <class KEY, class DATA> int
-JAWS_Assoc_Array_Iterator<KEY,DATA>::is_done (void)
+JAWS_Assoc_Array_Iterator<KEY,DATA>::is_done ()
 {
   return (this->j_ == this->aa_.maxsize_);
 }
diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.h b/ACE/apps/JAWS2/JAWS/Assoc_Array.h
index 7c6b22a94e7..c08d4a6e9d1 100644
--- a/ACE/apps/JAWS2/JAWS/Assoc_Array.h
+++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.h
@@ -11,7 +11,7 @@ friend class JAWS_Assoc_Array_Iterator<KEY, DATA>;
 
 public:
   JAWS_Assoc_Array (int maxsize = 1024);
-  ~JAWS_Assoc_Array (void);
+  ~JAWS_Assoc_Array ();
 
   int index (const KEY &k);
   // Returns the index into the array associated with key k
@@ -39,7 +39,7 @@ public:
   // and successfully destroyed it, 0 if it did not find the
   // item, or -1 if an error occurred.
 
-  void clear (void);
+  void clear ();
   // Destroys all keys and associated data.
 
 protected:
@@ -60,16 +60,16 @@ class JAWS_Assoc_Array_Iterator
 {
 public:
   JAWS_Assoc_Array_Iterator (const JAWS_Assoc_Array<KEY, DATA> &aa);
-  ~JAWS_Assoc_Array_Iterator (void);
+  ~JAWS_Assoc_Array_Iterator ();
 
-  KEY * key (void);
-  DATA * data (void);
+  KEY * key ();
+  DATA * data ();
 
-  int first (void);
-  int last (void);
-  int next (void);
-  int previous (void);
-  int is_done (void);
+  int first ();
+  int last ();
+  int next ();
+  int previous ();
+  int is_done ();
 
 private:
   // declare private and do not define: explicitly
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp
index f7634c1e6bd..662f15cbd3f 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp
@@ -75,7 +75,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::JAWS_Cache_Hash (ACE_Allocator *alloc
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC>
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void)
+JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash ()
 {
   if (this->hashtable_)
     {
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h
index 538896fd8d5..d04cf681754 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h
@@ -20,7 +20,7 @@ public:
   // number important?  I am trying to maximize scattering when using
   // mod on the hashed value.  This might be bogus though.
 
-  virtual ~JAWS_Cache_Hash (void);
+  virtual ~JAWS_Cache_Hash ();
 
   int find (const EXT_ID &ext_id) const;
   int find (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id) const;
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp
index 1aa8ce79a42..ad44fcc0d33 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp
@@ -31,7 +31,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_Heap (ACE_Allocator *alloc,
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap (void)
+JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap ()
 {
   if (this->heap_ != 0)
     {
@@ -149,7 +149,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
+JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i ()
 {
   /* ASSERT: this->size_ > 0 */
   this->size_--;
@@ -279,7 +279,7 @@ JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id)
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> unsigned int
-JAWS_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void)
+JAWS_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::priority ()
 {
   return this->int_id_->priority ();
 }
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h
index 12308b42c23..b151cf27665 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h
@@ -26,7 +26,7 @@ public:
   // maxsize is the total number of objects the in memory cache is
   // willing to manage
 
-  ~JAWS_Cache_Heap (void);
+  ~JAWS_Cache_Heap ();
 
   int is_empty () const;
   int is_full () const;
@@ -57,7 +57,7 @@ protected:
   void remove_i (size_t pos);
   // remove the element residing at pos, but do not delete it.
 
-  void remove_i (void);
+  void remove_i ();
   // remove the element residing at the top of heap, but do not delete it.
 
 private:
@@ -77,7 +77,7 @@ class JAWS_Cache_Heap_Item
 
 public:
   JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id);
-  unsigned int priority (void);
+  unsigned int priority ();
 
 private:
   EXT_ID ext_id_;
diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp
index 492152f6936..cfa66fa8ed5 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp
@@ -18,7 +18,7 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_List (ACE_Allocator *alloc,
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_List (void)
+JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_List ()
 {
   while (this->head_ != 0)
     this->remove (this->head_);
@@ -94,7 +94,7 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
+JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i ()
 {
   /* ASSERT: this->size_ > 0 */
   this->size_--;
@@ -206,7 +206,7 @@ JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id)
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> unsigned int
-JAWS_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void)
+JAWS_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::priority ()
 {
   return this->int_id_->priority ();
 }
diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h
index 4b147775b83..69ac360becb 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h
@@ -29,7 +29,7 @@ public:
   // maxsize is the total number of objects the in memory cache is
   // willing to manage
 
-  ~JAWS_Cache_List (void);
+  ~JAWS_Cache_List ();
 
   int is_empty () const;
   int is_full () const;
@@ -60,7 +60,7 @@ protected:
   void remove_i (Cache_List_Item *item);
   // remove the element residing at pos, but do not delete it.
 
-  void remove_i (void);
+  void remove_i ();
   // remove the element residing at the top of heap, but do not delete it.
 
 private:
@@ -85,7 +85,7 @@ public:
   typedef JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN> Cache_List;
 
   JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id);
-  unsigned int priority (void);
+  unsigned int priority ();
 
 private:
   EXT_ID ext_id_;
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
index 6c27bc4cc6c..fd17e3dd77c 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
@@ -27,7 +27,7 @@ JAWS_String_Equal_Functor::operator int () const
   return this->i_ == 0;
 }
 
-JAWS_Strdup_String::JAWS_Strdup_String (void)
+JAWS_Strdup_String::JAWS_Strdup_String ()
   : c_ (0),
     s_ (0)
 {
@@ -48,7 +48,7 @@ JAWS_Strdup_String::JAWS_Strdup_String (const JAWS_Strdup_String &s)
   ++*(this->c_);
 }
 
-JAWS_Strdup_String::~JAWS_Strdup_String (void)
+JAWS_Strdup_String::~JAWS_Strdup_String ()
 {
   if (this->c_ && --*(this->c_) == 0)
     {
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.h b/ACE/apps/JAWS2/JAWS/Cache_Manager.h
index a8bf25ab346..a545e989acb 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.h
@@ -29,10 +29,10 @@ private:
 class JAWS_Strdup_String
 {
 public:
-  JAWS_Strdup_String (void);
+  JAWS_Strdup_String ();
   JAWS_Strdup_String (const char *s);
   JAWS_Strdup_String (const JAWS_Strdup_String &s);
-  ~JAWS_Strdup_String (void);
+  ~JAWS_Strdup_String ();
 
   operator const char * () const;
   void operator = (const char *s);
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp
index 9aebb67a912..2165e3d43ed 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp
@@ -160,13 +160,13 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Manager (void)
+JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Manager ()
 {
   this->close ();
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void)
+JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close ()
 {
   while (this->waterlevel_ > 0)
     this->FLUSH_i ();
@@ -296,7 +296,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
 JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::FLUSH_i (void)
+::FLUSH_i ()
 {
   KEY temp_key;
   JAWS_Cache_Object *temp_object;
@@ -469,7 +469,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
 JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::FLUSH (void)
+::FLUSH ()
 {
   ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, g, this->lock_, -1);
 
@@ -507,7 +507,7 @@ JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>
 }
 
 template <class KEY, class DATA, class CACHE_MANAGER>
-JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~JAWS_Cache_Proxy (void)
+JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~JAWS_Cache_Proxy ()
 {
   DATA *data = this->data ();
   this->manager_->DROP (this->object_);
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h
index 2d2c87385ef..5e9e708a53b 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h
@@ -71,9 +71,9 @@ public:
                                       // counts
             );
 
-  ~JAWS_Cache_Manager (void);
+  ~JAWS_Cache_Manager ();
 
-  int close (void);
+  int close ();
 
   // Search Methods
 
@@ -96,7 +96,7 @@ public:
   // Decrement reference count on cached object, perhaps delete.
   // Returns 0 if only decremented, 1 if deleted, -1 if error.
 
-  int FLUSH (void);
+  int FLUSH ();
   // Removes lowest priority object from cache.
 
 protected:
@@ -109,7 +109,7 @@ protected:
   // Inserts or replaces object associated with key into cache.
   // Return 0 on success, -1 on failure.
 
-  int FLUSH_i (void);
+  int FLUSH_i ();
   // Removes lowest priority object from cache.
 
   int FLUSH_i (const KEY &key);
@@ -153,7 +153,7 @@ public:
   JAWS_Cache_Proxy (const KEY &, DATA *, size_t, Cache_Manager * = 0);
   // Corresponds to a U/PUT
 
-  virtual ~JAWS_Cache_Proxy (void);
+  virtual ~JAWS_Cache_Proxy ();
 
   DATA *data () const;
   operator DATA * () const;
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp
index c01050ff69e..b850dbf7230 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp
@@ -50,14 +50,14 @@ JAWS_Cache_Object::count () const
 }
 
 int
-JAWS_Cache_Object::acquire (void)
+JAWS_Cache_Object::acquire ()
 {
   this->new_last_access_ = ACE_OS::time ((time_t *)0);
   return this->acquire_i ();
 }
 
 int
-JAWS_Cache_Object::release (void)
+JAWS_Cache_Object::release ()
 {
   this->last_access_ = this->new_last_access_;
   return this->release_i ();
@@ -101,12 +101,12 @@ JAWS_Referenced_Cache_Object (const void *data, size_t size)
 {
 }
 
-JAWS_Referenced_Cache_Object::~JAWS_Referenced_Cache_Object (void)
+JAWS_Referenced_Cache_Object::~JAWS_Referenced_Cache_Object ()
 {
 }
 
 ACE_Lock &
-JAWS_Referenced_Cache_Object::lock (void)
+JAWS_Referenced_Cache_Object::lock ()
 {
   return this->lock_adapter_;
 }
@@ -121,13 +121,13 @@ JAWS_Referenced_Cache_Object::count_i () const
 }
 
 int
-JAWS_Referenced_Cache_Object::acquire_i (void)
+JAWS_Referenced_Cache_Object::acquire_i ()
 {
   return this->count_.acquire_read ();
 }
 
 int
-JAWS_Referenced_Cache_Object::release_i (void)
+JAWS_Referenced_Cache_Object::release_i ()
 {
   return this->count_.release ();
 }
@@ -155,12 +155,12 @@ JAWS_Counted_Cache_Object (const void *data, size_t size)
 {
 }
 
-JAWS_Counted_Cache_Object::~JAWS_Counted_Cache_Object (void)
+JAWS_Counted_Cache_Object::~JAWS_Counted_Cache_Object ()
 {
 }
 
 ACE_Lock &
-JAWS_Counted_Cache_Object::lock (void)
+JAWS_Counted_Cache_Object::lock ()
 {
   return this->lock_adapter_;
 }
@@ -174,7 +174,7 @@ JAWS_Counted_Cache_Object::count_i () const
 }
 
 int
-JAWS_Counted_Cache_Object::acquire_i (void)
+JAWS_Counted_Cache_Object::acquire_i ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0);
 
@@ -183,7 +183,7 @@ JAWS_Counted_Cache_Object::acquire_i (void)
 }
 
 int
-JAWS_Counted_Cache_Object::release_i (void)
+JAWS_Counted_Cache_Object::release_i ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0);
 
@@ -205,7 +205,7 @@ JAWS_Cache_Object_Factory::JAWS_Cache_Object_Factory (ACE_Allocator *alloc)
     this->allocator_ = ACE_Allocator::instance ();
 }
 
-JAWS_Cache_Object_Factory::~JAWS_Cache_Object_Factory (void)
+JAWS_Cache_Object_Factory::~JAWS_Cache_Object_Factory ()
 {
 }
 
@@ -227,7 +227,7 @@ JAWS_Referenced_Cache_Object_Factory
 }
 
 JAWS_Referenced_Cache_Object_Factory
-::~JAWS_Referenced_Cache_Object_Factory (void)
+::~JAWS_Referenced_Cache_Object_Factory ()
 {
 }
 
@@ -259,7 +259,7 @@ JAWS_Counted_Cache_Object_Factory
 }
 
 JAWS_Counted_Cache_Object_Factory
-::~JAWS_Counted_Cache_Object_Factory (void)
+::~JAWS_Counted_Cache_Object_Factory ()
 {
 }
 
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.h b/ACE/apps/JAWS2/JAWS/Cache_Object.h
index a5506ea641a..a2607f3fc8c 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Object.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Object.h
@@ -21,7 +21,7 @@ class JAWS_Cache_Object
 {
 public:
   JAWS_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Cache_Object (void);
+  virtual ~JAWS_Cache_Object ();
 
   void *internal () const;
   void internal (void *);
@@ -30,8 +30,8 @@ public:
   size_t size () const;
   unsigned int count () const;
 
-  int acquire (void);
-  int release (void);
+  int acquire ();
+  int release ();
 
   time_t last_access () const;
   time_t first_access () const;
@@ -67,14 +67,14 @@ class JAWS_Referenced_Cache_Object : public JAWS_Cache_Object
 {
 public:
   JAWS_Referenced_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Referenced_Cache_Object (void);
+  virtual ~JAWS_Referenced_Cache_Object ();
 
-  virtual ACE_Lock & lock (void);
+  virtual ACE_Lock & lock ();
 
 protected:
   virtual unsigned int count_i () const;
-  virtual int acquire_i (void);
-  virtual int release_i (void);
+  virtual int acquire_i ();
+  virtual int release_i ();
   virtual unsigned int priority_i () const;
 
 private:
@@ -86,14 +86,14 @@ class JAWS_Counted_Cache_Object : public JAWS_Cache_Object
 {
 public:
   JAWS_Counted_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Counted_Cache_Object (void);
+  virtual ~JAWS_Counted_Cache_Object ();
 
-  virtual ACE_Lock & lock (void);
+  virtual ACE_Lock & lock ();
 
 protected:
   virtual unsigned int count_i () const;
-  virtual int acquire_i (void);
-  virtual int release_i (void);
+  virtual int acquire_i ();
+  virtual int release_i ();
   virtual unsigned int priority_i () const;
 
 private:
@@ -107,7 +107,7 @@ class JAWS_Cache_Object_Factory
 {
 public:
   JAWS_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Cache_Object_Factory (void);
+  virtual ~JAWS_Cache_Object_Factory ();
 
   int open (ACE_Allocator *alloc = 0);
 
@@ -122,7 +122,7 @@ class JAWS_Referenced_Cache_Object_Factory : public JAWS_Cache_Object_Factory
 {
 public:
   JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Referenced_Cache_Object_Factory (void);
+  virtual ~JAWS_Referenced_Cache_Object_Factory ();
 
   virtual JAWS_Cache_Object * create (const void *, size_t);
   virtual void destroy (JAWS_Cache_Object *);
@@ -132,7 +132,7 @@ class JAWS_Counted_Cache_Object_Factory : public JAWS_Cache_Object_Factory
 {
 public:
   JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Counted_Cache_Object_Factory (void);
+  virtual ~JAWS_Counted_Cache_Object_Factory ();
 
   virtual JAWS_Cache_Object * create (const void *, size_t);
   virtual void destroy (JAWS_Cache_Object *);
diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.cpp b/ACE/apps/JAWS2/JAWS/Concurrency.cpp
index bb47fcc24c5..bfebb34802a 100644
--- a/ACE/apps/JAWS2/JAWS/Concurrency.cpp
+++ b/ACE/apps/JAWS2/JAWS/Concurrency.cpp
@@ -8,7 +8,7 @@
 #include "JAWS/Reaper.h"
 
 
-JAWS_Concurrency_Base::JAWS_Concurrency_Base (void)
+JAWS_Concurrency_Base::JAWS_Concurrency_Base ()
   : ACE_Task<ACE_SYNCH> (new ACE_Thread_Manager),
     mb_acquired_ (0),
     mb_ (0),
@@ -16,14 +16,14 @@ JAWS_Concurrency_Base::JAWS_Concurrency_Base (void)
 {
 }
 
-JAWS_Concurrency_Base::~JAWS_Concurrency_Base (void)
+JAWS_Concurrency_Base::~JAWS_Concurrency_Base ()
 {
   delete this->thr_mgr_;
   delete this->reaper_;
 }
 
 ACE_Message_Block *
-JAWS_Concurrency_Base::singleton_mb (void)
+JAWS_Concurrency_Base::singleton_mb ()
 {
   if (this->mb_acquired_ == 0)
     {
@@ -54,7 +54,7 @@ JAWS_Concurrency_Base::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 }
 
 int
-JAWS_Concurrency_Base::svc (void)
+JAWS_Concurrency_Base::svc ()
 {
   JAWS_TRACE ("JAWS_Concurrency_Base::svc");
 
@@ -201,12 +201,12 @@ JAWS_Concurrency_Base::svc_hook (JAWS_Data_Block *ts_db)
 }
 
 int
-JAWS_Concurrency_Base::activate_hook (void)
+JAWS_Concurrency_Base::activate_hook ()
 {
   return 0;
 }
 
-JAWS_Dispatcher::JAWS_Dispatcher (void)
+JAWS_Dispatcher::JAWS_Dispatcher ()
   : policy_(0)
 {
 }
@@ -218,7 +218,7 @@ JAWS_Dispatcher::dispatch (ACE_Message_Block *mb)
 }
 
 JAWS_Dispatch_Policy *
-JAWS_Dispatcher::policy (void)
+JAWS_Dispatcher::policy ()
 {
   return this->policy_;
 }
@@ -295,7 +295,7 @@ JAWS_Thread_Per_Task::svc_loop (JAWS_Data_Block *db)
 }
 
 int
-JAWS_Thread_Per_Task::activate_hook (void)
+JAWS_Thread_Per_Task::activate_hook ()
 {
   const int force_active = 1;
   const int nthreads = 1;
diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.h b/ACE/apps/JAWS2/JAWS/Concurrency.h
index 00d290d0e16..18c4571d2ea 100644
--- a/ACE/apps/JAWS2/JAWS/Concurrency.h
+++ b/ACE/apps/JAWS2/JAWS/Concurrency.h
@@ -29,8 +29,8 @@ class JAWS_Export JAWS_Concurrency_Base : public ACE_Task<ACE_SYNCH>
 
 {
 public:
-  JAWS_Concurrency_Base (void);
-  ~JAWS_Concurrency_Base (void);
+  JAWS_Concurrency_Base ();
+  ~JAWS_Concurrency_Base ();
 
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
   virtual int svc ();
@@ -42,10 +42,10 @@ public:
   virtual int svc_hook (JAWS_Data_Block *db);
   // does the work of following the pipeline tasks
 
-  virtual int activate_hook (void);
+  virtual int activate_hook ();
   // callback for IO_Handler when accept completes
 
-  virtual ACE_Message_Block *singleton_mb (void);
+  virtual ACE_Message_Block *singleton_mb ();
 
 protected:
   int mb_acquired_;
@@ -64,10 +64,10 @@ class JAWS_Export JAWS_Dispatcher
   //     IO can find a thread to take care of it.
 {
 public:
-  JAWS_Dispatcher (void);
+  JAWS_Dispatcher ();
 
   int dispatch (ACE_Message_Block *mb);
-  JAWS_Dispatch_Policy *policy (void);
+  JAWS_Dispatch_Policy *policy ();
   JAWS_Dispatch_Policy *policy (JAWS_Dispatch_Policy *p);
 
 private:
@@ -110,7 +110,7 @@ public:
   virtual int svc_loop (JAWS_Data_Block *db);
   // a single iteration
 
-  virtual int activate_hook (void);
+  virtual int activate_hook ();
   // callback for IO_Handler when accept completes
 
 private:
diff --git a/ACE/apps/JAWS2/JAWS/Data_Block.cpp b/ACE/apps/JAWS2/JAWS/Data_Block.cpp
index f1b7c4d9aec..a0142a386fc 100644
--- a/ACE/apps/JAWS2/JAWS/Data_Block.cpp
+++ b/ACE/apps/JAWS2/JAWS/Data_Block.cpp
@@ -2,7 +2,7 @@
 #include "JAWS/Policy.h"
 
 
-JAWS_Data_Block::JAWS_Data_Block (void)
+JAWS_Data_Block::JAWS_Data_Block ()
   : ACE_Message_Block (JAWS_DATA_BLOCK_SIZE),
     io_handler_ (0),
     policy_ (0),
@@ -20,30 +20,30 @@ JAWS_Data_Block::JAWS_Data_Block (JAWS_Data_Block &db)
 {
 }
 
-JAWS_Data_Block::~JAWS_Data_Block (void)
+JAWS_Data_Block::~JAWS_Data_Block ()
 {
 }
 
 JAWS_Pipeline_Handler *
-JAWS_Data_Block::task (void)
+JAWS_Data_Block::task ()
 {
   return this->task_;
 }
 
 JAWS_IO_Handler *
-JAWS_Data_Block::io_handler (void)
+JAWS_Data_Block::io_handler ()
 {
   return this->io_handler_;
 }
 
 JAWS_Dispatch_Policy *
-JAWS_Data_Block::policy (void)
+JAWS_Data_Block::policy ()
 {
   return this->policy_;
 }
 
 void *
-JAWS_Data_Block::payload (void)
+JAWS_Data_Block::payload ()
 {
   return this->payload_;
 }
diff --git a/ACE/apps/JAWS2/JAWS/Data_Block.h b/ACE/apps/JAWS2/JAWS/Data_Block.h
index 4beb61cdb4c..e0408b6a8bc 100644
--- a/ACE/apps/JAWS2/JAWS/Data_Block.h
+++ b/ACE/apps/JAWS2/JAWS/Data_Block.h
@@ -21,14 +21,14 @@ class JAWS_Export JAWS_Data_Block : public ACE_Message_Block
 //   Defines the communication unit between pipeline components
 {
 public:
-  JAWS_Data_Block (void);
+  JAWS_Data_Block ();
   JAWS_Data_Block (JAWS_Data_Block &db);
-  ~JAWS_Data_Block (void);
+  ~JAWS_Data_Block ();
 
-  JAWS_Pipeline_Handler *task (void);
-  JAWS_IO_Handler *io_handler (void);
-  JAWS_Dispatch_Policy *policy (void);
-  void *payload (void);
+  JAWS_Pipeline_Handler *task ();
+  JAWS_IO_Handler *io_handler ();
+  JAWS_Dispatch_Policy *policy ();
+  void *payload ();
 
   void task (JAWS_Pipeline_Handler *taskp);
   void io_handler (JAWS_IO_Handler *handlerp);
diff --git a/ACE/apps/JAWS2/JAWS/FILE.cpp b/ACE/apps/JAWS2/JAWS/FILE.cpp
index d7408c77435..41ce5dfb3d6 100644
--- a/ACE/apps/JAWS2/JAWS/FILE.cpp
+++ b/ACE/apps/JAWS2/JAWS/FILE.cpp
@@ -3,12 +3,12 @@
 #include "JAWS/FILE.h"
 
 
-JAWS_FILE::JAWS_FILE (void)
+JAWS_FILE::JAWS_FILE ()
   : map_ (0)
 {
 }
 
-JAWS_FILE::~JAWS_FILE (void)
+JAWS_FILE::~JAWS_FILE ()
 {
   delete this->map_;
   this->map_ = 0;
diff --git a/ACE/apps/JAWS2/JAWS/FILE.h b/ACE/apps/JAWS2/JAWS/FILE.h
index f80c7c9f509..803572cc497 100644
--- a/ACE/apps/JAWS2/JAWS/FILE.h
+++ b/ACE/apps/JAWS2/JAWS/FILE.h
@@ -15,9 +15,9 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO
 // Like ACE_FILE_IO, but support for ACE_Mem_Map;
 {
 public:
-  JAWS_FILE (void);
+  JAWS_FILE ();
 
-  ~JAWS_FILE (void);
+  ~JAWS_FILE ();
 
   ACE_Mem_Map *mem_map (int length = -1,
                         int prot = PROT_RDWR,
diff --git a/ACE/apps/JAWS2/JAWS/Filecache.cpp b/ACE/apps/JAWS2/JAWS/Filecache.cpp
index 652a169b062..5f6ebf01a7c 100644
--- a/ACE/apps/JAWS2/JAWS/Filecache.cpp
+++ b/ACE/apps/JAWS2/JAWS/Filecache.cpp
@@ -73,19 +73,19 @@ JAWS_Cached_FILE::JAWS_Cached_FILE (const char *const &filename,
 {
 }
 
-JAWS_Cached_FILE::~JAWS_Cached_FILE (void)
+JAWS_Cached_FILE::~JAWS_Cached_FILE ()
 {
   this->file_.close ();
 }
 
 ACE_FILE_IO *
-JAWS_Cached_FILE::file (void)
+JAWS_Cached_FILE::file ()
 {
   return &(this->file_);
 }
 
 ACE_Mem_Map *
-JAWS_Cached_FILE::mmap (void)
+JAWS_Cached_FILE::mmap ()
 {
   return (this->data () == 0 ? 0 : this->data ()->mem_map ());
 }
diff --git a/ACE/apps/JAWS2/JAWS/Filecache.h b/ACE/apps/JAWS2/JAWS/Filecache.h
index 62ae5783680..40840a00a2d 100644
--- a/ACE/apps/JAWS2/JAWS/Filecache.h
+++ b/ACE/apps/JAWS2/JAWS/Filecache.h
@@ -50,10 +50,10 @@ public:
                     size_t size,
                     JAWS_Filecache_Proxy::Cache_Manager *cm = 0);
 
-  ~JAWS_Cached_FILE (void);
+  ~JAWS_Cached_FILE ();
 
-  ACE_FILE_IO * file (void);
-  ACE_Mem_Map * mmap (void);
+  ACE_FILE_IO * file ();
+  ACE_Mem_Map * mmap ();
 
 private:
   ACE_FILE_IO file_;
diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp
index 0a5ca46367f..81d4a0bb693 100644
--- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp
@@ -29,7 +29,7 @@ JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>
 }
 
 template <class EXT_ID, class INT_ID>
-JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>::~JAWS_Hash_Bucket_Item (void)
+JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>::~JAWS_Hash_Bucket_Item ()
 {
   this->next_ = 0;
   this->prev_ = 0;
@@ -53,7 +53,7 @@ JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc)
 
 template <class EXT_ID, class INT_ID>
 JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
-~JAWS_Hash_Bucket_DLCStack (void)
+~JAWS_Hash_Bucket_DLCStack ()
 {
   this->reset ();
 }
@@ -99,7 +99,7 @@ push (const EXT_ID &ext_id, const INT_ID &int_id)
 }
 
 template <class EXT_ID, class INT_ID> JAWS_HASH_BUCKET_ITEM *
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void)
+JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop ()
 {
   JAWS_HASH_BUCKET_ITEM *item = 0;
 
@@ -124,7 +124,7 @@ JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void)
 }
 
 template <class EXT_ID, class INT_ID> void
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::reset (void)
+JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::reset ()
 {
   JAWS_HASH_BUCKET_ITEM *item = 0;
 
@@ -186,7 +186,7 @@ JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void)
+JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first ()
 {
   int result = 0;
 
@@ -202,13 +202,13 @@ JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::last (void)
+JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::last ()
 {
   return this->first ();
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void)
+JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance ()
 {
   int result = 1;
 
@@ -229,7 +229,7 @@ JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert (void)
+JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert ()
 {
   int result = 1;
 
@@ -318,12 +318,12 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::open (ACE_Allocator *alloc)
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC>
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::~JAWS_Hash_Bucket_Manager (void)
+JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::~JAWS_Hash_Bucket_Manager ()
 {
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::close (void)
+JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::close ()
 {
   this->dlcstack_.reset ();
   return 0;
diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h
index 934ee54bbe0..050871ecae7 100644
--- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h
+++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h
@@ -29,7 +29,7 @@ public:
   JAWS_Hash_Bucket_Item (JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0,
                          JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0);
 
-  ~JAWS_Hash_Bucket_Item (void);
+  ~JAWS_Hash_Bucket_Item ();
   // Destructor.
 
   EXT_ID ext_id_;
@@ -60,7 +60,7 @@ class JAWS_Hash_Bucket_DLCStack
 
 public:
   JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0);
-  ~JAWS_Hash_Bucket_DLCStack (void);
+  ~JAWS_Hash_Bucket_DLCStack ();
 
   int is_empty () const;
   // Returns 1 if the container is empty, otherwise returns 0.
@@ -70,12 +70,12 @@ public:
   // Adds <new_item> to the head of the list.
   // Returns the new item that was inserted.
 
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *pop (void);
+  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *pop ();
   // Removes and returns the first <item> in the list.  Returns
   // internal node's address on success, 0 if the queue was empty.
   // This method will *not* free the internal node.
 
-  void reset (void);
+  void reset ();
   // Reset the <JAWS_Hash_Bucket_DLCStack> to be empty.
   // Notice that since no one is interested in the items within,
   // This operation will delete all items.
@@ -99,20 +99,20 @@ class JAWS_Hash_Bucket_DLCStack_Iterator
 public:
   JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack);
 
-  int first (void);
+  int first ();
   // Moves to first element in the set, clears done flag.  Returns 0
   // if empty, 1 otherwise.
 
-  int last (void);
+  int last ();
   // Moves to last element in the set, clears done flag.  Returns 0 if
   // empty, 1 otherwise.
 
-  int advance (void);
+  int advance ();
   // Move forward by one element of set.  Returns 0 if empty or we end
   // up being the first element in the set, 1 otherwise.  If advance
   // takes us to the first element, done is set to true.
 
-  int revert (void);
+  int revert ();
   // Move backward by one element of set.  Returns 0 if empty or we
   // end up being the last element in the set, 1 otherwise.  If revert
   // takes us to the last element, done is set to true.
@@ -146,8 +146,8 @@ public:
   JAWS_Hash_Bucket_Manager (ACE_Allocator *alloc = 0);
   int open (ACE_Allocator *alloc = 0);
 
-  ~JAWS_Hash_Bucket_Manager (void);
-  int close (void);
+  ~JAWS_Hash_Bucket_Manager ();
+  int close ();
 
   int find (const EXT_ID &ext_id) const;
   int find (const EXT_ID &ext_id, INT_ID &int_id) const;
diff --git a/ACE/apps/JAWS2/JAWS/Headers.cpp b/ACE/apps/JAWS2/JAWS/Headers.cpp
index f536db5b0bf..6ffc759b130 100644
--- a/ACE/apps/JAWS2/JAWS/Headers.cpp
+++ b/ACE/apps/JAWS2/JAWS/Headers.cpp
@@ -21,7 +21,7 @@ JAWS_Header_Data::JAWS_Header_Data (const char *name, int type,
 {
 }
 
-JAWS_Header_Data::~JAWS_Header_Data (void)
+JAWS_Header_Data::~JAWS_Header_Data ()
 {
   if ( this->header_name_ )
       ACE_OS::free ((void *)this->header_name_);
@@ -74,17 +74,17 @@ JAWS_Header_Data::header_type (int type)
 
 // Header Table
 
-JAWS_Headers::JAWS_Headers (void)
+JAWS_Headers::JAWS_Headers ()
   : iter_ (*this)
 {
 }
 
-JAWS_Headers::~JAWS_Headers (void)
+JAWS_Headers::~JAWS_Headers ()
 {
 }
 
 JAWS_Header_Table_Iterator &
-JAWS_Headers::iter (void)
+JAWS_Headers::iter ()
 {
   return this->iter_;
 }
diff --git a/ACE/apps/JAWS2/JAWS/Headers.h b/ACE/apps/JAWS2/JAWS/Headers.h
index 889bc2e2a70..1ecabd49e90 100644
--- a/ACE/apps/JAWS2/JAWS/Headers.h
+++ b/ACE/apps/JAWS2/JAWS/Headers.h
@@ -27,7 +27,7 @@ class JAWS_Export JAWS_Header_Data
 public:
   JAWS_Header_Data (const char *name, const char *value = 0, int type = 0);
   JAWS_Header_Data (const char *name, int type, const char *value = 0);
-  ~JAWS_Header_Data (void);
+  ~JAWS_Header_Data ();
 
   const char * header_name () const;
   const char * header_value () const;
@@ -49,8 +49,8 @@ typedef ACE_DLList_Iterator<JAWS_Header_Data> JAWS_Header_Table_Iterator;
 class JAWS_Export JAWS_Headers : public JAWS_Header_Table
 {
 public:
-  JAWS_Headers (void);
-  ~JAWS_Headers (void);
+  JAWS_Headers ();
+  ~JAWS_Headers ();
 
   int insert (JAWS_Header_Data *new_data);
   // insert the new data 0 -> success, -1 -> failure
@@ -66,7 +66,7 @@ public:
   void remove_all (const char *const &header_name);
   // remove all headers from list that match header_name
 
-  JAWS_Header_Table_Iterator &iter (void);
+  JAWS_Header_Table_Iterator &iter ();
   // returns an iterator to the headers container
 
 private:
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
index f7249e89f76..e4ee96609eb 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
@@ -4,11 +4,11 @@
 #include "ace/OS_NS_sys_socket.h"
 
 
-JAWS_IO_Acceptor::JAWS_IO_Acceptor (void)
+JAWS_IO_Acceptor::JAWS_IO_Acceptor ()
 {
 }
 
-JAWS_IO_Acceptor::~JAWS_IO_Acceptor (void)
+JAWS_IO_Acceptor::~JAWS_IO_Acceptor ()
 {
 }
 
@@ -25,7 +25,7 @@ JAWS_IO_Acceptor::open (const ACE_HANDLE &)
 }
 
 void
-JAWS_IO_Acceptor::close (void)
+JAWS_IO_Acceptor::close ()
 {
 }
 
@@ -43,7 +43,7 @@ JAWS_IO_Acceptor::accept (size_t, const void *)
 }
 
 ACE_HANDLE
-JAWS_IO_Acceptor::get_handle (void)
+JAWS_IO_Acceptor::get_handle ()
 {
   return ACE_INVALID_HANDLE;
 }
@@ -86,13 +86,13 @@ JAWS_IO_Synch_Acceptor::accept (size_t, const void *)
 }
 
 ACE_HANDLE
-JAWS_IO_Synch_Acceptor::get_handle (void)
+JAWS_IO_Synch_Acceptor::get_handle ()
 {
   return this->acceptor_.get_handle ();
 }
 
 
-JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void)
+JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor ()
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   : acceptor_ (*(new ACE_Asynch_Acceptor<JAWS_Asynch_Handler>)),
     acceptor_ptr_ (&acceptor_)
@@ -100,7 +100,7 @@ JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void)
 {
 }
 
-JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor (void)
+JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor ()
 {
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   delete this->acceptor_ptr_;
@@ -171,7 +171,7 @@ JAWS_IO_Asynch_Acceptor::accept (ACE_SOCK_Stream &, ACE_Addr *,
 }
 
 ACE_HANDLE
-JAWS_IO_Asynch_Acceptor::get_handle (void)
+JAWS_IO_Asynch_Acceptor::get_handle ()
 {
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   return this->acceptor_.get_handle ();
@@ -182,7 +182,7 @@ JAWS_IO_Asynch_Acceptor::get_handle (void)
 
 
 void
-JAWS_IO_Asynch_Acceptor::close (void)
+JAWS_IO_Asynch_Acceptor::close ()
 {
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   delete this->acceptor_ptr_;
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
index 49db8f68176..bf92cf3d2d7 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
@@ -33,8 +33,8 @@ typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX> JAWS_IO_SOCK_Acceptor;
 class JAWS_Export JAWS_IO_Acceptor
 {
 public:
-  JAWS_IO_Acceptor (void);
-  virtual ~JAWS_IO_Acceptor (void);
+  JAWS_IO_Acceptor ();
+  virtual ~JAWS_IO_Acceptor ();
 
   virtual int open (const ACE_INET_Addr &address, int backlog = 20);
   // Initiate a passive mode socket.
@@ -52,10 +52,10 @@ public:
   virtual int accept (size_t bytes_to_read = 0, const void *act = 0);
   // This initiates a new asynchronous accept through the AcceptEx call.
 
-  virtual ACE_HANDLE get_handle (void);
+  virtual ACE_HANDLE get_handle ();
   // Get the listener's handle
 
-  virtual void close (void);
+  virtual void close ();
   // Close the acceptor.
 
   enum { ASYNC = 0, SYNCH = 1 };
@@ -79,7 +79,7 @@ public:
                       int reset_new_handle = 0) const;
   // Accept the connection
 
-  virtual ACE_HANDLE get_handle (void);
+  virtual ACE_HANDLE get_handle ();
   // Get the listener's handle
 
 private:
@@ -93,8 +93,8 @@ private:
 class JAWS_Export JAWS_IO_Asynch_Acceptor : public JAWS_IO_Acceptor
 {
 public:
-  JAWS_IO_Asynch_Acceptor (void);
-  virtual ~JAWS_IO_Asynch_Acceptor (void);
+  JAWS_IO_Asynch_Acceptor ();
+  virtual ~JAWS_IO_Asynch_Acceptor ();
 
   virtual int open (const ACE_INET_Addr &address, int backlog = 20);
   // Initiate an asynchronous passive connection
@@ -105,10 +105,10 @@ public:
   virtual int accept (size_t bytes_to_read = 0, const void *act = 0);
   // This initiates a new asynchronous accept through the AcceptEx call.
 
-  virtual ACE_HANDLE get_handle (void);
+  virtual ACE_HANDLE get_handle ();
   // Get the listener's handle
 
-  virtual void close (void);
+  virtual void close ();
 
 private:
   virtual int accept (ACE_SOCK_Stream &new_stream,
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
index 54e836a20de..ba446ad0988 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
@@ -11,16 +11,16 @@
 #include "JAWS/Waiter.h"
 #include "JAWS/Filecache.h"
 
-JAWS_Abstract_IO_Handler::~JAWS_Abstract_IO_Handler (void)
+JAWS_Abstract_IO_Handler::~JAWS_Abstract_IO_Handler ()
 {
 }
 
-JAWS_IO_Handler_Factory::~JAWS_IO_Handler_Factory (void)
+JAWS_IO_Handler_Factory::~JAWS_IO_Handler_Factory ()
 {
 }
 
 JAWS_IO_Handler *
-JAWS_IO_Handler_Factory::create_io_handler (void)
+JAWS_IO_Handler_Factory::create_io_handler ()
 {
   JAWS_TRACE ("JAWS_IO_Handler_Factory::create");
 
@@ -50,7 +50,7 @@ JAWS_IO_Handler::JAWS_IO_Handler (JAWS_IO_Handler_Factory *factory)
 {
 }
 
-JAWS_IO_Handler::~JAWS_IO_Handler (void)
+JAWS_IO_Handler::~JAWS_IO_Handler ()
 {
   this->mb_ = 0;
   this->status_ = 0;
@@ -76,7 +76,7 @@ JAWS_IO_Handler::accept_complete (ACE_HANDLE handle)
 }
 
 void
-JAWS_IO_Handler::accept_error (void)
+JAWS_IO_Handler::accept_error ()
 {
   // callback into pipeline task, notify that the accept has failed
   this->status_ |= ACCEPT_ERROR;
@@ -94,7 +94,7 @@ JAWS_IO_Handler::read_complete (ACE_Message_Block *data)
 }
 
 void
-JAWS_IO_Handler::read_error (void)
+JAWS_IO_Handler::read_error ()
 {
   // this->pipeline_->read_error ();
   this->status_ |= READ_ERROR;
@@ -102,7 +102,7 @@ JAWS_IO_Handler::read_error (void)
 }
 
 void
-JAWS_IO_Handler::transmit_file_complete (void)
+JAWS_IO_Handler::transmit_file_complete ()
 {
   JAWS_TRACE ("JAWS_IO_Handler::transmit_file_complete");
   // this->pipeline_->transmit_file_complete ();
@@ -121,7 +121,7 @@ JAWS_IO_Handler::transmit_file_error (int result)
 }
 
 void
-JAWS_IO_Handler::receive_file_complete (void)
+JAWS_IO_Handler::receive_file_complete ()
 {
   this->status_ |= RECEIVE_OK;
   this->status_ &= (RECEIVE_OK+1);
@@ -136,7 +136,7 @@ JAWS_IO_Handler::receive_file_error (int result)
 }
 
 void
-JAWS_IO_Handler::write_error (void)
+JAWS_IO_Handler::write_error ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) error in writing response\n"));
 
@@ -146,21 +146,21 @@ JAWS_IO_Handler::write_error (void)
 }
 
 void
-JAWS_IO_Handler::confirmation_message_complete (void)
+JAWS_IO_Handler::confirmation_message_complete ()
 {
   this->status_ |= WRITE_OK;
   this->status_ &= (WRITE_OK+1);
 }
 
 void
-JAWS_IO_Handler::error_message_complete (void)
+JAWS_IO_Handler::error_message_complete ()
 {
   this->status_ |= WRITE_OK;
   this->status_ &= (WRITE_OK+1);
 }
 
 JAWS_IO_Handler_Factory *
-JAWS_IO_Handler::factory (void)
+JAWS_IO_Handler::factory ()
 {
   return this->factory_;
 }
@@ -178,7 +178,7 @@ JAWS_IO_Handler::task (JAWS_Pipeline_Handler *ph)
 }
 
 JAWS_Pipeline_Handler *
-JAWS_IO_Handler::task (void)
+JAWS_IO_Handler::task ()
 {
   return this->task_;
 }
@@ -190,52 +190,52 @@ JAWS_IO_Handler::message_block (JAWS_Data_Block *mb)
 }
 
 JAWS_Data_Block *
-JAWS_IO_Handler::message_block (void)
+JAWS_IO_Handler::message_block ()
 {
   return this->mb_;
 }
 
 void
-JAWS_IO_Handler::done (void)
+JAWS_IO_Handler::done ()
 {
   this->factory ()->destroy_io_handler (this);
 }
 
 int
-JAWS_IO_Handler::status (void)
+JAWS_IO_Handler::status ()
 {
   return this->status_;
 }
 
 void
-JAWS_IO_Handler::idle (void)
+JAWS_IO_Handler::idle ()
 {
   this->status_ &= (IDLE+1);
 }
 
 void
-JAWS_IO_Handler::acquire (void)
+JAWS_IO_Handler::acquire ()
 {
 }
 
 void
-JAWS_IO_Handler::lock (void)
+JAWS_IO_Handler::lock ()
 {
 }
 
 void
-JAWS_IO_Handler::release (void)
+JAWS_IO_Handler::release ()
 {
 }
 
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
-JAWS_Asynch_IO_Handler_Factory::~JAWS_Asynch_IO_Handler_Factory (void)
+JAWS_Asynch_IO_Handler_Factory::~JAWS_Asynch_IO_Handler_Factory ()
 {
 }
 
 JAWS_IO_Handler *
-JAWS_Asynch_IO_Handler_Factory::create_io_handler (void)
+JAWS_Asynch_IO_Handler_Factory::create_io_handler ()
 {
   JAWS_TRACE ("JAWS_Asynch_IO_Handler_Factory::create");
 
@@ -268,46 +268,46 @@ JAWS_Asynch_IO_Handler::JAWS_Asynch_IO_Handler (JAWS_Asynch_IO_Handler_Factory *
   this->status_ = 1;
 }
 
-JAWS_Asynch_IO_Handler::~JAWS_Asynch_IO_Handler (void)
+JAWS_Asynch_IO_Handler::~JAWS_Asynch_IO_Handler ()
 {
   delete this->handler_;
   this->handler_ = 0;
 }
 
 ACE_Handler *
-JAWS_Asynch_IO_Handler::handler (void)
+JAWS_Asynch_IO_Handler::handler ()
 {
   return this->handler_;
 }
 
 void
-JAWS_Asynch_IO_Handler::acquire (void)
+JAWS_Asynch_IO_Handler::acquire ()
 {
   //cerr << "(" << thr_self () << ") acquire handler: " << this << endl;
   this->count_.acquire_read ();
 }
 
 void
-JAWS_Asynch_IO_Handler::lock (void)
+JAWS_Asynch_IO_Handler::lock ()
 {
   //cerr << "(" << thr_self () << ") locking handler: " << this << endl;
   this->count_.acquire_write ();
 }
 
 void
-JAWS_Asynch_IO_Handler::release (void)
+JAWS_Asynch_IO_Handler::release ()
 {
   //cerr << "(" << thr_self () << ") release handler: " << this << endl;
   this->count_.release ();
 }
 
-JAWS_Asynch_Handler::JAWS_Asynch_Handler (void)
+JAWS_Asynch_Handler::JAWS_Asynch_Handler ()
   : ioh_ (0)
 {
   this->proactor (ACE_Proactor::instance ());
 }
 
-JAWS_Asynch_Handler::~JAWS_Asynch_Handler (void)
+JAWS_Asynch_Handler::~JAWS_Asynch_Handler ()
 {
 }
 
@@ -361,7 +361,7 @@ JAWS_Asynch_Handler::handle () const
 #endif
 
 void
-JAWS_Asynch_Handler::dispatch_handler (void)
+JAWS_Asynch_Handler::dispatch_handler ()
 {
 #if 0
   // A future version of ACE will support this.
@@ -489,7 +489,7 @@ JAWS_Asynch_Handler::handler (JAWS_Asynch_IO_Handler *ioh)
 }
 
 JAWS_Asynch_IO_Handler *
-JAWS_Asynch_Handler::handler (void)
+JAWS_Asynch_Handler::handler ()
 {
   return this->ioh_;
 }
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h
index ac6d100f9f3..b1236e818e0 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h
@@ -45,7 +45,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 class JAWS_Export JAWS_Abstract_IO_Handler
 {
 public:
-  virtual ~JAWS_Abstract_IO_Handler (void);
+  virtual ~JAWS_Abstract_IO_Handler ();
 
   virtual void task (JAWS_Pipeline_Handler *ph) = 0;
   virtual JAWS_Pipeline_Handler *task (void) = 0;
@@ -144,8 +144,8 @@ class JAWS_Asynch_IO_Handler;
 class JAWS_Export JAWS_Asynch_Handler : public ACE_Service_Handler
 {
 public:
-  JAWS_Asynch_Handler (void);
-  virtual ~JAWS_Asynch_Handler (void);
+  JAWS_Asynch_Handler ();
+  virtual ~JAWS_Asynch_Handler ();
 
   /// This method will be called when an asynchronous read completes on
   /// a stream.
@@ -166,9 +166,9 @@ public:
   virtual void handle_accept (const ACE_Asynch_Accept::Result &result);
 
   virtual void handler (JAWS_Asynch_IO_Handler *ioh);
-  virtual JAWS_Asynch_IO_Handler * handler (void);
+  virtual JAWS_Asynch_IO_Handler * handler ();
 
-  virtual void dispatch_handler (void);
+  virtual void dispatch_handler ();
 
   /// Call back entry point for ACE_Asynch_Acceptor
   virtual void open (ACE_HANDLE h, ACE_Message_Block &mb);
@@ -188,38 +188,38 @@ class JAWS_Export JAWS_IO_Handler : public JAWS_Abstract_IO_Handler
 {
 public:
   JAWS_IO_Handler (JAWS_IO_Handler_Factory *factory);
-  virtual ~JAWS_IO_Handler (void);
+  virtual ~JAWS_IO_Handler ();
 
   // Inherited from JAWS_IO_Handler
 
   virtual void accept_complete (ACE_HANDLE handle);
-  virtual void accept_error (void);
+  virtual void accept_error ();
   virtual void read_complete (ACE_Message_Block *data);
-  virtual void read_error (void);
-  virtual void transmit_file_complete (void);
+  virtual void read_error ();
+  virtual void transmit_file_complete ();
   virtual void transmit_file_error (int result);
-  virtual void receive_file_complete (void);
+  virtual void receive_file_complete ();
   virtual void receive_file_error (int result);
-  virtual void write_error (void);
-  virtual void confirmation_message_complete (void);
-  virtual void error_message_complete (void);
+  virtual void write_error ();
+  virtual void confirmation_message_complete ();
+  virtual void error_message_complete ();
 
-  virtual JAWS_IO_Handler_Factory *factory (void);
+  virtual JAWS_IO_Handler_Factory *factory ();
   virtual ACE_HANDLE handle () const;
 
-  virtual void done (void);
-  virtual int status (void);
-  virtual void idle (void);
+  virtual void done ();
+  virtual int status ();
+  virtual void idle ();
 
-  virtual void acquire (void);
-  virtual void lock (void);
-  virtual void release (void);
+  virtual void acquire ();
+  virtual void lock ();
+  virtual void release ();
 
   virtual void task (JAWS_Pipeline_Handler *ph);
-  virtual JAWS_Pipeline_Handler *task (void);
+  virtual JAWS_Pipeline_Handler *task ();
 
   virtual void message_block (JAWS_Data_Block *mb);
-  virtual JAWS_Data_Block *message_block (void);
+  virtual JAWS_Data_Block *message_block ();
 
 protected:
   /// The state of the handler.
@@ -243,10 +243,10 @@ class JAWS_Export JAWS_IO_Handler_Factory
 {
 public:
   /// Destructor
-  virtual ~JAWS_IO_Handler_Factory (void);
+  virtual ~JAWS_IO_Handler_Factory ();
 
   /// This creates a new JAWS_IO_Handler
-  virtual JAWS_IO_Handler *create_io_handler (void);
+  virtual JAWS_IO_Handler *create_io_handler ();
 
   /// This deletes a JAWS_IO_Handler
   virtual void destroy_io_handler (JAWS_IO_Handler *handler);
@@ -264,10 +264,10 @@ class JAWS_Export JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factor
 {
 public:
   /// Destructor
-  virtual ~JAWS_Asynch_IO_Handler_Factory (void);
+  virtual ~JAWS_Asynch_IO_Handler_Factory ();
 
   /// This creates a new JAWS_IO_Handler
-  virtual JAWS_IO_Handler *create_io_handler (void);
+  virtual JAWS_IO_Handler *create_io_handler ();
 
   /// This deletes a JAWS_IO_Handler
   virtual void destroy_io_handler (JAWS_IO_Handler *handler);
@@ -282,13 +282,13 @@ friend class JAWS_Waiter;
   // Provide implementations for the common functions.
 public:
   explicit JAWS_Asynch_IO_Handler (JAWS_Asynch_IO_Handler_Factory *factory);
-  virtual ~JAWS_Asynch_IO_Handler (void);
+  virtual ~JAWS_Asynch_IO_Handler ();
 
-  virtual ACE_Handler *handler (void);
+  virtual ACE_Handler *handler ();
 
-  virtual void acquire (void);
-  virtual void lock (void);
-  virtual void release (void);
+  virtual void acquire ();
+  virtual void lock ();
+  virtual void release ();
 
 protected:
   JAWS_Asynch_Handler *handler_;
diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp
index 633d4d8dcef..0755d676fb0 100644
--- a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp
+++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp
@@ -19,7 +19,7 @@
 // #include "HTTP_Helpers.h"
 
 
-JAWS_IO::JAWS_IO (void)
+JAWS_IO::JAWS_IO ()
   : handle_ (ACE_INVALID_HANDLE),
     handler_ (0),
     inet_addr_ (0),
@@ -27,13 +27,13 @@ JAWS_IO::JAWS_IO (void)
 {
 }
 
-JAWS_IO::~JAWS_IO (void)
+JAWS_IO::~JAWS_IO ()
 {
 }
 
 #if 0
 ACE_HANDLE
-JAWS_IO::handle (void)
+JAWS_IO::handle ()
 {
   return this->handle_;
 }
@@ -57,12 +57,12 @@ JAWS_IO::acceptor (JAWS_IO_Acceptor *acceptor)
 }
 #endif /* 0 */
 
-JAWS_Synch_IO::JAWS_Synch_IO (void)
+JAWS_Synch_IO::JAWS_Synch_IO ()
 {
   this->acceptor_ = JAWS_IO_Synch_Acceptor_Singleton::instance ();
 }
 
-JAWS_Synch_IO::~JAWS_Synch_IO (void)
+JAWS_Synch_IO::~JAWS_Synch_IO ()
 {
   if (this->handle_ != ACE_INVALID_HANDLE)
     ACE_OS::closesocket (this->handle_);
@@ -324,11 +324,11 @@ JAWS_Synch_IO::send_message (JAWS_IO_Handler *ioh,
 // This only works on asynch I/O-capable systems.
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
-JAWS_Asynch_IO::JAWS_Asynch_IO (void)
+JAWS_Asynch_IO::JAWS_Asynch_IO ()
 {
 }
 
-JAWS_Asynch_IO::~JAWS_Asynch_IO (void)
+JAWS_Asynch_IO::~JAWS_Asynch_IO ()
 {
   if (this->handle_ != ACE_INVALID_HANDLE)
     ACE_OS::closesocket (this->handle_);
diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.h b/ACE/apps/JAWS2/JAWS/Jaws_IO.h
index 4106daf0cc3..4078b241794 100644
--- a/ACE/apps/JAWS2/JAWS/Jaws_IO.h
+++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.h
@@ -45,13 +45,13 @@ class JAWS_IO_Acceptor;
 class JAWS_Export JAWS_IO
 {
 public:
-  JAWS_IO (void);
-  virtual ~JAWS_IO (void);
+  JAWS_IO ();
+  virtual ~JAWS_IO ();
 
   //  void acceptor (JAWS_IO_Acceptor *acceptor);
   //  void handler (JAWS_IO_Handler *handler);
   //  void handle (ACE_HANDLE h);
-  //  ACE_HANDLE handle (void);
+  //  ACE_HANDLE handle ();
 
   // James, please add documentation here.
 
@@ -113,9 +113,9 @@ protected:
 class JAWS_Export JAWS_Synch_IO : public JAWS_IO
 {
 public:
-  JAWS_Synch_IO (void);
+  JAWS_Synch_IO ();
 
-  virtual ~JAWS_Synch_IO (void);
+  virtual ~JAWS_Synch_IO ();
 
   virtual void accept (JAWS_IO_Handler *ioh,
                        ACE_Message_Block *mb = 0,
@@ -173,9 +173,9 @@ typedef ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>
 class JAWS_Export JAWS_Asynch_IO : public JAWS_IO
 {
 public:
-  JAWS_Asynch_IO (void);
+  JAWS_Asynch_IO ();
 
-  virtual ~JAWS_Asynch_IO (void);
+  virtual ~JAWS_Asynch_IO ();
 
   virtual void accept (JAWS_IO_Handler *ioh,
                        ACE_Message_Block *mb = 0,
diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp
index 63b00475404..e1ce02ce129 100644
--- a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp
+++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp
@@ -254,7 +254,7 @@ JAWS_Parse_Headers::parse_header_value (JAWS_Header_Info *info,
 }
 
 
-JAWS_Header_Info::JAWS_Header_Info (void)
+JAWS_Header_Info::JAWS_Header_Info ()
   : end_of_headers_ (0),
     end_of_line_ (1),
     last_header_data_ (0),
@@ -263,7 +263,7 @@ JAWS_Header_Info::JAWS_Header_Info (void)
 {
 }
 
-JAWS_Header_Info::~JAWS_Header_Info (void)
+JAWS_Header_Info::~JAWS_Header_Info ()
 {
   JAWS_Header_Table_Iterator iter (this->table_);
   JAWS_Header_Data *data_ptr;
@@ -277,7 +277,7 @@ JAWS_Header_Info::~JAWS_Header_Info (void)
 }
 
 void
-JAWS_Header_Info::dump (void)
+JAWS_Header_Info::dump ()
 {
   JAWS_Header_Table_Iterator iter (this->table_);
 
@@ -297,7 +297,7 @@ JAWS_Header_Info::dump (void)
 }
 
 JAWS_Headers *
-JAWS_Header_Info::table (void)
+JAWS_Header_Info::table ()
 {
   return &(this->table_);
 }
@@ -321,7 +321,7 @@ JAWS_Header_Info::append_last_header_value (char c)
 }
 
 int
-JAWS_Header_Info::append_last_header_value (void)
+JAWS_Header_Info::append_last_header_value ()
 {
   if (this->last_header_data_ == 0 || this->last_header_length_ == 0)
     return -1;
@@ -349,7 +349,7 @@ JAWS_Header_Info::append_last_header_value (const char *begin, const char *end)
 }
 
 void
-JAWS_Header_Info::reduce_last_header_value (void)
+JAWS_Header_Info::reduce_last_header_value ()
 {
   if (this->last_header_data_ == 0) return;
 
@@ -394,7 +394,7 @@ JAWS_Header_Info::create_next_header_value (char *ht)
 }
 
 void
-JAWS_Header_Info::finish_last_header_value (void)
+JAWS_Header_Info::finish_last_header_value ()
 {
   if (this->last_header_data_ != 0)
     {
@@ -412,7 +412,7 @@ JAWS_Header_Info::finish_last_header_value (void)
 }
 
 char *
-JAWS_Header_Info::header_buf (void)
+JAWS_Header_Info::header_buf ()
 {
   return this->header_buf_;
 }
diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.h b/ACE/apps/JAWS2/JAWS/Parse_Headers.h
index bed98f9078c..fc42206345f 100644
--- a/ACE/apps/JAWS2/JAWS/Parse_Headers.h
+++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.h
@@ -17,8 +17,8 @@
 class JAWS_Export JAWS_Header_Info
 {
 public:
-  JAWS_Header_Info (void);
-  ~JAWS_Header_Info (void);
+  JAWS_Header_Info ();
+  ~JAWS_Header_Info ();
 
   int end_of_line () const;
   void end_of_line (int flag);
@@ -30,19 +30,19 @@ public:
 
   const JAWS_Header_Data * last_header_data () const;
 
-  char *header_buf (void);
+  char *header_buf ();
 
   void append_last_header_value (char c);
-  int append_last_header_value (void);
+  int append_last_header_value ();
   void append_last_header_value (const char *begin, const char *end);
-  void reduce_last_header_value (void);
+  void reduce_last_header_value ();
 
   void create_next_header_value (char *ht);
   // This will insert last_header_data into the table if it is not
   // null.  Then, it will create a new header_data node and populate
   // it.  If ht is null, last_header_data is not inserted.
 
-  void finish_last_header_value (void);
+  void finish_last_header_value ();
   // This will insert last_header_data into the table if it is not
   // null.
 
@@ -52,7 +52,7 @@ public:
   int status () const;
   void status (int s);
 
-  JAWS_Headers *table (void);
+  JAWS_Headers *table ();
 
   enum STATUS_CODE
   {
@@ -70,7 +70,7 @@ public:
   // In Apache, they assume that each header line should not exceed
   // 8K.  Who am I to disagree?
 
-  void dump (void);
+  void dump ();
 
 private:
   int end_of_headers_;
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline.cpp b/ACE/apps/JAWS2/JAWS/Pipeline.cpp
index 8b5478cf2a5..6522e40fdeb 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline.cpp
+++ b/ACE/apps/JAWS2/JAWS/Pipeline.cpp
@@ -1,7 +1,7 @@
 #include "JAWS/Pipeline.h"
 
 
-JAWS_Pipeline::JAWS_Pipeline (void)
+JAWS_Pipeline::JAWS_Pipeline ()
 {
 }
 
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline.h b/ACE/apps/JAWS2/JAWS/Pipeline.h
index d1fc4a7abde..a9072aecf58 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline.h
+++ b/ACE/apps/JAWS2/JAWS/Pipeline.h
@@ -27,7 +27,7 @@ class JAWS_Export JAWS_Pipeline : public JAWS_Pipeline_Task
   //   Methods that are common to pipeline components
 {
 public:
-  JAWS_Pipeline (void);
+  JAWS_Pipeline ();
   // ACE_Task hooks
 
   virtual int open (void * = 0);
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp
index ef0b598cd3f..4e75616de89 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp
@@ -5,12 +5,12 @@
 
 
 template <class TYPE>
-JAWS_Pipeline_Abstract_Handler<TYPE>::JAWS_Pipeline_Abstract_Handler (void)
+JAWS_Pipeline_Abstract_Handler<TYPE>::JAWS_Pipeline_Abstract_Handler ()
 {
 }
 
 template <class TYPE>
-JAWS_Pipeline_Abstract_Handler<TYPE>::~JAWS_Pipeline_Abstract_Handler (void)
+JAWS_Pipeline_Abstract_Handler<TYPE>::~JAWS_Pipeline_Abstract_Handler ()
 {
 }
 
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h
index 693904bc8e3..8ee9db8b6bd 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h
@@ -11,8 +11,8 @@ class JAWS_Pipeline_Abstract_Handler : public JAWS_Pipeline_Task
   //   Methods that are common to pipeline components
 {
 public:
-  JAWS_Pipeline_Abstract_Handler (void);
-  virtual ~JAWS_Pipeline_Abstract_Handler (void);
+  JAWS_Pipeline_Abstract_Handler ();
+  virtual ~JAWS_Pipeline_Abstract_Handler ();
   // ACE_Task hooks
 
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
index e96cf0c5391..44c815ee1e5 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
@@ -6,12 +6,12 @@
 #include "JAWS/Policy.h"
 
 
-JAWS_Pipeline_Handler::JAWS_Pipeline_Handler (void)
+JAWS_Pipeline_Handler::JAWS_Pipeline_Handler ()
   : policy_ (0)
 {
 }
 
-JAWS_Pipeline_Handler::~JAWS_Pipeline_Handler (void)
+JAWS_Pipeline_Handler::~JAWS_Pipeline_Handler ()
 {
 }
 
@@ -41,7 +41,7 @@ JAWS_Pipeline_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 }
 
 JAWS_Dispatch_Policy *
-JAWS_Pipeline_Handler::policy (void)
+JAWS_Pipeline_Handler::policy ()
 {
   return this->policy_;
 }
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h
index 87250c98d19..f96729314f4 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h
@@ -17,12 +17,12 @@ class JAWS_Export JAWS_Pipeline_Handler
   : public JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>
 {
 public:
-  JAWS_Pipeline_Handler (void);
-  virtual ~JAWS_Pipeline_Handler (void);
+  JAWS_Pipeline_Handler ();
+  virtual ~JAWS_Pipeline_Handler ();
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
   virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv) = 0;
 
-  virtual JAWS_Dispatch_Policy * policy (void);
+  virtual JAWS_Dispatch_Policy * policy ();
   virtual void policy (JAWS_Dispatch_Policy *);
 
 private:
diff --git a/ACE/apps/JAWS2/JAWS/Policy.cpp b/ACE/apps/JAWS2/JAWS/Policy.cpp
index cfd062537f3..7c350fb7a7c 100644
--- a/ACE/apps/JAWS2/JAWS/Policy.cpp
+++ b/ACE/apps/JAWS2/JAWS/Policy.cpp
@@ -4,15 +4,15 @@
 #include "JAWS/IO_Acceptor.h"
 
 
-JAWS_Dispatch_Policy::JAWS_Dispatch_Policy (void)
+JAWS_Dispatch_Policy::JAWS_Dispatch_Policy ()
 {
 }
 
-JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy (void)
+JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy ()
 {
 }
 
-JAWS_Default_Dispatch_Policy::JAWS_Default_Dispatch_Policy (void)
+JAWS_Default_Dispatch_Policy::JAWS_Default_Dispatch_Policy ()
   : ratio_ (1),
     concurrency_ (JAWS_Thread_Pool_Singleton::instance ()),
     ioh_factory_ (JAWS_Synch_IO_Handler_Factory_Singleton::instance ()),
@@ -21,36 +21,36 @@ JAWS_Default_Dispatch_Policy::JAWS_Default_Dispatch_Policy (void)
 {
 }
 
-JAWS_Default_Dispatch_Policy::~JAWS_Default_Dispatch_Policy (void)
+JAWS_Default_Dispatch_Policy::~JAWS_Default_Dispatch_Policy ()
 {
 }
 
 int
-JAWS_Default_Dispatch_Policy::ratio (void)
+JAWS_Default_Dispatch_Policy::ratio ()
 {
   return this->ratio_;
 }
 
 JAWS_IO *
-JAWS_Default_Dispatch_Policy::io (void)
+JAWS_Default_Dispatch_Policy::io ()
 {
   return this->io_;
 }
 
 JAWS_IO_Handler_Factory *
-JAWS_Default_Dispatch_Policy::ioh_factory (void)
+JAWS_Default_Dispatch_Policy::ioh_factory ()
 {
   return this->ioh_factory_;
 }
 
 JAWS_IO_Acceptor *
-JAWS_Default_Dispatch_Policy::acceptor (void)
+JAWS_Default_Dispatch_Policy::acceptor ()
 {
   return this->acceptor_;
 }
 
 JAWS_Concurrency_Base *
-JAWS_Default_Dispatch_Policy::concurrency (void)
+JAWS_Default_Dispatch_Policy::concurrency ()
 {
   return this->concurrency_;
 }
diff --git a/ACE/apps/JAWS2/JAWS/Policy.h b/ACE/apps/JAWS2/JAWS/Policy.h
index 0d4b6f3d606..a8fdab0c405 100644
--- a/ACE/apps/JAWS2/JAWS/Policy.h
+++ b/ACE/apps/JAWS2/JAWS/Policy.h
@@ -18,8 +18,8 @@ class JAWS_IO_Handler_Factory;
 class JAWS_Export JAWS_Dispatch_Policy
 {
 public:
-  JAWS_Dispatch_Policy (void);
-  virtual ~JAWS_Dispatch_Policy (void);
+  JAWS_Dispatch_Policy ();
+  virtual ~JAWS_Dispatch_Policy ();
 
   virtual int ratio (void) = 0;
   virtual JAWS_IO * io (void) = 0;
@@ -37,14 +37,14 @@ public:
 class JAWS_Export JAWS_Default_Dispatch_Policy : public JAWS_Dispatch_Policy
 {
 public:
-  JAWS_Default_Dispatch_Policy (void);
-  virtual ~JAWS_Default_Dispatch_Policy (void);
-
-  virtual int ratio (void);
-  virtual JAWS_IO *io (void);
-  virtual JAWS_IO_Handler_Factory *ioh_factory (void);
-  virtual JAWS_IO_Acceptor *acceptor (void);
-  virtual JAWS_Concurrency_Base *concurrency (void);
+  JAWS_Default_Dispatch_Policy ();
+  virtual ~JAWS_Default_Dispatch_Policy ();
+
+  virtual int ratio ();
+  virtual JAWS_IO *io ();
+  virtual JAWS_IO_Handler_Factory *ioh_factory ();
+  virtual JAWS_IO_Acceptor *acceptor ();
+  virtual JAWS_Concurrency_Base *concurrency ();
 
   virtual void ratio (int r);
   virtual void io (JAWS_IO *iop);
diff --git a/ACE/apps/JAWS2/JAWS/Reaper.cpp b/ACE/apps/JAWS2/JAWS/Reaper.cpp
index a7800bb446e..ca928fea6c5 100644
--- a/ACE/apps/JAWS2/JAWS/Reaper.cpp
+++ b/ACE/apps/JAWS2/JAWS/Reaper.cpp
@@ -9,7 +9,7 @@ JAWS_Reaper::JAWS_Reaper (JAWS_Concurrency_Base *concurrency)
 {
 }
 
-JAWS_Reaper::~JAWS_Reaper (void)
+JAWS_Reaper::~JAWS_Reaper ()
 {
 }
 
@@ -31,7 +31,7 @@ JAWS_Reaper::open (void *)
 }
 
 int
-JAWS_Reaper::svc (void)
+JAWS_Reaper::svc ()
 {
   ACE_TRACE ("JAWS_Reaper::svc");
   int result = this->concurrency_->thr_mgr ()->wait ();
diff --git a/ACE/apps/JAWS2/JAWS/Reaper.h b/ACE/apps/JAWS2/JAWS/Reaper.h
index a4c7ff3f081..460c736add0 100644
--- a/ACE/apps/JAWS2/JAWS/Reaper.h
+++ b/ACE/apps/JAWS2/JAWS/Reaper.h
@@ -30,7 +30,7 @@ class JAWS_Export JAWS_Reaper : public ACE_Task<ACE_SYNCH>
 {
 public:
   JAWS_Reaper (JAWS_Concurrency_Base *concurrency);
-  virtual ~JAWS_Reaper (void);
+  virtual ~JAWS_Reaper ();
 
   virtual int open (void * = 0);
   virtual int svc ();
diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp
index 915c340ef1c..f98e9196639 100644
--- a/ACE/apps/JAWS2/JAWS/Server.cpp
+++ b/ACE/apps/JAWS2/JAWS/Server.cpp
@@ -15,7 +15,7 @@
 #include "JAWS/Pipeline_Tasks.h"
 
 
-JAWS_Server::JAWS_Server (void)
+JAWS_Server::JAWS_Server ()
   : port_ (5432),
     concurrency_ (0),
     dispatch_ (0),
diff --git a/ACE/apps/JAWS2/JAWS/Server.h b/ACE/apps/JAWS2/JAWS/Server.h
index 336b6c85062..afb49027a00 100644
--- a/ACE/apps/JAWS2/JAWS/Server.h
+++ b/ACE/apps/JAWS2/JAWS/Server.h
@@ -11,7 +11,7 @@ class JAWS_IO_Handler_Factory;
 class JAWS_Export JAWS_Server
 {
 public:
-  JAWS_Server (void);
+  JAWS_Server ();
   JAWS_Server (int argc, char *argv[]);
 
   void init (int argc, char *argv[]);
diff --git a/ACE/apps/JAWS2/JAWS/Waiter.cpp b/ACE/apps/JAWS2/JAWS/Waiter.cpp
index efd915513d7..aaa1f691d77 100644
--- a/ACE/apps/JAWS2/JAWS/Waiter.cpp
+++ b/ACE/apps/JAWS2/JAWS/Waiter.cpp
@@ -4,23 +4,23 @@
 #include "JAWS/IO_Handler.h"
 
 
-JAWS_Waiter::JAWS_Waiter (void)
+JAWS_Waiter::JAWS_Waiter ()
   : iter_ (*this)
 {
 }
 
-JAWS_Waiter::~JAWS_Waiter (void)
+JAWS_Waiter::~JAWS_Waiter ()
 {
 }
 
 JAWS_Waiter_Base_Iterator &
-JAWS_Waiter::iter (void)
+JAWS_Waiter::iter ()
 {
   return this->iter_;
 }
 
 int
-JAWS_Waiter::index (void)
+JAWS_Waiter::index ()
 {
 #if 0
   // A future version of ACE will support this.
diff --git a/ACE/apps/JAWS2/JAWS/Waiter.h b/ACE/apps/JAWS2/JAWS/Waiter.h
index e7854dc8de0..b96be4ab302 100644
--- a/ACE/apps/JAWS2/JAWS/Waiter.h
+++ b/ACE/apps/JAWS2/JAWS/Waiter.h
@@ -23,13 +23,13 @@ typedef JAWS_Assoc_Array_Iterator<JAWS_Thread_ID, JAWS_IO_Handler *>
 class JAWS_Export JAWS_Waiter : public JAWS_Waiter_Base
 {
 public:
-  JAWS_Waiter (void);
-  ~JAWS_Waiter (void);
+  JAWS_Waiter ();
+  ~JAWS_Waiter ();
 
-  JAWS_Waiter_Base_Iterator &iter (void);
+  JAWS_Waiter_Base_Iterator &iter ();
   // Returns an iterator to the headers container.
 
-  int index (void);
+  int index ();
   // Returns the index into the table associated with calling thread.
 
   JAWS_IO_Handler * wait_for_completion (int i = -1);
diff --git a/ACE/apps/JAWS3/http/HTTP_Data.h b/ACE/apps/JAWS3/http/HTTP_Data.h
index f08081d9f98..ae6a3bb0c77 100644
--- a/ACE/apps/JAWS3/http/HTTP_Data.h
+++ b/ACE/apps/JAWS3/http/HTTP_Data.h
@@ -13,9 +13,9 @@ class JAWS_HTTP_Data
 public:
   JAWS_HTTP_Data (JAWS_HTTP_Service_Handler *sh);
 
-  ACE_SOCK_Stream & peer (void);
-  ACE_Message_Block & mb (void);
-  ACE_FILE_IO & file_io (void);
+  ACE_SOCK_Stream & peer ();
+  ACE_Message_Block & mb ();
+  ACE_FILE_IO & file_io ();
 
 private:
   JAWS_HTTP_Service_Handler *sh_;
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
index b548cb52685..3c80dd3b67a 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
@@ -8,7 +8,7 @@
 #include "HTTP_States.h"
 #include "HTTP_Data.h"
 
-JAWS_HTTP_Service_Handler::JAWS_HTTP_Service_Handler (void)
+JAWS_HTTP_Service_Handler::JAWS_HTTP_Service_Handler ()
   : JAWS_Protocol_Handler (JAWS_HTTP_Read_Request::instance (), & this->data_)
   , data_ (this)
 {
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
index 812fd041b31..e456ffd8502 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
@@ -26,7 +26,7 @@ class JAWS_HTTP_Service_Handler
 //     there is less programming effort.
 {
 public:
-  JAWS_HTTP_Service_Handler (void);
+  JAWS_HTTP_Service_Handler ();
 
   int open (void *);
 
diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.h b/ACE/apps/JAWS3/jaws3/Asynch_IO.h
index 1c787eaf88f..1be659522d8 100644
--- a/ACE/apps/JAWS3/jaws3/Asynch_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.h
@@ -16,7 +16,7 @@ class JAWS_Asynch_IO;
 class JAWS_Export JAWS_Asynch_IO : public JAWS_IO_Impl
 {
 public:
-  static JAWS_Asynch_IO * instance (void)
+  static JAWS_Asynch_IO * instance ()
   {
     return ACE_Singleton<JAWS_Asynch_IO, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp
index 7960f2a0368..bcd714d7a81 100644
--- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp
+++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp
@@ -20,7 +20,7 @@ JAWS_Cached_Allocator<T, ACE_LOCK>::set_next_pool (char *pool, char *next_pool)
 }
 
 template <class T, class ACE_LOCK> void
-JAWS_Cached_Allocator<T, ACE_LOCK>::extend_pool (void)
+JAWS_Cached_Allocator<T, ACE_LOCK>::extend_pool ()
 {
   char *new_pool = 0;
   ACE_NEW (new_pool, char[this->pool_size_ + sizeof (char *)]);
@@ -51,7 +51,7 @@ JAWS_Cached_Allocator<T, ACE_LOCK>::JAWS_Cached_Allocator (size_t n_chunks)
 }
 
 template <class T, class ACE_LOCK>
-JAWS_Cached_Allocator<T, ACE_LOCK>::~JAWS_Cached_Allocator (void)
+JAWS_Cached_Allocator<T, ACE_LOCK>::~JAWS_Cached_Allocator ()
 {
   char *curr = this->pool_head_;
 
@@ -92,7 +92,7 @@ JAWS_Cached_Allocator<T, ACE_LOCK>::free (void *ptr)
 
 
 template <class T> JAWS_Cached_Allocator<T, ACE_SYNCH_NULL_MUTEX> *
-JAWS_TSS_Cached_Allocator<T>::ts_allocator (void)
+JAWS_TSS_Cached_Allocator<T>::ts_allocator ()
 {
   JAWS_Cached_Allocator<T, ACE_SYNCH_NULL_MUTEX> *ts_obj = 0;
 
@@ -118,7 +118,7 @@ JAWS_TSS_Cached_Allocator<T>::JAWS_TSS_Cached_Allocator (size_t n_chunks)
 }
 
 template <class T>
-JAWS_TSS_Cached_Allocator<T>::~JAWS_TSS_Cached_Allocator (void)
+JAWS_TSS_Cached_Allocator<T>::~JAWS_TSS_Cached_Allocator ()
 {
 }
 
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
index 2b4a0c1d8d5..cc6a1367167 100644
--- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
+++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
@@ -24,7 +24,7 @@ class JAWS_Cached_Allocator : public ACE_New_Allocator
 public:
   JAWS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS);
 
-  ~JAWS_Cached_Allocator (void);
+  ~JAWS_Cached_Allocator ();
 
   void* malloc (size_t);
   // get a chunk of memory from free store.
@@ -37,7 +37,7 @@ protected:
 
   void set_next_pool (char *pool, char *next_pool);
 
-  void extend_pool (void);
+  void extend_pool ();
 
 private:
   size_t pool_size_;
@@ -66,7 +66,7 @@ class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator
 public:
   JAWS_TSS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS);
 
-  ~JAWS_TSS_Cached_Allocator (void);
+  ~JAWS_TSS_Cached_Allocator ();
 
   void * malloc (size_t);
   // get a chunk of memory from free store.
@@ -75,7 +75,7 @@ public:
   // return a chunk of memory back to free store.
 
 protected:
-  JAWS_Cached_Allocator<T, ACE_SYNCH_NULL_MUTEX> * ts_allocator (void);
+  JAWS_Cached_Allocator<T, ACE_SYNCH_NULL_MUTEX> * ts_allocator ();
 
 private:
   size_t n_chunks_;
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.cpp b/ACE/apps/JAWS3/jaws3/Concurrency.cpp
index de8f19e417d..b637c86e406 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/Concurrency.cpp
@@ -20,7 +20,7 @@ typedef ACE_Singleton<ACE_Message_Block, ACE_SYNCH_NULL_MUTEX>
 
 
 int
-JAWS_Concurrency_Impl::svc (void)
+JAWS_Concurrency_Impl::svc ()
 {
   JAWS_Protocol_Handler *ph;
 
@@ -84,7 +84,7 @@ JAWS_Concurrency_Bridge<JAWS_Concurrency_Impl>
 
 
 void
-JAWS_Concurrency_Bridge<JAWS_Concurrency_Impl>::shutdown (void)
+JAWS_Concurrency_Bridge<JAWS_Concurrency_Impl>::shutdown ()
 {
   ACE_Message_Block *empty_mb = JAWS_Empty_Message_Block::instance ();
   JAWS_CONCURRENCY_TASK *task;
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.h b/ACE/apps/JAWS3/jaws3/Concurrency.h
index 16a9ad059ea..0a3c8e88dcd 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/Concurrency.h
@@ -21,7 +21,7 @@ public:
 
   virtual int getq (JAWS_Protocol_Handler *&ph) = 0;
 
-  int svc (void);
+  int svc ();
 };
 
 
@@ -38,7 +38,7 @@ public:
   int putq (JAWS_Protocol_Handler *ph);
   int getq (JAWS_Protocol_Handler *&ph);
 
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   JAWS_Concurrency_Impl *impl_;
@@ -54,7 +54,7 @@ class JAWS_Export JAWS_Concurrency
   : public JAWS_Concurrency_Bridge<JAWS_CONCURRENCY_CONCRETE_IMPL>
 {
 public:
-  static JAWS_Concurrency * instance (void)
+  static JAWS_Concurrency * instance ()
   {
     return ACE_Singleton<JAWS_Concurrency, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp
index 3882a4e8158..11bbaf82a02 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp
+++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp
@@ -34,7 +34,7 @@ JAWS_Concurrency_Bridge<CONCURRENCY_IMPL>::getq (JAWS_Protocol_Handler *&ph)
 
 
 template <class CONCURRENCY_IMPL> void
-JAWS_Concurrency_Bridge<CONCURRENCY_IMPL>::shutdown (void)
+JAWS_Concurrency_Bridge<CONCURRENCY_IMPL>::shutdown ()
 {
   ACE_Message_Block *empty_mb = JAWS_Empty_Message_Block::instance ();
   JAWS_CONCURRENCY_TASK *task;
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.h b/ACE/apps/JAWS3/jaws3/Concurrency_T.h
index 4c4582db890..371c53b58de 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency_T.h
+++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.h
@@ -26,7 +26,7 @@ public:
   int putq (JAWS_Protocol_Handler *ph);
   int getq (JAWS_Protocol_Handler *&ph);
 
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   CONCURRENCY_IMPL *impl_;
diff --git a/ACE/apps/JAWS3/jaws3/Config_File.cpp b/ACE/apps/JAWS3/jaws3/Config_File.cpp
index a62a7cd14ea..9c73c9da154 100644
--- a/ACE/apps/JAWS3/jaws3/Config_File.cpp
+++ b/ACE/apps/JAWS3/jaws3/Config_File.cpp
@@ -17,7 +17,7 @@
 class JAWS_strings
 {
 public:
-  ~JAWS_strings (void)
+  ~JAWS_strings ()
   {
     void *p;
     while (this->queue_.dequeue_head (p) != -1)
@@ -60,12 +60,12 @@ class JAWS_Config_File_Impl
 {
 public:
   JAWS_Config_File_Impl (const ACE_TCHAR *config_file);
-  ~JAWS_Config_File_Impl (void);
+  ~JAWS_Config_File_Impl ();
   int find (const ACE_TCHAR *key, const ACE_TCHAR *&value);
 
-  void parse_file (void);
-  void reset (void);
-  void dump (void);
+  void parse_file ();
+  void reset ();
+  void dump ();
 
   enum { JAWS_CONFIG_FILE_SYMBOL_TABLE_SIZE = 211 };
 
@@ -85,7 +85,7 @@ JAWS_Config_File_Impl::JAWS_Config_File_Impl (const ACE_TCHAR *config_file)
   this->parse_file ();
 }
 
-JAWS_Config_File_Impl::~JAWS_Config_File_Impl (void)
+JAWS_Config_File_Impl::~JAWS_Config_File_Impl ()
 {
   delete this->symbols_;
   this->symbols_ = 0;
@@ -100,7 +100,7 @@ JAWS_Config_File_Impl::find (const ACE_TCHAR *key, const ACE_TCHAR *&value)
 }
 
 void
-JAWS_Config_File_Impl::parse_file (void)
+JAWS_Config_File_Impl::parse_file ()
 {
   ACE_FILE_Connector fconnector;
   ACE_FILE_IO fio;
@@ -242,7 +242,7 @@ JAWS_Config_File_Impl::parse_file (void)
 }
 
 void
-JAWS_Config_File_Impl::reset (void)
+JAWS_Config_File_Impl::reset ()
 {
   delete this->symbols_;
   delete this->strings_;
@@ -252,7 +252,7 @@ JAWS_Config_File_Impl::reset (void)
 }
 
 void
-JAWS_Config_File_Impl::dump (void)
+JAWS_Config_File_Impl::dump ()
 {
   JAWS_SYMBOL_TABLE_ITERATOR iter (*this->symbols_);
   JAWS_SYMBOL_TABLE_ENTRY *entry = 0;
@@ -283,13 +283,13 @@ JAWS_Config_File::find (const ACE_TCHAR *key, const ACE_TCHAR *&value)
 }
 
 void
-JAWS_Config_File::reset (void)
+JAWS_Config_File::reset ()
 {
   this->impl_->reset ();
 }
 
 void
-JAWS_Config_File::dump (void)
+JAWS_Config_File::dump ()
 {
   this->impl_->dump ();
 }
diff --git a/ACE/apps/JAWS3/jaws3/Config_File.h b/ACE/apps/JAWS3/jaws3/Config_File.h
index bac607cf2bd..4eca8925e95 100644
--- a/ACE/apps/JAWS3/jaws3/Config_File.h
+++ b/ACE/apps/JAWS3/jaws3/Config_File.h
@@ -53,10 +53,10 @@ public:
   // Find the <value> associated with <key>.
 
 public:
-  void reset (void);
+  void reset ();
   // Re-read the configuration file.
 
-  void dump (void);
+  void dump ();
   // Dump the values of all configuration variables.
 
 private:
diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h
index ce39f969914..a847a1a8f01 100644
--- a/ACE/apps/JAWS3/jaws3/Datagram.h
+++ b/ACE/apps/JAWS3/jaws3/Datagram.h
@@ -79,7 +79,7 @@ class JAWS_Export JAWS_Datagram
 public:
   JAWS_Datagram (JAWS_Datagram_Impl *impl = 0);
 
-  static JAWS_Datagram * instance (void)
+  static JAWS_Datagram * instance ()
   {
     return ACE_Singleton<JAWS_Datagram, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Event_Completer.cpp b/ACE/apps/JAWS3/jaws3/Event_Completer.cpp
index f971714d96f..40a6ba6d473 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Completer.cpp
+++ b/ACE/apps/JAWS3/jaws3/Event_Completer.cpp
@@ -6,7 +6,7 @@
 
 // Default do nothing completers.
 
-JAWS_Event_Completer::~JAWS_Event_Completer (void)
+JAWS_Event_Completer::~JAWS_Event_Completer ()
 {
 }
 
diff --git a/ACE/apps/JAWS3/jaws3/Event_Completer.h b/ACE/apps/JAWS3/jaws3/Event_Completer.h
index f3e5e4a42e9..357fd8fb8c4 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Completer.h
+++ b/ACE/apps/JAWS3/jaws3/Event_Completer.h
@@ -12,7 +12,7 @@ class JAWS_Export JAWS_Event_Completer
 //     Event completion callback class.
 {
 public:
-  virtual ~JAWS_Event_Completer (void);
+  virtual ~JAWS_Event_Completer ();
 
   virtual void accept_complete (const JAWS_Event_Result &r, void *act = 0);
   // The callback entry point when input has been read.
diff --git a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp
index adf97124453..43ff3acd3e4 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp
+++ b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp
@@ -19,14 +19,14 @@ JAWS_Event_Dispatcher_Proactor_Event_Loop (void *)
 
 
 void
-JAWS_Event_Dispatcher::end_event_loop (void)
+JAWS_Event_Dispatcher::end_event_loop ()
 {
   ACE_Reactor::end_event_loop ();
 }
 
 
 void
-JAWS_Event_Dispatcher::run_event_loop (void)
+JAWS_Event_Dispatcher::run_event_loop ()
 {
   // First, initiate the proactor thread
 
diff --git a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h
index dfc17932de8..6fb71ce353f 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h
+++ b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h
@@ -41,8 +41,8 @@ class JAWS_Event_Dispatcher;
 class JAWS_Export JAWS_Event_Dispatcher
 {
 public:
-  static void end_event_loop (void);
-  static void run_event_loop (void);
+  static void end_event_loop ();
+  static void run_event_loop ();
 };
 
 #endif /* JAWS_EVENT_DISPATCHER_H */
diff --git a/ACE/apps/JAWS3/jaws3/FILE.cpp b/ACE/apps/JAWS3/jaws3/FILE.cpp
index 856b6ce16f5..90a0fd8706b 100644
--- a/ACE/apps/JAWS3/jaws3/FILE.cpp
+++ b/ACE/apps/JAWS3/jaws3/FILE.cpp
@@ -10,13 +10,13 @@
 #include "jaws3/FILE.h"
 
 
-JAWS_FILE::JAWS_FILE (void)
+JAWS_FILE::JAWS_FILE ()
   : map_ (0)
   , can_map_ (0)
 {
 }
 
-JAWS_FILE::~JAWS_FILE (void)
+JAWS_FILE::~JAWS_FILE ()
 {
   delete this->map_;
   this->map_ = 0;
diff --git a/ACE/apps/JAWS3/jaws3/FILE.h b/ACE/apps/JAWS3/jaws3/FILE.h
index f09ff65b7a0..37c7143ef51 100644
--- a/ACE/apps/JAWS3/jaws3/FILE.h
+++ b/ACE/apps/JAWS3/jaws3/FILE.h
@@ -13,9 +13,9 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO
 // Like ACE_FILE_IO, but support for ACE_Mem_Map;
 {
 public:
-  JAWS_FILE (void);
+  JAWS_FILE ();
 
-  ~JAWS_FILE (void);
+  ~JAWS_FILE ();
 
   ACE_Mem_Map *mem_map (int length = -1,
                         int prot = PROT_RDWR,
diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp
index c9e7e0231cf..1e7648bb884 100644
--- a/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp
@@ -34,7 +34,7 @@ JAWS_IO::JAWS_IO (JAWS_IO_Impl *impl)
     }
 }
 
-JAWS_IO::~JAWS_IO (void)
+JAWS_IO::~JAWS_IO ()
 {
 }
 
diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.h b/ACE/apps/JAWS3/jaws3/Jaws_IO.h
index ffd7db696c3..892f519452f 100644
--- a/ACE/apps/JAWS3/jaws3/Jaws_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.h
@@ -75,9 +75,9 @@ class JAWS_Export JAWS_IO
 public:
   JAWS_IO (JAWS_IO_Impl *impl = 0);
 
-  ~JAWS_IO (void);
+  ~JAWS_IO ();
 
-  static JAWS_IO * instance (void)
+  static JAWS_IO * instance ()
   {
     return ACE_Singleton<JAWS_IO, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Options.cpp b/ACE/apps/JAWS3/jaws3/Options.cpp
index 572fd06697f..93b22a9b6e6 100644
--- a/ACE/apps/JAWS3/jaws3/Options.cpp
+++ b/ACE/apps/JAWS3/jaws3/Options.cpp
@@ -6,7 +6,7 @@
 
 #include "jaws3/Options.h"
 
-JAWS_Options::JAWS_Options (void)
+JAWS_Options::JAWS_Options ()
 {
   this->cf_ = new JAWS_Config_File ("jaws.conf");
 }
diff --git a/ACE/apps/JAWS3/jaws3/Options.h b/ACE/apps/JAWS3/jaws3/Options.h
index 0c91f080ad2..a8dc9a0ee2f 100644
--- a/ACE/apps/JAWS3/jaws3/Options.h
+++ b/ACE/apps/JAWS3/jaws3/Options.h
@@ -19,11 +19,11 @@ class JAWS_Options;
 class JAWS_Export JAWS_Options
 {
 public:
-  JAWS_Options (void);
+  JAWS_Options ();
 
   const char *getenv (const char *key);
 
-  static JAWS_Options * instance (void)
+  static JAWS_Options * instance ()
   {
     return ACE_Singleton<JAWS_Options, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp
index e2b715c5641..004f52488a2 100644
--- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp
+++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp
@@ -5,7 +5,7 @@
 #include "jaws3/Protocol_Handler.h"
 #include "jaws3/Concurrency.h"
 
-JAWS_Protocol_State::~JAWS_Protocol_State (void)
+JAWS_Protocol_State::~JAWS_Protocol_State ()
 {
 }
 
@@ -21,14 +21,14 @@ JAWS_Protocol_Handler::JAWS_Protocol_Handler ( JAWS_Protocol_State *state
 }
 
 
-JAWS_Protocol_Handler::~JAWS_Protocol_Handler (void)
+JAWS_Protocol_Handler::~JAWS_Protocol_Handler ()
 {
   this->mb_.replace_data_block (0);
 }
 
 
 int
-JAWS_Protocol_Handler::service (void)
+JAWS_Protocol_Handler::service ()
 {
   if (this->state_ == 0)
     return -1;
diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h
index 92a534d3392..e4892744fcd 100644
--- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h
+++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h
@@ -12,7 +12,7 @@ class JAWS_Export JAWS_Protocol_State
   friend class JAWS_Protocol_Handler;
 
 public:
-  virtual ~JAWS_Protocol_State (void);
+  virtual ~JAWS_Protocol_State ();
 
 protected:
   virtual int service (JAWS_Event_Completer *, void *data) = 0;
@@ -35,15 +35,15 @@ class JAWS_Export JAWS_Protocol_Handler
 public:
   JAWS_Protocol_Handler (JAWS_Protocol_State *state = 0, void *data = 0);
 
-  virtual int service (void);
+  virtual int service ();
 
-  virtual void dismiss (void)
+  virtual void dismiss ()
   {
     delete this;
   }
 
 protected:
-  virtual ~JAWS_Protocol_Handler (void);
+  virtual ~JAWS_Protocol_Handler ();
   // Try to guarantee this class will be created dynamically.
 
 protected:
diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
index d26eb4f290b..bc9252a8030 100644
--- a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
@@ -155,7 +155,7 @@ JAWS_Reactive_IO::transmit ( ACE_HANDLE handle
 
 
 void
-JAWS_IO_Reactive_Handler::open (void)
+JAWS_IO_Reactive_Handler::open ()
 {
   int result = ACE_Reactor::instance ()->notify (this);
 
diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.h b/ACE/apps/JAWS3/jaws3/Reactive_IO.h
index c385a4befbb..5ca6c3ed6bd 100644
--- a/ACE/apps/JAWS3/jaws3/Reactive_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.h
@@ -16,7 +16,7 @@ class JAWS_Reactive_IO;
 class JAWS_Export JAWS_Reactive_IO : public JAWS_IO_Impl
 {
 public:
-  static JAWS_Reactive_IO * instance (void)
+  static JAWS_Reactive_IO * instance ()
   {
     return ACE_Singleton<JAWS_Reactive_IO, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
index aff12038559..08258f888df 100644
--- a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
+++ b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
@@ -21,7 +21,7 @@ class JAWS_IO_Reactive_Handler : public ACE_Event_Handler
   friend class JAWS_IO_Reactive_Transmit;
 
 public:
-  virtual void open (void);
+  virtual void open ();
 
   int handle_timeout (const ACE_Time_Value &, const void *);
 
@@ -59,7 +59,7 @@ private:
 
 public: // needed for destructor due to "aCC: HP ANSI C++ B3910B A.03.39" compiler bug
 
-  ~JAWS_IO_Reactive_Handler (void)
+  ~JAWS_IO_Reactive_Handler ()
   {
     if (this->timer_id_ != -1)
       ACE_Reactor::instance ()->cancel_timer (this->timer_id_);
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
index f5d20c75c74..855d39e4f1b 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
@@ -52,7 +52,7 @@ JAWS_Signal_Task_function (void *)
 }
 
 
-JAWS_Signal_Task::JAWS_Signal_Task (void)
+JAWS_Signal_Task::JAWS_Signal_Task ()
 {
   // Set our signal mask.
   this->sigset_.empty_set ();
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h
index f3eb3169246..8a7e749ed66 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.h
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.h
@@ -11,9 +11,9 @@
 class JAWS_Export JAWS_Signal_Task
 {
 public:
-  JAWS_Signal_Task (void);
+  JAWS_Signal_Task ();
 
-  static JAWS_Signal_Task * instance (void)
+  static JAWS_Signal_Task * instance ()
   {
     return ACE_Singleton<JAWS_Signal_Task, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Synch_IO.h b/ACE/apps/JAWS3/jaws3/Synch_IO.h
index 0ef9acdc722..d549b60ece5 100644
--- a/ACE/apps/JAWS3/jaws3/Synch_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Synch_IO.h
@@ -9,7 +9,7 @@
 class JAWS_Export JAWS_Synch_IO : public JAWS_IO_Impl
 {
 public:
-  static JAWS_Synch_IO * instance (void)
+  static JAWS_Synch_IO * instance ()
   {
     return ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
index 76bdfd8c47b..13290d06ca9 100644
--- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
@@ -11,7 +11,7 @@
 #include "jaws3/Options.h"
 
 
-JAWS_THYBRID_Concurrency::JAWS_THYBRID_Concurrency (void)
+JAWS_THYBRID_Concurrency::JAWS_THYBRID_Concurrency ()
   : getting_ (0)
   , min_number_of_threads_ (1)
   , max_number_of_threads_ (-1)
diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h
index 257dc9f5293..ff7a2b0d676 100644
--- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h
@@ -9,13 +9,13 @@
 class JAWS_Export JAWS_THYBRID_Concurrency : public JAWS_Concurrency_Impl
 {
 public:
-  JAWS_THYBRID_Concurrency (void);
+  JAWS_THYBRID_Concurrency ();
 
   int putq (JAWS_Protocol_Handler *ph);
 
   int getq (JAWS_Protocol_Handler *&ph);
 
-  static JAWS_THYBRID_Concurrency * instance (void)
+  static JAWS_THYBRID_Concurrency * instance ()
   {
     return ACE_Singleton<JAWS_THYBRID_Concurrency, ACE_SYNCH_MUTEX>
            ::instance ();
diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
index 9a9d0ce104b..1e78ef73a75 100644
--- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
@@ -9,7 +9,7 @@
 #include "jaws3/Protocol_Handler.h"
 #include "jaws3/Options.h"
 
-JAWS_TPOOL_Concurrency::JAWS_TPOOL_Concurrency (void)
+JAWS_TPOOL_Concurrency::JAWS_TPOOL_Concurrency ()
   : number_of_threads_ (5)
   , shutdown_task_ (0)
   , error_ (0)
diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h
index 1e8935414da..06af9e1b5b3 100644
--- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h
@@ -7,13 +7,13 @@
 class JAWS_Export JAWS_TPOOL_Concurrency : public JAWS_Concurrency_Impl
 {
 public:
-  JAWS_TPOOL_Concurrency (void);
+  JAWS_TPOOL_Concurrency ();
 
   int putq (JAWS_Protocol_Handler *ph);
 
   int getq (JAWS_Protocol_Handler *&ph);
 
-  static JAWS_TPOOL_Concurrency * instance (void)
+  static JAWS_TPOOL_Concurrency * instance ()
   {
     return ACE_Singleton<JAWS_TPOOL_Concurrency, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp
index 15a547c685e..02af889d865 100644
--- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp
@@ -10,7 +10,7 @@
 #include "jaws3/Options.h"
 
 
-JAWS_TPR_Concurrency::JAWS_TPR_Concurrency (void)
+JAWS_TPR_Concurrency::JAWS_TPR_Concurrency ()
   : getting_ (0)
   , shutdown_task_ (0)
   , error_ (0)
diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h
index e47286a4275..ea83640c795 100644
--- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h
@@ -9,13 +9,13 @@
 class JAWS_Export JAWS_TPR_Concurrency : public JAWS_Concurrency_Impl
 {
 public:
-  JAWS_TPR_Concurrency (void);
+  JAWS_TPR_Concurrency ();
 
   int putq (JAWS_Protocol_Handler *ph);
 
   int getq (JAWS_Protocol_Handler *&ph);
 
-  static JAWS_TPR_Concurrency * instance (void)
+  static JAWS_TPR_Concurrency * instance ()
   {
     return ACE_Singleton<JAWS_TPR_Concurrency, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp
index 3bd8b01a112..a24e8e53e37 100644
--- a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp
+++ b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp
@@ -8,7 +8,7 @@
 #include "jaws3/Timer_Helpers.h"
 
 
-JAWS_Task_Timer::JAWS_Task_Timer (void)
+JAWS_Task_Timer::JAWS_Task_Timer ()
 {
   this->timer_queue_.activate ();
 }
diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.h b/ACE/apps/JAWS3/jaws3/Task_Timer.h
index 5f1c91a5460..547b4740915 100644
--- a/ACE/apps/JAWS3/jaws3/Task_Timer.h
+++ b/ACE/apps/JAWS3/jaws3/Task_Timer.h
@@ -14,9 +14,9 @@ class JAWS_Task_Timer;
 class JAWS_Export JAWS_Task_Timer : public JAWS_Timer_Impl
 {
 public:
-  JAWS_Task_Timer (void);
+  JAWS_Task_Timer ();
 
-  static JAWS_Timer_Impl * instance (void)
+  static JAWS_Timer_Impl * instance ()
   {
     return ACE_Singleton<JAWS_Task_Timer, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/jaws3/Timer.h b/ACE/apps/JAWS3/jaws3/Timer.h
index a59f5ef14c3..b69c8a50397 100644
--- a/ACE/apps/JAWS3/jaws3/Timer.h
+++ b/ACE/apps/JAWS3/jaws3/Timer.h
@@ -54,7 +54,7 @@ class JAWS_Export JAWS_Timer
 public:
   JAWS_Timer (JAWS_Timer_Impl *impl = 0);
 
-  static JAWS_Timer * instance (void)
+  static JAWS_Timer * instance ()
   {
     return ACE_Singleton<JAWS_Timer, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/small/SS_Data.cpp b/ACE/apps/JAWS3/small/SS_Data.cpp
index 36f183e90eb..05eb9989680 100644
--- a/ACE/apps/JAWS3/small/SS_Data.cpp
+++ b/ACE/apps/JAWS3/small/SS_Data.cpp
@@ -8,19 +8,19 @@ TeraSS_Data::TeraSS_Data (TeraSS_Service_Handler *sh)
 }
 
 ACE_SOCK_Stream &
-TeraSS_Data::peer (void)
+TeraSS_Data::peer ()
 {
   return this->sh_->peer ();
 }
 
 ACE_Message_Block &
-TeraSS_Data::mb (void)
+TeraSS_Data::mb ()
 {
   return this->mb_;
 }
 
 ACE_FILE_IO &
-TeraSS_Data::file_io (void)
+TeraSS_Data::file_io ()
 {
   return this->file_io_;
 }
diff --git a/ACE/apps/JAWS3/small/SS_Data.h b/ACE/apps/JAWS3/small/SS_Data.h
index 2fa551bc38b..8c98856c11e 100644
--- a/ACE/apps/JAWS3/small/SS_Data.h
+++ b/ACE/apps/JAWS3/small/SS_Data.h
@@ -13,9 +13,9 @@ class TeraSS_Data
 public:
   TeraSS_Data (TeraSS_Service_Handler *sh);
 
-  ACE_SOCK_Stream & peer (void);
-  ACE_Message_Block & mb (void);
-  ACE_FILE_IO & file_io (void);
+  ACE_SOCK_Stream & peer ();
+  ACE_Message_Block & mb ();
+  ACE_FILE_IO & file_io ();
 
 private:
   ACE_Message_Block mb_;
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
index 1b2b9d133bb..ae3a2b7d395 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
@@ -8,7 +8,7 @@
 #include "SS_State_READ.h"
 #include "SS_Data.h"
 
-TeraSS_Service_Handler::TeraSS_Service_Handler (void)
+TeraSS_Service_Handler::TeraSS_Service_Handler ()
   : JAWS_Protocol_Handler (TeraSS_State_READ::instance (), & this->data_)
   , data_ (this)
 {
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h
index 91392dbc4c0..2a53337d52e 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.h
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h
@@ -27,7 +27,7 @@ class TeraSS_Service_Handler
 //     there is less programming effort.
 {
 public:
-  TeraSS_Service_Handler (void);
+  TeraSS_Service_Handler ();
 
   int open (void *);
 
diff --git a/ACE/apps/JAWS3/small/SS_State_DONE.h b/ACE/apps/JAWS3/small/SS_State_DONE.h
index be67fde6aa0..c4feebc2045 100644
--- a/ACE/apps/JAWS3/small/SS_State_DONE.h
+++ b/ACE/apps/JAWS3/small/SS_State_DONE.h
@@ -17,7 +17,7 @@ public:
                                    , void *act
                                    );
 
-  static JAWS_Protocol_State * instance (void)
+  static JAWS_Protocol_State * instance ()
   {
     return ACE_Singleton<TeraSS_State_DONE, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/small/SS_State_ERROR.h b/ACE/apps/JAWS3/small/SS_State_ERROR.h
index d042d6fcf0c..388259914bb 100644
--- a/ACE/apps/JAWS3/small/SS_State_ERROR.h
+++ b/ACE/apps/JAWS3/small/SS_State_ERROR.h
@@ -16,7 +16,7 @@ public:
                                    , void *act
                                    );
 
-  static JAWS_Protocol_State * instance (void)
+  static JAWS_Protocol_State * instance ()
   {
     return ACE_Singleton<TeraSS_State_ERROR, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/small/SS_State_PARSE.h b/ACE/apps/JAWS3/small/SS_State_PARSE.h
index 54ec2a93068..b20c27b13f0 100644
--- a/ACE/apps/JAWS3/small/SS_State_PARSE.h
+++ b/ACE/apps/JAWS3/small/SS_State_PARSE.h
@@ -16,7 +16,7 @@ public:
                                    , void *act
                                    );
 
-  static JAWS_Protocol_State * instance (void)
+  static JAWS_Protocol_State * instance ()
   {
     return ACE_Singleton<TeraSS_State_PARSE, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/small/SS_State_READ.h b/ACE/apps/JAWS3/small/SS_State_READ.h
index 2fb1861116b..0064914eb06 100644
--- a/ACE/apps/JAWS3/small/SS_State_READ.h
+++ b/ACE/apps/JAWS3/small/SS_State_READ.h
@@ -16,7 +16,7 @@ public:
                                    , void *act
                                    );
 
-  static JAWS_Protocol_State * instance (void)
+  static JAWS_Protocol_State * instance ()
   {
     return ACE_Singleton<TeraSS_State_READ, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/JAWS3/small/SS_State_WRITE.h b/ACE/apps/JAWS3/small/SS_State_WRITE.h
index 18f3340a34f..55c91f23219 100644
--- a/ACE/apps/JAWS3/small/SS_State_WRITE.h
+++ b/ACE/apps/JAWS3/small/SS_State_WRITE.h
@@ -16,7 +16,7 @@ public:
                                    , void *act
                                    );
 
-  static JAWS_Protocol_State * instance (void)
+  static JAWS_Protocol_State * instance ()
   {
     return ACE_Singleton<TeraSS_State_WRITE, ACE_SYNCH_MUTEX>::instance ();
   }
diff --git a/ACE/apps/drwho/BS_Client.cpp b/ACE/apps/drwho/BS_Client.cpp
index 67f3a7c009a..3c671b591c7 100644
--- a/ACE/apps/drwho/BS_Client.cpp
+++ b/ACE/apps/drwho/BS_Client.cpp
@@ -5,7 +5,7 @@
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 
-BS_Client::BS_Client (void)
+BS_Client::BS_Client ()
 {
   this->count_ = FILE_MANAGER::instance ()->open_file (Options::friend_file);
 
@@ -77,7 +77,7 @@ BS_Client::insert (const char *key_name, int)
 }
 
 Protocol_Record *
-BS_Client::get_each_entry (void)
+BS_Client::get_each_entry ()
 {
   for (Protocol_Record *prp = Binary_Search::get_each_entry ();
        prp != 0;
diff --git a/ACE/apps/drwho/BS_Client.h b/ACE/apps/drwho/BS_Client.h
index bf01638072c..bf7894c94a0 100644
--- a/ACE/apps/drwho/BS_Client.h
+++ b/ACE/apps/drwho/BS_Client.h
@@ -24,7 +24,7 @@ class BS_Client : public Binary_Search
 public:
   // = Initialization.
   /// Constructor.
-  BS_Client (void);
+  BS_Client ();
 
   /**
    * This function is used to merge the <key_name> from server
@@ -42,7 +42,7 @@ public:
    * we skip over entries that don't have any hosts associated with
    * them.
    */
-  virtual Protocol_Record *get_each_entry (void);
+  virtual Protocol_Record *get_each_entry ();
 };
 
 #endif /* _BS_CLIENT_H */
diff --git a/ACE/apps/drwho/BS_Server.cpp b/ACE/apps/drwho/BS_Server.cpp
index f658d018c1d..b72d20fb46f 100644
--- a/ACE/apps/drwho/BS_Server.cpp
+++ b/ACE/apps/drwho/BS_Server.cpp
@@ -106,7 +106,7 @@ BS_Server::insert (const char *key_name, int max_len)
 // (because these entries weren't on the server machine. */
 
 Protocol_Record *
-BS_Server::get_next_entry (void)
+BS_Server::get_next_entry ()
 {
   for (Protocol_Record *prp = Binary_Search::get_next_entry ();
        prp != 0;
diff --git a/ACE/apps/drwho/BS_Server.h b/ACE/apps/drwho/BS_Server.h
index 4ff7b597bc7..fefcc6f718e 100644
--- a/ACE/apps/drwho/BS_Server.h
+++ b/ACE/apps/drwho/BS_Server.h
@@ -42,7 +42,7 @@ public:
    * we skip over entries that don't have any hosts associated with
    * them.
    */
-  virtual Protocol_Record *get_next_entry (void);
+  virtual Protocol_Record *get_next_entry ();
 };
 
 #endif /* _BS_SERVER_H */
diff --git a/ACE/apps/drwho/Binary_Search.cpp b/ACE/apps/drwho/Binary_Search.cpp
index 9c18195f35f..338b3540fbe 100644
--- a/ACE/apps/drwho/Binary_Search.cpp
+++ b/ACE/apps/drwho/Binary_Search.cpp
@@ -18,7 +18,7 @@ Binary_Search::name_compare (const void *s1, const void *s2)
 // interface to include an "initialize" and "next" function!
 
 Protocol_Record *
-Binary_Search::get_next_entry (void)
+Binary_Search::get_next_entry ()
 {
   // Reset the iterator if we are starting from the beginning.
 
@@ -43,7 +43,7 @@ Binary_Search::get_next_entry (void)
 // skip over entries that don't have any hosts associated with them.
 
 Protocol_Record *
-Binary_Search::get_each_entry (void)
+Binary_Search::get_each_entry ()
 {
   // Reset the iterator if we are starting from the beginning.
 
@@ -63,7 +63,7 @@ Binary_Search::get_each_entry (void)
   return 0;
 }
 
-Binary_Search::~Binary_Search (void)
+Binary_Search::~Binary_Search ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
@@ -72,7 +72,7 @@ Binary_Search::~Binary_Search (void)
 
 // Used to initialize the values for the iterators...
 
-Binary_Search::Binary_Search (void)
+Binary_Search::Binary_Search ()
   : current_ptr_ (0),
     current_index_ (0)
 {
diff --git a/ACE/apps/drwho/Binary_Search.h b/ACE/apps/drwho/Binary_Search.h
index 3036991ffa9..07c1631444e 100644
--- a/ACE/apps/drwho/Binary_Search.h
+++ b/ACE/apps/drwho/Binary_Search.h
@@ -25,10 +25,10 @@ class Binary_Search : public Search_Struct
 {
 public:
   /// Initialize the values for the iterators...
-  Binary_Search (void);
+  Binary_Search ();
 
   /// Destructor.
-  virtual ~Binary_Search (void);
+  virtual ~Binary_Search ();
 
   /**
    * Returns the next friend in the sequence of sorted friends.  Note
@@ -36,7 +36,7 @@ public:
    * iterator interface to include an "initialize" and "next"
    * function!
    */
-  virtual Protocol_Record *get_next_entry (void);
+  virtual Protocol_Record *get_next_entry ();
 
   /**
    * An iterator, similar to Binary_Search::get_next_friend, though in
@@ -45,7 +45,7 @@ public:
    * we skip over entries that don't have any hosts associated with
    * them.
    */
-  virtual Protocol_Record *get_each_entry (void);
+  virtual Protocol_Record *get_each_entry ();
 
   /**
    * This function is used to merge the <key_name> from server
diff --git a/ACE/apps/drwho/CM_Client.cpp b/ACE/apps/drwho/CM_Client.cpp
index 36e8c9da3b9..de5551c06cf 100644
--- a/ACE/apps/drwho/CM_Client.cpp
+++ b/ACE/apps/drwho/CM_Client.cpp
@@ -92,7 +92,7 @@ CM_Client::receive (int timeout)
 }
 
 int
-CM_Client::send (void)
+CM_Client::send ()
 {
   int packet_length = 0;
 
@@ -126,12 +126,12 @@ CM_Client::send (void)
   return 1;
 }
 
-CM_Client::CM_Client (void)
+CM_Client::CM_Client ()
   : top_ (0)
 {
 }
 
-CM_Client::~CM_Client (void)
+CM_Client::~CM_Client ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/apps/drwho/CM_Client.h b/ACE/apps/drwho/CM_Client.h
index ecc5652811b..690d87ed4af 100644
--- a/ACE/apps/drwho/CM_Client.h
+++ b/ACE/apps/drwho/CM_Client.h
@@ -28,16 +28,16 @@ class CM_Client : public Comm_Manager
 {
 public:
   /// Constructor.
-  CM_Client (void);
+  CM_Client ();
 
   /// Destructor.
-  virtual ~CM_Client (void);
+  virtual ~CM_Client ();
 
   virtual int mux (char *packet, int &packet_length)   = 0;
   virtual int demux (char *packet, int &packet_length) = 0;
   virtual int open (short port_number);
   virtual int receive (int timeout = 0);
-  virtual int send (void);
+  virtual int send ();
 
 private:
   fd_set read_fd_;
diff --git a/ACE/apps/drwho/CM_Server.cpp b/ACE/apps/drwho/CM_Server.cpp
index 8062a305baa..5844a915378 100644
--- a/ACE/apps/drwho/CM_Server.cpp
+++ b/ACE/apps/drwho/CM_Server.cpp
@@ -69,7 +69,7 @@ CM_Server::receive (int)
 }
 
 int
-CM_Server::send (void)
+CM_Server::send ()
 {
   int  packet_length = 0;
 
@@ -93,11 +93,11 @@ CM_Server::send (void)
   return 1;
 }
 
-CM_Server::CM_Server (void)
+CM_Server::CM_Server ()
 {
 }
 
-CM_Server::~CM_Server (void)
+CM_Server::~CM_Server ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/apps/drwho/CM_Server.h b/ACE/apps/drwho/CM_Server.h
index c7f4e8fb8ea..bd0ffae70b7 100644
--- a/ACE/apps/drwho/CM_Server.h
+++ b/ACE/apps/drwho/CM_Server.h
@@ -24,12 +24,12 @@
 class CM_Server : public Comm_Manager
 {
 public:
-  CM_Server (void);
-  virtual ~CM_Server (void);
+  CM_Server ();
+  virtual ~CM_Server ();
 
   virtual int open (short port_number);
   virtual int receive (int timeout = 0);
-  virtual int send (void);
+  virtual int send ();
   virtual int mux (char *packet, int &packet_length)   = 0;
   virtual int demux (char *packet, int &packet_length) = 0;
 };
diff --git a/ACE/apps/drwho/Comm_Manager.cpp b/ACE/apps/drwho/Comm_Manager.cpp
index 9527bf8557e..7538bde5a1d 100644
--- a/ACE/apps/drwho/Comm_Manager.cpp
+++ b/ACE/apps/drwho/Comm_Manager.cpp
@@ -1,5 +1,5 @@
 #include "Comm_Manager.h"
 
-Comm_Manager::~Comm_Manager (void)
+Comm_Manager::~Comm_Manager ()
 {
 }
diff --git a/ACE/apps/drwho/Comm_Manager.h b/ACE/apps/drwho/Comm_Manager.h
index dc681033755..c062ae4f274 100644
--- a/ACE/apps/drwho/Comm_Manager.h
+++ b/ACE/apps/drwho/Comm_Manager.h
@@ -18,7 +18,7 @@
 class Comm_Manager
 {
 public:
-  virtual ~Comm_Manager (void);
+  virtual ~Comm_Manager ();
 
   // = TITLE
   //   Provides a virtual communcations layer for the drwho program.
diff --git a/ACE/apps/drwho/Drwho_Node.cpp b/ACE/apps/drwho/Drwho_Node.cpp
index 1786b89f13d..d4720eb695f 100644
--- a/ACE/apps/drwho/Drwho_Node.cpp
+++ b/ACE/apps/drwho/Drwho_Node.cpp
@@ -10,7 +10,7 @@ Drwho_Node::Drwho_Node (const char *h_name, Drwho_Node *n)
        next_ (n)
 {}
 
-Drwho_Node::Drwho_Node (void)
+Drwho_Node::Drwho_Node ()
      : key_name1_ (0),
        key_name2_ (0),
        tty_name_ (0),
@@ -21,7 +21,7 @@ Drwho_Node::Drwho_Node (void)
 {}
 
 const char *
-Drwho_Node::get_login_name (void)
+Drwho_Node::get_login_name ()
 {
   return this->key_name1_;
 }
@@ -34,7 +34,7 @@ Drwho_Node::set_login_name (const char *str)
 }
 
 const char *
-Drwho_Node::get_real_name (void)
+Drwho_Node::get_real_name ()
 {
   return this->key_name2_;
 }
@@ -47,7 +47,7 @@ Drwho_Node::set_real_name (const char *str)
 }
 
 const char *
-Drwho_Node::get_host_name (void)
+Drwho_Node::get_host_name ()
 {
   return this->key_name1_;
 }
@@ -60,13 +60,13 @@ Drwho_Node::set_host_name (const char *str)
 }
 
 int
-Drwho_Node::get_active_count (void)
+Drwho_Node::get_active_count ()
 {
   return this->active_count_;
 }
 
 int
-Drwho_Node::get_inactive_count (void)
+Drwho_Node::get_inactive_count ()
 {
   return this->inactive_count_;
 }
@@ -93,7 +93,7 @@ Drwho_Node::set_idle_time (int idle_time)
 }
 
 int
-Drwho_Node::get_idle_time (void)
+Drwho_Node::get_idle_time ()
 {
   return this->idle_time_;
 }
diff --git a/ACE/apps/drwho/Drwho_Node.h b/ACE/apps/drwho/Drwho_Node.h
index f463cfbc072..03263d23fef 100644
--- a/ACE/apps/drwho/Drwho_Node.h
+++ b/ACE/apps/drwho/Drwho_Node.h
@@ -23,19 +23,19 @@ class Drwho_Node
 {
 public:
   Drwho_Node (const char *host, Drwho_Node *next);
-  Drwho_Node (void);
+  Drwho_Node ();
 
-  int get_active_count (void);
-  int get_inactive_count (void);
+  int get_active_count ();
+  int get_inactive_count ();
   int set_active_count (int count);
   int set_inactive_count (int count);
   int set_idle_time (int idle_time);
-  int get_idle_time (void);
-  const char *get_host_name (void);
+  int get_idle_time ();
+  const char *get_host_name ();
   const char *set_host_name (const char *str);
-  const char *get_login_name (void);
+  const char *get_login_name ();
   const char *set_login_name (const char *);
-  const char *get_real_name (void);
+  const char *get_real_name ();
   const char *set_real_name (const char *);
 
   const char *key_name1_;
diff --git a/ACE/apps/drwho/File_Manager.cpp b/ACE/apps/drwho/File_Manager.cpp
index 2edfde45bc9..2418da2ffc2 100644
--- a/ACE/apps/drwho/File_Manager.cpp
+++ b/ACE/apps/drwho/File_Manager.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_NS_ctype.h"
 #include "File_Manager.h"
 
-File_Manager::File_Manager (void)
+File_Manager::File_Manager ()
   : number_of_friends (0),
     max_key_length (0),
     buffer_ptr (0),
@@ -69,7 +69,7 @@ File_Manager::get_login_and_real_name (const char *&login_name, const char *&rea
 // Open up the yp passwd file and slurp all the users in!
 
 int
-File_Manager::open_passwd_file (void)
+File_Manager::open_passwd_file ()
 {
   char *filename = const_cast<char *> ("passwd-XXXXXX");
   ACE_HANDLE f = ACE_OS::mkstemp (filename);
diff --git a/ACE/apps/drwho/File_Manager.h b/ACE/apps/drwho/File_Manager.h
index 2025d454c7b..9482608698a 100644
--- a/ACE/apps/drwho/File_Manager.h
+++ b/ACE/apps/drwho/File_Manager.h
@@ -31,7 +31,7 @@ class File_Manager
 {
 public:
   /// Constructor.
-  File_Manager (void);
+  File_Manager ();
 
   int open_file (const char *filename);
   void get_login_and_real_name (const char *&login_name,
@@ -45,7 +45,7 @@ private:
   int buffer_size;
 
   int open_friends_file (const char *filename);
-  int open_passwd_file (void);
+  int open_passwd_file ();
 
   ACE_Mem_Map mmap_;
 };
diff --git a/ACE/apps/drwho/Hash_Table.cpp b/ACE/apps/drwho/Hash_Table.cpp
index b548056acbd..a2e666a81df 100644
--- a/ACE/apps/drwho/Hash_Table.cpp
+++ b/ACE/apps/drwho/Hash_Table.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
-Hash_Table::Hash_Table (void)
+Hash_Table::Hash_Table ()
   : current_ptr (0),
     current_index (0),
     hash_table_size (HASH_TABLE_SIZE)
@@ -19,7 +19,7 @@ Hash_Table::Hash_Table (void)
 // Iterate through the hash table returning one node at a time...
 
 Protocol_Record *
-Hash_Table::get_next_entry (void)
+Hash_Table::get_next_entry ()
 {
   // Reset the iterator if we are starting from the beginning.
 
@@ -48,14 +48,14 @@ Hash_Table::get_next_entry (void)
 }
 
 Protocol_Record *
-Hash_Table::get_each_entry (void)
+Hash_Table::get_each_entry ()
 {
   return this->get_next_entry ();
 }
 
 // Frees up all the dynamic memory in the hash table.
 
-Hash_Table::~Hash_Table (void)
+Hash_Table::~Hash_Table ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/apps/drwho/Hash_Table.h b/ACE/apps/drwho/Hash_Table.h
index a2fc1cec730..24a31d65d29 100644
--- a/ACE/apps/drwho/Hash_Table.h
+++ b/ACE/apps/drwho/Hash_Table.h
@@ -22,12 +22,12 @@
 class Hash_Table : public Search_Struct
 {
 public:
-  Hash_Table (void);
-  virtual ~Hash_Table (void);
+  Hash_Table ();
+  virtual ~Hash_Table ();
   virtual Protocol_Record *insert (const char *key_name,
                                    int max_len = MAXUSERIDNAMELEN) = 0;
-  virtual Protocol_Record *get_next_entry (void);
-  virtual Protocol_Record *get_each_entry (void);
+  virtual Protocol_Record *get_next_entry ();
+  virtual Protocol_Record *get_each_entry ();
 
 protected:
   enum
diff --git a/ACE/apps/drwho/Multicast_Manager.cpp b/ACE/apps/drwho/Multicast_Manager.cpp
index fefc4e854ec..536a99140b5 100644
--- a/ACE/apps/drwho/Multicast_Manager.cpp
+++ b/ACE/apps/drwho/Multicast_Manager.cpp
@@ -20,7 +20,7 @@ const char *Multicast_Manager::host_names[] =
 };
 
 void
-Multicast_Manager::insert_default_hosts (void)
+Multicast_Manager::insert_default_hosts ()
 {
   // Enter the static list of hosts into the dynamic table!
 
@@ -177,7 +177,7 @@ Host_Elem::Host_Elem (const char *h_name,
 }
 
 int
-Multicast_Manager::outstanding_hosts_remain (void)
+Multicast_Manager::outstanding_hosts_remain ()
 {
   return Multicast_Manager::received_host_count > 0;
 }
diff --git a/ACE/apps/drwho/Multicast_Manager.h b/ACE/apps/drwho/Multicast_Manager.h
index b96b1d2d41f..59700edda65 100644
--- a/ACE/apps/drwho/Multicast_Manager.h
+++ b/ACE/apps/drwho/Multicast_Manager.h
@@ -39,10 +39,10 @@ public:
   static void add_host (const char *host_name);
   static void checkoff_host (in_addr host_addr);
   static int get_next_host_addr (in_addr &host_addr);
-  static int outstanding_hosts_remain (void);
+  static int outstanding_hosts_remain ();
   static int get_next_non_responding_host (const char *&host_name);
   static int insert_hosts_from_file (const char *filename);
-  static void insert_default_hosts (void);
+  static void insert_default_hosts ();
 
 private:
   static hostent *get_host_entry (const char *host);
diff --git a/ACE/apps/drwho/PMC_All.cpp b/ACE/apps/drwho/PMC_All.cpp
index 4549b0bd32f..75ba7710571 100644
--- a/ACE/apps/drwho/PMC_All.cpp
+++ b/ACE/apps/drwho/PMC_All.cpp
@@ -87,13 +87,13 @@ PMC_All::insert_protocol_info (Protocol_Record &protocol_record)
 }
 
 void
-PMC_All::process (void)
+PMC_All::process ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "remote users logged on\n"));
   PM_Client::process ();
 }
 
-PMC_All::PMC_All (void)
+PMC_All::PMC_All ()
 {
 }
diff --git a/ACE/apps/drwho/PMC_All.h b/ACE/apps/drwho/PMC_All.h
index 15b9c92e19f..196f8d3cb68 100644
--- a/ACE/apps/drwho/PMC_All.h
+++ b/ACE/apps/drwho/PMC_All.h
@@ -27,8 +27,8 @@ protected:
   virtual int decode (char *packet, int &total_bytes);
 
 public:
-  PMC_All (void);
-  virtual void process (void);
+  PMC_All ();
+  virtual void process ();
 };
 
 #endif /* _PMC_ALL_H */
diff --git a/ACE/apps/drwho/PMC_Flo.cpp b/ACE/apps/drwho/PMC_Flo.cpp
index 549b8156f1c..ba27fe887ae 100644
--- a/ACE/apps/drwho/PMC_Flo.cpp
+++ b/ACE/apps/drwho/PMC_Flo.cpp
@@ -112,13 +112,13 @@ PMC_Flo::insert_protocol_info (Protocol_Record &protocol_record)
 }
 
 void
-PMC_Flo::process (void)
+PMC_Flo::process ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "remote friends logged on\n"));
   PM_Client::process ();
 }
 
-PMC_Flo::PMC_Flo (void)
+PMC_Flo::PMC_Flo ()
 {
 }
diff --git a/ACE/apps/drwho/PMC_Flo.h b/ACE/apps/drwho/PMC_Flo.h
index 84cbbcd1ffa..5f422099ffe 100644
--- a/ACE/apps/drwho/PMC_Flo.h
+++ b/ACE/apps/drwho/PMC_Flo.h
@@ -22,8 +22,8 @@
 class PMC_Flo : public PM_Client
 {
 public:
-  PMC_Flo (void);
-  virtual void process (void);
+  PMC_Flo ();
+  virtual void process ();
 
 protected:
   virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record);
diff --git a/ACE/apps/drwho/PMC_Ruser.cpp b/ACE/apps/drwho/PMC_Ruser.cpp
index c5fb1c67eac..5e764bfdc34 100644
--- a/ACE/apps/drwho/PMC_Ruser.cpp
+++ b/ACE/apps/drwho/PMC_Ruser.cpp
@@ -117,9 +117,9 @@ PMC_Ruser::handle_protocol_entries (const char *cp,
 }
 
 void
-PMC_Ruser::process (void)
+PMC_Ruser::process ()
 {
-  const char *(Drwho_Node::*get_name)(void);
+  const char *(Drwho_Node::*get_name)();
 
   if (Options::get_opt (Options::PRINT_LOGIN_NAME))
     get_name = &Drwho_Node::get_login_name;
@@ -172,6 +172,6 @@ PMC_Ruser::process (void)
     }
 }
 
-PMC_Ruser::PMC_Ruser (void)
+PMC_Ruser::PMC_Ruser ()
 {
 }
diff --git a/ACE/apps/drwho/PMC_Ruser.h b/ACE/apps/drwho/PMC_Ruser.h
index e5773c849da..3939c4025a4 100644
--- a/ACE/apps/drwho/PMC_Ruser.h
+++ b/ACE/apps/drwho/PMC_Ruser.h
@@ -22,8 +22,8 @@
 class PMC_Ruser : public PM_Client
 {
 public:
-  PMC_Ruser (void);
-  virtual void process (void);
+  PMC_Ruser ();
+  virtual void process ();
 
 protected:
   char *handle_protocol_entries (const char *cp,
diff --git a/ACE/apps/drwho/PMC_Usr.cpp b/ACE/apps/drwho/PMC_Usr.cpp
index 38793b293c0..5a4a00191a7 100644
--- a/ACE/apps/drwho/PMC_Usr.cpp
+++ b/ACE/apps/drwho/PMC_Usr.cpp
@@ -71,7 +71,7 @@ PMC_Usr::decode (char *packet, int &packet_length)
 }
 
 void
-PMC_Usr::process (void)
+PMC_Usr::process ()
 {
   Protocol_Record *prp = this->get_each_friend ();
   Drwho_Node *np  = prp->get_drwho_list ();
diff --git a/ACE/apps/drwho/PMC_Usr.h b/ACE/apps/drwho/PMC_Usr.h
index 7516fc8db60..07bd6dff900 100644
--- a/ACE/apps/drwho/PMC_Usr.h
+++ b/ACE/apps/drwho/PMC_Usr.h
@@ -23,7 +23,7 @@ class PMC_Usr : public PM_Client
 {
 public:
   PMC_Usr (char *usr_name);
-  virtual void process (void);
+  virtual void process ();
 
 protected:
   virtual int encode (char *packet, int &total_bytes);
diff --git a/ACE/apps/drwho/PMS_All.cpp b/ACE/apps/drwho/PMS_All.cpp
index 715af0501af..6379074467d 100644
--- a/ACE/apps/drwho/PMS_All.cpp
+++ b/ACE/apps/drwho/PMS_All.cpp
@@ -95,6 +95,6 @@ PMS_All::insert_protocol_info (Protocol_Record &protocol_record)
   return prp;
 }
 
-PMS_All::PMS_All (void)
+PMS_All::PMS_All ()
 {
 }
diff --git a/ACE/apps/drwho/PMS_All.h b/ACE/apps/drwho/PMS_All.h
index 1e7fbbfa04b..dd9ea7b4e31 100644
--- a/ACE/apps/drwho/PMS_All.h
+++ b/ACE/apps/drwho/PMS_All.h
@@ -22,7 +22,7 @@
 class PMS_All : public PM_Server
 {
 public:
-  PMS_All (void);
+  PMS_All ();
 
 protected:
   virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record);
diff --git a/ACE/apps/drwho/PMS_Flo.cpp b/ACE/apps/drwho/PMS_Flo.cpp
index 9d51bf856b9..7c15845f717 100644
--- a/ACE/apps/drwho/PMS_Flo.cpp
+++ b/ACE/apps/drwho/PMS_Flo.cpp
@@ -70,6 +70,6 @@ PMS_Flo::decode (char *packet, int &packet_length)
   return 1;
 }
 
-PMS_Flo::PMS_Flo (void)
+PMS_Flo::PMS_Flo ()
 {
 }
diff --git a/ACE/apps/drwho/PMS_Flo.h b/ACE/apps/drwho/PMS_Flo.h
index eac5aab5752..f538b851f1d 100644
--- a/ACE/apps/drwho/PMS_Flo.h
+++ b/ACE/apps/drwho/PMS_Flo.h
@@ -22,7 +22,7 @@
 class PMS_Flo : public PM_Server
 {
 public:
-  PMS_Flo (void);
+  PMS_Flo ();
 
 protected:
   virtual int encode (char *packet, int &total_bytes);
diff --git a/ACE/apps/drwho/PMS_Ruser.cpp b/ACE/apps/drwho/PMS_Ruser.cpp
index a20b8899e2f..e029fda6c98 100644
--- a/ACE/apps/drwho/PMS_Ruser.cpp
+++ b/ACE/apps/drwho/PMS_Ruser.cpp
@@ -128,6 +128,6 @@ PMS_Ruser::handle_protocol_entries (char *buf_ptr,
   return buf_ptr;
 }
 
-PMS_Ruser::PMS_Ruser (void)
+PMS_Ruser::PMS_Ruser ()
 {
 }
diff --git a/ACE/apps/drwho/PMS_Ruser.h b/ACE/apps/drwho/PMS_Ruser.h
index d3010b8ce38..869b640912a 100644
--- a/ACE/apps/drwho/PMS_Ruser.h
+++ b/ACE/apps/drwho/PMS_Ruser.h
@@ -22,7 +22,7 @@
 class PMS_Ruser : public PM_Server
 {
 public:
-  PMS_Ruser (void);
+  PMS_Ruser ();
 
 protected:
   virtual char *handle_protocol_entries (char *bp, Drwho_Node *hp);
diff --git a/ACE/apps/drwho/PMS_Usr.cpp b/ACE/apps/drwho/PMS_Usr.cpp
index fb9eb0ed387..ea8d48c0e57 100644
--- a/ACE/apps/drwho/PMS_Usr.cpp
+++ b/ACE/apps/drwho/PMS_Usr.cpp
@@ -76,6 +76,6 @@ PMS_Usr::decode (char *packet, int &packet_length)
   return 1;
 }
 
-PMS_Usr::PMS_Usr (void)
+PMS_Usr::PMS_Usr ()
 {
 }
diff --git a/ACE/apps/drwho/PMS_Usr.h b/ACE/apps/drwho/PMS_Usr.h
index 93d0a642fe6..66fc4fceb56 100644
--- a/ACE/apps/drwho/PMS_Usr.h
+++ b/ACE/apps/drwho/PMS_Usr.h
@@ -22,7 +22,7 @@
 class PMS_Usr : public PM_Server
 {
 public:
-  PMS_Usr (void);
+  PMS_Usr ();
 
 protected:
   virtual int encode (char *packet, int &total_bytes);
diff --git a/ACE/apps/drwho/PM_Client.cpp b/ACE/apps/drwho/PM_Client.cpp
index 623ac65f634..1272a3fcdc4 100644
--- a/ACE/apps/drwho/PM_Client.cpp
+++ b/ACE/apps/drwho/PM_Client.cpp
@@ -36,9 +36,9 @@ PM_Client::insert_protocol_info (Protocol_Record &protocol_record)
 // friends info in a nicely formatted manner.
 
 void
-PM_Client::process (void)
+PM_Client::process ()
 {
-  const char *(Protocol_Record::*get_name)(void);
+  const char *(Protocol_Record::*get_name)();
 
   if (Options::get_opt (Options::PRINT_LOGIN_NAME))
     get_name = &Protocol_Record::get_login;
@@ -128,11 +128,11 @@ PM_Client::handle_protocol_entries (const char *cp,
   return (char *) ACE::strend (cp);
 }
 
-PM_Client::PM_Client (void)
+PM_Client::PM_Client ()
   : max_key_length (0)
 {
 }
 
-PM_Client::~PM_Client (void)
+PM_Client::~PM_Client ()
 {
 }
diff --git a/ACE/apps/drwho/PM_Client.h b/ACE/apps/drwho/PM_Client.h
index 0ccd91504ff..af1cf18309e 100644
--- a/ACE/apps/drwho/PM_Client.h
+++ b/ACE/apps/drwho/PM_Client.h
@@ -22,12 +22,12 @@
 class PM_Client : public Protocol_Manager
 {
 public:
-  PM_Client (void);
-  virtual ~PM_Client (void);
+  PM_Client ();
+  virtual ~PM_Client ();
 
   virtual int encode (char *packet, int &total_bytes) = 0;
   virtual int decode (char *packet, int &total_bytes) = 0;
-  virtual void process (void);
+  virtual void process ();
 
 protected:
   int max_key_length;
diff --git a/ACE/apps/drwho/PM_Server.cpp b/ACE/apps/drwho/PM_Server.cpp
index f82fb3d383f..662735e25ea 100644
--- a/ACE/apps/drwho/PM_Server.cpp
+++ b/ACE/apps/drwho/PM_Server.cpp
@@ -12,7 +12,7 @@
 // whether a given LOGIN_NAME is currently idle or not.
 
 int
-PM_Server::process (void)
+PM_Server::process ()
 {
   RWho_DB_Manager ru;
   Protocol_Record protocol_record (1);
@@ -72,10 +72,10 @@ PM_Server::handle_protocol_entries (char *buf_ptr,
   return buf_ptr;
 }
 
-PM_Server::PM_Server (void)
+PM_Server::PM_Server ()
 {
 }
 
-PM_Server::~PM_Server (void)
+PM_Server::~PM_Server ()
 {
 }
diff --git a/ACE/apps/drwho/PM_Server.h b/ACE/apps/drwho/PM_Server.h
index 3ced1b326a1..52ffb63ae17 100644
--- a/ACE/apps/drwho/PM_Server.h
+++ b/ACE/apps/drwho/PM_Server.h
@@ -22,12 +22,12 @@
 class PM_Server : public Protocol_Manager
 {
 public:
-  PM_Server (void);
-  virtual ~PM_Server (void);
+  PM_Server ();
+  virtual ~PM_Server ();
 
   virtual int encode (char *packet, int &total_bytes) = 0;
   virtual int decode (char *packet, int &total_bytes) = 0;
-  virtual int process (void);
+  virtual int process ();
 
 protected:
   virtual char *handle_protocol_entries (char *bp,
diff --git a/ACE/apps/drwho/Protocol_Manager.cpp b/ACE/apps/drwho/Protocol_Manager.cpp
index 1d9bfc6d723..b5cfb466f8f 100644
--- a/ACE/apps/drwho/Protocol_Manager.cpp
+++ b/ACE/apps/drwho/Protocol_Manager.cpp
@@ -37,12 +37,12 @@ Protocol_Manager::get_drwho_node (char *key_name, Drwho_Node *&head)
   return head;
 }
 
-Protocol_Manager::Protocol_Manager (void)
+Protocol_Manager::Protocol_Manager ()
   : total_users (0)
 {
 }
 
-Protocol_Manager::~Protocol_Manager (void)
+Protocol_Manager::~Protocol_Manager ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
@@ -52,13 +52,13 @@ Protocol_Manager::~Protocol_Manager (void)
 // Returns the next friend in the sequence of sorted friends.
 
 Protocol_Record *
-Protocol_Manager::get_next_friend (void)
+Protocol_Manager::get_next_friend ()
 {
   return this->ss->get_next_entry ();
 }
 
 Protocol_Record *
-Protocol_Manager::get_each_friend (void)
+Protocol_Manager::get_each_friend ()
 {
   return this->ss->get_each_entry ();
 }
@@ -66,7 +66,7 @@ Protocol_Manager::get_each_friend (void)
 // Returns the number of friends.
 
 int
-Protocol_Manager::friend_count (void)
+Protocol_Manager::friend_count ()
 {
   return this->ss->n_elems ();
 }
@@ -74,7 +74,7 @@ Protocol_Manager::friend_count (void)
 // Returns total number of users logged in throughout the system.
 
 int
-Protocol_Manager::get_total_users (void)
+Protocol_Manager::get_total_users ()
 {
   return Protocol_Manager::total_users;
 }
diff --git a/ACE/apps/drwho/Protocol_Manager.h b/ACE/apps/drwho/Protocol_Manager.h
index 6dc42c35dd1..37978300d47 100644
--- a/ACE/apps/drwho/Protocol_Manager.h
+++ b/ACE/apps/drwho/Protocol_Manager.h
@@ -31,8 +31,8 @@
 class Protocol_Manager
 {
 public:
-  Protocol_Manager (void);
-  virtual ~Protocol_Manager (void);
+  Protocol_Manager ();
+  virtual ~Protocol_Manager ();
 
   virtual int encode (char *packet, int &total_bytes) = 0;
   virtual int decode (char *packet, int &total_bytes) = 0;
@@ -41,14 +41,14 @@ protected:
   int total_users;
   Search_Struct *ss;
 
-  int friend_count (void);
+  int friend_count ();
 
   Drwho_Node *get_drwho_node (char *host_name, Drwho_Node *&head);
-  int get_total_users (void);
+  int get_total_users ();
   void increment_total_users (int remote_users = 1);
 
-  Protocol_Record *get_next_friend (void);
-  Protocol_Record *get_each_friend (void);
+  Protocol_Record *get_next_friend ();
+  Protocol_Record *get_each_friend ();
 
   virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record) = 0;
 };
diff --git a/ACE/apps/drwho/Protocol_Record.cpp b/ACE/apps/drwho/Protocol_Record.cpp
index 7190b7bd777..45c3f7b00e2 100644
--- a/ACE/apps/drwho/Protocol_Record.cpp
+++ b/ACE/apps/drwho/Protocol_Record.cpp
@@ -6,7 +6,7 @@
 
 Drwho_Node Protocol_Record::drwho_node_;
 
-Protocol_Record::~Protocol_Record (void)
+Protocol_Record::~Protocol_Record ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
@@ -21,7 +21,7 @@ Protocol_Record::~Protocol_Record (void)
     }
 }
 
-Protocol_Record::Protocol_Record (void)
+Protocol_Record::Protocol_Record ()
   : key_name1_ (0),
     key_name2_ (0),
     drwho_list_ (0),
@@ -50,7 +50,7 @@ Protocol_Record::Protocol_Record (const char *kn1,
 }
 
 const char *
-Protocol_Record::get_login (void)
+Protocol_Record::get_login ()
 {
   return this->key_name1_;
 }
@@ -63,13 +63,13 @@ Protocol_Record::set_login (const char *str)
 }
 
 const char *
-Protocol_Record::get_real (void)
+Protocol_Record::get_real ()
 {
   return this->key_name2_;
 }
 
 const char *
-Protocol_Record::get_host (void)
+Protocol_Record::get_host ()
 {
   return this->key_name1_;
 }
@@ -89,7 +89,7 @@ Protocol_Record::set_real (const char *str)
 }
 
 Drwho_Node *
-Protocol_Record::get_drwho_list (void)
+Protocol_Record::get_drwho_list ()
 {
   return this->drwho_list_;
 }
diff --git a/ACE/apps/drwho/Protocol_Record.h b/ACE/apps/drwho/Protocol_Record.h
index 7ea6da05d74..31d20b57256 100644
--- a/ACE/apps/drwho/Protocol_Record.h
+++ b/ACE/apps/drwho/Protocol_Record.h
@@ -22,18 +22,18 @@
 class Protocol_Record
 {
 public:
-  Protocol_Record (void);
+  Protocol_Record ();
   Protocol_Record (int use_dummy);
   Protocol_Record (const char *key_name1,
                    Protocol_Record *next = 0);
-  ~Protocol_Record (void);
-  const char *get_host (void);
+  ~Protocol_Record ();
+  const char *get_host ();
   const char *set_host (const char *str);
-  const char *get_login (void);
+  const char *get_login ();
   const char *set_login (const char *str);
-  const char *get_real (void);
+  const char *get_real ();
   const char *set_real (const char *str);
-  Drwho_Node *get_drwho_list (void);
+  Drwho_Node *get_drwho_list ();
 
   static Drwho_Node drwho_node_;
   const char *key_name1_;
diff --git a/ACE/apps/drwho/Rwho_DB_Manager.cpp b/ACE/apps/drwho/Rwho_DB_Manager.cpp
index 4910da3f0f7..d36b1f646be 100644
--- a/ACE/apps/drwho/Rwho_DB_Manager.cpp
+++ b/ACE/apps/drwho/Rwho_DB_Manager.cpp
@@ -12,7 +12,7 @@
 // files in the directory, which are assumed to be "." and ".." (this
 // function needs to be changed if this assumption does not hold!)
 
-RWho_DB_Manager::RWho_DB_Manager (void)
+RWho_DB_Manager::RWho_DB_Manager ()
   : number_of_users (0),
     current_user (0),
     WHOD_HEADER_SIZE (sizeof host_data - sizeof host_data.wd_we),
@@ -41,7 +41,7 @@ RWho_DB_Manager::RWho_DB_Manager (void)
 
 // The destructor cleans up the RWHOD_DIR handle.
 
-RWho_DB_Manager::~RWho_DB_Manager (void)
+RWho_DB_Manager::~RWho_DB_Manager ()
 {
   if (ACE_OS::chdir (this->original_pathname) < 0)
     ACE_ERROR ((LM_ERROR,
@@ -64,7 +64,7 @@ RWho_DB_Manager::~RWho_DB_Manager (void)
 //  Are there any more hosts? */
 
 int
-RWho_DB_Manager::get_next_host (void)
+RWho_DB_Manager::get_next_host ()
 {
   time_t current_time;
 
diff --git a/ACE/apps/drwho/Rwho_DB_Manager.h b/ACE/apps/drwho/Rwho_DB_Manager.h
index 3672fd02a30..42e2c8611d7 100644
--- a/ACE/apps/drwho/Rwho_DB_Manager.h
+++ b/ACE/apps/drwho/Rwho_DB_Manager.h
@@ -31,8 +31,8 @@
 class RWho_DB_Manager
 {
 public:
-  RWho_DB_Manager (void);
-  ~RWho_DB_Manager (void);
+  RWho_DB_Manager ();
+  ~RWho_DB_Manager ();
   int get_next_user (Protocol_Record &protocol_record);
 
 private:
@@ -44,7 +44,7 @@ private:
   char original_pathname[MAXPATHLEN + 1];
   const char *rwho_dir_name;
 
-  int get_next_host (void);
+  int get_next_host ();
 };
 
 #endif /* _RWHO_DB_MANAGER_H */
diff --git a/ACE/apps/drwho/SL_Server.cpp b/ACE/apps/drwho/SL_Server.cpp
index 06fe054eb5b..879f9fee5a8 100644
--- a/ACE/apps/drwho/SL_Server.cpp
+++ b/ACE/apps/drwho/SL_Server.cpp
@@ -8,7 +8,7 @@ SL_Server::SL_Server (const char *usr_name)
 }
 
 Protocol_Record *
-SL_Server::get_each_entry (void)
+SL_Server::get_each_entry ()
 {
   Protocol_Record *prp = Single_Lookup::get_each_entry ();
   return prp->get_drwho_list () == 0 ? 0 : prp;
diff --git a/ACE/apps/drwho/SL_Server.h b/ACE/apps/drwho/SL_Server.h
index 69be906c54d..c45649c8194 100644
--- a/ACE/apps/drwho/SL_Server.h
+++ b/ACE/apps/drwho/SL_Server.h
@@ -25,7 +25,7 @@ public:
   SL_Server (const char *packet);
   virtual Protocol_Record *insert (const char *key_name,
                                    int max_len = MAXUSERIDNAMELEN);
-  virtual Protocol_Record *get_each_entry (void);
+  virtual Protocol_Record *get_each_entry ();
 };
 
 #endif /* _SL_SERVER_H */
diff --git a/ACE/apps/drwho/SML_Client.cpp b/ACE/apps/drwho/SML_Client.cpp
index f4d46e59bfe..c41305f7e60 100644
--- a/ACE/apps/drwho/SML_Client.cpp
+++ b/ACE/apps/drwho/SML_Client.cpp
@@ -14,7 +14,7 @@ SML_Client::receive (int)
 }
 
 int
-SML_Client::send (void)
+SML_Client::send ()
 {
   if (this->mux (this->send_packet_, this->packet_length) < 0)
     return -1;
@@ -25,10 +25,10 @@ SML_Client::send (void)
   return 1;
 }
 
-SML_Client::SML_Client (void)
+SML_Client::SML_Client ()
 {
 }
 
-SML_Client::~SML_Client (void)
+SML_Client::~SML_Client ()
 {
 }
diff --git a/ACE/apps/drwho/SML_Client.h b/ACE/apps/drwho/SML_Client.h
index a6eb4fcfdbf..85575b0cfd0 100644
--- a/ACE/apps/drwho/SML_Client.h
+++ b/ACE/apps/drwho/SML_Client.h
@@ -18,10 +18,10 @@
 class SML_Client : public SM_Client
 {
 public:
-  SML_Client (void);
-  virtual ~SML_Client (void);
+  SML_Client ();
+  virtual ~SML_Client ();
   virtual int receive (int timeout = 0);
-  virtual int send (void);
+  virtual int send ();
 
 private:
   SML_Server sml_server;
diff --git a/ACE/apps/drwho/SML_Server.cpp b/ACE/apps/drwho/SML_Server.cpp
index 65dbcd9ef2d..87afe72db44 100644
--- a/ACE/apps/drwho/SML_Server.cpp
+++ b/ACE/apps/drwho/SML_Server.cpp
@@ -1,9 +1,9 @@
 #include "SML_Server.h"
 
-SML_Server::SML_Server (void)
+SML_Server::SML_Server ()
 {
 }
 
-SML_Server::~SML_Server (void)
+SML_Server::~SML_Server ()
 {
 }
diff --git a/ACE/apps/drwho/SML_Server.h b/ACE/apps/drwho/SML_Server.h
index 54090554d02..33116238bd7 100644
--- a/ACE/apps/drwho/SML_Server.h
+++ b/ACE/apps/drwho/SML_Server.h
@@ -17,8 +17,8 @@
 class SML_Server : public SM_Server
 {
 public:
-  SML_Server (void);
-  virtual ~SML_Server (void);
+  SML_Server ();
+  virtual ~SML_Server ();
 };
 
 #endif /* _SML_SERVER_H */
diff --git a/ACE/apps/drwho/SMR_Client.cpp b/ACE/apps/drwho/SMR_Client.cpp
index 84852dc64af..e861854393a 100644
--- a/ACE/apps/drwho/SMR_Client.cpp
+++ b/ACE/apps/drwho/SMR_Client.cpp
@@ -15,6 +15,6 @@ SMR_Client::SMR_Client (short port_number)
                 1));
 }
 
-SMR_Client::~SMR_Client (void)
+SMR_Client::~SMR_Client ()
 {
 }
diff --git a/ACE/apps/drwho/SMR_Client.h b/ACE/apps/drwho/SMR_Client.h
index 9acf958036a..fee2454064b 100644
--- a/ACE/apps/drwho/SMR_Client.h
+++ b/ACE/apps/drwho/SMR_Client.h
@@ -18,7 +18,7 @@ class SMR_Client : public SM_Client
 {
 public:
   SMR_Client (short port_number);
-  virtual ~SMR_Client (void);
+  virtual ~SMR_Client ();
 };
 
 #endif /* _SMR_CLIENT_H */
diff --git a/ACE/apps/drwho/SMR_Server.cpp b/ACE/apps/drwho/SMR_Server.cpp
index ecec25c1c10..31f735aa1ed 100644
--- a/ACE/apps/drwho/SMR_Server.cpp
+++ b/ACE/apps/drwho/SMR_Server.cpp
@@ -11,6 +11,6 @@ SMR_Server::SMR_Server (short port_number)
                 1));
 }
 
-SMR_Server::~SMR_Server (void)
+SMR_Server::~SMR_Server ()
 {
 }
diff --git a/ACE/apps/drwho/SMR_Server.h b/ACE/apps/drwho/SMR_Server.h
index d25db5d68b9..1ca8887f217 100644
--- a/ACE/apps/drwho/SMR_Server.h
+++ b/ACE/apps/drwho/SMR_Server.h
@@ -18,7 +18,7 @@ class SMR_Server : public SM_Server
 {
 public:
   SMR_Server (short port_number);
-  ~SMR_Server (void);
+  ~SMR_Server ();
 };
 
 #endif /* _SMR_SERVER_H */
diff --git a/ACE/apps/drwho/SM_Client.cpp b/ACE/apps/drwho/SM_Client.cpp
index 9a7545f5e68..17e5635799a 100644
--- a/ACE/apps/drwho/SM_Client.cpp
+++ b/ACE/apps/drwho/SM_Client.cpp
@@ -58,16 +58,16 @@ SM_Client::mux (char *packet, int &packet_length)
   return 1;
 }
 
-SM_Client::SM_Client (void)
+SM_Client::SM_Client ()
 {
 }
 
-SM_Client::~SM_Client (void)
+SM_Client::~SM_Client ()
 {
 }
 
 void
-SM_Client::process (void)
+SM_Client::process ()
 {
   this->pm_client->process ();
 }
diff --git a/ACE/apps/drwho/SM_Client.h b/ACE/apps/drwho/SM_Client.h
index 436b0a4b3c4..6799d062633 100644
--- a/ACE/apps/drwho/SM_Client.h
+++ b/ACE/apps/drwho/SM_Client.h
@@ -19,12 +19,12 @@
 class SM_Client : public Select_Manager, public CM_Client
 {
 public:
-  SM_Client (void);
-  virtual ~SM_Client (void);
+  SM_Client ();
+  virtual ~SM_Client ();
 
   virtual int mux (char *packet, int &packet_length);
   virtual int demux (char *packet, int &packet_length);
-  virtual void process (void);
+  virtual void process ();
 
 private:
   PM_Client *pm_client;
diff --git a/ACE/apps/drwho/SM_Server.cpp b/ACE/apps/drwho/SM_Server.cpp
index 5c7271c2474..bcc2a29f33e 100644
--- a/ACE/apps/drwho/SM_Server.cpp
+++ b/ACE/apps/drwho/SM_Server.cpp
@@ -58,10 +58,10 @@ SM_Server::mux (char *packet,
   return pm_server->encode (packet, packet_length);
 }
 
-SM_Server::SM_Server (void)
+SM_Server::SM_Server ()
 {
 }
 
-SM_Server::~SM_Server (void)
+SM_Server::~SM_Server ()
 {
 }
diff --git a/ACE/apps/drwho/SM_Server.h b/ACE/apps/drwho/SM_Server.h
index b729d61e45f..5c1ba2de733 100644
--- a/ACE/apps/drwho/SM_Server.h
+++ b/ACE/apps/drwho/SM_Server.h
@@ -19,8 +19,8 @@
 class SM_Server : public Select_Manager, public CM_Server
 {
 public:
-  SM_Server (void);
-  virtual ~SM_Server (void);
+  SM_Server ();
+  virtual ~SM_Server ();
   virtual int mux (char *packet, int &packet_length);
   virtual int demux (char *packet, int &packet_length);
 
diff --git a/ACE/apps/drwho/Search_Struct.cpp b/ACE/apps/drwho/Search_Struct.cpp
index 33491396ee1..c9feb783815 100644
--- a/ACE/apps/drwho/Search_Struct.cpp
+++ b/ACE/apps/drwho/Search_Struct.cpp
@@ -2,19 +2,19 @@
 #include "Search_Struct.h"
 #include "ace/Log_Msg.h"
 
-Search_Struct::~Search_Struct (void)
+Search_Struct::~Search_Struct ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
                 "disposing Search_Struct\n"));
 }
 
-Search_Struct::Search_Struct (void)
+Search_Struct::Search_Struct ()
   : count_ (0)
 {}
 
 int
-Search_Struct::n_elems (void)
+Search_Struct::n_elems ()
 {
   return this->count_;
 }
diff --git a/ACE/apps/drwho/Search_Struct.h b/ACE/apps/drwho/Search_Struct.h
index ff39c6bcc65..c8762f70daf 100644
--- a/ACE/apps/drwho/Search_Struct.h
+++ b/ACE/apps/drwho/Search_Struct.h
@@ -23,9 +23,9 @@
 class Search_Struct
 {
 public:
-  Search_Struct (void);
-  virtual ~Search_Struct (void);
-  virtual int n_elems (void);
+  Search_Struct ();
+  virtual ~Search_Struct ();
+  virtual int n_elems ();
 
   virtual Protocol_Record *insert (const char *key_name,
                                    int max_len = MAXUSERIDNAMELEN) = 0;
diff --git a/ACE/apps/drwho/Select_Manager.cpp b/ACE/apps/drwho/Select_Manager.cpp
index 6ac3cd75b8f..c34e0b51f54 100644
--- a/ACE/apps/drwho/Select_Manager.cpp
+++ b/ACE/apps/drwho/Select_Manager.cpp
@@ -1,6 +1,6 @@
 #include "Select_Manager.h"
 
 
-Select_Manager::~Select_Manager (void)
+Select_Manager::~Select_Manager ()
 {
 }
diff --git a/ACE/apps/drwho/Select_Manager.h b/ACE/apps/drwho/Select_Manager.h
index 124af5d836c..ba0dc81a617 100644
--- a/ACE/apps/drwho/Select_Manager.h
+++ b/ACE/apps/drwho/Select_Manager.h
@@ -15,7 +15,7 @@
 class Select_Manager
 {
 public:
-  virtual ~Select_Manager (void);
+  virtual ~Select_Manager ();
 
   virtual int mux (char *packet,
                    int &packet_length) = 0 ;
diff --git a/ACE/apps/drwho/Single_Lookup.cpp b/ACE/apps/drwho/Single_Lookup.cpp
index 57c33772bf2..a286ab8e226 100644
--- a/ACE/apps/drwho/Single_Lookup.cpp
+++ b/ACE/apps/drwho/Single_Lookup.cpp
@@ -10,7 +10,7 @@ Single_Lookup::Single_Lookup (const char *usr_name)
            Protocol_Record (ACE::strnew (usr_name)));
 }
 
-Single_Lookup::~Single_Lookup (void)
+Single_Lookup::~Single_Lookup ()
 {
   if (Options::get_opt (Options::DEBUGGING))
     ACE_DEBUG ((LM_DEBUG,
@@ -18,13 +18,13 @@ Single_Lookup::~Single_Lookup (void)
 }
 
 Protocol_Record *
-Single_Lookup::get_each_entry (void)
+Single_Lookup::get_each_entry ()
 {
   return this->prp_;
 }
 
 Protocol_Record *
-Single_Lookup::get_next_entry (void)
+Single_Lookup::get_next_entry ()
 {
   return this->get_each_entry ();
 }
diff --git a/ACE/apps/drwho/Single_Lookup.h b/ACE/apps/drwho/Single_Lookup.h
index b5e2d952efd..b341328fc66 100644
--- a/ACE/apps/drwho/Single_Lookup.h
+++ b/ACE/apps/drwho/Single_Lookup.h
@@ -24,11 +24,11 @@ class Single_Lookup : public Search_Struct
 {
 public:
   Single_Lookup (const char *usr_name);
-  virtual ~Single_Lookup (void);
+  virtual ~Single_Lookup ();
   virtual Protocol_Record *insert (const char *key_name,
                                    int max_len = MAXUSERIDNAMELEN) = 0;
-  virtual Protocol_Record *get_next_entry (void);
-  virtual Protocol_Record *get_each_entry (void);
+  virtual Protocol_Record *get_next_entry ();
+  virtual Protocol_Record *get_each_entry ();
 
 protected:
   Protocol_Record *prp_;
diff --git a/ACE/apps/drwho/client.cpp b/ACE/apps/drwho/client.cpp
index 3cdc417e64d..4f49ff6c1b2 100644
--- a/ACE/apps/drwho/client.cpp
+++ b/ACE/apps/drwho/client.cpp
@@ -20,7 +20,7 @@
 // Factory function.
 
 static SM_Client *
-make_client (void)
+make_client ()
 {
   SM_Client *client = 0;
 
diff --git a/ACE/apps/drwho/server.cpp b/ACE/apps/drwho/server.cpp
index b497b1fcf2c..40d1bea6f80 100644
--- a/ACE/apps/drwho/server.cpp
+++ b/ACE/apps/drwho/server.cpp
@@ -23,7 +23,7 @@
 #include "ace/OS_NS_sys_socket.h"
 
 static char *
-time_stamp (void)
+time_stamp ()
 {
   time_t time_now;
   char *temp;
@@ -49,7 +49,7 @@ exit_server (int sig)
 // Returns TRUE if the program was started by INETD.
 
 static int
-started_by_inetd (void)
+started_by_inetd ()
 {
   sockaddr_in sin;
   int size = sizeof sin;
diff --git a/ACE/apps/gperf/src/Bool_Array.cpp b/ACE/apps/gperf/src/Bool_Array.cpp
index 6c946c4702d..e2f206b134a 100644
--- a/ACE/apps/gperf/src/Bool_Array.cpp
+++ b/ACE/apps/gperf/src/Bool_Array.cpp
@@ -29,7 +29,7 @@
 
 // Prints out debugging diagnostics.
 
-Bool_Array::~Bool_Array (void)
+Bool_Array::~Bool_Array ()
 {
   if (option[DEBUGGING])
     ACE_DEBUG ((LM_DEBUG,
@@ -40,7 +40,7 @@ Bool_Array::~Bool_Array (void)
   delete [] this->storage_array_;
 }
 
-Bool_Array::Bool_Array (void)
+Bool_Array::Bool_Array ()
   : storage_array_ (0),
     generation_number_ (0),
     size_ (0)
@@ -82,7 +82,7 @@ Bool_Array::find (u_long slot)
 }
 
 void
-Bool_Array::reset (void)
+Bool_Array::reset ()
 {
   if (++generation_number_ == 0)
     {
diff --git a/ACE/apps/gperf/src/Bool_Array.h b/ACE/apps/gperf/src/Bool_Array.h
index 3f043390ab7..e082b2ed93b 100644
--- a/ACE/apps/gperf/src/Bool_Array.h
+++ b/ACE/apps/gperf/src/Bool_Array.h
@@ -43,19 +43,19 @@ class Bool_Array
 {
 public:
   /// Constructor
-  Bool_Array (void);
+  Bool_Array ();
 
   /// Initialize the array (requires O(n) time).
   int open (u_long);
 
   /// Destructor.
-  ~Bool_Array (void);
+  ~Bool_Array ();
 
   /// Locate the @a value in the array (requires O(1) time).
   int find (u_long value);
 
   /// Reinitializes the array (requires O(1) time).
-  void reset (void);
+  void reset ();
 
 private:
   /// Initialization of the index space.
diff --git a/ACE/apps/gperf/src/Gen_Perf.cpp b/ACE/apps/gperf/src/Gen_Perf.cpp
index b28bc2bcd50..382e95cf50c 100644
--- a/ACE/apps/gperf/src/Gen_Perf.cpp
+++ b/ACE/apps/gperf/src/Gen_Perf.cpp
@@ -37,7 +37,7 @@ extern const char *version_string;
 /// of 2), may initialize the associated values array, and determines
 /// the maximum hash table size.  Note: using the random numbers is
 /// often helpful, though not as deterministic, of course!
-Gen_Perf::Gen_Perf (void)
+Gen_Perf::Gen_Perf ()
   : max_hash_value (0),
     fewest_collisions (0),
     num_done (1),
@@ -232,7 +232,7 @@ Gen_Perf::change (List_Node *prior, List_Node *curr)
 }
 
 int
-Gen_Perf::open (void)
+Gen_Perf::open ()
 {
   if (this->key_list.read_keys () == -1)
     return -1;
@@ -314,7 +314,7 @@ Gen_Perf::open (void)
 /// assign hash values from 0 to N-1. Then go ahead with the normal
 /// logic that is there for perfect hashing.
 int
-Gen_Perf::compute_binary_search (void)
+Gen_Perf::compute_binary_search ()
 {
   // Do a string sort.
   this->key_list.string_sort ();
@@ -333,7 +333,7 @@ Gen_Perf::compute_binary_search (void)
 }
 
 int
-Gen_Perf::compute_linear_search (void)
+Gen_Perf::compute_linear_search ()
 {
   // Convert the list of keys to a linear list without
   // equivalence classes.
@@ -352,7 +352,7 @@ Gen_Perf::compute_linear_search (void)
 }
 
 int
-Gen_Perf::compute_perfect_hash (void)
+Gen_Perf::compute_perfect_hash ()
 {
   List_Node *curr = 0;
 
@@ -416,7 +416,7 @@ Gen_Perf::compute_perfect_hash (void)
 /// The alternatives (e.g., back-tracking) are too time-consuming, i.e,
 /// exponential in the number of keys.
 int
-Gen_Perf::run (void)
+Gen_Perf::run ()
 {
   if (this->open () == -1)
     return 1;
@@ -447,7 +447,7 @@ Gen_Perf::run (void)
 }
 
 /// Prints out some diagnostics upon completion.
-Gen_Perf::~Gen_Perf (void)
+Gen_Perf::~Gen_Perf ()
 {
   if (option[DEBUGGING])
     {
diff --git a/ACE/apps/gperf/src/Gen_Perf.h b/ACE/apps/gperf/src/Gen_Perf.h
index c52e1bb2263..c0ab6455928 100644
--- a/ACE/apps/gperf/src/Gen_Perf.h
+++ b/ACE/apps/gperf/src/Gen_Perf.h
@@ -37,21 +37,21 @@ class Gen_Perf : private ACE_Copy_Disabled
 {
 public:
   /// Constructor.
-  Gen_Perf (void);
+  Gen_Perf ();
 
   /// Destructor
-  ~Gen_Perf (void);
+  ~Gen_Perf ();
 
   /// Attempt to generate a perfect hash function.
-  int run (void);
+  int run ();
 
 private:
-  int open (void);
+  int open ();
   int change (List_Node *prior, List_Node *curr);
   int affects_prev (char c, List_Node *curr);
-  int compute_perfect_hash (void);
-  int compute_binary_search (void);
-  int compute_linear_search (void);
+  int compute_perfect_hash ();
+  int compute_binary_search ();
+  int compute_linear_search ();
   static int hash (List_Node *key_node);
   static int compute_disjoint_union (char *s1, char *s2, char *s3);
   static void sort_set (char *union_set, int len);
diff --git a/ACE/apps/gperf/src/Hash_Table.cpp b/ACE/apps/gperf/src/Hash_Table.cpp
index f074e2b95e9..87a120d2467 100644
--- a/ACE/apps/gperf/src/Hash_Table.cpp
+++ b/ACE/apps/gperf/src/Hash_Table.cpp
@@ -45,7 +45,7 @@ Hash_Table::Hash_Table (size_t s)
                   this->size_ * sizeof *this->table_);
 }
 
-Hash_Table::~Hash_Table (void)
+Hash_Table::~Hash_Table ()
 {
   if (option[DEBUGGING])
     {
diff --git a/ACE/apps/gperf/src/Hash_Table.h b/ACE/apps/gperf/src/Hash_Table.h
index ea4975f160c..5c68f0a2d09 100644
--- a/ACE/apps/gperf/src/Hash_Table.h
+++ b/ACE/apps/gperf/src/Hash_Table.h
@@ -50,7 +50,7 @@ public:
   Hash_Table (size_t s);
 
   /// Destructor
-  ~Hash_Table (void);
+  ~Hash_Table ();
 
   List_Node *find (List_Node *item, int ignore_length);
 
diff --git a/ACE/apps/gperf/src/Iterator.cpp b/ACE/apps/gperf/src/Iterator.cpp
index 38ed9511270..2bf4be1cedf 100644
--- a/ACE/apps/gperf/src/Iterator.cpp
+++ b/ACE/apps/gperf/src/Iterator.cpp
@@ -43,7 +43,7 @@ Iterator::Iterator (char *s,
 /// Provide an Iterator, returning the ``next'' value from the list of
 /// valid values given in the constructor.
 int
-Iterator::operator() (void)
+Iterator::operator() ()
 {
   // Variables to record the Iterator's status when handling ranges,
   // e.g., 3-12.
diff --git a/ACE/apps/gperf/src/Iterator.h b/ACE/apps/gperf/src/Iterator.h
index 2a08dc4956b..fa1a03b176f 100644
--- a/ACE/apps/gperf/src/Iterator.h
+++ b/ACE/apps/gperf/src/Iterator.h
@@ -54,7 +54,7 @@ public:
             int word_end,
             int bad_val,
             int key_end);
-  int operator () (void);
+  int operator () ();
 
 private:
   /// A pointer to the string provided by the user.
diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp
index 93ee544af97..1d02a425acb 100644
--- a/ACE/apps/gperf/src/Key_List.cpp
+++ b/ACE/apps/gperf/src/Key_List.cpp
@@ -57,7 +57,7 @@ int Key_List::field_width = 0;
 int Key_List::determined_[ACE_STANDARD_CHARACTER_SET_SIZE];
 
 /// Destructor dumps diagnostics during debugging.
-Key_List::~Key_List (void)
+Key_List::~Key_List ()
 {
   if (option[DEBUGGING])
     this->dump ();
@@ -161,7 +161,7 @@ Key_List::special_input (char delimiter)
 /// Stores any C/C++ source code that must be included verbatim into
 /// the generated code output.
 char *
-Key_List::save_include_src (void)
+Key_List::save_include_src ()
 {
   int c = getchar ();
 
@@ -181,7 +181,7 @@ Key_List::save_include_src (void)
 /// table from a user-defined struct, or whether the user is content to
 /// simply use the default array of keys.
 char *
-Key_List::array_type (void)
+Key_List::array_type ()
 {
   return special_input ('%');
 }
@@ -189,7 +189,7 @@ Key_List::array_type (void)
 /// Sets up the Return_Type, the Struct_Tag type and the Array_Type
 /// based upon various user Options.
 int
-Key_List::output_types (void)
+Key_List::output_types ()
 {
   if (option[TYPE])
     {
@@ -244,7 +244,7 @@ Key_List::output_types (void)
 /// ``links,'' i.e., unhashable elements possessing identical key sets
 /// and lengths.
 int
-Key_List::read_keys (void)
+Key_List::read_keys ()
 {
   this->include_src = this->save_include_src ();
   if (this->include_src == 0)
@@ -461,7 +461,7 @@ Key_List::already_determined (List_Node *ptr)
 // paper from Jan 1980 JACM for details....
 
 void
-Key_List::reorder (void)
+Key_List::reorder ()
 {
   List_Node *ptr = 0;
 
@@ -503,7 +503,7 @@ Key_List::reorder (void)
 // item!
 
 void
-Key_List::output_min_max (void)
+Key_List::output_min_max ()
 {
   List_Node *temp = 0;
   for (temp = head; temp->next; temp = temp->next)
@@ -770,7 +770,7 @@ Key_List::output_switch (int use_keyword_table)
 // code in generated function ``in_word_set.''
 
 void
-Key_List::output_keylength_table (void)
+Key_List::output_keylength_table ()
 {
   const int max_column = 15;
   int slot = 0;
@@ -806,7 +806,7 @@ Key_List::output_keylength_table (void)
 // function.
 
 void
-Key_List::output_keyword_table (void)
+Key_List::output_keyword_table ()
 {
   const char *l_brace = *head->rest ? "{" : "";
   const char *r_brace = *head->rest ? "}," : "";
@@ -904,7 +904,7 @@ Key_List::output_keyword_table (void)
 // the proper encoding for each key word
 
 int
-Key_List::output_binary_search_function (void)
+Key_List::output_binary_search_function ()
 {
   ACE_OS::printf ("%s\n", include_src);
 
@@ -1002,7 +1002,7 @@ Key_List::output_binary_search_function (void)
 // the proper encoding for each key word
 
 int
-Key_List::output_linear_search_function (void)
+Key_List::output_linear_search_function ()
 {
   ACE_OS::printf ("%s\n", include_src);
 
@@ -1089,7 +1089,7 @@ Key_List::output_linear_search_function (void)
 // encoding for each key word.
 
 void
-Key_List::output_hash_function (void)
+Key_List::output_hash_function ()
 {
   const int max_column = 10;
   int count = max_hash_value;
@@ -1303,7 +1303,7 @@ Key_List::update_lookup_array (int lookup_array[],
 // smaller, contiguous range of the keyword table.
 
 int
-Key_List::output_lookup_array (void)
+Key_List::output_lookup_array ()
 {
   if (total_duplicates > 0)
     {
@@ -1483,7 +1483,7 @@ Key_List::output_lookup_array (void)
 // Generates C code to perform the keyword lookup.
 
 void
-Key_List::output_lookup_function (void)
+Key_List::output_lookup_function ()
 {
   if (!option[OPTIMIZE])
     ACE_OS::printf ("  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)\n    {\n");
@@ -1571,7 +1571,7 @@ Key_List::output_lookup_function (void)
 // Output the table and the functions that map upper case into lower case!
 
 void
-Key_List::output_strcasecmp (void)
+Key_List::output_strcasecmp ()
 {
   ACE_OS::printf ("%s",
           "/* This array is designed for mapping upper and lower case letter\n"
@@ -1634,7 +1634,7 @@ Key_List::output_strcasecmp (void)
 // based upon the user's Options.
 
 int
-Key_List::output (void)
+Key_List::output ()
 {
   if (option[BINARYSEARCH])
     // Generate code binary search.
@@ -1794,7 +1794,7 @@ Key_List::output (void)
 // Sorts the keys by hash value.
 
 void
-Key_List::sort (void)
+Key_List::sort ()
 {
   // By default, we sort via hashing.
   hash_sort = 1;
@@ -1805,7 +1805,7 @@ Key_List::sort (void)
 
 // Sorts the keys by normal strcmp.
 void
-Key_List::string_sort (void)
+Key_List::string_sort ()
 {
   // Flatten the equivalence class list to a linear list.
 
@@ -1857,7 +1857,7 @@ Key_List::string_sort (void)
 // Dumps the key list to stderr stream.
 
 void
-Key_List::dump (void)
+Key_List::dump ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nDumping key list information:\ntotal non-static linked keywords = %d"
@@ -1914,7 +1914,7 @@ Key_List::dump (void)
 
 // Simple-minded constructor action here...
 
-Key_List::Key_List (void)
+Key_List::Key_List ()
   : head (0),
     total_duplicates (0),
     array_type_ (dup_string (Key_List::default_array_type)),
@@ -1931,7 +1931,7 @@ Key_List::Key_List (void)
 // Returns the length of entire key list.
 
 int
-Key_List::keyword_list_length (void)
+Key_List::keyword_list_length ()
 {
   return list_len;
 }
@@ -1939,7 +1939,7 @@ Key_List::keyword_list_length (void)
 // Returns length of longest key read.
 
 int
-Key_List::max_key_length (void)
+Key_List::max_key_length ()
 {
   return max_key_len;
 }
diff --git a/ACE/apps/gperf/src/Key_List.h b/ACE/apps/gperf/src/Key_List.h
index 03260bcae4c..62a10486812 100644
--- a/ACE/apps/gperf/src/Key_List.h
+++ b/ACE/apps/gperf/src/Key_List.h
@@ -59,15 +59,15 @@ public:
 class Key_List : private ACE_Copy_Disabled
 {
 public:
-  Key_List (void);
-  ~Key_List (void);
-  int keyword_list_length (void);
-  int max_key_length (void);
-  void reorder (void);
-  void sort (void);
-  void string_sort (void);
-  int read_keys (void);
-  int output (void);
+  Key_List ();
+  ~Key_List ();
+  int keyword_list_length ();
+  int max_key_length ();
+  void reorder ();
+  void sort ();
+  void string_sort ();
+  int read_keys ();
+  int output ();
 
   /// Points to the head of the linked list.
   List_Node *head;
@@ -89,20 +89,20 @@ private:
   // @@ All of the following methods should be factored out and
   // replaced by the use of the Strategy/Bridge pattern so that we can
   // easily add new languages.
-  void output_min_max (void);
+  void output_min_max ();
   void output_switch (int use_keyword_table = 0);
-  void output_keyword_table (void);
-  void output_keylength_table (void);
-  void output_hash_function (void);
-  void output_lookup_function (void);
-  int output_binary_search_function(void);
-  int output_linear_search_function (void);
-  int output_lookup_array (void);
-  void output_strcasecmp (void);
-  int output_types (void);
-  void dump (void);
-  char *array_type (void);
-  char *save_include_src (void);
+  void output_keyword_table ();
+  void output_keylength_table ();
+  void output_hash_function ();
+  void output_lookup_function ();
+  int output_binary_search_function();
+  int output_linear_search_function ();
+  int output_lookup_array ();
+  void output_strcasecmp ();
+  int output_types ();
+  void dump ();
+  char *array_type ();
+  char *save_include_src ();
   char *special_input (char delimiter);
   List_Node *merge (List_Node *list1, List_Node *list2);
   List_Node *merge_sort (List_Node *head);
diff --git a/ACE/apps/gperf/src/List_Node.cpp b/ACE/apps/gperf/src/List_Node.cpp
index 6cc5d741dfa..d0cb3787f18 100644
--- a/ACE/apps/gperf/src/List_Node.cpp
+++ b/ACE/apps/gperf/src/List_Node.cpp
@@ -121,7 +121,7 @@ List_Node::List_Node (char *k, int len)
   sort (keysig, ACE_Utils::truncate_cast<int> (ptr - keysig));
 }
 
-List_Node::~List_Node (void)
+List_Node::~List_Node ()
 {
   delete [] this->key;
   delete [] this->keysig;
diff --git a/ACE/apps/gperf/src/List_Node.h b/ACE/apps/gperf/src/List_Node.h
index 30638894308..172f690864e 100644
--- a/ACE/apps/gperf/src/List_Node.h
+++ b/ACE/apps/gperf/src/List_Node.h
@@ -44,7 +44,7 @@ public:
   List_Node (char *key, int len);
 
   /// Destructor.
-  ~List_Node (void);
+  ~List_Node ();
 
   static void sort (char *base, int len);
 
diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp
index 68a1c51846f..1e650698e3a 100644
--- a/ACE/apps/gperf/src/Options.cpp
+++ b/ACE/apps/gperf/src/Options.cpp
@@ -81,7 +81,7 @@ char Options::key_positions_[MAX_KEY_POS];
 
 /// Prints program usage to standard error stream.
 void
-Options::usage (void)
+Options::usage ()
 {
   ACE_ERROR ((LM_ERROR,
               "Usage: %n [-abBcCdDef[num]gGhH<hashname>i<init>IjJ"
@@ -92,7 +92,7 @@ Options::usage (void)
 
 /// Output command-line Options.
 void
-Options::print_options (void)
+Options::print_options ()
 {
   ACE_OS::printf ("/* Command-line: ");
 
@@ -132,7 +132,7 @@ Options::key_sort (char *base, int len)
 
 // Sets the default Options.
 
-Options::Options (void)
+Options::Options ()
 {
   key_positions_[0] = WORD_START;
   key_positions_[1] = WORD_END;
@@ -151,7 +151,7 @@ Options::Options (void)
 }
 
 /// Dumps option status when debug is set.
-Options::~Options (void)
+Options::~Options ()
 {
   if (ACE_BIT_ENABLED (option_word_, DEBUGGING))
     {
@@ -730,14 +730,14 @@ Options::operator != (enum Option_Type opt)
 
 /// Initializes the key Iterator.
 void
-Options::reset (void)
+Options::reset ()
 {
   key_pos_ = 0;
 }
 
 /// Returns current key_position and advanced index.
 int
-Options::get (void)
+Options::get ()
 {
   return key_positions_[key_pos_++];
 }
@@ -751,14 +751,14 @@ Options::asso_max (int r)
 
 /// Returns the size of the table size.
 int
-Options::asso_max (void)
+Options::asso_max ()
 {
   return size_;
 }
 
 /// Returns total distinct key positions.
 u_int
-Options::max_keysig_size (void)
+Options::max_keysig_size ()
 {
   return total_keysig_size_;
 }
@@ -772,70 +772,70 @@ Options::keysig_size (u_int a_size)
 
 /// Returns the jump value.
 int
-Options::jump (void)
+Options::jump ()
 {
   return jump_;
 }
 
 /// Returns the generated function name.
 const char *
-Options::function_name (void)
+Options::function_name ()
 {
   return function_name_.c_str ();
 }
 
 /// Returns the fill default
 const char *
-Options::fill_default (void)
+Options::fill_default ()
 {
   return fill_default_.c_str ();
 }
 
 /// Returns the keyword key name.
 const char *
-Options::key_name (void)
+Options::key_name ()
 {
   return key_name_.c_str ();
 }
 
 /// Returns the hash function name.
 const char *
-Options::hash_name (void)
+Options::hash_name ()
 {
   return hash_name_.c_str ();
 }
 
 /// Returns the generated class name.
 const char *
-Options::class_name (void)
+Options::class_name ()
 {
   return class_name_.c_str ();
 }
 
 /// Returns the initial associated character value.
 int
-Options::initial_value (void)
+Options::initial_value ()
 {
   return initial_asso_value_;
 }
 
 /// Returns the iterations value.
 int
-Options::iterations (void)
+Options::iterations ()
 {
   return iterations_;
 }
 
 /// Returns the string used to delimit keywords from other attributes.
 const char *
-Options::delimiter (void)
+Options::delimiter ()
 {
   return delimiters_.c_str ();
 }
 
 /// Gets the total number of switch statements to generate.
 int
-Options::total_switches (void)
+Options::total_switches ()
 {
   return total_switches_;
 }
diff --git a/ACE/apps/gperf/src/Options.h b/ACE/apps/gperf/src/Options.h
index 4aa84edfd1d..1bfac29b593 100644
--- a/ACE/apps/gperf/src/Options.h
+++ b/ACE/apps/gperf/src/Options.h
@@ -100,29 +100,29 @@ enum
 class Options : private ACE_Copy_Disabled
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
   int operator[] (Option_Type option);
   int parse_args (int argc, ACE_TCHAR *argv[]);
   void operator= (enum Option_Type);
   bool operator!= (enum Option_Type);
-  static void print_options (void);
+  static void print_options ();
   static void asso_max (int r);
-  static int asso_max (void);
-  static void reset (void);
-  static int get (void);
-  static int iterations (void);
-  static u_int max_keysig_size (void);
+  static int asso_max ();
+  static void reset ();
+  static int get ();
+  static int iterations ();
+  static u_int max_keysig_size ();
   static void keysig_size (u_int);
-  static int jump (void);
-  static int initial_value (void);
-  static int total_switches (void);
-  static const char *function_name (void);
-  static const char *fill_default (void);
-  static const char *key_name (void);
-  static const char *class_name (void);
-  static const char *hash_name (void);
-  static const char *delimiter (void);
+  static int jump ();
+  static int initial_value ();
+  static int total_switches ();
+  static const char *function_name ();
+  static const char *fill_default ();
+  static const char *key_name ();
+  static const char *class_name ();
+  static const char *hash_name ();
+  static const char *delimiter ();
 
 private:
   /// Holds the user-specified Options.
@@ -180,7 +180,7 @@ private:
   static int key_sort (char *base, int len);
 
   /// Prints proper program usage.
-  static void usage (void);
+  static void usage ();
 };
 
 /// Global option coordinator for the entire program.
diff --git a/ACE/apps/soreduce/SO_Group.cpp b/ACE/apps/soreduce/SO_Group.cpp
index 5ab3b76f3e6..532c12b1eac 100644
--- a/ACE/apps/soreduce/SO_Group.cpp
+++ b/ACE/apps/soreduce/SO_Group.cpp
@@ -20,7 +20,7 @@ SO_Group::SO_Group ()
   libs_ = new Library*[max_libs_];
 }
 
-SO_Group::~SO_Group (void)
+SO_Group::~SO_Group ()
 {
   for (int i = 0; i < num_libs_; delete libs_[i++])
     {
@@ -165,7 +165,7 @@ SO_Group::add_executable (const char * path)
 }
 
 void
-SO_Group::analize (void)
+SO_Group::analize ()
 {
   for (int passcount = 0; undefs_.modified (); ++passcount)
     {
@@ -182,7 +182,7 @@ SO_Group::analize (void)
 }
 
 void
-SO_Group::write_results (void)
+SO_Group::write_results ()
 {
   for (int i = 0; i < num_libs_; libs_[i++]->write_export_list (1))
     {
@@ -191,7 +191,7 @@ SO_Group::write_results (void)
 }
 
 void
-SO_Group::load_modules (void)
+SO_Group::load_modules ()
 {
   for (int i = 0; i < num_libs_; libs_[i++]->load_modules ())
     {
@@ -200,7 +200,7 @@ SO_Group::load_modules (void)
 }
 
 void
-SO_Group::list_libs (void)
+SO_Group::list_libs ()
 {
   ACE_DEBUG ((LM_DEBUG, "Libs subject to analysis:\n"));
 
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
index 93f6c356cfb..46ac38bc5d6 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
@@ -73,14 +73,14 @@ public:
   ~Test ();
 
   HANDLE handle (void) { return this->thr_handle_; }
-  int run (void);
+  int run ();
   const char *start (const char *name);
   bool status (int *exit_status);
-  int wait (void);
-  void kill (void);
+  int wait ();
+  void kill ();
 
   // Clean up remnants of a test run.
-  void cleanup (void);
+  void cleanup ();
 
 private:
   HMODULE dll_handle_;
@@ -102,13 +102,13 @@ public:
 
   // Run the Peer's session; intended to be called from a new thread devoted
   // to this peer's session.
-  int svc (void);
+  int svc ();
 
 private:
   Peer () {};
 
   // Process command input from socket.
-  int command (void);
+  int command ();
 
   // Send a reply string to the peer.
   int reply (const char *msg);
@@ -124,7 +124,7 @@ private:
 // socket handle over which this object receives control commands from the
 // host test driver.
 int
-Peer::svc (void)
+Peer::svc ()
 {
   // Read commands until EOF (peer closed) or protocol error
   while (0 == this->command ())
@@ -135,7 +135,7 @@ Peer::svc (void)
 }
 
 int
-Peer::command (void)
+Peer::command ()
 {
   // The protocol exchanges with the peer are execpted to be lock-step
   // request-reply command lines, so we can make assumptions about a complete
@@ -328,7 +328,7 @@ Test::~Test ()
 }
 
 int
-Test::run (void)
+Test::run ()
 {
   this->running_ = true;
   try
@@ -431,7 +431,7 @@ Test::status (int *exit_status)
 }
 
 int
-Test::wait (void)
+Test::wait ()
 {
   WaitForSingleObject (this->thr_handle_, INFINITE);
   if (!this->running_)
@@ -440,7 +440,7 @@ Test::wait (void)
 }
 
 void
-Test::kill (void)
+Test::kill ()
 {
   TerminateThread (this->thr_handle_, -1);
   this->cleanup ();
@@ -450,7 +450,7 @@ Test::kill (void)
 
 // Clean up remnants of a test run.
 void
-Test::cleanup (void)
+Test::cleanup ()
 {
   if (this->dll_handle_ != NULL)
     {
@@ -607,7 +607,7 @@ format_errmsg (unsigned int errcode, const char *prefix)
 #define TEST_RUNNER_API __declspec(dllimport)
 #endif
 
-__declspec(dllexport) int test_entry(void)
+__declspec(dllexport) int test_entry()
 {
   return 0;
 }
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
index 1caabf2b2fd..49c8923c4c0 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
@@ -1,5 +1,5 @@
 #include <stdio.h>
-__declspec(dllimport) int test_entry(void);
+__declspec(dllimport) int test_entry();
 
 // This is plain Windows code, not ACE. Therefore we disable
 // the check for ACE_OS
diff --git a/ACE/contrib/FaCE/CE_ARGV.cpp b/ACE/contrib/FaCE/CE_ARGV.cpp
index 6e7370c625d..463ed1e41c8 100644
--- a/ACE/contrib/FaCE/CE_ARGV.cpp
+++ b/ACE/contrib/FaCE/CE_ARGV.cpp
@@ -105,7 +105,7 @@ CE_ARGV::CE_ARGV(wchar_t* cmdLine)
 }
 
 
-CE_ARGV::~CE_ARGV(void)
+CE_ARGV::~CE_ARGV()
 {
     for (int i = 0; i < ce_argc_; ++i) {
         delete [] ce_argv_[i];
diff --git a/ACE/contrib/FaCE/CE_ARGV.h b/ACE/contrib/FaCE/CE_ARGV.h
index a8e1567e8b8..083432bb313 100644
--- a/ACE/contrib/FaCE/CE_ARGV.h
+++ b/ACE/contrib/FaCE/CE_ARGV.h
@@ -40,23 +40,23 @@ public:
     /**
      * Default Dtor that deletes any memory allocated for the converted string.
      */
-    ~CE_ARGV(void);
+    ~CE_ARGV();
 
     /**
      * Returns the number of command line parameters, same as argc on Unix.
      */
-    int argc(void);
+    int argc();
 
     /**
      * Returns the 'char**' that contains the converted command line parameters.
      */
-    wchar_t** argv(void);
+    wchar_t** argv();
 
 private:
     /**
      * Copy Ctor is not allowed.
      */
-    CE_ARGV(void);
+    CE_ARGV();
 
     /**
      * Copy Ctor is not allowed.
diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp
index 857cb941725..9600e99560e 100644
--- a/ACE/examples/APG/Active_Objects/AO.cpp
+++ b/ACE/examples/APG/Active_Objects/AO.cpp
@@ -18,7 +18,7 @@ public:
     status_result_ = 1;
   }
 
-  int status_update (void)
+  int status_update ()
   {
     ACE_TRACE ("HA_ControllerAgent::status_update");
     ACE_DEBUG ((LM_DEBUG,
@@ -30,7 +30,7 @@ public:
   }
 
 private:
-  int next_result_id (void)
+  int next_result_id ()
   {
     ACE_TRACE ("HA_ControllerAgent::next_cmd_id");
     return status_result_++;
@@ -50,7 +50,7 @@ public:
     ACE_TRACE ("StatusUpdate::StatusUpdate");
   }
 
-  virtual int call (void)
+  virtual int call ()
   {
     ACE_TRACE ("StatusUpdate::call");
 
@@ -68,7 +68,7 @@ private:
 class ExitMethod : public ACE_Method_Request
 {
 public:
-  virtual int call (void)
+  virtual int call ()
   {
     // Cause exit.
     return -1;
@@ -85,7 +85,7 @@ public:
     this->activate ();
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_TRACE ("Scheduler::svc");
 
@@ -117,7 +117,7 @@ class HA_ControllerAgentProxy
 {
   // This acts as a Proxy to the controller impl object.
 public:
-  ACE_Future<int> status_update (void)
+  ACE_Future<int> status_update ()
   {
     ACE_TRACE("HA_ControllerAgentProxy::status_update");
     ACE_Future<int> result;
@@ -131,7 +131,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void exit (void)
+  void exit ()
   {
   //FUZZ: enable check_for_lack_ACE_OS
     ACE_TRACE ("HA_ControllerAgentProxy::exit");
diff --git a/ACE/examples/APG/Active_Objects/AO2.cpp b/ACE/examples/APG/Active_Objects/AO2.cpp
index bd73fb10f7e..9543f6480d0 100644
--- a/ACE/examples/APG/Active_Objects/AO2.cpp
+++ b/ACE/examples/APG/Active_Objects/AO2.cpp
@@ -18,7 +18,7 @@ public:
     status_result_ = 1;
   }
 
-  int status_update (void)
+  int status_update ()
   {
     ACE_TRACE ("HA_ControllerAgent::status_update");
     ACE_DEBUG ((LM_DEBUG,
@@ -31,7 +31,7 @@ public:
   }
 
 private:
-  int next_result_id (void)
+  int next_result_id ()
   {
     ACE_TRACE ("HA_ControllerAgent::next_cmd_id");
     return status_result_++;
@@ -50,7 +50,7 @@ public:
     ACE_TRACE ("StatusUpdate::StatusUpdate");
   }
 
-  virtual int call (void)
+  virtual int call ()
   {
     ACE_TRACE ("StatusUpdate::call");
 
@@ -67,7 +67,7 @@ private:
 class ExitMethod : public ACE_Method_Request
 {
 public:
-  virtual int call (void)
+  virtual int call ()
   {
     // Cause exit.
     return -1;
@@ -83,7 +83,7 @@ public:
     this->activate ();
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_TRACE ("Scheduler::svc");
 
@@ -114,7 +114,7 @@ class HA_ControllerAgentProxy
 {
   // This acts as a Proxy to the controller impl object.
 public:
-  ACE_Future<int> status_update (void)
+  ACE_Future<int> status_update ()
   {
     ACE_TRACE("HA_ControllerAgentProxy::status_update");
     ACE_Future<int> result;
@@ -128,7 +128,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void exit (void)
+  void exit ()
   {
   //FUZZ: enable check_for_lack_ACE_OS
 
diff --git a/ACE/examples/APG/Containers/Allocator.cpp b/ACE/examples/APG/Containers/Allocator.cpp
index bfa0bf0f510..0cb42e3d45d 100644
--- a/ACE/examples/APG/Containers/Allocator.cpp
+++ b/ACE/examples/APG/Containers/Allocator.cpp
@@ -8,7 +8,7 @@ class StackExample
 public:
   // Illustrate all the differnet
   // types of stacks provided by ACE.
-  int run (void);
+  int run ();
 
 private:
   // Illustrate the use of an unbounded stack.
@@ -16,7 +16,7 @@ private:
 };
 
 // Listing 1 code/ch05
-int StackExample::run (void)
+int StackExample::run ()
 {
   ACE_TRACE ("StackExample::run");
 
diff --git a/ACE/examples/APG/Containers/DLList.cpp b/ACE/examples/APG/Containers/DLList.cpp
index dc8f25b7638..0de893dd330 100644
--- a/ACE/examples/APG/Containers/DLList.cpp
+++ b/ACE/examples/APG/Containers/DLList.cpp
@@ -13,14 +13,14 @@ typedef ACE_DLList<DataElement> MyList;
 class ListTest
 {
 public:
-  int run (void);
+  int run ();
   void displayList (MyList & list); // Display all elements.
   void destroyList (MyList& list);  // Destroy all elements.
 };
 // Listing 2
 // Listing 3 code/ch05
 int
-ListTest::run (void)
+ListTest::run ()
 {
   ACE_TRACE ("ListTest::run");
 
diff --git a/ACE/examples/APG/Containers/Hash_Map.cpp b/ACE/examples/APG/Containers/Hash_Map.cpp
index 6fdc461eb40..8d2596bfa6f 100644
--- a/ACE/examples/APG/Containers/Hash_Map.cpp
+++ b/ACE/examples/APG/Containers/Hash_Map.cpp
@@ -19,16 +19,16 @@ public:
   Hash_Map_Example ();
 
   // Illustrate the hash map.
-  int run (void);
+  int run ();
 
   // Use the forward iterator.
-  void iterate_forward (void);
+  void iterate_forward ();
 
   // Use the reverse iterator.
-  void iterate_reverse (void);
+  void iterate_reverse ();
 
   // Remove all the elements from the map.
-  void remove_all (void);
+  void remove_all ();
 
 private:
   Hash_Map<int, DataElement> map_;
@@ -43,7 +43,7 @@ Hash_Map_Example::Hash_Map_Example()
 }
 // Listing 2
 
-int Hash_Map_Example::run (void)
+int Hash_Map_Example::run ()
 {
   ACE_TRACE ("Hash_Map_Example::run");
 
@@ -76,7 +76,7 @@ int Hash_Map_Example::run (void)
   return 0;
 }
 
-void Hash_Map_Example::iterate_forward (void)
+void Hash_Map_Example::iterate_forward ()
 {
   ACE_TRACE ("Hash_Map_Example::iterate_forward");
 
@@ -89,7 +89,7 @@ void Hash_Map_Example::iterate_forward (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Hash_Map_Example::iterate_reverse (void)
+void Hash_Map_Example::iterate_reverse ()
 {
   ACE_TRACE ("Hash_Map_Example::iterate_reverse");
 
@@ -102,7 +102,7 @@ void Hash_Map_Example::iterate_reverse (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Hash_Map_Example::remove_all (void)
+void Hash_Map_Example::remove_all ()
 {
   ACE_TRACE ("Hash_Map_Example::remove_all");
   map_.unbind_all ();
diff --git a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp
index e7471806fc0..d56305e9318 100644
--- a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp
+++ b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp
@@ -21,22 +21,22 @@ public:
   }
 
   // illustrate the hash map
-  int run (void);
+  int run ();
 
   // use the forward iterate
-  void iterate_forward (void);
+  void iterate_forward ();
 
   // use the reverse iterator
-  void iterate_reverse (void);
+  void iterate_reverse ();
 
   // remove all the elements from the map
-  void remove_all (void);
+  void remove_all ();
 
 private:
   Hash_Map<KeyType, DataElement> map_;
 };
 
-int Hash_Map_Example::run (void)
+int Hash_Map_Example::run ()
 {
   ACE_TRACE ("Hash_Map_Example::run");
 
@@ -69,7 +69,7 @@ int Hash_Map_Example::run (void)
   return 0;
 }
 
-void Hash_Map_Example::iterate_forward (void)
+void Hash_Map_Example::iterate_forward ()
 {
   ACE_TRACE ("Hash_Map_Example::iterate_forward");
 
@@ -82,7 +82,7 @@ void Hash_Map_Example::iterate_forward (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Hash_Map_Example::iterate_reverse (void)
+void Hash_Map_Example::iterate_reverse ()
 {
   ACE_TRACE ("Hash_Map_Example::iterate_reverse");
 
@@ -95,7 +95,7 @@ void Hash_Map_Example::iterate_reverse (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Hash_Map_Example::remove_all (void)
+void Hash_Map_Example::remove_all ()
 {
   ACE_TRACE ("Hash_Map_Example::remove_all");
   map_.unbind_all ();
diff --git a/ACE/examples/APG/Containers/Map_Manager.cpp b/ACE/examples/APG/Containers/Map_Manager.cpp
index 5d248944415..cc1e7144035 100644
--- a/ACE/examples/APG/Containers/Map_Manager.cpp
+++ b/ACE/examples/APG/Containers/Map_Manager.cpp
@@ -8,24 +8,24 @@ class Map_Example
 {
 public:
   // Illustrate the ACE_Map_Manager.
-  int run (void);
+  int run ();
 
 private:
   // Iterate in the forward direction.
-  void iterate_forward (void);
+  void iterate_forward ();
 
   // Iterate in the other direction.
-  void iterate_reverse (void);
+  void iterate_reverse ();
 
   // Remove all elements from the map.
-  void remove_all (void);
+  void remove_all ();
 
 private:
   ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex> map_;
 };
 
 // Listing 2 code/ch05
-int Map_Example::run (void)
+int Map_Example::run ()
 {
   ACE_TRACE ("Map_Example::run");
 
@@ -60,7 +60,7 @@ int Map_Example::run (void)
 }
 // Listing 2
 // Listing 3 code/ch05
-void Map_Example::iterate_forward (void)
+void Map_Example::iterate_forward ()
 {
   ACE_TRACE ("Map_Example::iterate_forward");
 
@@ -79,7 +79,7 @@ void Map_Example::iterate_forward (void)
 }
 
 
-void Map_Example::iterate_reverse (void)
+void Map_Example::iterate_reverse ()
 {
   ACE_TRACE ("Map_Example::iterate_reverse");
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse iteration\n")));
@@ -97,7 +97,7 @@ void Map_Example::iterate_reverse (void)
 }
 // Listing 3
 // Listing 4 code/ch05
-void Map_Example::remove_all (void)
+void Map_Example::remove_all ()
 {
   ACE_TRACE ("Map_Example::remove_all");
 
diff --git a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp
index 6bf41ffb9a3..e28634d5a0d 100644
--- a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp
+++ b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp
@@ -49,23 +49,23 @@ class Map_Example
 {
 public:
   // Illustrate the ACE_Map_Manager<>.
-  int run (void);
+  int run ();
 
 private:
   // Iterate in the forward direction.
-  void iterate_forward (void);
+  void iterate_forward ();
 
   // Iterate in the other direction.
-  void iterate_reverse (void);
+  void iterate_reverse ();
 
   // Remove all elements from the map.
-  void remove_all (void);
+  void remove_all ();
 
 private:
   ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex> map_;
 };
 
-int Map_Example::run (void)
+int Map_Example::run ()
 {
   ACE_TRACE ("Map_Example::run");
 
@@ -102,7 +102,7 @@ int Map_Example::run (void)
   return 0;
 }
 
-void Map_Example::iterate_forward (void)
+void Map_Example::iterate_forward ()
 {
   ACE_TRACE ("Map_Example::iterate_forward");
 
@@ -117,7 +117,7 @@ void Map_Example::iterate_forward (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Map_Example::iterate_reverse (void)
+void Map_Example::iterate_reverse ()
 {
   ACE_TRACE ("Map_Example::iterate_reverse");
 
@@ -132,7 +132,7 @@ void Map_Example::iterate_reverse (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Map_Example::remove_all (void)
+void Map_Example::remove_all ()
 {
   ACE_TRACE ("Map_Example::remove_all");
 
diff --git a/ACE/examples/APG/Containers/Queues.cpp b/ACE/examples/APG/Containers/Queues.cpp
index 6a08136ea72..a0dfda6274c 100644
--- a/ACE/examples/APG/Containers/Queues.cpp
+++ b/ACE/examples/APG/Containers/Queues.cpp
@@ -7,19 +7,19 @@ class QueueExample
 {
 public:
   // Illustrate the various ACE Queues.
-  int run (void);
+  int run ();
 
 private:
   // Illustrate the ACE unbounded queue
   // that has copies of the data elements.
-  int runStackUnboundedQueue (void);
+  int runStackUnboundedQueue ();
 
   // Illustrate the ACE unbounded queue
   // with pointers to elements on the heap.
-  int runHeapUnboundedQueue (void);
+  int runHeapUnboundedQueue ();
 };
 
-int QueueExample::run (void)
+int QueueExample::run ()
 {
   ACE_TRACE ("QueueExample::run");
 
@@ -45,7 +45,7 @@ int QueueExample::run (void)
 }
 
 // Listing 1 code/ch05
-int QueueExample::runStackUnboundedQueue (void)
+int QueueExample::runStackUnboundedQueue ()
 {
   ACE_TRACE ("QueueExample::runStackUnboundedQueue");
 
@@ -78,7 +78,7 @@ int QueueExample::runStackUnboundedQueue (void)
 }
 // Listing 1
 // Listing 2 code/ch05
-int QueueExample::runHeapUnboundedQueue (void)
+int QueueExample::runHeapUnboundedQueue ()
 {
   ACE_TRACE ("QueueExample::runHeapUnboundedQueue");
 
diff --git a/ACE/examples/APG/Containers/RB_Tree.cpp b/ACE/examples/APG/Containers/RB_Tree.cpp
index 1c67c48e26a..7f299451931 100644
--- a/ACE/examples/APG/Containers/RB_Tree.cpp
+++ b/ACE/examples/APG/Containers/RB_Tree.cpp
@@ -14,24 +14,24 @@ class Tree_Example
 {
 public:
   // Illustrate the tree.
-  int run (void);
+  int run ();
 
 private:
   // Use the forward iterator.
-  void iterate_forward (void);
+  void iterate_forward ();
 
   // Use the reverse iterator.
-  void iterate_reverse (void);
+  void iterate_reverse ();
 
   // Remove all elements from the tree.
-  int remove_all (void);
+  int remove_all ();
 
 private:
   Tree<int, DataElement*> tree_;
 };
 
 // Listing 1 code/ch05
-int Tree_Example::run (void)
+int Tree_Example::run ()
 {
   ACE_TRACE ("Tree_Example::run");
 
@@ -71,7 +71,7 @@ int Tree_Example::run (void)
   return 0;
 }
 
-void Tree_Example::iterate_forward (void)
+void Tree_Example::iterate_forward ()
 {
   ACE_TRACE ("Tree_Example::iterate_forward");
 
@@ -85,7 +85,7 @@ void Tree_Example::iterate_forward (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Tree_Example::iterate_reverse (void)
+void Tree_Example::iterate_reverse ()
 {
   ACE_TRACE ("Tree_Example::iterate_reverse");
 
@@ -100,7 +100,7 @@ void Tree_Example::iterate_reverse (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-int Tree_Example::remove_all (void)
+int Tree_Example::remove_all ()
 {
   ACE_TRACE ("Tree_Example::remove_all");
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Removing elements\n")));
diff --git a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp
index e82227915a3..d1fb62435ba 100644
--- a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp
+++ b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp
@@ -18,17 +18,17 @@ class Tree_Example
 {
 public:
   // Illustrate the tree.
-  int run (void);
+  int run ();
 
 private:
   // Use the forward iterator.
-  void iterate_forward (void);
+  void iterate_forward ();
 
   // Use the reverse iterator.
-  void iterate_reverse (void);
+  void iterate_reverse ();
 
   // Remove all elements from the tree.
-  int remove_all (void);
+  int remove_all ();
 
 private:
   Tree<KeyType, DataElement*> tree_;
@@ -78,7 +78,7 @@ int Tree_Example::run ()
   return 0;
 }
 
-void Tree_Example::iterate_forward (void)
+void Tree_Example::iterate_forward ()
 {
   ACE_TRACE ("Tree_Example::iterate_forward");
 
@@ -91,7 +91,7 @@ void Tree_Example::iterate_forward (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-void Tree_Example::iterate_reverse (void)
+void Tree_Example::iterate_reverse ()
 {
   ACE_TRACE ("Tree_Example::iterate_reverse");
 
@@ -104,7 +104,7 @@ void Tree_Example::iterate_reverse (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
 
-int Tree_Example::remove_all (void)
+int Tree_Example::remove_all ()
 {
   ACE_TRACE ("Tree_Example::remove_all");
 
diff --git a/ACE/examples/APG/Containers/Sets.cpp b/ACE/examples/APG/Containers/Sets.cpp
index c4e3436abed..771cfb80f59 100644
--- a/ACE/examples/APG/Containers/Sets.cpp
+++ b/ACE/examples/APG/Containers/Sets.cpp
@@ -7,17 +7,17 @@ class SetExample
 {
 public:
   // Illustrate all ACE set types.
-  int run (void);
+  int run ();
 
 private:
   // Illustrate the ACE Bounded Sets.
-  int runBoundedSet (void);
+  int runBoundedSet ();
 
   // Illustrate the ACE Unbounded sets.
-  int runUnboundedSet (void);
+  int runUnboundedSet ();
 };
 
-int SetExample::run (void)
+int SetExample::run ()
 {
   ACE_TRACE ("SetExample::run");
 
diff --git a/ACE/examples/APG/Containers/Stacks.cpp b/ACE/examples/APG/Containers/Stacks.cpp
index 5e8612f656f..e1a6b535c2e 100644
--- a/ACE/examples/APG/Containers/Stacks.cpp
+++ b/ACE/examples/APG/Containers/Stacks.cpp
@@ -10,23 +10,23 @@ public:
 
   // Illustrate all the differnet
   // types of stacks provided by ACE.
-  int run (void);
+  int run ();
 
 private:
   // Illustrate the use of a bounded stack.
-  int runBoundedStack (void);
+  int runBoundedStack ();
 
   // Illustrate the use of an unbounded stack.
-  int runUnboundedStack (void);
+  int runUnboundedStack ();
 
   // Illustrate the use of a compile time fixed stack.
-  int runFixedStack (void);
+  int runFixedStack ();
 
 private:
   ACE_Bounded_Stack<DataElement*> privateStack_;
 };
 
-int StackExample::run (void)
+int StackExample::run ()
 {
   ACE_TRACE ("StackExample::run");
 
@@ -45,7 +45,7 @@ int StackExample::run (void)
   return 0;
 }
 // Listing 1 code/ch05
-int StackExample::runBoundedStack (void)
+int StackExample::runBoundedStack ()
 {
   ACE_TRACE ("StackExample::runBoundedStack");
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using a bounded stack\n")));
@@ -78,7 +78,7 @@ int StackExample::runBoundedStack (void)
 }
 // Listing 1
 // Listing 2 code/ch05
-int StackExample::runFixedStack (void)
+int StackExample::runFixedStack ()
 {
   ACE_TRACE ("StackExample::runFixedStack");
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using a fixed stack\n")));
@@ -102,7 +102,7 @@ int StackExample::runFixedStack (void)
   return 0;
 }
 
-int StackExample::runUnboundedStack (void)
+int StackExample::runUnboundedStack ()
 {
   ACE_TRACE ("StackExample::runUnboundedStack");
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using an unbounded stack\n")));
diff --git a/ACE/examples/APG/Logging/Change_Mask.cpp b/ACE/examples/APG/Logging/Change_Mask.cpp
index 22161ddb191..96bbd75dcb1 100644
--- a/ACE/examples/APG/Logging/Change_Mask.cpp
+++ b/ACE/examples/APG/Logging/Change_Mask.cpp
@@ -1,6 +1,6 @@
 #include "ace/Log_Msg.h"
 
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
 
diff --git a/ACE/examples/APG/Logging/Howto_Syslog.cpp b/ACE/examples/APG/Logging/Howto_Syslog.cpp
index 500cc5b562c..333caa4f228 100644
--- a/ACE/examples/APG/Logging/Howto_Syslog.cpp
+++ b/ACE/examples/APG/Logging/Howto_Syslog.cpp
@@ -1,6 +1,6 @@
 #include "ace/Log_Msg.h"
 
-void foo (void);
+void foo ();
 
 // Listing 1 code/ch03
 int ACE_TMAIN (int, ACE_TCHAR *argv[])
@@ -18,7 +18,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
   return 0;
 }
 
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
 
diff --git a/ACE/examples/APG/Logging/LogManager.h b/ACE/examples/APG/Logging/LogManager.h
index 523abff55d8..08695c70c7f 100644
--- a/ACE/examples/APG/Logging/LogManager.h
+++ b/ACE/examples/APG/Logging/LogManager.h
@@ -20,7 +20,7 @@ public:
     (const ACE_TCHAR *prog_name = ACE_TEXT (""));
   void redirectToOStream (ACE_OSTREAM_TYPE *output);
   void redirectToFile (const char *filename);
-  void redirectToStderr (void);
+  void redirectToStderr ();
   ACE_Log_Msg_Callback * redirectToCallback
     (ACE_Log_Msg_Callback *callback);
 
@@ -71,7 +71,7 @@ void LogManager::redirectToFile (const char *filename)
   this->redirectToOStream ((ACE_OSTREAM_TYPE *)log_stream_);
 }
 
-void LogManager::redirectToStderr (void)
+void LogManager::redirectToStderr ()
 {
   ACE_LOG_MSG->clr_flags
     (ACE_Log_Msg::OSTREAM | ACE_Log_Msg::LOGGER);
diff --git a/ACE/examples/APG/Logging/Simple1.cpp b/ACE/examples/APG/Logging/Simple1.cpp
index cbbb00e7c76..3c390f2c25b 100644
--- a/ACE/examples/APG/Logging/Simple1.cpp
+++ b/ACE/examples/APG/Logging/Simple1.cpp
@@ -1,6 +1,6 @@
 #include "ace/Log_Msg.h"
 
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
@@ -13,7 +13,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
 
diff --git a/ACE/examples/APG/Logging/Simple2.cpp b/ACE/examples/APG/Logging/Simple2.cpp
index 123f65f95ac..b0d043a98e8 100644
--- a/ACE/examples/APG/Logging/Simple2.cpp
+++ b/ACE/examples/APG/Logging/Simple2.cpp
@@ -1,6 +1,6 @@
 #include "ace/Log_Msg.h"
 
-void foo(void);
+void foo();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
@@ -15,7 +15,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-void foo(void)
+void foo()
 {
   ACE_TRACE ("foo");
 
diff --git a/ACE/examples/APG/Logging/Trace.h b/ACE/examples/APG/Logging/Trace.h
index f0d31c4a26f..58c8827bd70 100644
--- a/ACE/examples/APG/Logging/Trace.h
+++ b/ACE/examples/APG/Logging/Trace.h
@@ -41,7 +41,7 @@ public:
       this->line_ = line;
     }
 
-  ~Trace (void)
+  ~Trace ()
     {
       ACE_Log_Msg *lm = ACE_LOG_MSG;
       if (lm->tracing_enabled ()
diff --git a/ACE/examples/APG/Logging/Trace_Return.cpp b/ACE/examples/APG/Logging/Trace_Return.cpp
index 1f2022c0dfe..f65e88278f5 100644
--- a/ACE/examples/APG/Logging/Trace_Return.cpp
+++ b/ACE/examples/APG/Logging/Trace_Return.cpp
@@ -1,7 +1,7 @@
 #include "Trace.h"
 
 // Listing 1 code/ch03
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
@@ -14,7 +14,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   TRACE_RETURN (0);
 }
 
-void foo (void)
+void foo ()
 {
   TRACE ("foo");
   MY_DEBUG (ACE_TEXT ("Howdy Pardner\n"));
diff --git a/ACE/examples/APG/Logging/Use_LogManager.cpp b/ACE/examples/APG/Logging/Use_LogManager.cpp
index d7b7c3607d9..c3fcf27292f 100644
--- a/ACE/examples/APG/Logging/Use_LogManager.cpp
+++ b/ACE/examples/APG/Logging/Use_LogManager.cpp
@@ -1,7 +1,7 @@
 #include "LogManager.h"
 
 // Listing 1 code/ch03
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
@@ -15,7 +15,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
   return 0;
 }
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
   LOG_MANAGER->redirectToFile ("output.test");
diff --git a/ACE/examples/APG/Logging/Use_Ostream.cpp b/ACE/examples/APG/Logging/Use_Ostream.cpp
index 056de60b2c9..8834e497fe1 100644
--- a/ACE/examples/APG/Logging/Use_Ostream.cpp
+++ b/ACE/examples/APG/Logging/Use_Ostream.cpp
@@ -1,7 +1,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/streams.h"
 
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
@@ -26,7 +26,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
 
diff --git a/ACE/examples/APG/Logging/Use_Stderr.cpp b/ACE/examples/APG/Logging/Use_Stderr.cpp
index 465e9eb08cb..807313ca18e 100644
--- a/ACE/examples/APG/Logging/Use_Stderr.cpp
+++ b/ACE/examples/APG/Logging/Use_Stderr.cpp
@@ -1,6 +1,6 @@
 #include "ace/Log_Msg.h"
 
-void foo (void);
+void foo ();
 
 // Listing 1 code/ch03
 int ACE_TMAIN (int, ACE_TCHAR *argv[])
@@ -28,7 +28,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
   return 0;
 }
 
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
 
diff --git a/ACE/examples/APG/Logging/Use_Syslog.cpp b/ACE/examples/APG/Logging/Use_Syslog.cpp
index 173f595c4bb..dce9f5d6505 100644
--- a/ACE/examples/APG/Logging/Use_Syslog.cpp
+++ b/ACE/examples/APG/Logging/Use_Syslog.cpp
@@ -1,6 +1,6 @@
 #include "ace/Log_Msg.h"
 
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
@@ -22,7 +22,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
   return 0;
 }
 
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
 
diff --git a/ACE/examples/APG/Logging/Wrap_Macros.cpp b/ACE/examples/APG/Logging/Wrap_Macros.cpp
index 764a45f7359..65b4e031725 100644
--- a/ACE/examples/APG/Logging/Wrap_Macros.cpp
+++ b/ACE/examples/APG/Logging/Wrap_Macros.cpp
@@ -1,7 +1,7 @@
 #include "Trace.h"
 
 // Listing 1 code/ch03
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
@@ -12,7 +12,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-void foo (void)
+void foo ()
 {
   ACE_TRACE ("foo");
   MY_DEBUG (ACE_TEXT ("Howdy Pardner\n"));
diff --git a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp
index ddeb577bbf7..81a61cc2aa4 100644
--- a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp
+++ b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp
@@ -1,6 +1,6 @@
 #include "Log_Msg_Alt.h"
 
-void foo (void);
+void foo ();
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
diff --git a/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp b/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp
index 75608e0fe3e..b5d63b3e6f0 100644
--- a/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp
+++ b/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp
@@ -26,7 +26,7 @@ int send_unicast (const ACE_INET_Addr &to)
 // Listing 1
 
 // Listing 2 code/ch09
-void echo_dgram (void)
+void echo_dgram ()
 {
   ACE_INET_Addr my_addr (static_cast<u_short> (10102));
   ACE_INET_Addr your_addr;
@@ -44,7 +44,7 @@ void echo_dgram (void)
 // Listing 3 code/ch09
 #include "ace/SOCK_CODgram.h"
 // Exclude 3
-static void show_codgram (void)
+static void show_codgram ()
 {
   char buff[BUFSIZ];
   size_t buflen = sizeof (buff);
diff --git a/ACE/examples/APG/Naming/Graphable_Element.h b/ACE/examples/APG/Naming/Graphable_Element.h
index ae2e0c16150..505e1e0a112 100644
--- a/ACE/examples/APG/Naming/Graphable_Element.h
+++ b/ACE/examples/APG/Naming/Graphable_Element.h
@@ -26,7 +26,7 @@ public:
     return this->when_;
   }
 
-  inline float temp (void)
+  inline float temp ()
   {
     return this->temp_;
   }
diff --git a/ACE/examples/APG/Naming/Name_Binding.h b/ACE/examples/APG/Naming/Name_Binding.h
index 0c21cde49e3..069ef1eae2a 100644
--- a/ACE/examples/APG/Naming/Name_Binding.h
+++ b/ACE/examples/APG/Naming/Name_Binding.h
@@ -35,16 +35,16 @@ public:
     this->type_ = 0;
   }
 
-  char *name (void)
+  char *name ()
   { return this->name_; }
 
-  char *value (void)
+  char *value ()
   { return this->value_; }
 
-  const char *type (void)
+  const char *type ()
   { return this->type_; }
 
-  int int_value (void)
+  int int_value ()
   { return ACE_OS::atoi (this->value ()); }
 
 private:
diff --git a/ACE/examples/APG/Naming/Temperature_Grapher.cpp b/ACE/examples/APG/Naming/Temperature_Grapher.cpp
index 36fa5256eab..2020981a612 100644
--- a/ACE/examples/APG/Naming/Temperature_Grapher.cpp
+++ b/ACE/examples/APG/Naming/Temperature_Grapher.cpp
@@ -6,7 +6,7 @@
 #include "Temperature_Grapher.h"
 
 // Listing 1 code/ch21
-void Temperature_Grapher::monitor (void)
+void Temperature_Grapher::monitor ()
 {
   for (;;)
     {
@@ -17,7 +17,7 @@ void Temperature_Grapher::monitor (void)
 // Listing 1
 
 // Listing 2 code/ch21
-void Temperature_Grapher::update_graph (void)
+void Temperature_Grapher::update_graph ()
 {
   Name_Binding_Ptr lastUpdate
     (this->naming_context_.fetch ("lastUpdate"));
diff --git a/ACE/examples/APG/Naming/Temperature_Monitor.cpp b/ACE/examples/APG/Naming/Temperature_Monitor.cpp
index 7b4420bddff..0dc015cd2df 100644
--- a/ACE/examples/APG/Naming/Temperature_Monitor.cpp
+++ b/ACE/examples/APG/Naming/Temperature_Monitor.cpp
@@ -37,7 +37,7 @@ void Temperature_Monitor::record_temperature (float temp)
 }
 
 // Listing 41 code/ch21
-void Temperature_Monitor::record_failure (void)
+void Temperature_Monitor::record_failure ()
 {
   Name_Binding_Ptr lastReset
     (this->naming_context_.fetch ("lastReset"));
@@ -103,7 +103,7 @@ Temperature_Monitor::reset_device (Name_Binding_Ptr &resetCount)
 // Listing 5
 
 // Listing 2 code/ch21
-void Temperature_Monitor::monitor (void)
+void Temperature_Monitor::monitor ()
 {
   this->thermometer_ =
     new Thermometer (this->opt_.thermometer_address ());
diff --git a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp
index 3978a12839c..5dc3df0dd1a 100644
--- a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp
+++ b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp
@@ -81,7 +81,7 @@ void Temperature_Monitor2::reset_device (Name_Binding_Ptr &resetCount)
   this->naming_context_.rebind ("resetCount", number_of_resets);
 }
 
-void Temperature_Monitor2::record_failure (void)
+void Temperature_Monitor2::record_failure ()
 {
   Name_Binding_Ptr lastFailure (this->naming_context_.fetch ("lastFailure"));
   Name_Binding_Ptr lastReset (this->naming_context_.fetch ("lastReset"));
@@ -117,7 +117,7 @@ void Temperature_Monitor2::record_failure (void)
   this->naming_context_.rebind ("lastFailure", lastFailureTime);
 }
 
-void Temperature_Monitor2::monitor (void)
+void Temperature_Monitor2::monitor ()
 {
   this->thermometer_ = new Thermometer (this->opt_.thermometer_address ());
 
diff --git a/ACE/examples/APG/Naming/Temperature_Monitor2.h b/ACE/examples/APG/Naming/Temperature_Monitor2.h
index ab4f8b5601b..3db78c107e4 100644
--- a/ACE/examples/APG/Naming/Temperature_Monitor2.h
+++ b/ACE/examples/APG/Naming/Temperature_Monitor2.h
@@ -16,12 +16,12 @@ public:
           shared_context_(shared_context)
     { }
 
-  void monitor (void);
+  void monitor ();
 
 protected:
   void record_temperature (float temp);
   void record_history (float temp);
-  void record_failure (void);
+  void record_failure ();
   void reset_device (Name_Binding_Ptr & resetCount);
 
 private:
diff --git a/ACE/examples/APG/Naming/Temperature_Monitor_Options.h b/ACE/examples/APG/Naming/Temperature_Monitor_Options.h
index 18e84066a40..9ab5c9fabb8 100644
--- a/ACE/examples/APG/Naming/Temperature_Monitor_Options.h
+++ b/ACE/examples/APG/Naming/Temperature_Monitor_Options.h
@@ -7,32 +7,32 @@ class Temperature_Monitor_Options
     Temperature_Monitor_Options (int, ACE_TCHAR *[])
     { }
 
-    const char *thermometer_address (void)
+    const char *thermometer_address ()
     {
       return "serial:// s0/0x3e52";
     }
 
-    int poll_interval (void)
+    int poll_interval ()
     {
       return 10; // every 10 seconds
     }
 
-    int reset_interval (void)
+    int reset_interval ()
     {
       return 60; // sixty seconds
     }
 
-    int excessive_resets (void)
+    int excessive_resets ()
     {
       return 5; // no response in 5 minutes
     }
 
-    const char *admin_email (void)
+    const char *admin_email ()
     {
       return "root@localhost";
     }
 
-    const char *email_from (void)
+    const char *email_from ()
     {
       return "temperature monitor";
     }
diff --git a/ACE/examples/APG/Naming/Thermometer.h b/ACE/examples/APG/Naming/Thermometer.h
index 78073b1eb1d..2c4c4a0233b 100644
--- a/ACE/examples/APG/Naming/Thermometer.h
+++ b/ACE/examples/APG/Naming/Thermometer.h
@@ -12,7 +12,7 @@ public:
     : addr_(addr), threshold_(5)
   { }
 
-  float temperature (void)
+  float temperature ()
   {
     int success = ACE_OS::rand () % 10;
     if (success < this->threshold_)
@@ -26,12 +26,12 @@ public:
     return (float)itemp;
   }
 
-  const char *address (void)
+  const char *address ()
   {
     return this->addr_;
   }
 
-  void reset (void)
+  void reset ()
   {
     this->threshold_ = 4;
     ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Resetting thermometer %C\n"),
diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.h b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
index d09848f3e06..9626b710b8a 100644
--- a/ACE/examples/APG/Proactor/HA_Proactive_Status.h
+++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
@@ -65,7 +65,7 @@ template <class HANDLER>
 class ACE_Asynch_Acceptor : public ACE_Handler
       ...
 protected:
-  virtual HANDLER *make_handler (void)
+  virtual HANDLER *make_handler ()
   {
     return new HANDLER;
   }
diff --git a/ACE/examples/APG/Processes/Process_Mutex.cpp b/ACE/examples/APG/Processes/Process_Mutex.cpp
index b48588301fb..e8ae41e3e17 100644
--- a/ACE/examples/APG/Processes/Process_Mutex.cpp
+++ b/ACE/examples/APG/Processes/Process_Mutex.cpp
@@ -12,7 +12,7 @@ public:
     ACE_TRACE ("GResourceUser::GResourceUser");
   }
 
-  void run (void)
+  void run ()
   {
     ACE_TRACE ("GResourceUser::run");
 
diff --git a/ACE/examples/APG/Processes/Spawn.cpp b/ACE/examples/APG/Processes/Spawn.cpp
index 19d0bc77b8d..711b10cb5ff 100644
--- a/ACE/examples/APG/Processes/Spawn.cpp
+++ b/ACE/examples/APG/Processes/Spawn.cpp
@@ -19,7 +19,7 @@ public:
     ACE_OS::strcpy (programName_, program_name);
   }
 
-  int doWork (void)
+  int doWork ()
   {
     ACE_TRACE ("Manager::doWork");
 
@@ -43,7 +43,7 @@ public:
 
 private:
   // Listing 3 code/ch10
-  int dumpRun (void)
+  int dumpRun ()
   {
     ACE_TRACE ("Manager::dumpRun");
 
@@ -132,7 +132,7 @@ public:
     ACE_TRACE ("Slave::Slave");
   }
 
-  int doWork (void)
+  int doWork ()
   {
     ACE_TRACE ("Slave::doWork");
 
@@ -155,7 +155,7 @@ public:
   }
 // Listing 4
 
-  void showWho (void)
+  void showWho ()
   {
     ACE_TRACE ("Slave::showWho");
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp
index 0242a893b17..58c092215ca 100644
--- a/ACE/examples/APG/Reactor/HAStatus.cpp
+++ b/ACE/examples/APG/Reactor/HAStatus.cpp
@@ -45,7 +45,7 @@ public:
   ACE_SOCK_Stream &peer (void) { return this->sock_; }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  int open (void);
+  int open ();
   //FUZZ: enable check_for_lack_ACE_OS
 
   // Get this handler's I/O handle.
@@ -128,7 +128,7 @@ ClientAcceptor::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 
 // Listing 7 code/ch07
 int
-ClientService::open (void)
+ClientService::open ()
 {
   ACE_TCHAR peer_name[MAXHOSTNAMELEN];
   ACE_INET_Addr peer_addr;
diff --git a/ACE/examples/APG/Reactor/Timer_State_Data.cpp b/ACE/examples/APG/Reactor/Timer_State_Data.cpp
index d84dfdd5c18..8cd424fdf2f 100644
--- a/ACE/examples/APG/Reactor/Timer_State_Data.cpp
+++ b/ACE/examples/APG/Reactor/Timer_State_Data.cpp
@@ -25,7 +25,7 @@ public:
     return this->location_;
   }
 
-  int querySensor (void)
+  int querySensor ()
   {
     // ...
     return ++this->count_;
diff --git a/ACE/examples/APG/Reactor/Timers.cpp b/ACE/examples/APG/Reactor/Timers.cpp
index 734069456c1..f6638bcf698 100644
--- a/ACE/examples/APG/Reactor/Timers.cpp
+++ b/ACE/examples/APG/Reactor/Timers.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_signal.h"
 
-typedef void (*timerTask_t)(void);
+typedef void (*timerTask_t)();
 
 // Listing 1 code/ch07
 pid_t timerTask (int initialDelay,
@@ -50,7 +50,7 @@ void foo ()
 }
 // Listing 2
 
-void programMainLoop (void)
+void programMainLoop ()
 {
   ACE_OS::sleep (30);
 }
diff --git a/ACE/examples/APG/Shared_Memory/Hash_Map.cpp b/ACE/examples/APG/Shared_Memory/Hash_Map.cpp
index 908382c4736..d4f7de29e54 100644
--- a/ACE/examples/APG/Shared_Memory/Hash_Map.cpp
+++ b/ACE/examples/APG/Shared_Memory/Hash_Map.cpp
@@ -132,7 +132,7 @@ int addRecords(HASH_MAP *map, ALLOCATOR *shmem_allocator)
 }
 // Listing 4
 // Listing 5 code/ch17
-int handle_child (void)
+int handle_child ()
 {
   ACE_TRACE ("handle_child");
 
diff --git a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp
index d24b6f8f770..3ab6d0f08a2 100644
--- a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp
+++ b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp
@@ -45,7 +45,7 @@ private:
 };
 // Listing 2
 
-void showRecords (void)
+void showRecords ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("The following records were found:\n")));
@@ -64,7 +64,7 @@ void showRecords (void)
   }
 }
 
-int addRecords (void)
+int addRecords ()
 {
   char buf[32];
 
diff --git a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp
index 8b3a254bf9e..1e0e65418e1 100644
--- a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp
+++ b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp
@@ -223,7 +223,7 @@ int handle_parent (ACE_TCHAR *cmdLine)
 // Listing 2
 
 // Listing 3 code/ch17
-int handle_child (void)
+int handle_child ()
 {
   ALLOCATOR *shmem_allocator = 0;
   ACE_MMAP_Memory_Pool_Options options
diff --git a/ACE/examples/APG/Streams/Answerer.cpp b/ACE/examples/APG/Streams/Answerer.cpp
index 87b7b8dd7a5..79cfb0101bc 100644
--- a/ACE/examples/APG/Streams/Answerer.cpp
+++ b/ACE/examples/APG/Streams/Answerer.cpp
@@ -108,7 +108,7 @@ protected:
     return 0;
   }
 
-  ACE_FILE_Addr get_incoming_message_queue (void)
+  ACE_FILE_Addr get_incoming_message_queue ()
   {
     // Exclude 24
     return ACE_FILE_Addr (ACE_TEXT ("/tmp/incoming_message"));
diff --git a/ACE/examples/APG/Streams/BasicTask.h b/ACE/examples/APG/Streams/BasicTask.h
index 8198f6b8d15..b172099b0d1 100644
--- a/ACE/examples/APG/Streams/BasicTask.h
+++ b/ACE/examples/APG/Streams/BasicTask.h
@@ -35,7 +35,7 @@ public:
   // Listing 101
 
   // Listing 1020 code/ch18
-  virtual int svc (void)
+  virtual int svc ()
   {
     for (ACE_Message_Block *message = 0; ; )
       {
@@ -131,7 +131,7 @@ protected:
   // Listing 104 code/ch18
   virtual int process (Message *message) = 0;
 
-  virtual int desired_threads (void)
+  virtual int desired_threads ()
   {
     return 1;
   }
diff --git a/ACE/examples/APG/Streams/CommandModule.cpp b/ACE/examples/APG/Streams/CommandModule.cpp
index fc2a642ea1c..77164f537af 100644
--- a/ACE/examples/APG/Streams/CommandModule.cpp
+++ b/ACE/examples/APG/Streams/CommandModule.cpp
@@ -10,7 +10,7 @@ CommandModule::CommandModule (const ACE_TCHAR *module_name,
 // Listing 01
 
 // Listing 02 code/ch18
-ACE_SOCK_Stream &CommandModule::peer (void)
+ACE_SOCK_Stream &CommandModule::peer ()
 {
   ACE_SOCK_Stream *peer = (ACE_SOCK_Stream *)this->arg ();
   return *peer;
diff --git a/ACE/examples/APG/Streams/CommandModule.h b/ACE/examples/APG/Streams/CommandModule.h
index 6b6f01a3a07..217599791d2 100644
--- a/ACE/examples/APG/Streams/CommandModule.h
+++ b/ACE/examples/APG/Streams/CommandModule.h
@@ -18,7 +18,7 @@ public:
                    CommandTask *reader,
                    ACE_SOCK_Stream *peer);
 
-  ACE_SOCK_Stream &peer (void);
+  ACE_SOCK_Stream &peer ();
 };
 // Listing 01
 
diff --git a/ACE/examples/APG/Streams/CommandTask.cpp b/ACE/examples/APG/Streams/CommandTask.cpp
index 858ccadf090..b7b715925ce 100644
--- a/ACE/examples/APG/Streams/CommandTask.cpp
+++ b/ACE/examples/APG/Streams/CommandTask.cpp
@@ -55,7 +55,7 @@ int CommandTask::close (u_long flags)
 
 // Listing 06 code/ch18
 // Listing 061 code/ch18
-int CommandTask::svc (void)
+int CommandTask::svc ()
 {
   ACE_Message_Block *message;
 
diff --git a/ACE/examples/APG/Streams/CommandTasks.cpp b/ACE/examples/APG/Streams/CommandTasks.cpp
index 8ea4c397c86..a96ca9541bf 100644
--- a/ACE/examples/APG/Streams/CommandTasks.cpp
+++ b/ACE/examples/APG/Streams/CommandTasks.cpp
@@ -15,7 +15,7 @@ AnswerCallModule::AnswerCallModule (ACE_SOCK_Stream *peer)
 { }
 // Listing 011
 // Listing 012 code/ch18
-AnswerCallDownstreamTask::AnswerCallDownstreamTask (void)
+AnswerCallDownstreamTask::AnswerCallDownstreamTask ()
   : CommandTask(Command::CMD_ANSWER_CALL)
 { }
 // Listing 012
@@ -38,7 +38,7 @@ int AnswerCallDownstreamTask::process (Command *command)
 }
 // Listing 013
 // Listing 014 code/ch18
-AnswerCallUpstreamTask::AnswerCallUpstreamTask (void)
+AnswerCallUpstreamTask::AnswerCallUpstreamTask ()
   : CommandTask(Command::CMD_ANSWER_CALL)
 { }
 // Listing 014
@@ -62,7 +62,7 @@ RetrieveCallerIdModule::RetrieveCallerIdModule
 // Listing 021
 // Listing 022 code/ch18
 RetrieveCallerIdDownstreamTask::RetrieveCallerIdDownstreamTask
-  (void)
+  ()
     : CommandTask(Command::CMD_RETRIEVE_CALLER_ID)
 { }
 
@@ -76,7 +76,7 @@ int RetrieveCallerIdDownstreamTask::process (Command *)
 // Listing 022
 // Listing 023 code/ch18
 RetrieveCallerIdUpstreamTask::RetrieveCallerIdUpstreamTask
-  (void)
+  ()
     : CommandTask(Command::CMD_RETRIEVE_CALLER_ID)
 { }
 
@@ -106,7 +106,7 @@ PlayMessageModule::PlayMessageModule (ACE_SOCK_Stream *peer)
                    peer)
 { }
 
-PlayMessageDownstreamTask::PlayMessageDownstreamTask (void)
+PlayMessageDownstreamTask::PlayMessageDownstreamTask ()
   : CommandTask(Command::CMD_PLAY_MESSAGE)
 { }
 // Listing 032 code/ch18
@@ -143,7 +143,7 @@ int PlayMessageDownstreamTask::process (Command *command)
   return Command::RESULT_SUCCESS;
 }
 // Listing 032
-PlayMessageUpstreamTask::PlayMessageUpstreamTask (void)
+PlayMessageUpstreamTask::PlayMessageUpstreamTask ()
   : CommandTask(Command::CMD_PLAY_MESSAGE)
 { }
 
@@ -166,7 +166,7 @@ RecordMessageModule::RecordMessageModule (ACE_SOCK_Stream *peer)
                    peer)
 { }
 
-RecordMessageDownstreamTask::RecordMessageDownstreamTask (void)
+RecordMessageDownstreamTask::RecordMessageDownstreamTask ()
   : CommandTask(Command::CMD_RECORD_MESSAGE)
 { }
 
@@ -175,7 +175,7 @@ int RecordMessageDownstreamTask::process (Command *)
   return Command::RESULT_SUCCESS;
 }
 
-RecordMessageUpstreamTask::RecordMessageUpstreamTask (void)
+RecordMessageUpstreamTask::RecordMessageUpstreamTask ()
   : CommandTask(Command::CMD_RECORD_MESSAGE)
 { }
 // Listing 033 code/ch18
diff --git a/ACE/examples/APG/Streams/Message.h b/ACE/examples/APG/Streams/Message.h
index e6962896c85..61f2a320e38 100644
--- a/ACE/examples/APG/Streams/Message.h
+++ b/ACE/examples/APG/Streams/Message.h
@@ -13,7 +13,7 @@ public:
   ~Message ()
   { }
 
-  RecordingDevice *recorder (void)
+  RecordingDevice *recorder ()
   {
     return this->device_;
   }
@@ -28,7 +28,7 @@ public:
     this->type_ = type;
   }
 
-  MessageType *type (void)
+  MessageType *type ()
   {
     return this->type_;
   }
@@ -38,7 +38,7 @@ public:
     this->id_ = id;
   }
 
-  CallerId *caller_id (void)
+  CallerId *caller_id ()
   {
     return this->id_;
   }
@@ -54,22 +54,22 @@ public:
     this->type_ = type;
   }
 
-  ACE_FILE_Addr &addr (void)
+  ACE_FILE_Addr &addr ()
   {
     return this->addr_;
   }
 
-  int is_text (void)
+  int is_text ()
   {
     return this->type_->is_text ();
   }
 
-  int is_audio (void)
+  int is_audio ()
   {
     return this->type_->is_audio ();
   }
 
-  int is_video (void)
+  int is_video ()
   {
     return this->type_->is_video ();
   }
diff --git a/ACE/examples/APG/Streams/MessageInfo.h b/ACE/examples/APG/Streams/MessageInfo.h
index b96a3ad67b3..ffc1ea1a25b 100644
--- a/ACE/examples/APG/Streams/MessageInfo.h
+++ b/ACE/examples/APG/Streams/MessageInfo.h
@@ -15,7 +15,7 @@ public:
   CallerId (ACE_TString id) : id_(id)
   { }
 
-  const ACE_TCHAR * string(void)
+  const ACE_TCHAR * string()
   {
     return this->id_.c_str ();
   }
@@ -59,31 +59,31 @@ public:
     : codec_(codec), addr_(addr)
   { }
 
-  int get_codec (void)
+  int get_codec ()
   {
     return this->codec_;
   }
 
-  ACE_FILE_Addr &get_addr (void)
+  ACE_FILE_Addr &get_addr ()
   {
     return this->addr_;
   }
 
-  int is_video (void)
+  int is_video ()
   {
     return
       this->get_codec () > FIRST_VIDEO_CODEC &&
       this->get_codec () < LAST_VIDEO_CODEC;
   }
 
-  int is_audio (void)
+  int is_audio ()
   {
     return
       this->get_codec () > FIRST_AUDIO_CODEC &&
       this->get_codec () < LAST_AUDIO_CODEC ;
   }
 
-  int is_text (void)
+  int is_text ()
   {
     return
       this->get_codec () > FIRST_TEXT_CODEC &&
diff --git a/ACE/examples/APG/Streams/RecordingDevice.h b/ACE/examples/APG/Streams/RecordingDevice.h
index 41a9739d987..f060b78a904 100644
--- a/ACE/examples/APG/Streams/RecordingDevice.h
+++ b/ACE/examples/APG/Streams/RecordingDevice.h
@@ -49,7 +49,7 @@ public:
   virtual MessageType *record_message (ACE_FILE_Addr &addr) = 0;
 
   // Release the RecordingDevice to accept another incoming call
-  virtual void release (void)
+  virtual void release ()
   {
     this->release_semaphore ();
   }
@@ -61,7 +61,7 @@ public:
     return 0;
   }
 
-  virtual RecordingDevice *wait_for_activity (void)
+  virtual RecordingDevice *wait_for_activity ()
   {
     // Block on a semaphore until it says we're ready to do
     // work.
@@ -90,12 +90,12 @@ public:
   }
 
 protected:
-  void acquire_semaphore (void)
+  void acquire_semaphore ()
   {
     this->semaphore_.acquire ();
   }
 
-  void release_semaphore (void)
+  void release_semaphore ()
   {
     // Reset the semaphore so that wait_for_activity() will
     // unblock.
diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp
index cf6cc0c084c..d06d2c131da 100644
--- a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp
+++ b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp
@@ -7,7 +7,7 @@
 #include "RecordingDevice_Text.h"
 #include "Util.h"
 
-TextListenerAcceptor::TextListenerAcceptor (void)
+TextListenerAcceptor::TextListenerAcceptor ()
   : ACE_Event_Handler(), RecordingDevice()
 { }
 
@@ -62,18 +62,18 @@ ACE_Event_Handler *TextListenerAcceptor::get_handler () const
   return (ACE_Event_Handler *)this;
 }
 
-RecordingDevice *TextListenerAcceptor::wait_for_activity (void)
+RecordingDevice *TextListenerAcceptor::wait_for_activity ()
 {
   this->RecordingDevice::wait_for_activity ();
   return new TextListener (this);
 }
 
-int TextListenerAcceptor::answer_call (void)
+int TextListenerAcceptor::answer_call ()
 {
   return -1;
 }
 
-CallerId *TextListenerAcceptor::retrieve_callerId (void)
+CallerId *TextListenerAcceptor::retrieve_callerId ()
 {
   return 0;
 }
@@ -108,7 +108,7 @@ const ACE_TCHAR *TextListener::get_name () const
 }
 
 // Listing 02 code/ch18
-int TextListener::answer_call (void)
+int TextListener::answer_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TextListener::answer_call()\n")));
@@ -129,7 +129,7 @@ int TextListener::answer_call (void)
 // Listing 02
 
 // Listing 03 code/ch18
-CallerId *TextListener::retrieve_callerId (void)
+CallerId *TextListener::retrieve_callerId ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TextListener::retrieve_callerId()\n")));
@@ -188,7 +188,7 @@ MessageType *TextListener::record_message (ACE_FILE_Addr &addr)
 // Listing 05
 
 // Listing 06 code/ch18
-void TextListener::release (void)
+void TextListener::release ()
 {
   delete this;
 }
diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.h b/ACE/examples/APG/Streams/RecordingDevice_Text.h
index 10dc44df1f6..dcd6e1dc664 100644
--- a/ACE/examples/APG/Streams/RecordingDevice_Text.h
+++ b/ACE/examples/APG/Streams/RecordingDevice_Text.h
@@ -39,11 +39,11 @@ public:
 
   ACE_Event_Handler *get_handler () const;
 
-  virtual RecordingDevice *wait_for_activity (void);
+  virtual RecordingDevice *wait_for_activity ();
 
-  virtual int answer_call (void);
+  virtual int answer_call ();
 
-  virtual CallerId *retrieve_callerId (void);
+  virtual CallerId *retrieve_callerId ();
 
   virtual int play_message (ACE_FILE_Addr &addr);
 
@@ -61,15 +61,15 @@ public:
 
   virtual const ACE_TCHAR *get_name () const;
 
-  int answer_call (void);
+  int answer_call ();
 
-  CallerId *retrieve_callerId (void);
+  CallerId *retrieve_callerId ();
 
   int play_message (ACE_FILE_Addr &addr);
 
   MessageType *record_message (ACE_FILE_Addr &addr);
 
-  virtual void release (void);
+  virtual void release ();
   // Listing 01
   // Listing 02 code/ch18
 private:
diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
index 5e850351bba..0cfcf309982 100644
--- a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
+++ b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
@@ -82,7 +82,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[])
 
 // Listing 2 code/ch19
 int
-HA_Status::fini (void)
+HA_Status::fini ()
 {
   this->acceptor_.close ();
   return 0;
diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp b/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp
index 68eb68422d0..d82a2989b2f 100644
--- a/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp
+++ b/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp
@@ -81,7 +81,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[])
 
 // Listing 2 code/ch19
 int
-HA_Status::fini (void)
+HA_Status::fini ()
 {
   this->acceptor_.close ();
   return 0;
diff --git a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp
index 007736eff47..b00697cd754 100644
--- a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp
+++ b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp
@@ -9,7 +9,7 @@
 class CanceledTask : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n")));
 
@@ -23,7 +23,7 @@ public:
       }
   }
 
-  int set_cancel_mode (void)
+  int set_cancel_mode ()
   {
     cancel_state new_state;
 
diff --git a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp
index 0fd82167e7c..37129d4466e 100644
--- a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp
+++ b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp
@@ -10,7 +10,7 @@
 class CanceledTask : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
 
diff --git a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp
index 915edf014fa..4d62f6dc2be 100644
--- a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp
+++ b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp
@@ -5,7 +5,7 @@
 class ExitHandler : public ACE_At_Thread_Exit
 {
 public:
-  virtual void apply (void)
+  virtual void apply ()
   {
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) is exiting\n")));
 
@@ -20,7 +20,7 @@ public:
   HA_CommandHandler(ExitHandler& eh) : eh_(eh)
   { }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
 
diff --git a/ACE/examples/APG/ThreadManagement/Pool.cpp b/ACE/examples/APG/ThreadManagement/Pool.cpp
index e90cf649751..ee4d4556b1e 100644
--- a/ACE/examples/APG/ThreadManagement/Pool.cpp
+++ b/ACE/examples/APG/ThreadManagement/Pool.cpp
@@ -8,7 +8,7 @@
 class HA_CommandHandler : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
     ACE_Message_Block *mb = 0;
diff --git a/ACE/examples/APG/ThreadManagement/Priorities.cpp b/ACE/examples/APG/ThreadManagement/Priorities.cpp
index fecb466e24f..4f2c477f1a3 100644
--- a/ACE/examples/APG/ThreadManagement/Priorities.cpp
+++ b/ACE/examples/APG/ThreadManagement/Priorities.cpp
@@ -13,7 +13,7 @@ public:
   HA_CommandHandler (const char *name) : name_ (name)
   { }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up %C\n"),
                 name_));
diff --git a/ACE/examples/APG/ThreadManagement/Signals.cpp b/ACE/examples/APG/ThreadManagement/Signals.cpp
index 80d424a5275..157274c1e66 100644
--- a/ACE/examples/APG/ThreadManagement/Signals.cpp
+++ b/ACE/examples/APG/ThreadManagement/Signals.cpp
@@ -24,7 +24,7 @@ public:
     return 0;
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n")));
 
diff --git a/ACE/examples/APG/ThreadManagement/Signals2.cpp b/ACE/examples/APG/ThreadManagement/Signals2.cpp
index 1a23f38565d..138abd01127 100644
--- a/ACE/examples/APG/ThreadManagement/Signals2.cpp
+++ b/ACE/examples/APG/ThreadManagement/Signals2.cpp
@@ -24,7 +24,7 @@ public:
     return 0;
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n")));
 
@@ -56,7 +56,7 @@ SignalableTask::process_message (ACE_Message_Block *)
 }
 
 void
-SignalableTask::handle_alert (void)
+SignalableTask::handle_alert ()
 {
   return;
 }
diff --git a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp
index 49389fcdb70..805e81435f5 100644
--- a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp
+++ b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp
@@ -34,7 +34,7 @@ HA_ThreadHook::add_sec_context_thr(ACE_TSS<SecurityContext> &secCtx)
 class HA_CommandHandler : public ACE_Task_Base
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
 
diff --git a/ACE/examples/APG/ThreadManagement/State.cpp b/ACE/examples/APG/ThreadManagement/State.cpp
index add2ca782ca..52b9845ca13 100644
--- a/ACE/examples/APG/ThreadManagement/State.cpp
+++ b/ACE/examples/APG/ThreadManagement/State.cpp
@@ -3,7 +3,7 @@
 class HA_CommandHandler : public ACE_Task_Base
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG
       ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n")));
diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp
index 3ad8c8b8c39..8f1172ba6e9 100644
--- a/ACE/examples/APG/ThreadPools/Futures.cpp
+++ b/ACE/examples/APG/ThreadPools/Futures.cpp
@@ -33,7 +33,7 @@ public:
 class LongWork : public ACE_Method_Request
 {
 public:
-  virtual int call (void)
+  virtual int call ()
   {
     ACE_TRACE ("LongWork::call");
     ACE_DEBUG
@@ -49,7 +49,7 @@ public:
     return 0;
   }
 
-  ACE_Future<ACE_CString*> &future (void)
+  ACE_Future<ACE_CString*> &future ()
   {
     ACE_TRACE ("LongWork::future");
     return result_;
@@ -68,7 +68,7 @@ private:
 class Exit : public ACE_Method_Request
 {
 public:
-  virtual int call (void)
+  virtual int call ()
   {
     ACE_TRACE ("Exit::call");
     return -1;
@@ -99,7 +99,7 @@ public:
     return this->queue_.enqueue (req);
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     thread_id_ = ACE_Thread::self ();
     while (1)
@@ -120,7 +120,7 @@ public:
     return 0;
   }
 
-  ACE_thread_t thread_id (void);
+  ACE_thread_t thread_id ();
 
 private:
   IManager *manager_;
@@ -129,7 +129,7 @@ private:
 };
 // Listing 3
 
-ACE_thread_t Worker::thread_id (void)
+ACE_thread_t Worker::thread_id ()
 {
   return thread_id_;
 }
@@ -152,7 +152,7 @@ public:
     return this->queue_.enqueue (req);
   }
 
-  int svc (void)
+  int svc ()
   {
     ACE_TRACE ("svc");
 
@@ -184,7 +184,7 @@ public:
     return 0;
   }
 
-  int shut_down (void);
+  int shut_down ();
 
   virtual int return_to_work (Worker *worker)
   {
@@ -199,7 +199,7 @@ public:
   }
 
 private:
-  Worker *choose_worker (void)
+  Worker *choose_worker ()
   {
     ACE_GUARD_RETURN
       (ACE_Thread_Mutex, worker_mon, this->workers_lock_, 0)
@@ -212,7 +212,7 @@ private:
     return worker;
   }
 
-  int create_worker_pool (void)
+  int create_worker_pool ()
   {
     ACE_GUARD_RETURN
       (ACE_Thread_Mutex, worker_mon, this->workers_lock_, -1);
@@ -227,7 +227,7 @@ private:
     return 0;
   }
 
-  int done (void)
+  int done ()
   {
     return (shutdown_ == 1);
   }
@@ -247,7 +247,7 @@ private:
 // Listing 4
 
 int
-Manager::shut_down (void)
+Manager::shut_down ()
 {
   ACE_TRACE ("Manager::shut_down");
   ACE_Unbounded_Queue<Worker* >::ITERATOR iter = this->workers_.begin ();
diff --git a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp
index 8f0e4a82145..6b740f60bc5 100644
--- a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp
+++ b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp
@@ -19,18 +19,18 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  int wait (void)
+  int wait ()
   {
     return this->cond_.wait ();
   }
 
-  int signal (void)
+  int signal ()
   {
     return this->cond_.signal ();
   }
   //FUZZ: enable check_for_lack_ACE_OS
 
-  ACE_thread_t owner (void)
+  ACE_thread_t owner ()
   {
     return this->owner_;
   }
@@ -51,19 +51,19 @@ public:
 
   virtual int svc ();
 
-  void shut_down (void)
+  void shut_down ()
   {
     shutdown_ = 1;
   }
 
 private:
-  int become_leader (void);
+  int become_leader ();
 
-  Follower *make_follower (void);
+  Follower *make_follower ();
 
-  int elect_new_leader (void);
+  int elect_new_leader ();
 
-  int leader_active (void)
+  int leader_active ()
   {
     ACE_TRACE ("LF_ThreadPool::leader_active");
     return this->current_leader_ != 0;
@@ -77,7 +77,7 @@ private:
 
   void process_message (ACE_Message_Block *mb);
 
-  int done (void)
+  int done ()
   {
     return (shutdown_ == 1);
   }
@@ -93,7 +93,7 @@ private:
 // Listing 1
 // Listing 2 code/ch16
 int
-LF_ThreadPool::svc (void)
+LF_ThreadPool::svc ()
 {
   ACE_TRACE ("LF_ThreadPool::svc");
   while (!done ())
@@ -121,7 +121,7 @@ LF_ThreadPool::svc (void)
 // Listing 2
 // Listing 3 code/ch16
 int
-LF_ThreadPool::become_leader (void)
+LF_ThreadPool::become_leader ()
 {
   ACE_TRACE ("LF_ThreadPool::become_leader");
 
@@ -147,7 +147,7 @@ LF_ThreadPool::become_leader (void)
 }
 
 Follower*
-LF_ThreadPool::make_follower (void)
+LF_ThreadPool::make_follower ()
 {
   ACE_TRACE ("LF_ThreadPool::make_follower");
 
@@ -161,7 +161,7 @@ LF_ThreadPool::make_follower (void)
 // Listing 3
 // Listing 5 code/ch16
 int
-LF_ThreadPool::elect_new_leader (void)
+LF_ThreadPool::elect_new_leader ()
 {
   ACE_TRACE ("LF_ThreadPool::elect_new_leader");
 
diff --git a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp
index 6386ee129bb..edd8441a815 100644
--- a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp
+++ b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp
@@ -111,7 +111,7 @@ reactor_event_hook (ACE_Reactor *)
 class ServerTP : public ACE_Task_Base
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Running the event loop\n")));
diff --git a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp
index b9f980c51ae..0b87733cde7 100644
--- a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp
+++ b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp
@@ -14,7 +14,7 @@ public:
   Workers ()
   { }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     while (1)
       {
@@ -63,7 +63,7 @@ public:
     ACE_TRACE ("Manager::Manager");
   }
 
-  int svc (void)
+  int svc ()
   {
     ACE_TRACE ("Manager::svc");
 
@@ -95,13 +95,13 @@ public:
   }
 
 private:
-  int done (void);
+  int done ();
 
   int shutdown_;
 };
 // Listing 1
 
-int Manager::done (void)
+int Manager::done ()
 {
   return (shutdown_ == 1);
 }
diff --git a/ACE/examples/APG/ThreadPools/ThreadPool.cpp b/ACE/examples/APG/ThreadPools/ThreadPool.cpp
index d5db44977f0..112ca57c991 100644
--- a/ACE/examples/APG/ThreadPools/ThreadPool.cpp
+++ b/ACE/examples/APG/ThreadPools/ThreadPool.cpp
@@ -28,7 +28,7 @@ class Worker : public ACE_Task<ACE_MT_SYNCH>
 public:
   Worker (IManager *manager) : manager_(manager) { }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_Thread_ID id;
     thread_id_ = id;
@@ -55,7 +55,7 @@ public:
   }
   // Listing 2
 
-  const ACE_Thread_ID& thread_id (void)
+  const ACE_Thread_ID& thread_id ()
   {
     return this->thread_id_;
   }
@@ -93,7 +93,7 @@ public:
     ACE_TRACE ("Manager::Manager");
   }
 
-  int svc (void)
+  int svc ()
   {
     ACE_TRACE ("Manager::svc");
 
@@ -134,7 +134,7 @@ public:
     return 0;
   }
 
-  int shut_down (void);
+  int shut_down ();
 
   const ACE_Thread_ID& thread_id (Worker *worker);
 
@@ -151,7 +151,7 @@ public:
   }
 
 private:
-  int create_worker_pool (void)
+  int create_worker_pool ()
   {
     ACE_GUARD_RETURN (ACE_Thread_Mutex,
                       worker_mon,
@@ -168,7 +168,7 @@ private:
     return 0;
   }
 
-  int done (void);
+  int done ();
 
 private:
   int shutdown_;
@@ -178,13 +178,13 @@ private:
 };
 // Listing 1
 
-int Manager::done (void)
+int Manager::done ()
 {
   return (shutdown_ == 1);
 }
 
 int
-Manager::shut_down (void)
+Manager::shut_down ()
 {
   ACE_TRACE ("Manager::shut_down");
   ACE_Unbounded_Queue<Worker* >::ITERATOR iter =
diff --git a/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp
index aadbea5068b..df3eea5c359 100644
--- a/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp
+++ b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp
@@ -26,7 +26,7 @@ public:
     : buf_(buf), in_(in), out_(out)
   { }
 
-  int svc (void)
+  int svc ()
   {
     SafeInt itemNo = 0;
     while (1)
@@ -68,7 +68,7 @@ public:
     : buf_(buf), in_(in), out_(out)
   { }
 
-  int svc (void)
+  int svc ()
   {
     while (1)
       {
diff --git a/ACE/examples/APG/ThreadSafety/Barrier.cpp b/ACE/examples/APG/ThreadSafety/Barrier.cpp
index a6d7b99e131..2bca398321f 100644
--- a/ACE/examples/APG/ThreadSafety/Barrier.cpp
+++ b/ACE/examples/APG/ThreadSafety/Barrier.cpp
@@ -18,10 +18,10 @@ public:
       shutdown_barrier_(shutdown_barrier)
     { }
 
-  void initialize_handler (void);
-  int handle_command_requests (void);
+  void initialize_handler ();
+  int handle_command_requests ();
 
-  int svc (void)
+  int svc ()
   {
     initialize_handler ();
     startup_barrier_.wait ();
@@ -43,7 +43,7 @@ private:
 // Listing 2
 
 void
-HA_CommandHandler::initialize_handler (void)
+HA_CommandHandler::initialize_handler ()
 {
   ACE_Time_Value tv (0, ACE_OS::rand () * 100);
   timespec_t t = (timespec_t)tv;
@@ -51,7 +51,7 @@ HA_CommandHandler::initialize_handler (void)
 }
 
 int
-HA_CommandHandler::handle_command_requests (void)
+HA_CommandHandler::handle_command_requests ()
 {
   ACE_Time_Value tv (0, ACE_OS::rand () * 100);
   timespec_t t = (timespec_t)tv;
diff --git a/ACE/examples/APG/ThreadSafety/Mutex.cpp b/ACE/examples/APG/ThreadSafety/Mutex.cpp
index 026f95dc587..937ec61b6b1 100644
--- a/ACE/examples/APG/ThreadSafety/Mutex.cpp
+++ b/ACE/examples/APG/ThreadSafety/Mutex.cpp
@@ -13,7 +13,7 @@ public:
   {
   }
 
-  virtual int priority (void)
+  virtual int priority ()
   {
     return NORMAL;
   }
@@ -21,7 +21,7 @@ public:
 
 class CriticalLogMessage : public LogMessage
 {
-  virtual int priority (void)
+  virtual int priority ()
   {
     return LogMessage::CRITICAL;
   }
diff --git a/ACE/examples/APG/ThreadSafety/RW_Lock.cpp b/ACE/examples/APG/ThreadSafety/RW_Lock.cpp
index 27f667ef674..42cd9e629c0 100644
--- a/ACE/examples/APG/ThreadSafety/RW_Lock.cpp
+++ b/ACE/examples/APG/ThreadSafety/RW_Lock.cpp
@@ -94,7 +94,7 @@ public:
   Runner(HA_DiscoveryAgent &agent) : agent_(agent)
   { }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_ASSERT(agent_.contains_device(devices[9]) == 1);
     agent_.remove_device (devices[9]);
diff --git a/ACE/examples/APG/ThreadSafety/Semaphore.cpp b/ACE/examples/APG/ThreadSafety/Semaphore.cpp
index 00cf7383a89..6ab1bc3bf33 100644
--- a/ACE/examples/APG/ThreadSafety/Semaphore.cpp
+++ b/ACE/examples/APG/ThreadSafety/Semaphore.cpp
@@ -15,7 +15,7 @@ public:
     : psema_(psema), csema_(csema), exit_condition_(0)
   { }
 
-  int svc (void)
+  int svc ()
   {
     while (!is_closed ())
       consume_item ();
@@ -47,7 +47,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void)
+  void shutdown ()
   {
   //FUZZ: enable check_for_lack_ACE_OS
     exit_condition_ = 1;
@@ -55,7 +55,7 @@ public:
     csema_.release (N_THREADS);
   }
 
-  int is_closed (void)
+  int is_closed ()
   {
     return exit_condition_;
   }
@@ -77,7 +77,7 @@ public:
       : psema_(psema), csema_(csema), consumer_(consumer)
   { }
 
-  int svc (void)
+  int svc ()
   {
     for (int i = 0; i <= MAX_PROD; i++)
       produce_item (i);
diff --git a/ACE/examples/APG/ThreadSafety/TSS.cpp b/ACE/examples/APG/ThreadSafety/TSS.cpp
index f895871be75..71c1590a33a 100644
--- a/ACE/examples/APG/ThreadSafety/TSS.cpp
+++ b/ACE/examples/APG/ThreadSafety/TSS.cpp
@@ -24,7 +24,7 @@ ClientContext::set_attribute (const char *name, void *value)
 class HA_CommandHandler : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_thread_t tid = this->thr_mgr ()->thr_self ();
     // Set our identifier in TSS.
@@ -36,7 +36,7 @@ public:
     return 0;
   }
 
-  int handle_requests (void)
+  int handle_requests ()
   {
     ACE_thread_t *tid =
       (ACE_thread_t*)this->tss_ctx_->get_attribute ("thread_id");
diff --git a/ACE/examples/APG/ThreadSafety/Tokens.cpp b/ACE/examples/APG/ThreadSafety/Tokens.cpp
index bf17405a8f4..93765c89c1c 100644
--- a/ACE/examples/APG/ThreadSafety/Tokens.cpp
+++ b/ACE/examples/APG/ThreadSafety/Tokens.cpp
@@ -64,7 +64,7 @@ public:
   HA_CommandHandler (HA_Device_Repository &rep) : rep_(rep)
   { }
 
-  int svc (void)
+  int svc ()
   {
     for (int i = 0; i < HA_Device_Repository::N_DEVICES; i++)
       rep_.update_device (i, "");
diff --git a/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp b/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
index baa6e9d6fd4..80754f67685 100644
--- a/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
+++ b/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
@@ -8,7 +8,7 @@
 class ThreadOne : public ACE_Task_Base
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_Local_Mutex mutex1 (ACE_TEXT ("resource1"),
                             0, // Deadlock detection enabled.
@@ -24,7 +24,7 @@ public:
 class ThreadTwo : public ACE_Task_Base
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_Local_Mutex mutex2 (ACE_TEXT ("resource2"),
                             0, // Deadlock detection enabled.
diff --git a/ACE/examples/APG/Threads/Activate.cpp b/ACE/examples/APG/Threads/Activate.cpp
index 6f7b8f0c9e7..3b62a6044ad 100644
--- a/ACE/examples/APG/Threads/Activate.cpp
+++ b/ACE/examples/APG/Threads/Activate.cpp
@@ -5,7 +5,7 @@
 class HA_CommandHandler : public ACE_Task_Base
 {
 public:
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG
       ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n")));
diff --git a/ACE/examples/APG/Threads/Condition_Variables.cpp b/ACE/examples/APG/Threads/Condition_Variables.cpp
index 659cd018d86..dea1e77d04e 100644
--- a/ACE/examples/APG/Threads/Condition_Variables.cpp
+++ b/ACE/examples/APG/Threads/Condition_Variables.cpp
@@ -12,13 +12,13 @@ public:
   HA_Device_Repository() : owner_(0)
   { }
 
-  int is_free (void)
+  int is_free ()
     { return (this->owner_ == 0); }
 
   int is_owner (ACE_Task_Base* tb)
     { return (this->owner_ == tb); }
 
-  ACE_Task_Base *get_owner (void)
+  ACE_Task_Base *get_owner ()
     { return this->owner_; }
 
   void set_owner (ACE_Task_Base *owner)
@@ -51,7 +51,7 @@ private:
 };
 // Listing 2 code/ch12
 int
-HA_CommandHandler::svc (void)
+HA_CommandHandler::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Handler Thread running\n")));
diff --git a/ACE/examples/APG/Threads/Message_Queue.cpp b/ACE/examples/APG/Threads/Message_Queue.cpp
index 6e609033036..9adc32104bd 100644
--- a/ACE/examples/APG/Threads/Message_Queue.cpp
+++ b/ACE/examples/APG/Threads/Message_Queue.cpp
@@ -7,7 +7,7 @@
 
 // Listing 5 code/ch12
 int
-HA_CommandHandler::svc (void)
+HA_CommandHandler::svc ()
 {
   while(1)
     {
@@ -43,7 +43,7 @@ HA_CommandHandler::svc (void)
 
 // Listing 4 code/ch12
 ACE_Message_Block *
-Message_Receiver::shut_down_message (void)
+Message_Receiver::shut_down_message ()
 {
   ACE_Message_Block *mb = 0;
   ACE_NEW_RETURN
diff --git a/ACE/examples/APG/Threads/Message_Receiver.h b/ACE/examples/APG/Threads/Message_Receiver.h
index 92f1ab61256..395a94d3a60 100644
--- a/ACE/examples/APG/Threads/Message_Receiver.h
+++ b/ACE/examples/APG/Threads/Message_Receiver.h
@@ -65,7 +65,7 @@ public:
   Message_Receiver (HA_CommandHandler *ch) : handler_(ch)
   { }
 
-  ACE_Message_Block *shut_down_message (void);
+  ACE_Message_Block *shut_down_message ();
 
   virtual int handle_input (ACE_HANDLE fd);
 
diff --git a/ACE/examples/APG/Threads/Mutexes.cpp b/ACE/examples/APG/Threads/Mutexes.cpp
index 032dd159dd1..29f8c195354 100644
--- a/ACE/examples/APG/Threads/Mutexes.cpp
+++ b/ACE/examples/APG/Threads/Mutexes.cpp
@@ -33,7 +33,7 @@ public:
   HA_CommandHandler (HA_Device_Repository& rep) : rep_(rep)
   { }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     ACE_DEBUG
       ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n")));
diff --git a/ACE/examples/APG/Timers/CB.cpp b/ACE/examples/APG/Timers/CB.cpp
index 722ea94b547..69cd122ee3f 100644
--- a/ACE/examples/APG/Timers/CB.cpp
+++ b/ACE/examples/APG/Timers/CB.cpp
@@ -54,7 +54,7 @@ CB::setID (long timerID)
 }
 
 long
-CB::getID (void)
+CB::getID ()
 {
   ACE_TRACE ("CB::getID");
   return timerID_;
diff --git a/ACE/examples/APG/Timers/CB.h b/ACE/examples/APG/Timers/CB.h
index 3cbf44983cd..d05154a876f 100644
--- a/ACE/examples/APG/Timers/CB.h
+++ b/ACE/examples/APG/Timers/CB.h
@@ -16,7 +16,7 @@ public:
   void setID (long timerID);
 
   // Get the timer id.
-  long getID (void);
+  long getID ();
 
   // Handle the timeout.
   virtual int handle_timeout(const ACE_Time_Value &tv,
diff --git a/ACE/examples/APG/Timers/PCB.cpp b/ACE/examples/APG/Timers/PCB.cpp
index 542ca97946f..abd93721818 100644
--- a/ACE/examples/APG/Timers/PCB.cpp
+++ b/ACE/examples/APG/Timers/PCB.cpp
@@ -63,14 +63,14 @@ PCB::getID () const
 }
 
 int
-PCB::handleClose (void)
+PCB::handleClose ()
 {
   ACE_TRACE ("PCB::handleClose");
   return 0;
 }
 
 int
-PCB::handleCancel (void)
+PCB::handleCancel ()
 {
   ACE_TRACE ("PCB::handleCancel");
   return 0;
diff --git a/ACE/examples/APG/Timers/PCB.h b/ACE/examples/APG/Timers/PCB.h
index abe953b30c5..97e64f69c59 100644
--- a/ACE/examples/APG/Timers/PCB.h
+++ b/ACE/examples/APG/Timers/PCB.h
@@ -15,8 +15,8 @@ public:
 
   // Handle a timeout event, cancel, and close.
   virtual int handleEvent (const void *arg);
-  virtual int handleCancel (void);
-  virtual int handleClose (void);
+  virtual int handleCancel ();
+  virtual int handleClose ();
 
 private:
   long timerID_;
diff --git a/ACE/examples/APG/Timers/PTimerDispatcher.cpp b/ACE/examples/APG/Timers/PTimerDispatcher.cpp
index 7601e08bbd8..dbb5b6477e3 100644
--- a/ACE/examples/APG/Timers/PTimerDispatcher.cpp
+++ b/ACE/examples/APG/Timers/PTimerDispatcher.cpp
@@ -1,6 +1,6 @@
 #include "PTimerDispatcher.h"
 
-void PTimer_Dispatcher::wait_for_event (void)
+void PTimer_Dispatcher::wait_for_event ()
 {
   ACE_TRACE ("PTimer_Dispatcher::wait_for_event");
 
diff --git a/ACE/examples/APG/Timers/PTimerDispatcher.h b/ACE/examples/APG/Timers/PTimerDispatcher.h
index 43047c67a8a..12c3ccabe03 100644
--- a/ACE/examples/APG/Timers/PTimerDispatcher.h
+++ b/ACE/examples/APG/Timers/PTimerDispatcher.h
@@ -11,7 +11,7 @@ class PCB;
 class PTimer_Dispatcher
 {
 public:
-  void wait_for_event (void);
+  void wait_for_event ();
 
   long schedule (PCB *cb,
                  void *arg,
diff --git a/ACE/examples/APG/Timers/TimerDispatcher.cpp b/ACE/examples/APG/Timers/TimerDispatcher.cpp
index a2b47e2bf39..9ccc18a7b71 100644
--- a/ACE/examples/APG/Timers/TimerDispatcher.cpp
+++ b/ACE/examples/APG/Timers/TimerDispatcher.cpp
@@ -1,6 +1,6 @@
 #include "TimerDispatcher.h"
 // Listing 1 code/ch20
-void Timer_Dispatcher::wait_for_event (void)
+void Timer_Dispatcher::wait_for_event ()
 {
   ACE_TRACE ("Timer_Dispatcher::wait_for_event");
 
diff --git a/ACE/examples/APG/Timers/TimerDispatcher.h b/ACE/examples/APG/Timers/TimerDispatcher.h
index 06ce42a8d8a..44df8959af2 100644
--- a/ACE/examples/APG/Timers/TimerDispatcher.h
+++ b/ACE/examples/APG/Timers/TimerDispatcher.h
@@ -11,7 +11,7 @@
 class Timer_Dispatcher
 {
 public:
-  void wait_for_event (void);
+  void wait_for_event ();
 
   long schedule (ACE_Event_Handler *cb,
                  void *arg,
diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp
index 1b59432e963..9c5ebf23b8d 100644
--- a/ACE/examples/ASX/CCM_App/CCM_App.cpp
+++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp
@@ -20,8 +20,8 @@ public:
 
   virtual int init (int, ACE_TCHAR *[]);
   virtual int fini ();
-  virtual int suspend (void);
-  virtual int resume (void);
+  virtual int suspend ();
+  virtual int resume ();
 };
 
 int
@@ -43,7 +43,7 @@ Test_Task::close (u_long)
 }
 
 int
-Test_Task::suspend (void)
+Test_Task::suspend ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("suspending in %s\n"),
@@ -52,7 +52,7 @@ Test_Task::suspend (void)
 }
 
 int
-Test_Task::resume (void)
+Test_Task::resume ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("resuming in %s\n"),
@@ -71,7 +71,7 @@ Test_Task::init (int, ACE_TCHAR *[])
 }
 
 int
-Test_Task::fini (void)
+Test_Task::fini ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("finalizing %s (%@)\n"),
@@ -87,33 +87,33 @@ ACE_SVC_FACTORY_DEFINE (Test_Task)
 
 // Dynamically linked functions used to control configuration.
 
-extern "C" ACE_Svc_Export MT_Stream *make_stream (void);
-extern "C" ACE_Svc_Export MT_Module *make_da (void);
-extern "C" ACE_Svc_Export MT_Module *make_ea (void);
-extern "C" ACE_Svc_Export MT_Module *make_mr (void);
+extern "C" ACE_Svc_Export MT_Stream *make_stream ();
+extern "C" ACE_Svc_Export MT_Module *make_da ();
+extern "C" ACE_Svc_Export MT_Module *make_ea ();
+extern "C" ACE_Svc_Export MT_Module *make_mr ();
 
 MT_Stream *
-make_stream (void)
+make_stream ()
 {
   return new MT_Stream;
 }
 
 MT_Module *
-make_da (void)
+make_da ()
 {
   return new MT_Module (ACE_TEXT ("Device_Adapter"),
                         new Test_Task, new Test_Task);
 }
 
 MT_Module *
-make_ea (void)
+make_ea ()
 {
   return new MT_Module (ACE_TEXT ("Event_Analyzer"),
                         new Test_Task, new Test_Task);
 }
 
 MT_Module *
-make_mr (void)
+make_mr ()
 {
   return new MT_Module (ACE_TEXT ("Multicast_Router"),
                         new Test_Task, new Test_Task);
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
index 489a6d3dacc..8cee2fd5b37 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
@@ -58,7 +58,7 @@ Consumer_Router::close (u_long)
 // Handle incoming messages in a separate thread.
 
 int
-Consumer_Router::svc (void)
+Consumer_Router::svc ()
 {
   assert (this->is_writer ());
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
index d97f61f976c..862b7a78f20 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
@@ -59,7 +59,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[])
 }
 
 int
-Event_Analyzer::fini (void)
+Event_Analyzer::fini ()
 {
   // No-op for now.
   return 0;
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
index d8ee1bddc3d..0aaff77865f 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -13,7 +13,7 @@
 Options *Options::instance_ = 0;
 
 Options *
-Options::instance (void)
+Options::instance ()
 {
   if (Options::instance_ == 0)
     Options::instance_ = new Options;
@@ -21,7 +21,7 @@ Options::instance (void)
   return Options::instance_;
 }
 
-Options::Options (void)
+Options::Options ()
   : thr_count_ (4),
     t_flags_ (0),
     high_water_mark_ (8 * 1024),
@@ -36,11 +36,11 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
-void Options::print_results (void)
+void Options::print_results ()
 {
 #if !defined (ACE_WIN32)
   ACE_Profile_Timer::ACE_Elapsed_Time et;
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.h b/ACE/examples/ASX/Event_Server/Event_Server/Options.h
index 5d125cb16ee..d9408f42aa8 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.h
@@ -15,65 +15,65 @@ class Options
   // = TITLE
   //     Option Singleton for Event Server.
 public:
-  static Options *instance (void);
+  static Options *instance ();
   // Singleton access point.
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments and set the options.
 
   // = Timer management.
-  void stop_timer (void);
-  void start_timer (void);
+  void stop_timer ();
+  void start_timer ();
 
   // = Set/get the number of threads.
   void thr_count (size_t count);
-  size_t thr_count (void);
+  size_t thr_count ();
 
   // = Set/get the size of the queue.
   void initial_queue_length (size_t length);
-  size_t initial_queue_length (void);
+  size_t initial_queue_length ();
 
   // = Set/get the high water mark.
   void high_water_mark (size_t size);
-  size_t high_water_mark (void);
+  size_t high_water_mark ();
 
   // = Set/get the high water mark.
   void low_water_mark (size_t size);
-  size_t low_water_mark (void);
+  size_t low_water_mark ();
 
   // = Set/get the size of a message.
   void message_size (size_t size);
-  size_t message_size (void);
+  size_t message_size ();
 
   // = Set/get the number of iterations.
   void iterations (size_t n);
-  size_t iterations (void);
+  size_t iterations ();
 
   // Set/get threading flags.
   void t_flags (long flag);
-  long t_flags (void);
+  long t_flags ();
 
   // Set/get supplier port number.
   void supplier_port (u_short port);
-  u_short supplier_port (void);
+  u_short supplier_port ();
 
   // Set/get consumer port number.
   void consumer_port (u_short port);
-  u_short consumer_port (void);
+  u_short consumer_port ();
 
   // Enabled if we're in debugging mode.
-  int debug (void);
+  int debug ();
 
   // Enabled if we're in verbose mode.
-  int verbose (void);
+  int verbose ();
 
   // Print the results to the STDERR.
-  void print_results (void);
+  void print_results ();
 
 private:
   // = Ensure we're a Singleton.
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
 
   ACE_Profile_Timer itimer_;
   // Time the process.
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index c9b98e55bac..61027fd6943 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -67,13 +67,13 @@ Peer_Router_Context::bind_peer (ROUTING_KEY key,
 }
 
 void
-Peer_Router_Context::duplicate (void)
+Peer_Router_Context::duplicate ()
 {
   this->reference_count_++;
 }
 
 void
-Peer_Router_Context::release (void)
+Peer_Router_Context::release ()
 {
   ACE_ASSERT (this->reference_count_ > 0);
   this->reference_count_--;
@@ -116,7 +116,7 @@ Peer_Router_Context::Peer_Router_Context (u_short port)
     }
 }
 
-Peer_Router_Context::~Peer_Router_Context (void)
+Peer_Router_Context::~Peer_Router_Context ()
 {
   // Free up the handle and close down the listening socket.
   ACE_DEBUG ((LM_DEBUG,
@@ -151,7 +151,7 @@ Peer_Router_Context::~Peer_Router_Context (void)
 }
 
 Peer_Router *
-Peer_Router_Context::peer_router (void)
+Peer_Router_Context::peer_router ()
 {
   return this->peer_router_;
 }
@@ -376,7 +376,7 @@ Peer_Router::control (ACE_Message_Block *mb)
 // Supplier_Router level in order to get the right level of control
 // for input and output.
 
-Peer_Handler::svc (void)
+Peer_Handler::svc ()
 {
   ACE_Message_Block *db, *hb;
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h
index 1e28194917a..f6a18497525 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h
@@ -82,13 +82,13 @@ public:
   // <ACE_Acceptor>.
 
   // = Set/Get Router Task.
-  Peer_Router *peer_router (void);
+  Peer_Router *peer_router ();
   void peer_router (Peer_Router *);
 
-  void release (void);
+  void release ();
   // Decrement the reference count and delete <this> when count == 0;
 
-  void duplicate (void);
+  void duplicate ();
   // Increment the reference count.
 
 private:
@@ -109,7 +109,7 @@ private:
   int reference_count_;
   // Keep track of when we can delete ourselves.
 
-  ~Peer_Router_Context (void);
+  ~Peer_Router_Context ();
   // Private to ensure dynamic allocation.
 
   friend class Friend_Of_Peer_Router_Context;
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
index 8b5e41dab67..485e1e1eb60 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
@@ -9,7 +9,7 @@
 // Handle outgoing messages in a separate thread.
 
 int
-Supplier_Router::svc (void)
+Supplier_Router::svc ()
 {
   assert (this->is_writer ());
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp
index 52c090e6800..0480f360987 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp
@@ -34,10 +34,10 @@ class Event_Server : public ACE_Sig_Adapter
   //     shutdown the <ACE_Reactor> cleanly when a SIGINT is
   //     generated.
 public:
-  Event_Server (void);
+  Event_Server ();
   // Constructor.
 
-  int svc (void);
+  int svc ();
   // Run the event-loop for the event server.
 
 private:
@@ -45,13 +45,13 @@ private:
   // Hook method called back when a user types something into the
   // STDIN in order to shut down the program.
 
-  int configure_stream (void);
+  int configure_stream ();
   // Setup the plumbing in the stream.
 
-  int set_watermarks (void);
+  int set_watermarks ();
   // Set the high and low queue watermarks.
 
-  int run_event_loop (void);
+  int run_event_loop ();
   // Run the event-loop for the <Event_Server>.
 
   MT_Stream event_server_;
@@ -59,7 +59,7 @@ private:
   // <Modules>.
 };
 
-Event_Server::Event_Server (void)
+Event_Server::Event_Server ()
   : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
   // Shutdown the <ACE_Reactor>'s event loop when a SIGINT is
   // received.
@@ -106,7 +106,7 @@ Event_Server::handle_input (ACE_HANDLE)
 }
 
 int
-Event_Server::configure_stream (void)
+Event_Server::configure_stream ()
 {
   Peer_Router_Context *src;
   // Create the <Supplier_Router>'s routing context.  This contains a
@@ -172,7 +172,7 @@ Event_Server::configure_stream (void)
 }
 
 int
-Event_Server::set_watermarks (void)
+Event_Server::set_watermarks ()
 {
   // Set the high and low water marks appropriately.  The water marks
   // control how much data can be buffered before the queues are
@@ -195,7 +195,7 @@ Event_Server::set_watermarks (void)
 }
 
 int
-Event_Server::run_event_loop (void)
+Event_Server::run_event_loop ()
 {
   // Begin the timer.
   Options::instance ()->start_timer ();
@@ -215,7 +215,7 @@ Event_Server::run_event_loop (void)
 }
 
 int
-Event_Server::svc (void)
+Event_Server::svc ()
 {
   if (this->configure_stream () == -1)
     return -1;
diff --git a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 2e9f25bf598..a4c4173f562 100644
--- a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -74,7 +74,7 @@ Event_Transceiver::handle_signal (int, siginfo_t *, ucontext_t *)
   return 0;
 }
 
-Event_Transceiver::Event_Transceiver (void)
+Event_Transceiver::Event_Transceiver ()
 {
 }
 
@@ -159,7 +159,7 @@ Event_Transceiver::handle_input (ACE_HANDLE handle)
 }
 
 int
-Event_Transceiver::transmitter (void)
+Event_Transceiver::transmitter ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) entering %s transmitter\n"),
@@ -179,7 +179,7 @@ Event_Transceiver::transmitter (void)
 }
 
 int
-Event_Transceiver::receiver (void)
+Event_Transceiver::receiver ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) entering %s receiver\n"),
diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
index e8f60673ba1..a6ef0d47449 100644
--- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -119,7 +119,7 @@ Common_Task::close (u_long exit_status)
 // know when to exit.
 
 int
-Producer::svc (void)
+Producer::svc ()
 {
   // Keep reading stdin, until we reach EOF.
 
@@ -180,7 +180,7 @@ Consumer::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 // reading and exit.
 
 int
-Consumer::svc (void)
+Consumer::svc ()
 {
   int result = 0;
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index 37a3f6bbb3b..9cd53b32811 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -65,7 +65,7 @@ Consumer_Router::close (u_long)
 // Handle incoming messages in a separate thread..
 
 int
-Consumer_Router::svc (void)
+Consumer_Router::svc ()
 {
   ACE_Message_Block *mb = 0;
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
index 511ef3e899b..e6364af591b 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
@@ -51,7 +51,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[])
 }
 
 int
-Event_Analyzer::fini (void)
+Event_Analyzer::fini ()
 {
   return 0;
 }
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
index 80084147d6e..a12e7ffb415 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
@@ -11,7 +11,7 @@
 
 #if defined (ACE_HAS_THREADS)
 
-Options::Options (void)
+Options::Options ()
     : thr_count_ (4),
       t_flags_ (THR_DETACHED),
       high_water_mark_ (8 * 1024),
@@ -28,11 +28,11 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
-void Options::print_results (void)
+void Options::print_results ()
 {
   ACE_Profile_Timer::ACE_Elapsed_Time et;
   this->itimer_.elapsed_time (et);
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.h b/ACE/examples/ASX/UPIPE_Event_Server/Options.h
index a835bbf93a9..ac228624f05 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Options.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.h
@@ -17,50 +17,50 @@
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
   void parse_args (int argc, ACE_TCHAR *argv[]);
 
-  void   stop_timer (void);
-  void   start_timer (void);
+  void   stop_timer ();
+  void   start_timer ();
 
   void   thr_count (size_t count);
-  size_t thr_count (void);
+  size_t thr_count ();
 
   void   initial_queue_length (size_t length);
-  size_t initial_queue_length (void);
+  size_t initial_queue_length ();
 
   void   high_water_mark (size_t size);
-  size_t high_water_mark (void);
+  size_t high_water_mark ();
 
   void   low_water_mark (size_t size);
-  size_t low_water_mark (void);
+  size_t low_water_mark ();
 
   void   message_size (size_t size);
-  size_t message_size (void);
+  size_t message_size ();
 
   void   iterations (size_t n);
-  size_t iterations (void);
+  size_t iterations ();
 
   void   t_flags (long flag);
-  long   t_flags (void);
+  long   t_flags ();
 
   void   supplier_port (const ACE_TCHAR *port);
-  const ACE_TCHAR  *supplier_port (void);
+  const ACE_TCHAR  *supplier_port ();
 
   void   consumer_port (const ACE_TCHAR *port);
-  const ACE_TCHAR  *consumer_port (void);
+  const ACE_TCHAR  *consumer_port ();
 
   void   supplier_file (const ACE_TCHAR *file);
-  const ACE_TCHAR  *supplier_file (void);
+  const ACE_TCHAR  *supplier_file ();
 
   void   consumer_file (const ACE_TCHAR *file);
-  const ACE_TCHAR  *consumer_file (void);
+  const ACE_TCHAR  *consumer_file ();
 
-  int    debug (void);
-  int    verbose (void);
+  int    debug ();
+  int    verbose ();
 
-  void   print_results (void);
+  void   print_results ();
 
 private:
   ACE_Profile_Timer itimer_;            // Time the process.
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
index 7e8797e5102..4014c96c53d 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
@@ -50,7 +50,7 @@ Acceptor_Factory<PH, PK>::Acceptor_Factory (Peer_Router<PH, PK> *pr)
 }
 
 template <class PH, class PK> Peer_Router<PH, PK> *
-Acceptor_Factory<PH, PK>::router (void)
+Acceptor_Factory<PH, PK>::router ()
 {
   return this->pr_;
 }
@@ -62,7 +62,7 @@ Peer_Handler<ROUTER, KEY>::Peer_Handler (ACE_Thread_Manager *tm)
 }
 
 template <class ROUTER, class KEY> int
-Peer_Handler<ROUTER, KEY>::svc (void)
+Peer_Handler<ROUTER, KEY>::svc ()
 {
   // Just a try !!  we're just reading from our ACE_Message_Queue.
   ACE_Message_Block *db, *hb;
@@ -203,12 +203,12 @@ Peer_Router<PH, PK>::send_peers (ACE_Message_Block *mb)
 }
 
 template <class PH, class PK>
-Peer_Router<PH, PK>::~Peer_Router (void)
+Peer_Router<PH, PK>::~Peer_Router ()
 {
 }
 
 template <class PH, class PK> int
-Peer_Router<PH, PK>::fini (void)
+Peer_Router<PH, PK>::fini ()
 {
   delete this->acceptor_;
   return 0;
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
index adac931146a..17ae8c06a62 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
@@ -29,7 +29,7 @@ class Acceptor_Factory : public ACE_Acceptor<PEER_HANDLER, ACE_UPIPE_ACCEPTOR>
 {
 public:
   Acceptor_Factory (Peer_Router<PEER_HANDLER, KEY> *pr);
-  Peer_Router<PEER_HANDLER, KEY> *router (void);
+  Peer_Router<PEER_HANDLER, KEY> *router ();
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the acceptor when it's linked dynamically.
@@ -74,7 +74,7 @@ class Peer_Router : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   Peer_Router (ACE_Thread_Manager * = 0);
-  ~Peer_Router (void);
+  ~Peer_Router ();
 
   typedef Peer_Handler<Peer_Router<PEER_HANDLER, PEER_KEY>, PEER_KEY> HANDLER;
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index 246dd46374b..4f039b6ab93 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -32,7 +32,7 @@ Supplier_Router::Supplier_Router (ACE_Thread_Manager *tm)
 // Handle incoming messages in a separate thread..
 
 int
-Supplier_Router::svc (void)
+Supplier_Router::svc ()
 {
   ACE_ASSERT (this->is_writer ());
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
index 06319b23c7e..4f3d42bbe87 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -27,11 +27,11 @@ typedef ACE_Module<ACE_MT_SYNCH> MT_Module;
 class Quit_Handler : public ACE_Sig_Adapter
 {
 public:
-  Quit_Handler (void);
+  Quit_Handler ();
   virtual int handle_input (ACE_HANDLE fd);
 };
 
-Quit_Handler::Quit_Handler (void)
+Quit_Handler::Quit_Handler ()
   : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {
   // Register to trap input from the user.
diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp
index 9ff1b557d5d..1c19a83e62e 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp
@@ -28,7 +28,7 @@ Input_Device_Wrapper_Base::Input_Device_Wrapper_Base (ACE_Thread_Manager *input_
 
 // Destructor.
 
-Input_Device_Wrapper_Base::~Input_Device_Wrapper_Base (void)
+Input_Device_Wrapper_Base::~Input_Device_Wrapper_Base ()
 {
 }
 
@@ -66,7 +66,7 @@ Input_Device_Wrapper_Base::set_send_count (long count)
 // if it has already done so, or -1 if there is a problem doing so.
 
 int
-Input_Device_Wrapper_Base::request_stop (void)
+Input_Device_Wrapper_Base::request_stop ()
 {
   if (is_active_)
     {
@@ -80,7 +80,7 @@ Input_Device_Wrapper_Base::request_stop (void)
 // This method runs the input device loop in the new thread.
 
 int
-Input_Device_Wrapper_Base::svc (void)
+Input_Device_Wrapper_Base::svc ()
 {
   ACE_Time_Value timeout;
   ACE_Message_Block *message;
@@ -174,7 +174,7 @@ Input_Device_Wrapper_Base::send_input_message (ACE_Message_Block *amb)
     }
 }
 
-Output_Device_Wrapper_Base::~Output_Device_Wrapper_Base (void)
+Output_Device_Wrapper_Base::~Output_Device_Wrapper_Base ()
 {
 }
 
@@ -203,7 +203,7 @@ Bounded_Packet_Relay::Bounded_Packet_Relay (ACE_Thread_Manager *input_task_mgr,
 
 // Destructor.
 
-Bounded_Packet_Relay::~Bounded_Packet_Relay (void)
+Bounded_Packet_Relay::~Bounded_Packet_Relay ()
 {
   // Reactivate the queue, and then clear it.
   queue_.activate ();
@@ -219,7 +219,7 @@ Bounded_Packet_Relay::~Bounded_Packet_Relay (void)
 // Requests output be sent to output device.
 
 int
-Bounded_Packet_Relay::send_input (void)
+Bounded_Packet_Relay::send_input ()
 {
   // Don't block, return immediately if queue is empty.
   ACE_Message_Block *item;
@@ -392,7 +392,7 @@ Bounded_Packet_Relay::end_transmission (Transmission_Status status)
 // Requests a report of statistics from the last transmission.
 
 int
-Bounded_Packet_Relay::report_statistics (void)
+Bounded_Packet_Relay::report_statistics ()
 {
   // Serialize access to start and end transmission calls,
   // statistics reporting calls.
@@ -455,7 +455,7 @@ Bounded_Packet_Relay::receive_input (void * arg)
 // Get high water mark for relay queue.
 
 ACE_UINT32
-Bounded_Packet_Relay::queue_hwm (void)
+Bounded_Packet_Relay::queue_hwm ()
 {
   return queue_lwm_;
 }
@@ -472,7 +472,7 @@ Bounded_Packet_Relay::queue_hwm (ACE_UINT32 hwm)
 // Get low water mark for relay queue.
 
 ACE_UINT32
-Bounded_Packet_Relay::queue_lwm (void)
+Bounded_Packet_Relay::queue_lwm ()
 {
   return queue_lwm_;
 }
@@ -489,7 +489,7 @@ Bounded_Packet_Relay::queue_lwm (ACE_UINT32 lwm)
 // Returns string corresponding to current status.
 
 const char *
-Bounded_Packet_Relay::status_msg (void)
+Bounded_Packet_Relay::status_msg ()
 {
   const char *status_msg;
   switch (status_)
diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
index 152bfdb8f9d..1a1ac517dbb 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
@@ -72,10 +72,10 @@ public:
                         Output_Device_Wrapper_Base *output_wrapper);
 
   /// Destructor.
-  virtual ~Bounded_Packet_Relay (void);
+  virtual ~Bounded_Packet_Relay ();
 
   /// Requests output be sent to output device.
-  int send_input (void);
+  int send_input ();
 
   /// Requests a transmission be started.
   int start_transmission (u_long packet_count,
@@ -86,7 +86,7 @@ public:
   int end_transmission (Transmission_Status status);
 
   /// Requests a report of statistics from the last transmission.
-  int report_statistics (void);
+  int report_statistics ();
 
   // = Command accessible entry points.
 
@@ -96,13 +96,13 @@ public:
   // = Accessors and mutators for relay settings
 
   /// Get high water mark for relay queue.
-  ACE_UINT32 queue_hwm (void);
+  ACE_UINT32 queue_hwm ();
 
   /// Set high water mark for relay queue.
   void queue_hwm (ACE_UINT32 hwm);
 
   /// Get low water mark for relay queue.
-  ACE_UINT32 queue_lwm (void);
+  ACE_UINT32 queue_lwm ();
 
   /// Set low water mark for relay queue.
   void queue_lwm (ACE_UINT32 lwm);
@@ -138,7 +138,7 @@ private:
   // = Transmission Statistics
 
   /// Returns string corresponding to current status.
-  const char *status_msg (void);
+  const char *status_msg ();
 
   /// Number of transmissions sent.
   u_long transmission_number_;
@@ -203,7 +203,7 @@ public:
    * terminate its thread.  Should return 1 if it will do so, 0 if it
    * has already done so, or -1 if there is a problem doing so.
    */
-  int request_stop (void);
+  int request_stop ();
 
   /// This method runs the input device loop in the new thread.
   virtual int svc ();
@@ -262,7 +262,7 @@ protected:
 class Output_Device_Wrapper_Base
 {
 public:
-  virtual ~Output_Device_Wrapper_Base (void);
+  virtual ~Output_Device_Wrapper_Base ();
 
   /// Writes contents of the passed message block out to the underlying
   /// output device.
diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp
index b58feac6f95..f4daee10850 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp
@@ -24,7 +24,7 @@
 // Constructor.
 
 template <class TQ>
-Bounded_Packet_Relay_Driver<TQ>::Bounded_Packet_Relay_Driver (void)
+Bounded_Packet_Relay_Driver<TQ>::Bounded_Packet_Relay_Driver ()
   : packet_count_cmd_ (0),
     arrival_period_cmd_ (0),
     transmit_period_cmd_ (0),
@@ -45,7 +45,7 @@ Bounded_Packet_Relay_Driver<TQ>::Bounded_Packet_Relay_Driver (void)
 // Destructor.
 
 template <class TQ>
-Bounded_Packet_Relay_Driver<TQ>::~Bounded_Packet_Relay_Driver (void)
+Bounded_Packet_Relay_Driver<TQ>::~Bounded_Packet_Relay_Driver ()
 {
   // delete all instantiated command objects
   delete packet_count_cmd_;
@@ -186,7 +186,7 @@ Bounded_Packet_Relay_Driver<TQ>::parse_commands (const char *buf)
 // Runs the test.
 
 template <class TQ> int
-Bounded_Packet_Relay_Driver<TQ>::run (void)
+Bounded_Packet_Relay_Driver<TQ>::run ()
 {
   this->init ();
 
@@ -202,7 +202,7 @@ Bounded_Packet_Relay_Driver<TQ>::run (void)
 // Gets the next request from the user input.
 
 template <class TQ> int
-Bounded_Packet_Relay_Driver<TQ>::get_next_request (void)
+Bounded_Packet_Relay_Driver<TQ>::get_next_request ()
 {
   char buf[BUFSIZ];
 
@@ -231,7 +231,7 @@ Bounded_Packet_Relay_Driver<TQ>::read_input (char *buf, size_t bufsiz)
 // Get count of packets to send in a transmission.
 
 template <class TQ> u_long
-Bounded_Packet_Relay_Driver<TQ>::packet_count (void)
+Bounded_Packet_Relay_Driver<TQ>::packet_count ()
 {
   return packet_count_;
 }
@@ -247,7 +247,7 @@ Bounded_Packet_Relay_Driver<TQ>::packet_count (u_long pc)
 // Get rate at which input packets are to arrive.
 
 template <class TQ> u_long
-Bounded_Packet_Relay_Driver<TQ>::arrival_period (void)
+Bounded_Packet_Relay_Driver<TQ>::arrival_period ()
 {
   return arrival_period_;
 }
@@ -263,7 +263,7 @@ Bounded_Packet_Relay_Driver<TQ>::arrival_period (u_long ap)
 // Get rate at which packets are to be relayed (usec).
 
 template <class TQ> u_long
-Bounded_Packet_Relay_Driver<TQ>::send_period (void)
+Bounded_Packet_Relay_Driver<TQ>::send_period ()
 {
   return send_period_;
 }
@@ -279,7 +279,7 @@ Bounded_Packet_Relay_Driver<TQ>::send_period (u_long sp)
 // Get limit on the duration of the transmission (usec).
 
 template <class TQ> u_long
-Bounded_Packet_Relay_Driver<TQ>::duration_limit (void)
+Bounded_Packet_Relay_Driver<TQ>::duration_limit ()
 {
   return duration_limit_;
 }
@@ -294,7 +294,7 @@ Bounded_Packet_Relay_Driver<TQ>::duration_limit (u_long dl)
 // Get logging level.
 
 template <class TQ> int
-Bounded_Packet_Relay_Driver<TQ>::logging_level (void)
+Bounded_Packet_Relay_Driver<TQ>::logging_level ()
 {
   return logging_level_;
 }
diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
index 1aa942bc38c..14a289ea0c9 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
@@ -44,10 +44,10 @@ class Bounded_Packet_Relay_Driver
 {
 public:
   /// Constructor.
-  Bounded_Packet_Relay_Driver (void);
+  Bounded_Packet_Relay_Driver ();
 
   /// Destructor.
-  virtual ~Bounded_Packet_Relay_Driver (void);
+  virtual ~Bounded_Packet_Relay_Driver ();
 
   /// Breaks up the input string buffer into pieces and executes the
   /// appropriate method to handle that operation.
@@ -58,11 +58,11 @@ public:
    * class should normally invoke this method.  Returns 0 when
    * successful, or 0 otherwise.
    */
-  virtual int run (void);
+  virtual int run ();
 
   /// This internal method gets the next request from the user.
   /// Returns -1 when user wants to exit.  Returns 0 otherwise.
-  virtual int get_next_request (void);
+  virtual int get_next_request ();
 
   /**
    * Reads input from the user into the buffer <buf> with a maximum of
@@ -79,31 +79,31 @@ public:
   virtual int init (void)=0;
 
   /// Get count of packets to send in a transmission.
-  u_long packet_count (void);
+  u_long packet_count ();
 
   /// Set count of packets to send in a transmission.
   void packet_count (u_long pc);
 
   /// Get rate at which input packets are to arrive.
-  u_long arrival_period (void);
+  u_long arrival_period ();
 
   /// Set rate at which input packets are to arrive.
   void arrival_period (u_long ap);
 
   /// Get rate at which packets are to be relayed (usec).
-  u_long send_period (void);
+  u_long send_period ();
 
   /// Set rate at which packets are to be relayed (usec).
   void send_period (u_long sp);
 
   /// Get limit on the duration of the transmission (usec).
-  u_long duration_limit (void);
+  u_long duration_limit ();
 
   /// Set limit on the duration of the transmission (usec).
   void duration_limit (u_long dl);
 
   /// Get logging level.
-  int logging_level (void);
+  int logging_level ();
 
   /// Set logging level.
   void logging_level (int ll);
diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
index d6250357ecd..3d33608a433 100644
--- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
+++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
@@ -40,7 +40,7 @@ Text_Input_Device_Wrapper::Text_Input_Device_Wrapper (ACE_Thread_Manager *input_
 
 // Destructor.
 
-Text_Input_Device_Wrapper::~Text_Input_Device_Wrapper (void)
+Text_Input_Device_Wrapper::~Text_Input_Device_Wrapper ()
 {
 }
 
@@ -66,7 +66,7 @@ Text_Input_Device_Wrapper::modify_device_settings (void *logging)
 // read from the underlying input device.
 
 ACE_Message_Block *
-Text_Input_Device_Wrapper::create_input_message (void)
+Text_Input_Device_Wrapper::create_input_message ()
 {
   // Construct a new message block to send.
   ACE_Message_Block *mb = 0;
@@ -171,7 +171,7 @@ User_Input_Task::User_Input_Task (Bounded_Packet_Relay *relay,
 
 // Destructor.
 
-User_Input_Task::~User_Input_Task (void)
+User_Input_Task::~User_Input_Task ()
 {
   this->clear_all_timers ();
 }
@@ -179,7 +179,7 @@ User_Input_Task::~User_Input_Task (void)
 // Runs the main event loop.
 
 int
-User_Input_Task::svc (void)
+User_Input_Task::svc ()
 {
   for (;;)
     // Call back to the driver's implementation of how to read and
@@ -446,7 +446,7 @@ User_Input_Task::shutdown (void *)
 // Helper method: clears all timers.
 
 int
-User_Input_Task::clear_all_timers (void)
+User_Input_Task::clear_all_timers ()
 {
   // loop through the timers in the queue, cancelling each one
   for (ACE_Timer_Node_T <ACE_Event_Handler *> *node;
@@ -468,7 +468,7 @@ BPR_Handler_Base::BPR_Handler_Base (Bounded_Packet_Relay &relay,
 
 // Destructor.
 
-BPR_Handler_Base::~BPR_Handler_Base (void)
+BPR_Handler_Base::~BPR_Handler_Base ()
 {
 }
 
@@ -507,7 +507,7 @@ Send_Handler::Send_Handler (u_long send_count,
 
 // Destructor.
 
-Send_Handler::~Send_Handler (void)
+Send_Handler::~Send_Handler ()
 {
 }
 
@@ -558,7 +558,7 @@ Send_Handler::handle_timeout (const ACE_Time_Value &,
 // Cancellation hook.
 
 int
-Send_Handler::cancelled (void)
+Send_Handler::cancelled ()
 {
   delete this;
   return 0;
@@ -594,7 +594,7 @@ Termination_Handler::Termination_Handler (Bounded_Packet_Relay &relay,
 
 // Destructor.
 
-Termination_Handler::~Termination_Handler (void)
+Termination_Handler::~Termination_Handler ()
 {
 }
 
@@ -622,7 +622,7 @@ Termination_Handler::handle_timeout (const ACE_Time_Value &,
 // Cancellation hook
 
 int
-Termination_Handler::cancelled (void)
+Termination_Handler::cancelled ()
 {
   delete this;
   return 0;
@@ -637,14 +637,14 @@ Thread_Bounded_Packet_Relay_Driver::Thread_Bounded_Packet_Relay_Driver (Bounded_
 
 // Destructor.
 
-Thread_Bounded_Packet_Relay_Driver::~Thread_Bounded_Packet_Relay_Driver (void)
+Thread_Bounded_Packet_Relay_Driver::~Thread_Bounded_Packet_Relay_Driver ()
 {
 }
 
 // Display the user menu.
 
 int
-Thread_Bounded_Packet_Relay_Driver::display_menu (void)
+Thread_Bounded_Packet_Relay_Driver::display_menu ()
 {
   static char menu[] =
     "\n\n  Options:\n"
@@ -688,7 +688,7 @@ Thread_Bounded_Packet_Relay_Driver::display_menu (void)
 // Initialize the driver.
 
 int
-Thread_Bounded_Packet_Relay_Driver::init (void)
+Thread_Bounded_Packet_Relay_Driver::init ()
 {
   // Initialize the <Command> objects with their corresponding
   // methods from <User_Input_Task>.
@@ -746,7 +746,7 @@ Thread_Bounded_Packet_Relay_Driver::init (void)
 // Run the driver
 
 int
-Thread_Bounded_Packet_Relay_Driver::run (void)
+Thread_Bounded_Packet_Relay_Driver::run ()
 {
   this->init ();
   return 0;
diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
index 691149db411..56bcf87fe1b 100644
--- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
+++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
@@ -76,7 +76,7 @@ public:
                              int logging = 0);
 
   /// Destructor.
-  virtual ~Text_Input_Device_Wrapper (void);
+  virtual ~Text_Input_Device_Wrapper ();
 
   /**
    * Modifies device settings based on passed pointer to a u_long.
@@ -88,7 +88,7 @@ public:
 protected:
   /// Creates a new message block, carrying data read from the
   /// underlying input device.
-  virtual ACE_Message_Block *create_input_message (void);
+  virtual ACE_Message_Block *create_input_message ();
 
 private:
   /// Length of the buffer into which to "read".
@@ -168,7 +168,7 @@ public:
                    Thread_Bounded_Packet_Relay_Driver &timer_queue_driver);
 
   /// Destructor.
-  virtual ~User_Input_Task (void);
+  virtual ~User_Input_Task ();
 
   /// This method runs the event loop in the new thread.
   virtual int svc ();
@@ -207,7 +207,7 @@ public:
   int shutdown (void *);
 
   /// Helper method: clears all timers.
-  int clear_all_timers (void);
+  int clear_all_timers ();
 
 private:
   /// How many microseconds are in a second.
@@ -245,7 +245,7 @@ public:
                     Thread_Timer_Queue &queue);
 
   /// Destructor.
-  virtual ~BPR_Handler_Base (void);
+  virtual ~BPR_Handler_Base ();
 
   // = Command accessible entry points.
 
@@ -291,14 +291,14 @@ public:
                 Thread_Bounded_Packet_Relay_Driver &driver);
 
   /// Destructor.
-  virtual ~Send_Handler (void);
+  virtual ~Send_Handler ();
 
   /// Call back hook.
   virtual int handle_timeout (const ACE_Time_Value &current_time,
                               const void *arg);
 
   /// Cancellation hook.
-  virtual int cancelled (void);
+  virtual int cancelled ();
 
   // = Command accessible entry points.
 
@@ -336,14 +336,14 @@ public:
                        Thread_Bounded_Packet_Relay_Driver &driver);
 
   /// Destructor.
-  virtual ~Termination_Handler (void);
+  virtual ~Termination_Handler ();
 
   /// Call back hook.
   virtual int handle_timeout (const ACE_Time_Value &current_time,
                               const void *arg);
 
   /// Cancellation hook.
-  virtual int cancelled (void);
+  virtual int cancelled ();
 
 private:
   /// Reference to the driver that will redisplay the user input menu.
@@ -371,16 +371,16 @@ public:
   Thread_Bounded_Packet_Relay_Driver (Bounded_Packet_Relay *relay);
 
   /// Destructor.
-  virtual ~Thread_Bounded_Packet_Relay_Driver (void);
+  virtual ~Thread_Bounded_Packet_Relay_Driver ();
 
   /// Displays the user menu.
-  virtual int display_menu (void);
+  virtual int display_menu ();
 
   /// Initializes the driver.
-  virtual int init (void);
+  virtual int init ();
 
   /// Run the driver.
-  virtual int run (void);
+  virtual int run ();
 
 private:
   /// User input task, subclassed from ACE_Task.
diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index 5ccdc05599b..abffe9238a5 100644
--- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -35,7 +35,7 @@ class AIO_CLD_Acceptor
 public:
   //FUZZ: disable check_for_lack_ACE_OS
   // Cancel accept and close all clients.
-  void close (void);
+  void close ();
   //FUZZ: enable check_for_lack_ACE_OS
 
   // Remove handler from client set.
@@ -44,7 +44,7 @@ public:
 
 protected:
   // Service handler factory method.
-  virtual AIO_Input_Handler *make_handler (void);
+  virtual AIO_Input_Handler *make_handler ();
 
   // Set of all connected clients
   ACE_Unbounded_Set<AIO_Input_Handler *> clients_;
diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h
index 2709285b859..5ab6fbc034b 100644
--- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h
+++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h
@@ -116,7 +116,7 @@ protected:
     (const ACE_Time_Value&, const void *);
 
   // Template method to create a new handler
-  virtual AIO_Output_Handler *make_handler (void)
+  virtual AIO_Output_Handler *make_handler ()
     { return OUTPUT_HANDLER::instance (); }
 
   // Address at which logging server listens for connections.
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
index 310ee23b1b6..c0722d5ebda 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -12,14 +12,14 @@
 
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
-Svc_Handler::Svc_Handler (void)
+Svc_Handler::Svc_Handler ()
   : mb_ (BUFSIZ + 1)
 {
   // An extra byte for null termination.
   this->mb_.size (BUFSIZ);
 }
 
-Svc_Handler::~Svc_Handler (void)
+Svc_Handler::~Svc_Handler ()
 {
 }
 
@@ -60,14 +60,14 @@ Svc_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
     ACE_Proactor::end_event_loop ();
 }
 
-IPC_Server::IPC_Server (void)
+IPC_Server::IPC_Server ()
   : n_threads_ (1),
     shutdown_ (0)
 {
   ACE_OS::strcpy (rendezvous_, ACE_TEXT ("acepipe"));
 }
 
-IPC_Server::~IPC_Server (void)
+IPC_Server::~IPC_Server ()
 {
 }
 
@@ -108,7 +108,7 @@ IPC_Server::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-IPC_Server::fini (void)
+IPC_Server::fini ()
 {
   return 0;
 }
@@ -159,7 +159,7 @@ run_reactor_event_loop (void *)
 }
 
 int
-IPC_Server::svc (void)
+IPC_Server::svc ()
 {
   // Performs the iterative server activities.
   while (this->shutdown_ == 0)
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.h b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
index 539fe2dc525..dd57e993055 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.h
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
@@ -24,8 +24,8 @@
 class Svc_Handler : public ACE_Svc_Handler <ACE_SPIPE_STREAM, ACE_NULL_SYNCH>, public ACE_Handler
 {
 public:
-  Svc_Handler (void);
-  ~Svc_Handler (void);
+  Svc_Handler ();
+  ~Svc_Handler ();
 
   virtual int open (void *);
 
@@ -41,8 +41,8 @@ private:
 class IPC_Server : public ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR>
 {
 public:
-  IPC_Server (void);
-  ~IPC_Server (void);
+  IPC_Server ();
+  ~IPC_Server ();
 
   // = Dynamic linking hooks.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.cpp b/ACE/examples/Connection/blocking/SPIPE-connector.cpp
index 65f3dd5b859..330defa5d63 100644
--- a/ACE/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/ACE/examples/Connection/blocking/SPIPE-connector.cpp
@@ -16,7 +16,7 @@ Peer_Handler::Peer_Handler (int iterations)
 {
 }
 
-Peer_Handler::~Peer_Handler (void)
+Peer_Handler::~Peer_Handler ()
 {
 }
 
@@ -122,19 +122,19 @@ Peer_Handler::get_handle () const
 }
 
 void
-Peer_Handler::display_menu (void)
+Peer_Handler::display_menu ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nplease enter input..: ")));
 }
 
-IPC_Client::IPC_Client (void)
+IPC_Client::IPC_Client ()
   : iterations_ (0),
     done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {
   ACE_OS::strcpy (rendezvous_, ACE_TEXT ("acepipe"));
 }
 
-IPC_Client::~IPC_Client (void)
+IPC_Client::~IPC_Client ()
 {
 }
 
@@ -176,13 +176,13 @@ IPC_Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-IPC_Client::fini (void)
+IPC_Client::fini ()
 {
   return 0;
 }
 
 int
-IPC_Client::svc (void)
+IPC_Client::svc ()
 {
   ACE_Reactor::instance ()->run_reactor_event_loop ();
   return 0;
diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.h b/ACE/examples/Connection/blocking/SPIPE-connector.h
index ae11b7e8b62..13954529c8c 100644
--- a/ACE/examples/Connection/blocking/SPIPE-connector.h
+++ b/ACE/examples/Connection/blocking/SPIPE-connector.h
@@ -23,7 +23,7 @@ public:
   // <iterations> is the number of buffers to send.  If <iterations>
   // == 0, then read from stdin.
 
-  ~Peer_Handler (void);
+  ~Peer_Handler ();
 
   virtual int open (void * = 0);
   // Activate the handler when connection is established.
@@ -36,7 +36,7 @@ public:
   virtual ACE_HANDLE get_handle () const;
 
 private:
-  void display_menu (void);
+  void display_menu ();
 
   int iterations_;
   // No. of buffers to send.
@@ -46,8 +46,8 @@ class IPC_Client : public ACE_Connector<Peer_Handler, ACE_SPIPE_CONNECTOR>
 {
 public:
   // Initialization
-  IPC_Client (void);
-  ~IPC_Client (void);
+  IPC_Client ();
+  ~IPC_Client ();
 
   // = Dynamic linking hooks.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/ACE/examples/Connection/misc/Connection_Handler.cpp b/ACE/examples/Connection/misc/Connection_Handler.cpp
index f33407233aa..5a4a3515276 100644
--- a/ACE/examples/Connection/misc/Connection_Handler.cpp
+++ b/ACE/examples/Connection/misc/Connection_Handler.cpp
@@ -45,7 +45,7 @@ Connection_Handler::close (u_long)
 }
 
 int
-Connection_Handler::svc (void)
+Connection_Handler::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in svc()\n")));
 
diff --git a/ACE/examples/Connection/misc/test_upipe.h b/ACE/examples/Connection/misc/test_upipe.h
index 8c1490db127..27770842273 100644
--- a/ACE/examples/Connection/misc/test_upipe.h
+++ b/ACE/examples/Connection/misc/test_upipe.h
@@ -24,7 +24,7 @@ public:
       return 0;
     }
 
-  virtual int svc (void)
+  virtual int svc ()
     {
       ACE_TRACE ("Server_Service::svc");
 
@@ -57,7 +57,7 @@ public:
       return this->activate (THR_DETACHED | THR_NEW_LWP);
     }
 
-  virtual int svc (void)
+  virtual int svc ()
     {
       ACE_TRACE ("Client_Service::svc");
       char buf[BUFSIZ];
diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp
index 51a61de8bd9..8b20bf97cc0 100644
--- a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp
+++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp
@@ -145,19 +145,19 @@ IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::init (int argc, ACE_TCHAR *argv[])
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
-IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::IPC_Server (void)
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::IPC_Server ()
   : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::fini ()
 {
   return 0;
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
-IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::~IPC_Server (void)
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::~IPC_Server ()
 {
 }
 
@@ -176,7 +176,7 @@ IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE handle,
 // Run the interative service.
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::svc (void)
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::svc ()
 {
   ACE_TCHAR buf[BUFSIZ];
 
diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h
index 3c38d7c0d70..e01d505a8ec 100644
--- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h
+++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h
@@ -43,10 +43,10 @@ class IPC_Server : public ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>
   // = TITLE
   //     This class illustrates how the <ACE_Oneshot_Acceptor> works.
 public:
-  IPC_Server (void);
+  IPC_Server ();
   // Constructor.
 
-  ~IPC_Server (void);
+  ~IPC_Server ();
   // Destructor.
 
   // = Demultiplexing hooks.
diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.cpp b/ACE/examples/Connection/non_blocking/CPP-connector.cpp
index 5eaea661e4e..06e89429916 100644
--- a/ACE/examples/Connection/non_blocking/CPP-connector.cpp
+++ b/ACE/examples/Connection/non_blocking/CPP-connector.cpp
@@ -58,14 +58,14 @@ Peer_Handler<PEER_STREAM>::close (u_long)
 }
 
 template <typename PEER_STREAM> int
-Peer_Handler<PEER_STREAM>::uninitialized (void)
+Peer_Handler<PEER_STREAM>::uninitialized ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("uninitialized!\n")));
   return 0;
 }
 
 template <typename PEER_STREAM> int
-Peer_Handler<PEER_STREAM>::connected (void)
+Peer_Handler<PEER_STREAM>::connected ()
 {
   char buf[BUFSIZ];
 
@@ -96,7 +96,7 @@ Peer_Handler<PEER_STREAM>::connected (void)
 }
 
 template <typename PEER_STREAM> int
-Peer_Handler<PEER_STREAM>::stdio (void)
+Peer_Handler<PEER_STREAM>::stdio ()
 {
   char buf[BUFSIZ];
 
@@ -196,7 +196,7 @@ Peer_Handler<PEER_STREAM>::handle_close (ACE_HANDLE h,
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
-IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::svc (void)
+IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::svc ()
 {
   if (this->reactor ())
     this->reactor ()->run_reactor_event_loop ();
@@ -205,13 +205,13 @@ IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::svc (void)
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
-IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::fini (void)
+IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::fini ()
 {
   return 0;
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR>
-IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::IPC_Client (void)
+IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::IPC_Client ()
   : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {
 }
@@ -261,7 +261,7 @@ IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::init (int argc, ACE_TCHAR *argv[])
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR>
-IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::~IPC_Client (void)
+IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::~IPC_Client ()
 {
 }
 
diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h
index a6c228d0e9a..8bc322a058d 100644
--- a/ACE/examples/Connection/non_blocking/CPP-connector.h
+++ b/ACE/examples/Connection/non_blocking/CPP-connector.h
@@ -42,11 +42,11 @@ public:
                               const void *);
 protected:
   // = These methods implement the State pattern.
-  int uninitialized (void);
-  int connected (void);
-  int stdio (void);
+  int uninitialized ();
+  int connected ();
+  int stdio ();
 
-  int (Peer_Handler<PEER_STREAM>::*action_) (void);
+  int (Peer_Handler<PEER_STREAM>::*action_) ();
   // Keeps track of which state we are in.
 };
 
@@ -56,10 +56,10 @@ class IPC_Client : public ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>
   // = TITLE
   //   This class illustrates how the <ACE_Connector> works.
 public:
-  IPC_Client (void);
+  IPC_Client ();
   // Constructor.
 
-  ~IPC_Client (void);
+  ~IPC_Client ();
   // Destructor.
 
   // = Dynamic linking hooks.
diff --git a/ACE/examples/DLL/Newsweek.cpp b/ACE/examples/DLL/Newsweek.cpp
index 65856fe18c6..a76a56d459e 100644
--- a/ACE/examples/DLL/Newsweek.cpp
+++ b/ACE/examples/DLL/Newsweek.cpp
@@ -37,10 +37,10 @@ Newsweek::operator delete (void *ptr)
 // Returns the Newsweek class pointer.
 // The ACE_BUILD_SVC_DLL and ACE_Svc_Export directives are necessary to
 // take care of exporting the function for Win32 platforms.
-extern "C" ACE_Svc_Export Magazine *create_magazine (void);
+extern "C" ACE_Svc_Export Magazine *create_magazine ();
 
 Magazine *
-create_magazine (void)
+create_magazine ()
 {
   Magazine *mag = 0;
   ACE_NEW_RETURN (mag, Newsweek, 0);
diff --git a/ACE/examples/DLL/Today.cpp b/ACE/examples/DLL/Today.cpp
index 2c48b1053b8..66724929970 100644
--- a/ACE/examples/DLL/Today.cpp
+++ b/ACE/examples/DLL/Today.cpp
@@ -38,9 +38,9 @@ Today::operator delete (void *ptr)
 // Returns the pointer to the Today class.
 // The ACE_BUILD_SVC_DLL and ACE_Svc_Export directives are necessary to
 // take care of exporting the function for Win32 platforms.
-extern "C" ACE_Svc_Export Magazine *create_magazine (void);
+extern "C" ACE_Svc_Export Magazine *create_magazine ();
 
-Magazine *create_magazine (void)
+Magazine *create_magazine ()
 {
   Magazine *mag = 0;
   ACE_NEW_RETURN (mag, Today, 0);
diff --git a/ACE/examples/DLL/test_dll.cpp b/ACE/examples/DLL/test_dll.cpp
index 5eb1276cc80..4f27a2e0261 100644
--- a/ACE/examples/DLL/test_dll.cpp
+++ b/ACE/examples/DLL/test_dll.cpp
@@ -6,7 +6,7 @@
 #include "ace/Log_Msg.h"
 #include <memory>
 
-typedef Magazine* (*Magazine_Creator) (void);
+typedef Magazine* (*Magazine_Creator) ();
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/ACE/examples/IOStream/server/iostream_server.cpp b/ACE/examples/IOStream/server/iostream_server.cpp
index f658f703bad..1128b002ae5 100644
--- a/ACE/examples/IOStream/server/iostream_server.cpp
+++ b/ACE/examples/IOStream/server/iostream_server.cpp
@@ -24,12 +24,12 @@ Handler::open (void *)
   return 0;
 }
 
-Handler::Handler (void)
+Handler::Handler ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P) starting handler %x\n", this));
 }
 
-Handler::~Handler (void)
+Handler::~Handler ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P) shutting down handler %x\n", this));
   ACE_Reactor::end_event_loop ();
diff --git a/ACE/examples/IOStream/server/iostream_server.h b/ACE/examples/IOStream/server/iostream_server.h
index 9145eb72b98..0e3b6bf6267 100644
--- a/ACE/examples/IOStream/server/iostream_server.h
+++ b/ACE/examples/IOStream/server/iostream_server.h
@@ -28,8 +28,8 @@ class Handler : public ACE_Svc_Handler<ACE_SOCK_IOStream, ACE_NULL_SYNCH>
   //     iostream characteristics of the peer.
 {
 public:
-  Handler (void);
-  ~Handler (void);
+  Handler ();
+  ~Handler ();
 
   // = <Svc_Handler> hooks.
   virtual int open (void *);
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 42d5698fc2f..9933b962de1 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -18,7 +18,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_main.h"
 
-Options::Options (void)
+Options::Options ()
   : host_ (ACE_DEFAULT_SERVER_HOST),
     port_ (ACE_DEFAULT_SERVER_PORT),
     sleep_time_ (0, 0), // By default, don't sleep between calls.
@@ -35,7 +35,7 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   ACE_MT (delete this->barrier_);
   delete [] this->message_buf_;
@@ -45,7 +45,7 @@ Options::~Options (void)
 typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS;
 
 int
-Options::init (void)
+Options::init ()
 {
   ACE_DEBUG((LM_DEBUG,"Options::init, len = %d\n",this->message_len_));
 
@@ -376,7 +376,7 @@ Options::twoway_client_test (void *)
 }
 
 ACE_THR_FUNC
-Options::thr_func (void)
+Options::thr_func ()
 {
   ACE_DEBUG((LM_DEBUG,"(%P|%t) in thread func, mesg len = %d\n",this->message_len()));
   if (this->oneway_ == 0)
@@ -386,7 +386,7 @@ Options::thr_func (void)
 }
 
 static int
-run_client (void)
+run_client ()
 {
   // Raise the socket handle limit to the maximum.
   ACE::set_handle_limit ();
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
index e06aaf8268e..77b9e094740 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
@@ -13,10 +13,10 @@ class Options
   //   Define the options for this test.
 {
 public:
-  Options (void);
+  Options ();
   // Constructor.
 
-  ~Options (void);
+  ~Options ();
   // Destructor.
 
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -47,12 +47,12 @@ public:
   const void *message_buf () const;
   // Returns a pointer to the message.
 
-  ACE_THR_FUNC thr_func (void);
+  ACE_THR_FUNC thr_func ();
   // Returns a pointer to the entry point into the thread that runs
   // the client test function.
 
 private:
-  int init (void);
+  int init ();
   // Initialize the message we're sending to the user and set up the
   // barrier.
 
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 1d5453ba7fe..39ee9d5d3b4 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -22,17 +22,17 @@ class Handler_Factory
   // = TITLE
   //   Creates the oneway or twoway handlers.
 public:
-  Handler_Factory (void);
+  Handler_Factory ();
   // Constructor.
 
-  ~Handler_Factory (void);
+  ~Handler_Factory ();
   // Destructor.
 
-  int handle_events (void);
+  int handle_events ();
   // Run the main event loop.
 
 private:
-  int init_acceptors (void);
+  int init_acceptors ();
   // Initialize the acceptors.
 
   int create_handler (ACE_SOCK_Acceptor &acceptor,
@@ -88,7 +88,7 @@ protected:
   virtual int svc ();
   // Template method entry point into the handler task.
 
-  virtual void print_results (void);
+  virtual void print_results ();
   // Print the results.
 
   size_t total_bytes_;
@@ -110,7 +110,7 @@ public:
   // Constructor.
 
 private:
-  virtual int run (void);
+  virtual int run ();
   // Template Method hook called by <svc>.
 };
 
@@ -122,10 +122,10 @@ public:
   // Constructor.
 
 private:
-  virtual int run (void);
+  virtual int run ();
   // Template Method hook called by <svc>.
 
-  virtual void print_results (void);
+  virtual void print_results ();
   // Print the results.
 };
 
@@ -147,11 +147,11 @@ Options::reply_message_len () const
   return this->reply_message_len_;
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
-Options::Options (void)
+Options::Options ()
   : verbose_ (0),
     port_ (ACE_DEFAULT_SERVER_PORT),
     reply_message_len_ (24) // Default to the approximate size of an
@@ -228,7 +228,7 @@ Handler::close (u_long)
 }
 
 int
-Handler::svc (void)
+Handler::svc ()
 {
   // Timer logic.
   this->timer_.start ();
@@ -272,7 +272,7 @@ Handler::parse_header_and_allocate_buffer (char *&request,
 }
 
 void
-Handler::print_results (void)
+Handler::print_results ()
 {
 }
 
@@ -284,7 +284,7 @@ Twoway_Handler::Twoway_Handler (ACE_HANDLE handle)
 // Function entry point into the twoway server task.
 
 int
-Twoway_Handler::run (void)
+Twoway_Handler::run ()
 {
   // Read data from client (terminate on error).
 
@@ -353,7 +353,7 @@ Oneway_Handler::Oneway_Handler (ACE_HANDLE handle)
 }
 
 void
-Oneway_Handler::print_results (void)
+Oneway_Handler::print_results ()
 {
   ACE_Profile_Timer::ACE_Elapsed_Time et;
   this->timer_.elapsed_time (et);
@@ -375,7 +375,7 @@ Oneway_Handler::print_results (void)
 // Function entry point into the oneway server task.
 
 int
-Oneway_Handler::run (void)
+Oneway_Handler::run ()
 {
   // Read data from client (terminate on error).
 
@@ -441,7 +441,7 @@ Handler_Factory::make_oneway_handler (ACE_HANDLE handle)
 }
 
 int
-Handler_Factory::init_acceptors (void)
+Handler_Factory::init_acceptors ()
 {
   // Create the oneway and twoway server addresses.
   ACE_INET_Addr twoway_server_addr (OPTIONS::instance ()->port ());
@@ -504,11 +504,11 @@ Handler_Factory::create_handler (ACE_SOCK_Acceptor &acceptor,
 #endif /* ACE_HAS_THREADS */
 }
 
-Handler_Factory::Handler_Factory (void)
+Handler_Factory::Handler_Factory ()
 {
 }
 
-Handler_Factory::~Handler_Factory (void)
+Handler_Factory::~Handler_Factory ()
 {
   this->twoway_acceptor_.close ();
   this->oneway_acceptor_.close ();
@@ -517,7 +517,7 @@ Handler_Factory::~Handler_Factory (void)
 // Run the main event loop.
 
 int
-Handler_Factory::handle_events (void)
+Handler_Factory::handle_events ()
 {
   if (this->init_acceptors () == -1)
     return -1;
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h
index 6d9adcf89fd..24c3b74ce92 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h
@@ -9,10 +9,10 @@ class Options
   //   Define the options for this test.
 {
 public:
-  Options (void);
+  Options ();
   // Constructor.
 
-  ~Options (void);
+  ~Options ();
   // Destructor.
 
   int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp
index b23f99c9b9c..8ba66a8ba24 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp
@@ -36,7 +36,7 @@ static struct pollfd poll_array[MAX_HANDLES];
 static Buffer_Info buffer_array[MAX_HANDLES];
 
 static void
-init_poll_array (void)
+init_poll_array ()
 {
   int i;
 
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
index 0e8320c08f4..f1df73461ee 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
@@ -13,7 +13,7 @@
 #include "ace/High_Res_Timer.h"
 
 static int
-run_client (void)
+run_client ()
 {
   ACE_MEM_Connector connector;
   ACE_MEM_Stream stream;
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index 4a1b8667898..1107e306fb7 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -18,7 +18,7 @@
 
 #include "SSL-client-simple.h"
 
-Options::Options (void)
+Options::Options ()
   : host_ (ACE_DEFAULT_SERVER_HOST),
     port_ (ACE_DEFAULT_SERVER_PORT),
     sleep_time_ (0, 0), // By default, don't sleep between calls.
@@ -31,7 +31,7 @@ Options::Options (void)
   ACE_OS::strcpy (quit_string_, "q");
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   delete [] this->message_buf_;
 }
@@ -40,7 +40,7 @@ Options::~Options (void)
 typedef ACE_Singleton<Options, ACE_Null_Mutex> OPTIONS;
 
 int
-Options::init (void)
+Options::init ()
 {
   // Check for default case.
   if (this->message_len_ == 0)
@@ -201,7 +201,7 @@ Options::shared_client_test (u_short port,
 // Static function entry point to the oneway client service.
 
 void
-Options::oneway_client_test (void)
+Options::oneway_client_test ()
 {
   ACE_SSL_SOCK_Stream cli_stream;
 
@@ -249,7 +249,7 @@ Options::oneway_client_test (void)
 // Static function entry point to the twoway client service.
 
 void
-Options::twoway_client_test (void)
+Options::twoway_client_test ()
 {
   ACE_SSL_SOCK_Stream cli_stream;
 
@@ -331,7 +331,7 @@ Options::twoway_client_test (void)
 }
 
 void
-Options::run (void)
+Options::run ()
 {
   if (this->oneway_ == 0)
     this->twoway_client_test ();
@@ -340,7 +340,7 @@ Options::run (void)
 }
 
 static int
-run_client (void)
+run_client ()
 {
   // Raise the socket handle limit to the maximum.
   ACE::set_handle_limit ();
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h
index 96f3179ee2c..80456d84a78 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h
@@ -13,10 +13,10 @@ class Options
   //   Define the options for this test.
 {
 public:
-  Options (void);
+  Options ();
   // Constructor.
 
-  ~Options (void);
+  ~Options ();
   // Destructor.
 
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -44,11 +44,11 @@ public:
   const void *message_buf () const;
   // Returns a pointer to the message.
 
-  void run (void);
+  void run ();
   // Run the test
 
 private:
-  int init (void);
+  int init ();
   // Initialize the message we're sending to the user and set up the
   // barrier.
 
@@ -57,10 +57,10 @@ private:
   // Performs the shared behavior of the oneway and twoway client
   // tests.
 
-  void twoway_client_test (void);
+  void twoway_client_test ();
   // Performs the twoway test.
 
-  void oneway_client_test (void);
+  void oneway_client_test ();
   // Performs the oneway test.
 
   const ACE_TCHAR *host_;
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index ffbeedbf8eb..cc035647927 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -17,7 +17,7 @@
 
 #include "SSL-client.h"
 
-Options::Options (void)
+Options::Options ()
   : host_ (ACE_DEFAULT_SERVER_HOST),
     port_ (ACE_DEFAULT_SERVER_PORT),
     sleep_time_ (0, 0), // By default, don't sleep between calls.
@@ -34,7 +34,7 @@ Options::Options (void)
   ACE_OS::strcpy (quit_string_, "q");
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   ACE_MT (delete this->barrier_);
   delete [] this->message_buf_;
@@ -44,7 +44,7 @@ Options::~Options (void)
 typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS;
 
 int
-Options::init (void)
+Options::init ()
 {
   // Check for default case.
   if (this->message_len_ == 0)
@@ -371,7 +371,7 @@ Options::twoway_client_test (void *)
 }
 
 ACE_THR_FUNC
-Options::thr_func (void)
+Options::thr_func ()
 {
   if (this->oneway_ == 0)
     return ACE_THR_FUNC (&Options::twoway_client_test);
@@ -380,7 +380,7 @@ Options::thr_func (void)
 }
 
 static int
-run_client (void)
+run_client ()
 {
   // Raise the socket handle limit to the maximum.
   ACE::set_handle_limit ();
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h
index db869ac2b6a..57857970701 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h
@@ -15,10 +15,10 @@ class Options
 {
 public:
   // Constructor.
-  Options (void);
+  Options ();
 
   // Destructor.
-  ~Options (void);
+  ~Options ();
 
   // Parse the command-line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -50,12 +50,12 @@ public:
 
   // Returns a pointer to the entry point into the thread that runs
   // the client test function.
-  ACE_THR_FUNC thr_func (void);
+  ACE_THR_FUNC thr_func ();
 
 private:
   // Initialize the message we're sending to the user and set up the
   // barrier.
-  int init (void);
+  int init ();
 
   // Performs the shared behavior of the oneway and twoway client
   // tests.
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index 1e1a552154d..8ff0fde8a55 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -22,17 +22,17 @@ class Handler_Factory
   // = TITLE
   //   Creates the oneway or twoway handlers.
 public:
-  Handler_Factory (void);
+  Handler_Factory ();
   // Constructor.
 
-  ~Handler_Factory (void);
+  ~Handler_Factory ();
   // Destructor.
 
-  int handle_events (void);
+  int handle_events ();
   // Run the main event loop.
 
 private:
-  int init_acceptors (void);
+  int init_acceptors ();
   // Initialize the acceptors.
 
   int create_handler (ACE_SSL_SOCK_Acceptor &acceptor,
@@ -89,7 +89,7 @@ protected:
   virtual int svc ();
   // Template method entry point into the handler task.
 
-  virtual void print_results (void);
+  virtual void print_results ();
   // Print the results.
 
   size_t total_bytes_;
@@ -114,7 +114,7 @@ public:
   // Constructor.
 
 private:
-  virtual int run (void);
+  virtual int run ();
   // Template Method hook called by <svc>.
 };
 
@@ -126,10 +126,10 @@ public:
   // Constructor.
 
 private:
-  virtual int run (void);
+  virtual int run ();
   // Template Method hook called by <svc>.
 
-  virtual void print_results (void);
+  virtual void print_results ();
   // Print the results.
 };
 
@@ -151,11 +151,11 @@ Options::reply_message_len () const
   return ACE_Utils::truncate_cast<int> (this->reply_message_len_);
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
-Options::Options (void)
+Options::Options ()
   : verbose_ (0),
     port_ (ACE_DEFAULT_SERVER_PORT),
     reply_message_len_ (24) // Default to the approximate size of an
@@ -236,7 +236,7 @@ Handler::close (u_long)
 }
 
 int
-Handler::svc (void)
+Handler::svc ()
 {
   // Timer logic.
   this->timer_.start ();
@@ -280,7 +280,7 @@ Handler::parse_header_and_allocate_buffer (char *&request,
 }
 
 void
-Handler::print_results (void)
+Handler::print_results ()
 {
 }
 
@@ -292,7 +292,7 @@ Twoway_Handler::Twoway_Handler (ACE_SSL_SOCK_Stream* ssl_stream)
 // Function entry point into the twoway server task.
 
 int
-Twoway_Handler::run (void)
+Twoway_Handler::run ()
 {
   // Read data from client (terminate on error).
 
@@ -364,7 +364,7 @@ Oneway_Handler::Oneway_Handler (ACE_SSL_SOCK_Stream *ssl_stream)
 }
 
 void
-Oneway_Handler::print_results (void)
+Oneway_Handler::print_results ()
 {
   ACE_Profile_Timer::ACE_Elapsed_Time et;
   this->timer_.elapsed_time (et);
@@ -386,7 +386,7 @@ Oneway_Handler::print_results (void)
 // Function entry point into the oneway server task.
 
 int
-Oneway_Handler::run (void)
+Oneway_Handler::run ()
 {
   // Read data from client (terminate on error).
 
@@ -455,7 +455,7 @@ Handler_Factory::make_oneway_handler (ACE_SSL_SOCK_Stream *ssl_stream)
 }
 
 int
-Handler_Factory::init_acceptors (void)
+Handler_Factory::init_acceptors ()
 {
   // Create the oneway and twoway server addresses.
   ACE_INET_Addr twoway_server_addr (OPTIONS::instance ()->port ());
@@ -521,11 +521,11 @@ Handler_Factory::create_handler (
 #endif /* ACE_HAS_THREADS */
 }
 
-Handler_Factory::Handler_Factory (void)
+Handler_Factory::Handler_Factory ()
 {
 }
 
-Handler_Factory::~Handler_Factory (void)
+Handler_Factory::~Handler_Factory ()
 {
   this->twoway_acceptor_.close ();
   this->oneway_acceptor_.close ();
@@ -534,7 +534,7 @@ Handler_Factory::~Handler_Factory (void)
 // Run the main event loop.
 
 int
-Handler_Factory::handle_events (void)
+Handler_Factory::handle_events ()
 {
   if (this->init_acceptors () == -1)
     return -1;
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h
index 3fb64a1c7eb..974dc63ccdc 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h
@@ -10,10 +10,10 @@ class Options
   //   Define the options for this test.
 {
 public:
-  Options (void);
+  Options ();
   // Constructor.
 
-  ~Options (void);
+  ~Options ();
   // Destructor.
 
   int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
index 74cf402d4d4..f4094eaf5cd 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
@@ -40,7 +40,7 @@ static struct pollfd poll_array[MAX_HANDLES];
 static Buffer_Info buffer_array[MAX_HANDLES];
 
 static void
-init_poll_array (void)
+init_poll_array ()
 {
   int i;
 
diff --git a/ACE/examples/Log_Msg/test_log_msg.cpp b/ACE/examples/Log_Msg/test_log_msg.cpp
index 4da36aaddd4..5eb33e13d29 100644
--- a/ACE/examples/Log_Msg/test_log_msg.cpp
+++ b/ACE/examples/Log_Msg/test_log_msg.cpp
@@ -22,14 +22,14 @@
 
 
 static void
-cleanup (void)
+cleanup ()
 {
   ACE_DEBUG ((LM_INFO,
               "leaving (%P)!\n"));
 }
 
 static void
-cause_error (void)
+cause_error ()
 {
   errno = EWOULDBLOCK;
   ACE_ERROR ((LM_DEBUG,
diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
index 10b599142a9..ba53e2b3af6 100644
--- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -29,7 +29,7 @@
 // Return the port number.
 
 u_short
-Options::port (void)
+Options::port ()
 {
   return this->port_;
 }
@@ -76,7 +76,7 @@ Logging_Acceptor;
 
 // Default constructor.
 
-Logging_Handler::Logging_Handler (void)
+Logging_Handler::Logging_Handler ()
 {
 }
 
diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.h b/ACE/examples/Logger/Acceptor-server/server_loggerd.h
index 4a20bba2cb8..46820b903ee 100644
--- a/ACE/examples/Logger/Acceptor-server/server_loggerd.h
+++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.h
@@ -13,7 +13,7 @@ class Options
   //     Keeps track of the options.
 public:
   void parse_args (int argc, ACE_TCHAR *argv[]);
-  u_short port (void);
+  u_short port ();
 
 private:
   u_short port_;
@@ -32,7 +32,7 @@ class Logging_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 //     utilize the <ACE_Reactor> timer mechanisms, as well.
 {
 public:
-  Logging_Handler (void);
+  Logging_Handler ();
 
   // = Hooks for opening and closing handlers.
   virtual int open (void *);
diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp
index df4ec12799e..8b58ade2c5c 100644
--- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp
+++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp
@@ -19,7 +19,7 @@ Logging_Handler::~Logging_Handler ()
 // Extract the underlying ACE_SOCK_Stream (e.g., for purposes of
 // accept()).
 ACE_SOCK_Stream &
-Logging_Handler::peer (void)
+Logging_Handler::peer ()
 {
   return this->cli_stream_;
 }
@@ -140,7 +140,7 @@ Logging_Handler::get_handle () const
 }
 
 int
-Logging_Handler::open (void)
+Logging_Handler::open ()
 {
   ACE_INET_Addr addr;
 
@@ -183,7 +183,7 @@ Logging_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 
 // Perform termination activities when close fails.
 int
-Logging_Handler::close (void)
+Logging_Handler::close ()
 {
   return this->handle_close ();
 }
diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp
index 3401fb675a1..1d1167cf673 100644
--- a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp
+++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp
@@ -14,12 +14,12 @@ IO_Test::IO_Test (const char *name,
 {
 }
 
-IO_Test::~IO_Test (void)
+IO_Test::~IO_Test ()
 {
 }
 
 const char *
-IO_Test::name (void)
+IO_Test::name ()
 {
   return this->name_;
 }
diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.h b/ACE/examples/Mem_Map/IO-tests/IO_Test.h
index 5098a992656..58c541e5baf 100644
--- a/ACE/examples/Mem_Map/IO-tests/IO_Test.h
+++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.h
@@ -17,10 +17,10 @@ public:
            ACE_Profile_Timer &tm);
 
   // Destructor.
-  virtual ~IO_Test (void);
+  virtual ~IO_Test ();
 
   // Return the name of the test
-  const char *name (void);
+  const char *name ();
 
   // Execute the IO test (note this is a pure virtual function...)
   virtual int run_test (int iterations,
diff --git a/ACE/examples/Mem_Map/IO-tests/test_io.cpp b/ACE/examples/Mem_Map/IO-tests/test_io.cpp
index 65a48a0d65b..4ddbe0931e4 100644
--- a/ACE/examples/Mem_Map/IO-tests/test_io.cpp
+++ b/ACE/examples/Mem_Map/IO-tests/test_io.cpp
@@ -32,7 +32,7 @@ static ACE_Profile_Timer profile_timer;
 // Explain usage and exit.
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_OS::fprintf (stderr, "usage: %s"
                    " [-i input_file] [-o output_file] [-n iteration_count] [-r]\n",
diff --git a/ACE/examples/Misc/test_trace.cpp b/ACE/examples/Misc/test_trace.cpp
index 13770d82a1c..c2d6a5caaa0 100644
--- a/ACE/examples/Misc/test_trace.cpp
+++ b/ACE/examples/Misc/test_trace.cpp
@@ -47,7 +47,7 @@ public:
 
   int recursive (size_t depth);
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     return this->recursive (this->depth_);
   }
@@ -71,7 +71,7 @@ My_Task::recursive (size_t depth)
 
 extern "C"
 void
-exithook (void)
+exithook ()
 {
   ACE_TRACE ("void exithook (void)");
 
diff --git a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
index d26d2418051..60e7eca8ba5 100644
--- a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
+++ b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
@@ -14,7 +14,7 @@ using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 class Monitor_Checker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     /// Get an instance of the MC service singleton.
     MC_ADMINMANAGER* mgr =
diff --git a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
index 5df97778106..4fe244f651d 100644
--- a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
+++ b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
@@ -12,7 +12,7 @@
 class Monitor_Checker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     /// Get an instance of the MC service singleton.
     MC_ADMINMANAGER* mgr =
diff --git a/ACE/examples/Monitor/Constraint/constraint.cpp b/ACE/examples/Monitor/Constraint/constraint.cpp
index ae05c8b852a..a85aa9c70cd 100644
--- a/ACE/examples/Monitor/Constraint/constraint.cpp
+++ b/ACE/examples/Monitor/Constraint/constraint.cpp
@@ -34,7 +34,7 @@ class Trigger16k : public Control_Action
 class Monitor_Checker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     /// Get an instance of the MC service singleton.
     MC_ADMINMANAGER* mgr =
diff --git a/ACE/examples/Monitor/Group/group.cpp b/ACE/examples/Monitor/Group/group.cpp
index 6de5850b054..30e6c309d25 100644
--- a/ACE/examples/Monitor/Group/group.cpp
+++ b/ACE/examples/Monitor/Group/group.cpp
@@ -17,7 +17,7 @@ using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 class Monitor_Checker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     /// Get an instance of the MC service singleton.
     MC_ADMINMANAGER* mgr =
diff --git a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
index 7d335a38631..c46b7d77b9a 100644
--- a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
+++ b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
@@ -12,7 +12,7 @@
 class Monitor_Checker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     /// Get an instance of the MC service singleton.
     MC_ADMINMANAGER* mgr =
diff --git a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
index de57420f0b7..7f4606c2256 100644
--- a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
+++ b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
@@ -20,7 +20,7 @@ public:
   {
   }
 
-  int svc (void)
+  int svc ()
   {
     /// Reconstruct the monitor's unique name using the queue's hex address.
     const int nibbles = 2 * sizeof (ptrdiff_t);
diff --git a/ACE/examples/Monitor/Num_Threads/num_threads.cpp b/ACE/examples/Monitor/Num_Threads/num_threads.cpp
index 5bc46daec4f..a9b829de9bc 100644
--- a/ACE/examples/Monitor/Num_Threads/num_threads.cpp
+++ b/ACE/examples/Monitor/Num_Threads/num_threads.cpp
@@ -9,7 +9,7 @@
 class Worker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     ACE_OS::sleep (5);
     return 0;
@@ -22,7 +22,7 @@ public:
 class Monitor_Checker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     /// Get an instance of the MC service singleton.
     MC_ADMINMANAGER* mgr =
diff --git a/ACE/examples/NT_Service/main.cpp b/ACE/examples/NT_Service/main.cpp
index b895d94c888..fd3a982bc68 100644
--- a/ACE/examples/NT_Service/main.cpp
+++ b/ACE/examples/NT_Service/main.cpp
@@ -27,15 +27,15 @@
 class Process
 {
 public:
-  Process (void);
-  ~Process (void);
+  Process ();
+  ~Process ();
 
   int run(int argc, ACE_TCHAR* argv[]);
 
 private:
   void parse_args (int argc,
                    ACE_TCHAR* argv[]);
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
 
 private:
   char progname[128];
@@ -52,7 +52,7 @@ private:
 
 typedef ACE_Singleton<Process, ACE_Mutex> PROCESS;
 
-Process::Process (void)
+Process::Process ()
   : opt_install (0),
     opt_remove (0),
     opt_start (0),
@@ -66,13 +66,13 @@ Process::Process (void)
   ACE::init ();
 }
 
-Process::~Process (void)
+Process::~Process ()
 {
   ACE::fini ();
 }
 
 void
-Process::print_usage_and_die (void)
+Process::print_usage_and_die ()
 {
   ACE_DEBUG ((LM_INFO,
               "Usage: %s"
diff --git a/ACE/examples/NT_Service/ntsvc.cpp b/ACE/examples/NT_Service/ntsvc.cpp
index 2f1b2245798..451bf5e303f 100644
--- a/ACE/examples/NT_Service/ntsvc.cpp
+++ b/ACE/examples/NT_Service/ntsvc.cpp
@@ -16,13 +16,13 @@
 
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
-Service::Service (void)
+Service::Service ()
 {
   // Remember the Reactor instance.
   reactor (ACE_Reactor::instance ());
 }
 
-Service::~Service (void)
+Service::~Service ()
 {
   if (ACE_Reactor::instance ()->cancel_timer(this) == -1)
     ACE_ERROR ((LM_ERROR,
@@ -78,7 +78,7 @@ Service::handle_timeout (const ACE_Time_Value &tv,
 // request is received.
 
 int
-Service::svc (void)
+Service::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Service::svc\n")));
diff --git a/ACE/examples/NT_Service/ntsvc.h b/ACE/examples/NT_Service/ntsvc.h
index 02d212adbd3..a7826d301ec 100644
--- a/ACE/examples/NT_Service/ntsvc.h
+++ b/ACE/examples/NT_Service/ntsvc.h
@@ -27,9 +27,9 @@
 class Service : public ACE_NT_Service
 {
 public:
-  Service (void);
+  Service ();
 
-  ~Service (void);
+  ~Service ();
 
   /// We override <handle_control> because it handles stop requests
   /// privately.
diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp
index 9a191a84b1c..46233c6f975 100644
--- a/ACE/examples/OS/Process/imore.cpp
+++ b/ACE/examples/OS/Process/imore.cpp
@@ -41,7 +41,7 @@ static ACE_TCHAR *fname = 0;   // File you want to view.
 static int use_named_pipe = 0; // Do we want to use named pipe?
 
 static void
-usage (void)
+usage ()
 {
   ACE_ERROR ((LM_ERROR, "Usage: imore [-n|-u] <filename>\n"
               "\t-n Use named pipe.\n"
diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp
index c96553954a2..fb97a2c09e7 100644
--- a/ACE/examples/OS/Process/process.cpp
+++ b/ACE/examples/OS/Process/process.cpp
@@ -112,7 +112,7 @@ parse_args (int argc, ACE_TCHAR **argv)
 
 // This shows how to set handles.
 static void
-test_more (void)
+test_more ()
 {
   ACE_HANDLE infile = ACE_OS::open (print_file, O_RDONLY);
 
@@ -150,7 +150,7 @@ test_more (void)
 // This is a simple usage of ACE_Process.
 
 static void
-test_date (void)
+test_date ()
 {
   ACE_Process_Options options;
   options.command_line (DATE_PATH);
@@ -177,7 +177,7 @@ test_date (void)
 }
 
 static void
-test_ls (void)
+test_ls ()
 {
   ACE_Process_Options options;
 #if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
@@ -203,7 +203,7 @@ test_ls (void)
 }
 
 static void
-test_wait (void)
+test_wait ()
 {
   ACE_Process_Options options;
 #if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
@@ -283,7 +283,7 @@ test_wait (void)
 // This is just to test the direct usage of CreateProcess.  I use this
 // occasionally as a sanity check when ACE_Process breaks.
 static void
-win32_test_ls (void)
+win32_test_ls ()
 {
   PROCESS_INFORMATION process_info;
   ACE_TEXT_STARTUPINFO startup_info;
@@ -346,7 +346,7 @@ win32_test_ls (void)
 // environment variables.
 
 static void
-win32_spawn_environment_process (void)
+win32_spawn_environment_process ()
 {
   PROCESS_INFORMATION process_info;
   ACE_TEXT_STARTUPINFO startup_info;
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp
index 9802af0b8ab..09b2ac53256 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp
@@ -4,7 +4,7 @@
 
 const iovec Fill_ACE_QoS::iov_ = {0,0};
 
-Fill_ACE_QoS::Fill_ACE_QoS (void)
+Fill_ACE_QoS::Fill_ACE_QoS ()
 {
   ACE_NEW (this->default_traffic_,
            ACE_Flow_Spec  (ACE_QOS_NOT_SPECIFIED,
@@ -20,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void)
 }
 
 // destructor.
-Fill_ACE_QoS::~Fill_ACE_QoS (void)
+Fill_ACE_QoS::~Fill_ACE_QoS ()
 {}
 
 int
@@ -89,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
 }
 
 Fill_ACE_QoS::FLOW_SPEC_HASH_MAP&
-Fill_ACE_QoS::map (void)
+Fill_ACE_QoS::map ()
 {
   return this->flow_spec_map_;
 }
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h
index 30097a33960..a454c049153 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h
@@ -33,10 +33,10 @@ public:
 
   //Initialization and termination methods.
   /// constructor.
-  Fill_ACE_QoS (void);
+  Fill_ACE_QoS ();
 
   /// destructor.
-  ~Fill_ACE_QoS (void);
+  ~Fill_ACE_QoS ();
 
   /// To be used by receivers. Fills the receiver qos and sets the
   /// sender qos to NO_TRAFFIC.
@@ -55,7 +55,7 @@ public:
                        const ACE_CString &send_flow_name);
 
   /// Returns the hash map of flowspecs indexed by flowspec name.
-  FLOW_SPEC_HASH_MAP& map (void);
+  FLOW_SPEC_HASH_MAP& map ();
 
 private:
   // The Service Provider is currently set to NULL for all ACE_QoS.
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
index 424fa4b09ac..551e3fe380c 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
@@ -24,14 +24,14 @@ QoS_Util::QoS_Util (int argc,
 }
 
 // destructor.
-QoS_Util::~QoS_Util (void)
+QoS_Util::~QoS_Util ()
 {
   delete this->mult_session_addr_;
   delete this->dest_addr_;
 }
 
 int
-QoS_Util::parse_args (void)
+QoS_Util::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h
index b3dccdb02e6..4c69c80de3f 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h
@@ -28,10 +28,10 @@ public:
   QoS_Util (int argc, ACE_TCHAR *argv[]);
 
   // destructor.
-  ~QoS_Util (void);
+  ~QoS_Util ();
 
   // Parse command-line arguments.
-  int parse_args (void);
+  int parse_args ();
 
   // GET methods.
   ACE_INET_Addr *mult_session_addr () const;
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp
index f20d0937f87..95cfd81bafa 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp
@@ -15,7 +15,7 @@
 #include "Fill_ACE_QoS.h"
 
 // Constructor.
-Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void)
+Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler ()
 {
 }
 
@@ -28,7 +28,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca
 }
 
 // Destructor.
-Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void)
+Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler ()
 {
 }
 
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h
index 003c171ad22..7bb5f8301e2 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h
@@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Receiver_QoS_Event_Handler (void);
+  Receiver_QoS_Event_Handler ();
 
   /// Constructor.
   Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos,
                               ACE_QoS_Session *qos_session);
 
   /// Destructor.
-  ~Receiver_QoS_Event_Handler (void);
+  ~Receiver_QoS_Event_Handler ();
 
   /// Override this to return the handle of the Dgram_Mcast
   /// that we are using.
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp
index 1eab340fd82..af8eab0cc77 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp
@@ -15,7 +15,7 @@
 #include "Fill_ACE_QoS.h"
 
 // Constructor.
-Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void)
+Sender_QoS_Event_Handler::Sender_QoS_Event_Handler ()
 {
 }
 
@@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q
 }
 
 // Destructor.
-Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void)
+Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler ()
 {
 }
 
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h
index 316e7710122..55896d2c54a 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h
@@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Sender_QoS_Event_Handler (void);
+  Sender_QoS_Event_Handler ();
 
   /// Constructor.
   Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos,
                             ACE_QoS_Session *qos_session);
 
   /// Destructor.
-  ~Sender_QoS_Event_Handler (void);
+  ~Sender_QoS_Event_Handler ();
 
   /// Override this to return the handle of the Dgram_Mcast
   /// that we are using.
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp
index 9802af0b8ab..09b2ac53256 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp
+++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp
@@ -4,7 +4,7 @@
 
 const iovec Fill_ACE_QoS::iov_ = {0,0};
 
-Fill_ACE_QoS::Fill_ACE_QoS (void)
+Fill_ACE_QoS::Fill_ACE_QoS ()
 {
   ACE_NEW (this->default_traffic_,
            ACE_Flow_Spec  (ACE_QOS_NOT_SPECIFIED,
@@ -20,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void)
 }
 
 // destructor.
-Fill_ACE_QoS::~Fill_ACE_QoS (void)
+Fill_ACE_QoS::~Fill_ACE_QoS ()
 {}
 
 int
@@ -89,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
 }
 
 Fill_ACE_QoS::FLOW_SPEC_HASH_MAP&
-Fill_ACE_QoS::map (void)
+Fill_ACE_QoS::map ()
 {
   return this->flow_spec_map_;
 }
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h
index 090eb11d9b7..e47fba10de0 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h
+++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h
@@ -32,10 +32,10 @@ public:
 
   //Initialization and termination methods.
   /// constructor.
-  Fill_ACE_QoS (void);
+  Fill_ACE_QoS ();
 
   /// destructor.
-  ~Fill_ACE_QoS (void);
+  ~Fill_ACE_QoS ();
 
   /// To be used by receivers. Fills the receiver qos and sets the
   /// sender qos to NO_TRAFFIC.
@@ -54,7 +54,7 @@ public:
                        const ACE_CString &send_flow_name);
 
   /// Returns the hash map of flowspecs indexed by flowspec name.
-  FLOW_SPEC_HASH_MAP& map (void);
+  FLOW_SPEC_HASH_MAP& map ();
 
 private:
   // The Service Provider is currently set to NULL for all ACE_QoS.
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
index 424fa4b09ac..551e3fe380c 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
+++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
@@ -24,14 +24,14 @@ QoS_Util::QoS_Util (int argc,
 }
 
 // destructor.
-QoS_Util::~QoS_Util (void)
+QoS_Util::~QoS_Util ()
 {
   delete this->mult_session_addr_;
   delete this->dest_addr_;
 }
 
 int
-QoS_Util::parse_args (void)
+QoS_Util::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h
index b3dccdb02e6..4c69c80de3f 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h
+++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h
@@ -28,10 +28,10 @@ public:
   QoS_Util (int argc, ACE_TCHAR *argv[]);
 
   // destructor.
-  ~QoS_Util (void);
+  ~QoS_Util ();
 
   // Parse command-line arguments.
-  int parse_args (void);
+  int parse_args ();
 
   // GET methods.
   ACE_INET_Addr *mult_session_addr () const;
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp
index 39f75176ab4..37443f87ea5 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp
+++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp
@@ -15,7 +15,7 @@
 #include "Fill_ACE_QoS.h"
 
 // Constructor.
-Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void)
+Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler ()
 {
 }
 
@@ -28,7 +28,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca
 }
 
 // Destructor.
-Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void)
+Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler ()
 {
 }
 
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h
index 003c171ad22..7bb5f8301e2 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h
+++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h
@@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Receiver_QoS_Event_Handler (void);
+  Receiver_QoS_Event_Handler ();
 
   /// Constructor.
   Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos,
                               ACE_QoS_Session *qos_session);
 
   /// Destructor.
-  ~Receiver_QoS_Event_Handler (void);
+  ~Receiver_QoS_Event_Handler ();
 
   /// Override this to return the handle of the Dgram_Mcast
   /// that we are using.
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp
index f98eed6ab35..cc6f03acf2d 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp
+++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp
@@ -15,7 +15,7 @@
 #include "Fill_ACE_QoS.h"
 
 // Constructor.
-Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void)
+Sender_QoS_Event_Handler::Sender_QoS_Event_Handler ()
 {
 }
 
@@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q
 }
 
 // Destructor.
-Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void)
+Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler ()
 {
 }
 
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h
index 316e7710122..55896d2c54a 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h
+++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h
@@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Sender_QoS_Event_Handler (void);
+  Sender_QoS_Event_Handler ();
 
   /// Constructor.
   Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos,
                             ACE_QoS_Session *qos_session);
 
   /// Destructor.
-  ~Sender_QoS_Event_Handler (void);
+  ~Sender_QoS_Event_Handler ();
 
   /// Override this to return the handle of the Dgram_Mcast
   /// that we are using.
diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp
index 9802af0b8ab..09b2ac53256 100644
--- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp
+++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp
@@ -4,7 +4,7 @@
 
 const iovec Fill_ACE_QoS::iov_ = {0,0};
 
-Fill_ACE_QoS::Fill_ACE_QoS (void)
+Fill_ACE_QoS::Fill_ACE_QoS ()
 {
   ACE_NEW (this->default_traffic_,
            ACE_Flow_Spec  (ACE_QOS_NOT_SPECIFIED,
@@ -20,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void)
 }
 
 // destructor.
-Fill_ACE_QoS::~Fill_ACE_QoS (void)
+Fill_ACE_QoS::~Fill_ACE_QoS ()
 {}
 
 int
@@ -89,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
 }
 
 Fill_ACE_QoS::FLOW_SPEC_HASH_MAP&
-Fill_ACE_QoS::map (void)
+Fill_ACE_QoS::map ()
 {
   return this->flow_spec_map_;
 }
diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h
index f52309cf9c1..0dcb1a16a43 100644
--- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h
+++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h
@@ -32,10 +32,10 @@ public:
 
   //Initialization and termination methods.
   /// constructor.
-  Fill_ACE_QoS (void);
+  Fill_ACE_QoS ();
 
   /// destructor.
-  ~Fill_ACE_QoS (void);
+  ~Fill_ACE_QoS ();
 
   /// To be used by receivers. Fills the receiver qos and sets the
   /// sender qos to NO_TRAFFIC.
@@ -54,7 +54,7 @@ public:
                        const ACE_CString &send_flow_name);
 
   /// Returns the hash map of flowspecs indexed by flowspec name.
-  FLOW_SPEC_HASH_MAP& map (void);
+  FLOW_SPEC_HASH_MAP& map ();
 
 private:
   // The Service Provider is currently set to NULL for all ACE_QoS.
diff --git a/ACE/examples/QOS/Simple/QoS_Util.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp
index 424fa4b09ac..551e3fe380c 100644
--- a/ACE/examples/QOS/Simple/QoS_Util.cpp
+++ b/ACE/examples/QOS/Simple/QoS_Util.cpp
@@ -24,14 +24,14 @@ QoS_Util::QoS_Util (int argc,
 }
 
 // destructor.
-QoS_Util::~QoS_Util (void)
+QoS_Util::~QoS_Util ()
 {
   delete this->mult_session_addr_;
   delete this->dest_addr_;
 }
 
 int
-QoS_Util::parse_args (void)
+QoS_Util::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
diff --git a/ACE/examples/QOS/Simple/QoS_Util.h b/ACE/examples/QOS/Simple/QoS_Util.h
index b3dccdb02e6..4c69c80de3f 100644
--- a/ACE/examples/QOS/Simple/QoS_Util.h
+++ b/ACE/examples/QOS/Simple/QoS_Util.h
@@ -28,10 +28,10 @@ public:
   QoS_Util (int argc, ACE_TCHAR *argv[]);
 
   // destructor.
-  ~QoS_Util (void);
+  ~QoS_Util ();
 
   // Parse command-line arguments.
-  int parse_args (void);
+  int parse_args ();
 
   // GET methods.
   ACE_INET_Addr *mult_session_addr () const;
diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp
index 5d97ebbbf6c..0b93ac300c3 100644
--- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp
+++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp
@@ -14,7 +14,7 @@
 #include "ace/OS_NS_string.h"
 
 // Constructor.
-Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void)
+Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler ()
 {
 }
 
@@ -27,7 +27,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca
 }
 
 // Destructor.
-Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void)
+Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler ()
 {
 }
 
diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h
index 003c171ad22..7bb5f8301e2 100644
--- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h
+++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h
@@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Receiver_QoS_Event_Handler (void);
+  Receiver_QoS_Event_Handler ();
 
   /// Constructor.
   Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos,
                               ACE_QoS_Session *qos_session);
 
   /// Destructor.
-  ~Receiver_QoS_Event_Handler (void);
+  ~Receiver_QoS_Event_Handler ();
 
   /// Override this to return the handle of the Dgram_Mcast
   /// that we are using.
diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp
index a259a2a04e0..f220353364f 100644
--- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp
+++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp
@@ -15,7 +15,7 @@
 #include "ace/OS_NS_string.h"
 
 // Constructor.
-Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void)
+Sender_QoS_Event_Handler::Sender_QoS_Event_Handler ()
 {
 }
 
@@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q
 }
 
 // Destructor.
-Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void)
+Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler ()
 {
 }
 
diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h
index 316e7710122..55896d2c54a 100644
--- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h
+++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h
@@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Sender_QoS_Event_Handler (void);
+  Sender_QoS_Event_Handler ();
 
   /// Constructor.
   Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos,
                             ACE_QoS_Session *qos_session);
 
   /// Destructor.
-  ~Sender_QoS_Event_Handler (void);
+  ~Sender_QoS_Event_Handler ();
 
   /// Override this to return the handle of the Dgram_Mcast
   /// that we are using.
diff --git a/ACE/examples/Reactor/FIFO/server.cpp b/ACE/examples/Reactor/FIFO/server.cpp
index 4b47f830ff9..eedf91e9e2c 100644
--- a/ACE/examples/Reactor/FIFO/server.cpp
+++ b/ACE/examples/Reactor/FIFO/server.cpp
@@ -10,8 +10,8 @@
 class FIFO_Recv_Handler : public ACE_Event_Handler
 {
 public:
-  FIFO_Recv_Handler (void);
-  ~FIFO_Recv_Handler (void);
+  FIFO_Recv_Handler ();
+  ~FIFO_Recv_Handler ();
 
   virtual ACE_HANDLE get_handle () const;
   virtual int handle_input (ACE_HANDLE fd);
@@ -20,7 +20,7 @@ private:
   ACE_FIFO_Recv_Msg fifo_reader_;
 };
 
-FIFO_Recv_Handler::FIFO_Recv_Handler (void)
+FIFO_Recv_Handler::FIFO_Recv_Handler ()
 {
   ACE_OS::unlink (ACE_DEFAULT_RENDEZVOUS);
 
@@ -41,7 +41,7 @@ FIFO_Recv_Handler::get_handle () const
   return this->fifo_reader_.get_handle ();
 }
 
-FIFO_Recv_Handler::~FIFO_Recv_Handler (void)
+FIFO_Recv_Handler::~FIFO_Recv_Handler ()
 {
   this->fifo_reader_.close ();
   this->fifo_reader_.remove ();
diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp
index e05f48db7fb..6e36d138132 100644
--- a/ACE/examples/Reactor/Misc/notification.cpp
+++ b/ACE/examples/Reactor/Misc/notification.cpp
@@ -31,7 +31,7 @@ public:
   Thread_Handler (size_t id,
                   size_t max_iterations);
 
-  ~Thread_Handler (void);
+  ~Thread_Handler ();
   // Destructor.
 
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
@@ -92,7 +92,7 @@ Thread_Handler::Thread_Handler (size_t id,
 {
 }
 
-Thread_Handler::~Thread_Handler (void)
+Thread_Handler::~Thread_Handler ()
 {
   // Cleanup resources so that we don't crash and burn when shutdown.
   ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (),
@@ -225,7 +225,7 @@ Thread_Handler::handle_input (ACE_HANDLE handle)
 // capabilities in separate threads.
 
 int
-Thread_Handler::svc (void)
+Thread_Handler::svc ()
 {
   ACE_Time_Value sleep_timeout (Thread_Handler::interval_.sec () / 2);
 
diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp
index c952c8a00a7..1dc03bbd4a2 100644
--- a/ACE/examples/Reactor/Misc/test_demuxing.cpp
+++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp
@@ -163,14 +163,14 @@ class STDIN_Handler : public ACE_Event_Handler
   //   This class illustrates that the ACE_Reactor can handle signals,
   //   STDIO, and timeouts using the same mechanisms.
 public:
-  STDIN_Handler (void);
-  ~STDIN_Handler (void);
+  STDIN_Handler ();
+  ~STDIN_Handler ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_timeout (const ACE_Time_Value &,
                               const void *arg);
 };
 
-STDIN_Handler::STDIN_Handler (void)
+STDIN_Handler::STDIN_Handler ()
 {
   if (ACE_Event_Handler::register_stdin_handler (this,
                                                  ACE_Reactor::instance (),
@@ -194,7 +194,7 @@ STDIN_Handler::STDIN_Handler (void)
                 1));
 }
 
-STDIN_Handler::~STDIN_Handler (void)
+STDIN_Handler::~STDIN_Handler ()
 {
   if (ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (),
                                                ACE_Thread_Manager::instance ()) == -1)
@@ -259,7 +259,7 @@ STDIN_Handler::handle_input (ACE_HANDLE handle)
 class Message_Handler : public ACE_Task <ACE_SYNCH>
 {
 public:
-  Message_Handler (void);
+  Message_Handler ();
 
   virtual int handle_input (ACE_HANDLE);
   // Called back within the context of the <ACE_Reactor> Singleton to
@@ -275,7 +275,7 @@ private:
   // message is enqueued.
 };
 
-Message_Handler::Message_Handler (void)
+Message_Handler::Message_Handler ()
   : notification_strategy_ (ACE_Reactor::instance (),
                             this,
                             ACE_Event_Handler::READ_MASK)
@@ -290,7 +290,7 @@ Message_Handler::Message_Handler (void)
 }
 
 int
-Message_Handler::svc (void)
+Message_Handler::svc ()
 {
   for (int i = 0;; i++)
     {
diff --git a/ACE/examples/Reactor/Misc/test_reactors.cpp b/ACE/examples/Reactor/Misc/test_reactors.cpp
index 1afa4f40229..194adbc3e3c 100644
--- a/ACE/examples/Reactor/Misc/test_reactors.cpp
+++ b/ACE/examples/Reactor/Misc/test_reactors.cpp
@@ -17,8 +17,8 @@ static const int MAX_TASKS = 20;
 class Test_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  Test_Task (void);
-  ~Test_Task (void);
+  Test_Task ();
+  ~Test_Task ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   virtual int open (void *args = 0);
@@ -43,7 +43,7 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2;
 
 static ACE_Recursive_Thread_Mutex reclock_;
 
-Test_Task::Test_Task (void)
+Test_Task::Test_Task ()
   : handled_ (0)
 {
   ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, reclock_);
@@ -54,7 +54,7 @@ Test_Task::Test_Task (void)
               Test_Task::task_count_));
 }
 
-Test_Task::~Test_Task (void)
+Test_Task::~Test_Task ()
 {
   ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, reclock_);
 
@@ -83,7 +83,7 @@ Test_Task::close (u_long)
 }
 
 int
-Test_Task::svc (void)
+Test_Task::svc ()
 {
   for (int i = 0; i < NUM_INVOCATIONS; i++)
     {
diff --git a/ACE/examples/Reactor/Misc/test_timer_queue.cpp b/ACE/examples/Reactor/Misc/test_timer_queue.cpp
index c53bda87e77..098128e9172 100644
--- a/ACE/examples/Reactor/Misc/test_timer_queue.cpp
+++ b/ACE/examples/Reactor/Misc/test_timer_queue.cpp
@@ -10,7 +10,7 @@
 class Example_Handler : public ACE_Event_Handler
 {
 public:
-  Example_Handler (void)
+  Example_Handler ()
     : count_ (1)
   {}
 
diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp
index 72f407c4ca8..108463c42d6 100644
--- a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp
+++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp
@@ -11,13 +11,13 @@
 #include "ace/OS_NS_stdlib.h"
 
 
-Log_Wrapper::Log_Wrapper (void)
+Log_Wrapper::Log_Wrapper ()
 {
   sequence_number_ = 0;
   this->log_msg_.app_id = ACE_OS::getpid ();
 }
 
-Log_Wrapper::~Log_Wrapper (void)
+Log_Wrapper::~Log_Wrapper ()
 {
 }
 
diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.h b/ACE/examples/Reactor/Multicast/Log_Wrapper.h
index 4de674e3ce4..13982529bce 100644
--- a/ACE/examples/Reactor/Multicast/Log_Wrapper.h
+++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.h
@@ -19,8 +19,8 @@ class Log_Wrapper
   //      multicast.
 {
 public:
-  Log_Wrapper (void);
-  ~Log_Wrapper (void);
+  Log_Wrapper ();
+  ~Log_Wrapper ();
 
   // = Types of logging messages.
   enum Log_Priority
diff --git a/ACE/examples/Reactor/Multicast/server.cpp b/ACE/examples/Reactor/Multicast/server.cpp
index d2d329a895d..93d5f4fa900 100644
--- a/ACE/examples/Reactor/Multicast/server.cpp
+++ b/ACE/examples/Reactor/Multicast/server.cpp
@@ -22,7 +22,7 @@ public:
   Server_Events (u_short port,
                  const char *mcast_addr,
                  long time_interval = 0);
-  ~Server_Events (void);
+  ~Server_Events ();
 
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv,
@@ -30,7 +30,7 @@ public:
 
   virtual ACE_HANDLE get_handle () const;
 
-  ACE_Time_Value *wait_time (void);
+  ACE_Time_Value *wait_time ();
 
 private:
   char *message_;
@@ -66,7 +66,7 @@ Server_Events::get_handle () const
 }
 
 ACE_Time_Value *
-Server_Events::wait_time (void)
+Server_Events::wait_time ()
 {
   return this->how_long_;
 }
@@ -104,7 +104,7 @@ Server_Events::Server_Events (u_short port,
 
 // A destructor that emacs refuses to color blue ;-)
 
-Server_Events::~Server_Events (void)
+Server_Events::~Server_Events ()
 {
   this->mcast_dgram_.leave (this->mcast_addr_);
 
diff --git a/ACE/examples/Reactor/Ntalker/ntalker.cpp b/ACE/examples/Reactor/Ntalker/ntalker.cpp
index 119b07df744..dfa1295f229 100644
--- a/ACE/examples/Reactor/Ntalker/ntalker.cpp
+++ b/ACE/examples/Reactor/Ntalker/ntalker.cpp
@@ -29,7 +29,7 @@ public:
            ACE_Reactor & );
   // Constructor.
 
-  ~Handler (void);
+  ~Handler ();
   // Destructor.
 
   // Event demuxer hooks.
@@ -130,7 +130,7 @@ Handler::handle_close (ACE_HANDLE h, ACE_Reactor_Mask)
   return 0;
 }
 
-Handler::~Handler (void)
+Handler::~Handler ()
 {
   if (this->mcast_.leave (sockmc_addr_) == -1)
     ACE_ERROR ((LM_ERROR,
diff --git a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
index 5354cd4ab60..95fc16e8a33 100644
--- a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
+++ b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
@@ -24,8 +24,8 @@
 
 #include <aio.h>
 
-int do_sysconf (void);
-int have_asynchio (void);
+int do_sysconf ();
+int have_asynchio ();
 
 static int file_handle = -1;
 char mb1 [BUFSIZ + 1];
@@ -34,15 +34,15 @@ aiocb aiocb1, aiocb2;
 sigset_t completion_signal;
 
 // For testing the <aio> stuff.
-int test_aio_calls (void);
-int issue_aio_calls (void);
-int query_aio_completions (void);
-int setup_signal_delivery (void);
-int do_sysconf (void);
-int have_asynchio (void);
+int test_aio_calls ();
+int issue_aio_calls ();
+int query_aio_completions ();
+int setup_signal_delivery ();
+int do_sysconf ();
+int have_asynchio ();
 
 int
-do_sysconf (void)
+do_sysconf ()
 {
   // Call sysconf to find out runtime values.
   errno = 0;
@@ -84,7 +84,7 @@ do_sysconf (void)
 }
 
 int
-have_asynchio (void)
+have_asynchio ()
 {
 #if defined (_POSIX_ASYNCHRONOUS_IO)
   // POSIX Asynch IO is present in this system.
diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp
index 4b0f49ac0b8..5c92b416e25 100644
--- a/ACE/examples/Reactor/Proactor/post_completions.cpp
+++ b/ACE/examples/Reactor/Proactor/post_completions.cpp
@@ -70,7 +70,7 @@ public:
     {}
   // Constructor.
 
-  virtual ~My_Result (void)
+  virtual ~My_Result ()
     {}
   // Destructor.
 
@@ -151,7 +151,7 @@ public:
       return 0;
     }
 
-  int svc (void)
+  int svc ()
     {
       // Handle events for 13 seconds.
       ACE_Time_Value run_time (13);
diff --git a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
index 08d0e2c996c..4a1e4d41506 100644
--- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
@@ -38,14 +38,14 @@ class Simple_Tester : public ACE_Handler
 {
 public:
   /// Constructor.
-  Simple_Tester (void);
+  Simple_Tester ();
 
-  ~Simple_Tester (void);
+  ~Simple_Tester ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Open the operations and initiate read from the file.
   ///FUZZ: enble check_for_lack_ACE_OS
-  int open (void);
+  int open ();
 
 protected:
   // = These methods are called by the freamwork.
@@ -57,7 +57,7 @@ protected:
   virtual void handle_write_file (const ACE_Asynch_Write_File::Result &result);
 
 private:
-  int initiate_read_file (void);
+  int initiate_read_file ();
 
   /// rf (read file): for writing from the file.
   ACE_Asynch_Read_File rf_;
@@ -79,13 +79,13 @@ private:
 };
 
 
-Simple_Tester::Simple_Tester (void)
+Simple_Tester::Simple_Tester ()
   : input_file_ (ACE_INVALID_HANDLE),
     dump_file_ (ACE_INVALID_HANDLE)
 {
 }
 
-Simple_Tester::~Simple_Tester (void)
+Simple_Tester::~Simple_Tester ()
 {
   ACE_OS::close (this->input_file_);
   ACE_OS::close (this->dump_file_);
@@ -93,7 +93,7 @@ Simple_Tester::~Simple_Tester (void)
 
 
 int
-Simple_Tester::open (void)
+Simple_Tester::open ()
 {
   // Initialize stuff
 
@@ -131,7 +131,7 @@ Simple_Tester::open (void)
 
 
 int
-Simple_Tester::initiate_read_file (void)
+Simple_Tester::initiate_read_file ()
 {
   // Create Message_Block
   ACE_Message_Block *mb = 0;
diff --git a/ACE/examples/Reactor/Proactor/test_aiocb.cpp b/ACE/examples/Reactor/Proactor/test_aiocb.cpp
index 88a48951f36..deb1085a773 100644
--- a/ACE/examples/Reactor/Proactor/test_aiocb.cpp
+++ b/ACE/examples/Reactor/Proactor/test_aiocb.cpp
@@ -34,16 +34,16 @@ class Test_Aio
 {
 public:
   /// Default constructor.
-  Test_Aio (void);
+  Test_Aio ();
 
   /// Initting the output file and the buffer.
-  int init (void);
+  int init ();
 
   /// Doing the testing stuff.
-  int do_aio (void);
+  int do_aio ();
 
   /// Destructor.
-  ~Test_Aio (void);
+  ~Test_Aio ();
 private:
   /// Output file descriptor.
   int out_fd_;
@@ -61,7 +61,7 @@ private:
   char *buffer_read_;
 };
 
-Test_Aio::Test_Aio (void)
+Test_Aio::Test_Aio ()
   : aiocb_write_ (new struct aiocb),
     aiocb_read_ (new struct aiocb),
     buffer_write_ (0),
@@ -69,7 +69,7 @@ Test_Aio::Test_Aio (void)
 {
 }
 
-Test_Aio::~Test_Aio (void)
+Test_Aio::~Test_Aio ()
 {
   delete aiocb_write_;
   delete aiocb_read_;
@@ -79,7 +79,7 @@ Test_Aio::~Test_Aio (void)
 
 // Init the output file and init the buffer.
 int
-Test_Aio::init (void)
+Test_Aio::init ()
 {
   // Open the output file.
   this->out_fd_ = open ("test_aio.log", O_RDWR | O_CREAT | O_TRUNC, 0666);
@@ -101,7 +101,7 @@ Test_Aio::init (void)
 // Go on aio_suspend. Wait for completion.
 // Print out the result.
 int
-Test_Aio::do_aio (void)
+Test_Aio::do_aio ()
 {
   // = Write to the file.
 
diff --git a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp
index 13a6c0ab11b..1d9ab41ea23 100644
--- a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp
+++ b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp
@@ -35,16 +35,16 @@ class Test_Aio
 {
 public:
   /// Default constructor.
-  Test_Aio (void);
+  Test_Aio ();
 
   /// Initting the output file and the buffer.
-  int init (void);
+  int init ();
 
   /// Doing the testing stuff.
-  int do_aio (void);
+  int do_aio ();
 
   /// Destructor.
-  ~Test_Aio (void);
+  ~Test_Aio ();
 private:
   /// Output file descriptor.
   int out_fd_;
@@ -62,7 +62,7 @@ private:
   char *buffer_read_;
 };
 
-Test_Aio::Test_Aio (void)
+Test_Aio::Test_Aio ()
   : aiocb_write_ (0),
     aiocb_read_ (0),
     buffer_write_ (0),
@@ -74,7 +74,7 @@ Test_Aio::Test_Aio (void)
            struct aiocb);
 }
 
-Test_Aio::~Test_Aio (void)
+Test_Aio::~Test_Aio ()
 {
   delete aiocb_write_;
   delete aiocb_read_;
@@ -84,7 +84,7 @@ Test_Aio::~Test_Aio (void)
 
 // Init the output file and init the buffer.
 int
-Test_Aio::init (void)
+Test_Aio::init ()
 {
   // Open the output file.
   this->out_fd_ = ACE_OS::open ("test_aio.log",
@@ -114,7 +114,7 @@ Test_Aio::init (void)
 // Go on aio_suspend. Wait for completion.
 // Print out the result.
 int
-Test_Aio::do_aio (void)
+Test_Aio::do_aio ()
 {
   // = Write to the file.
 
diff --git a/ACE/examples/Reactor/Proactor/test_aiosig.cpp b/ACE/examples/Reactor/Proactor/test_aiosig.cpp
index 0dee9cdc9fd..bea369ad140 100644
--- a/ACE/examples/Reactor/Proactor/test_aiosig.cpp
+++ b/ACE/examples/Reactor/Proactor/test_aiosig.cpp
@@ -36,15 +36,15 @@ aiocb aiocb1, aiocb2;
 sigset_t completion_signal;
 
 // Function prototypes.
-int setup_signal_delivery (void);
-int issue_aio_calls (void);
-int query_aio_completions (void);
-int test_aio_calls (void);
-int setup_signal_handler (void);
+int setup_signal_delivery ();
+int issue_aio_calls ();
+int query_aio_completions ();
+int test_aio_calls ();
+int setup_signal_handler ();
 int setup_signal_handler (int signal_number);
 
 int
-setup_signal_delivery (void)
+setup_signal_delivery ()
 {
   // Make the sigset_t consisting of the completion signal.
   if (sigemptyset (&completion_signal) == -1)
@@ -70,7 +70,7 @@ setup_signal_delivery (void)
 }
 
 int
-issue_aio_calls (void)
+issue_aio_calls ()
 {
   // Setup AIOCB.
   aiocb1.aio_fildes = file_handle;
@@ -111,7 +111,7 @@ issue_aio_calls (void)
 }
 
 int
-query_aio_completions (void)
+query_aio_completions ()
 {
   size_t number_of_compleions = 0;
   for (number_of_compleions = 0;
@@ -220,7 +220,7 @@ query_aio_completions (void)
 }
 
 int
-test_aio_calls (void)
+test_aio_calls ()
 {
   // Set up the input file.
   // Open file (in SEQUENTIAL_SCAN mode)
diff --git a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp
index 3da506a1125..4e530b6abf7 100644
--- a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp
+++ b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp
@@ -44,15 +44,15 @@ static aiocb aiocb3;
 static sigset_t completion_signal;
 
 // Function prototypes.
-static int setup_signal_delivery (void);
-static int issue_aio_calls (void);
-static int query_aio_completions (void);
-static int test_aio_calls (void);
+static int setup_signal_delivery ();
+static int issue_aio_calls ();
+static int query_aio_completions ();
+static int test_aio_calls ();
 static void null_handler (int signal_number, siginfo_t *info, void *context);
 static int setup_signal_handler (int signal_number);
 
 static int
-setup_signal_delivery (void)
+setup_signal_delivery ()
 {
   // = Mask all the signals.
 
@@ -116,7 +116,7 @@ setup_signal_handler (int signal_number)
 
 
 static int
-issue_aio_calls (void)
+issue_aio_calls ()
 {
   // Setup AIOCB.
   aiocb1.aio_fildes = file_handle;
@@ -174,7 +174,7 @@ issue_aio_calls (void)
 }
 
 static int
-query_aio_completions (void)
+query_aio_completions ()
 {
   for (size_t number_of_compleions = 0;
        number_of_compleions < 3;
@@ -298,7 +298,7 @@ query_aio_completions (void)
 }
 
 static int
-test_aio_calls (void)
+test_aio_calls ()
 {
   // Set up the input file.
   // Open file (in SEQUENTIAL_SCAN mode)
diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp
index 04df3895080..3ee661d9b30 100644
--- a/ACE/examples/Reactor/Proactor/test_cancel.cpp
+++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp
@@ -56,13 +56,13 @@ static int done = 0;
 static int read_size = 2;
 
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mb_ (read_size + 1),
     handle_ (ACE_INVALID_HANDLE)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Receiver: Closing down Remote connection:%d\n",
diff --git a/ACE/examples/Reactor/Proactor/test_cancel.h b/ACE/examples/Reactor/Proactor/test_cancel.h
index 4ab7daca364..7b2dc6f9dfc 100644
--- a/ACE/examples/Reactor/Proactor/test_cancel.h
+++ b/ACE/examples/Reactor/Proactor/test_cancel.h
@@ -20,8 +20,8 @@ class Receiver : public ACE_Service_Handler
   //     the network connection and dump it to a file.
 
 public:
-  Receiver (void);
-  ~Receiver (void);
+  Receiver ();
+  ~Receiver ();
 
   virtual void open (ACE_HANDLE handle,
                      ACE_Message_Block &message_block);
diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
index 44c67d7e6fb..87cef5d5197 100644
--- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -37,7 +37,7 @@ class My_Task: public ACE_Task <ACE_NULL_SYNCH>
 {
 public:
   // Constructor.
-  My_Task (void)
+  My_Task ()
     : time_flag_ (0)
     {}
 
@@ -68,7 +68,7 @@ public:
     }
 
   // Thread function.
-  int svc (void)
+  int svc ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t):Starting svc routine\n"));
diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
index 54a459d613c..f22cc5d6b57 100644
--- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -29,7 +29,7 @@
 class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler
 {
 public:
-  Timeout_Handler (void)
+  Timeout_Handler ()
     {
     }
 
@@ -67,7 +67,7 @@ class Worker : public ACE_Task <ACE_NULL_SYNCH>
 {
 public:
   // Thread fuction.
-  int svc (void)
+  int svc ()
     {
       ACE_DEBUG ((LM_DEBUG, "(%t) Worker started\n"));
 
diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp
index 241024aa3c3..52c8a271105 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp
@@ -59,13 +59,13 @@ static int done = 0;
 static int initial_read_size = BUFSIZ;
 
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : dump_file_ (ACE_INVALID_HANDLE),
     handle_ (ACE_INVALID_HANDLE)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   ACE_OS::close (this->dump_file_);
   ACE_OS::closesocket (this->handle_);
@@ -158,7 +158,7 @@ Receiver::open (ACE_HANDLE handle,
 }
 
 int
-Receiver::initiate_read_stream (void)
+Receiver::initiate_read_stream ()
 {
   // Create a new <Message_Block>.  Note that this message block will
   // be used both to <read> data asynchronously from the socket and to
@@ -275,8 +275,8 @@ Receiver::handle_write_file (const ACE_Asynch_Write_File::Result &result)
 class Sender : public ACE_Handler
 {
 public:
-  Sender (void);
-  ~Sender (void);
+  Sender ();
+  ~Sender ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
@@ -300,10 +300,10 @@ protected:
 
 private:
   /// Transmit the entire file in one fell swoop.
-  int transmit_file (void);
+  int transmit_file ();
 
   /// Initiate an asynchronous file read.
-  int initiate_read_file (void);
+  int initiate_read_file ();
 
   /// Network I/O handle
   ACE_SOCK_Stream stream_;
@@ -337,7 +337,7 @@ private:
   int transmit_file_done_;
 };
 
-Sender::Sender (void)
+Sender::Sender ()
   : input_file_ (ACE_INVALID_HANDLE),
     file_offset_ (0),
     file_size_ (0),
@@ -351,7 +351,7 @@ Sender::Sender (void)
   this->welcome_message_.wr_ptr (ACE_OS::strlen (data));
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   this->stream_.close ();
 }
@@ -422,7 +422,7 @@ Sender::open (const ACE_TCHAR *host,
 }
 
 int
-Sender::transmit_file (void)
+Sender::transmit_file ()
 {
   // Open file (in SEQUENTIAL_SCAN mode)
   ACE_HANDLE file_handle =
@@ -486,7 +486,7 @@ Sender::handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result)
 }
 
 int
-Sender::initiate_read_file (void)
+Sender::initiate_read_file ()
 {
   // Create a new <Message_Block>.  Note that this message block will
   // be used both to <read> data asynchronously from the file and to
diff --git a/ACE/examples/Reactor/Proactor/test_proactor.h b/ACE/examples/Reactor/Proactor/test_proactor.h
index 3efad0222bd..1dc7b45448e 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor.h
+++ b/ACE/examples/Reactor/Proactor/test_proactor.h
@@ -14,8 +14,8 @@ class Receiver : public ACE_Service_Handler
   //     connections arrive.  This class will then receive data from
   //     the network connection and dump it to a file.
 public:
-  Receiver (void);
-  ~Receiver (void);
+  Receiver ();
+  ~Receiver ();
 
   virtual void open (ACE_HANDLE handle,
                      ACE_Message_Block &message_block);
@@ -33,7 +33,7 @@ protected:
   // completes.
 
 private:
-  int initiate_read_stream (void);
+  int initiate_read_stream ();
   // Initiate an asynchronous <read> operation on the socket.
 
   ACE_Asynch_Read_Stream rs_;
diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
index e15a15c77b6..d0c7da1fe4c 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
@@ -105,8 +105,8 @@ int MyTask::svc ()
 class Receiver : public ACE_Service_Handler
 {
 public:
-  Receiver (void);
-  ~Receiver (void);
+  Receiver ();
+  ~Receiver ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// This is called after the new connection has been accepted.
@@ -128,7 +128,7 @@ protected:
                                     &result);
 
 private:
-  int  initiate_read_stream  (void);
+  int  initiate_read_stream  ();
   int  initiate_write_stream (ACE_Message_Block & mb, int nBytes );
   bool check_destroy () ;
 
@@ -143,7 +143,7 @@ private:
 
 long Receiver::nSessions = 0 ;
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : handle_ (ACE_INVALID_HANDLE),
     nIOCount ( 0 )
 {
@@ -152,7 +152,7 @@ Receiver::Receiver (void)
   ACE_DEBUG ((LM_DEBUG, "Receiver Ctor nSessions=%d\n", nSessions ));
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   ACE_GUARD (MyMutex, locker, m_Mtx);
   nSessions -- ;
@@ -210,7 +210,7 @@ void Receiver::open (ACE_HANDLE handle,
   check_destroy ();
 }
 
-int Receiver::initiate_read_stream (void)
+int Receiver::initiate_read_stream ()
 {
   ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1);
 
@@ -359,8 +359,8 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result
 class Sender : public ACE_Handler
 {
 public:
-  Sender (void);
-  ~Sender (void);
+  Sender ();
+  ~Sender ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
@@ -382,8 +382,8 @@ virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result
 &result);
 
 private:
-int initiate_read_stream (void);
-int initiate_write_stream (void);
+int initiate_read_stream ();
+int initiate_write_stream ();
 
 /// Network I/O handle
 ACE_SOCK_Stream stream_;
@@ -403,14 +403,14 @@ long    nIOCount ;
 
 static const char *data = "Welcome to Irfan World! Irfan RULES here !!\n";
 
-Sender::Sender (void)
+Sender::Sender ()
   :nIOCount ( 0 )
 {
   // Moment of inspiration... :-)
   this->welcome_message_.init (data, ACE_OS::strlen (data));
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   this->close ();
 }
@@ -474,7 +474,7 @@ int Sender::open (const ACE_TCHAR *host, u_short port)
   return 0;
 }
 
-int Sender::initiate_write_stream (void)
+int Sender::initiate_write_stream ()
 {
   ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1);
 
@@ -496,7 +496,7 @@ int Sender::initiate_write_stream (void)
   return 0;
 }
 
-int Sender::initiate_read_stream (void)
+int Sender::initiate_read_stream ()
 {
   ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1);
 
diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
index 7e5ea77f349..293d64a64e7 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
@@ -51,7 +51,7 @@
 //  Some debug helper functions
 static int disable_signal (int sigmin, int sigmax);
 #if 0
-static int print_sigmask (void);
+static int print_sigmask ();
 #endif
 
 #define  COUT(X)  cout << X; cout.flush ();
@@ -90,7 +90,7 @@ class MyTask: public ACE_Task<ACE_MT_SYNCH>
 public:
   MyTask (void) : threads_ (0), proactor_ (0) {}
 
-  int svc (void);
+  int svc ();
   void waitready (void) { event_.wait (); }
 
 private:
@@ -99,12 +99,12 @@ private:
   ACE_Proactor *proactor_;
   ACE_Manual_Event event_;
 
-  void create_proactor (void);
-  void delete_proactor (void);
+  void create_proactor ();
+  void delete_proactor ();
 };
 
 void
-MyTask::create_proactor (void)
+MyTask::create_proactor ()
 {
   ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_);
 
@@ -151,7 +151,7 @@ MyTask::create_proactor (void)
 }
 
 void
-MyTask::delete_proactor (void)
+MyTask::delete_proactor ()
 {
   ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_);
   if (--threads_ == 0)
@@ -164,7 +164,7 @@ MyTask::delete_proactor (void)
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) MyTask started\n"));
 
@@ -183,8 +183,8 @@ MyTask::svc (void)
 class Receiver : public ACE_Service_Handler
 {
 public:
-  Receiver (void);
-  ~Receiver (void);
+  Receiver ();
+  ~Receiver ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// This is called after the new connection has been accepted.
@@ -206,9 +206,9 @@ protected:
   virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
 
 private:
-  int  initiate_read_stream (void);
+  int  initiate_read_stream ();
   int  initiate_write_stream (ACE_Message_Block & mb, int nBytes);
-  int check_destroy (void);
+  int check_destroy ();
 
   ACE_Asynch_Read_Stream rs_;
   ACE_Asynch_Write_Stream ws_;
@@ -220,7 +220,7 @@ private:
 
 long Receiver::sessions_ = 0;
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : handle_ (ACE_INVALID_HANDLE),
     io_count_ (0)
 {
@@ -229,7 +229,7 @@ Receiver::Receiver (void)
   ACE_DEBUG ((LM_DEBUG, "Receiver Ctor sessions_=%d\n", sessions_));
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_);
   sessions_--;
@@ -239,7 +239,7 @@ Receiver::~Receiver (void)
 
 //  return true if we alive, false  we commited suicide
 int
-Receiver::check_destroy (void)
+Receiver::check_destroy ()
 {
   {
     ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1);
@@ -276,7 +276,7 @@ Receiver::open (ACE_HANDLE handle,
 }
 
 int
-Receiver::initiate_read_stream (void)
+Receiver::initiate_read_stream ()
 {
   ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1);
 
@@ -420,13 +420,13 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 class Sender : public ACE_Handler
 {
 public:
-  Sender (void);
-  ~Sender (void);
+  Sender ();
+  ~Sender ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
   int open (const ACE_TCHAR *host, u_short port);
-  void close (void);
+  void close ();
 
   ACE_HANDLE handle () const;
   virtual void handle (ACE_HANDLE);
@@ -441,8 +441,8 @@ protected:
   virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
 
 private:
-  int initiate_read_stream (void);
-  int initiate_write_stream (void);
+  int initiate_read_stream ();
+  int initiate_write_stream ();
 
   /// Network I/O handle
   ACE_SOCK_Stream stream_;
@@ -462,19 +462,19 @@ private:
 
 static const char *data = "Welcome to Irfan World! Irfan RULES here !!\n";
 
-Sender::Sender (void)
+Sender::Sender ()
   : io_count_ (0)
 {
   // Moment of inspiration... :-)
   this->welcome_message_.init (data, ACE_OS::strlen (data));
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   this->close ();
 }
 
-void Sender::close (void)
+void Sender::close ()
 {
   this->stream_.close ();
 }
@@ -531,7 +531,7 @@ int Sender::open (const ACE_TCHAR *host, u_short port)
 }
 
 int
-Sender::initiate_write_stream (void)
+Sender::initiate_write_stream ()
 {
   ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1);
 
@@ -550,7 +550,7 @@ Sender::initiate_write_stream (void)
 }
 
 int
-Sender::initiate_read_stream (void)
+Sender::initiate_read_stream ()
 {
   ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1);
 
@@ -845,7 +845,7 @@ disable_signal (int sigmin, int sigmax)
 
 #if 0
 static int
-print_sigmask (void)
+print_sigmask ()
 {
 #ifndef ACE_WIN32
   sigset_t  mask;
diff --git a/ACE/examples/Reactor/Proactor/test_timeout.cpp b/ACE/examples/Reactor/Proactor/test_timeout.cpp
index 5ac1c9fe36e..1d511a34c06 100644
--- a/ACE/examples/Reactor/Proactor/test_timeout.cpp
+++ b/ACE/examples/Reactor/Proactor/test_timeout.cpp
@@ -32,7 +32,7 @@
 class Timeout_Handler : public ACE_Handler
 {
 public:
-  Timeout_Handler (void)
+  Timeout_Handler ()
     : start_time_ (ACE_OS::gettimeofday ())
     {
     }
@@ -61,7 +61,7 @@ private:
 class Worker : public ACE_Task <ACE_NULL_SYNCH>
 {
 public:
-  int svc (void)
+  int svc ()
     {
       // Handle events for 13 seconds.
       ACE_Time_Value run_time (13);
diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
index 3dffa7bb76f..af43be19501 100644
--- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
+++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
@@ -28,7 +28,7 @@
 class Timeout_Handler : public ACE_Handler
 {
 public:
-  Timeout_Handler (void)
+  Timeout_Handler ()
     : count_ (0),
       start_time_ (ACE_OS::gettimeofday ())
     {
diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
index 35be6c6d568..46805f29b2e 100644
--- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
@@ -44,8 +44,8 @@ static int done = 0;
 class Receiver : public ACE_Service_Handler
 {
 public:
-  Receiver (void);
-  ~Receiver (void);
+  Receiver ();
+  ~Receiver ();
 
   int open_addr (const ACE_INET_Addr &localAddr);
 
@@ -65,13 +65,13 @@ private:
   const char* act_;
 };
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : completion_key_ ("Receiver Completion Key"),
     act_ ("Receiver ACT")
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   sock_dgram_.close ();
 }
@@ -218,8 +218,8 @@ Receiver::handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result)
 class Sender : public ACE_Handler
 {
 public:
-  Sender (void);
-  ~Sender (void);
+  Sender ();
+  ~Sender ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
@@ -243,13 +243,13 @@ private:
   const char* act_;
 };
 
-Sender::Sender (void)
+Sender::Sender ()
   : completion_key_ ("Sender completion key"),
     act_ ("Sender ACT")
 {
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   this->sock_dgram_.close ();
 }
diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h
index 9116f1280ab..0a0fd089e76 100644
--- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h
+++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h
@@ -42,7 +42,7 @@ class AcceptHandler : public ACE_Event_Handler {
          *
          * @return 0 on success, -1 on failure
          */
-        int open(void);
+        int open();
 
         /**
          * @name Overridden methods from the ACE_Event_Handler
diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h
index 4c5100b46ea..b3445ee6433 100644
--- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h
+++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h
@@ -48,7 +48,7 @@ class ReadHandler : public ACE_Event_Handler {
         /**
          * Initialization.
          */
-        ReadHandler(void);
+        ReadHandler();
 
         /**
          * Clean up data.
@@ -58,7 +58,7 @@ class ReadHandler : public ACE_Event_Handler {
         /**
          * Provide access to the internal stream socket.
          */
-        ACE_SOCK_Stream &getStream(void);
+        ACE_SOCK_Stream &getStream();
 
         /**
          * @name Overridden methods from the ACE_Event_Handler
diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
index 5f9792a7166..49775b0ef68 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
@@ -41,7 +41,7 @@ apc_callback (DWORD)
 }
 
 void
-queue_apc (void)
+queue_apc ()
 {
   DWORD result = ::QueueUserAPC (reinterpret_cast<PAPCFUNC> (&apc_callback),
                                                          // pointer to APC function
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp
index 83df6afa6b4..44b1076feb7 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp
@@ -26,7 +26,7 @@ class Event_Handler : public ACE_Event_Handler
 {
 public:
   Event_Handler (ACE_Reactor &reactor);
-  ~Event_Handler (void);
+  ~Event_Handler ();
   int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
   int handle_close (ACE_HANDLE handle,
                     ACE_Reactor_Mask close_mask);
@@ -54,7 +54,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor)
     ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n"));
 }
 
-Event_Handler::~Event_Handler (void)
+Event_Handler::~Event_Handler ()
 {
 }
 
@@ -77,7 +77,7 @@ Event_Handler::handle_close (ACE_HANDLE,
 }
 
 void
-worker (void)
+worker ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) Thread creation\n"));
   ACE_DEBUG ((LM_DEBUG, "(%t) Thread creating temporary file\n"));
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp
index 18e0373eccc..b33b0027522 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp
@@ -24,14 +24,14 @@
 class Event_Handler : public ACE_Event_Handler
 {
 public:
-  Event_Handler (void)
+  Event_Handler ()
     : event_ (1)
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Event_Handler created\n"));
   }
 
-  ~Event_Handler (void)
+  ~Event_Handler ()
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Event_Handler destroyed\n"));
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
index 5d8fe687f6e..78035c00323 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
@@ -56,7 +56,7 @@ public:
   {
   }
 
-  ~Handler (void)
+  ~Handler ()
   {
     this->reactor (0);
   }
@@ -116,7 +116,7 @@ public:
   {
   }
 
-  ~Different_Handler (void)
+  ~Different_Handler ()
   {
     this->reactor (0);
   }
@@ -203,7 +203,7 @@ protected:
 // Selection of which reactor should get created
 //
 ACE_Reactor *
-create_reactor (void)
+create_reactor ()
 {
   ACE_Reactor_Impl *impl = 0;
 
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
index af9f81725dd..ded3e193cb8 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
@@ -33,7 +33,7 @@ static int iterations = 10;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "usage: \n\t"
@@ -84,7 +84,7 @@ public:
                 size_t concurrent_threads);
 
   /// Destructor.
-  ~Task_Handler (void);
+  ~Task_Handler ();
 
   /// Called when object is removed from the ACE_Reactor
   virtual int handle_close (ACE_HANDLE handle,
@@ -98,7 +98,7 @@ public:
                               const void *arg = 0);
 
   /// Task event loop.
-  int svc (void);
+  int svc ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Signal an event.
@@ -111,7 +111,7 @@ private:
 
 // All threads do reactor->handle_events ()
 int
-Task_Handler::svc (void)
+Task_Handler::svc ()
 {
   // Try to become the owner
   ACE_Reactor::instance ()->owner (ACE_Thread::self ());
@@ -139,7 +139,7 @@ Task_Handler::Task_Handler (size_t number_of_handles,
                 "activate"));
 }
 
-Task_Handler::~Task_Handler (void)
+Task_Handler::~Task_Handler ()
 {
   this->reactor (0);
   delete [] this->events_;
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp
index 685cfaf11a3..87145b96e00 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp
@@ -110,8 +110,8 @@ class Network_Listener : public ACE_Event_Handler
 public:
   /// Default constructor
   /// Default constructor
-  Network_Listener (void);
-  ~Network_Listener (void);
+  Network_Listener ();
+  ~Network_Listener ();
 
   virtual int handle_input (ACE_HANDLE handle);
   virtual int handle_close (ACE_HANDLE handle,
@@ -122,7 +122,7 @@ public:
   ACE_SOCK_Acceptor acceptor_;
 };
 
-Network_Listener::Network_Listener (void)
+Network_Listener::Network_Listener ()
   : local_address_ (ACE_DEFAULT_SERVER_PORT),
     acceptor_ (local_address_, 1)
 {
@@ -132,7 +132,7 @@ Network_Listener::Network_Listener (void)
   ACE_TEST_ASSERT (result == 0);
 }
 
-Network_Listener::~Network_Listener (void)
+Network_Listener::~Network_Listener ()
 {
 }
 
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp
index d3d069885ea..b6816aada54 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp
@@ -44,7 +44,7 @@ class Simple_Handler : public ACE_Event_Handler
 {
 public:
   /// Default constructor
-  Simple_Handler (void);
+  Simple_Handler ();
 
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
   virtual int handle_close (ACE_HANDLE handle,
@@ -56,7 +56,7 @@ public:
   int handle_close_count_;
 };
 
-Simple_Handler::Simple_Handler (void)
+Simple_Handler::Simple_Handler ()
   : handle_signal_count_ (0),
     handle_close_count_ (0)
 {
@@ -106,7 +106,7 @@ Simple_Handler::handle_close (ACE_HANDLE handle,
 Simple_Handler simple_handler;
 
 void
-worker (void)
+worker ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) Thread creation\n"));
   ACE_DEBUG ((LM_DEBUG, "(%t) Thread sleeping\n"));
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
index c5b166217a4..7a16cab0692 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
@@ -26,11 +26,11 @@ class Event_Handler : public ACE_Event_Handler
 {
 public:
   Event_Handler (ACE_Reactor &reactor);
-  ~Event_Handler (void);
+  ~Event_Handler ();
   int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
   int handle_close (ACE_HANDLE handle,
                     ACE_Reactor_Mask close_mask);
-  ACE_Registry::Naming_Context &context (void);
+  ACE_Registry::Naming_Context &context ();
 
 private:
   ACE_Auto_Event event_;
@@ -55,7 +55,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor)
     ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n"));
 }
 
-Event_Handler::~Event_Handler (void)
+Event_Handler::~Event_Handler ()
 {
 }
 
@@ -84,7 +84,7 @@ Event_Handler::handle_close (ACE_HANDLE,
 }
 
 ACE_Registry::Naming_Context &
-Event_Handler::context (void)
+Event_Handler::context ()
 {
   return this->context_;
 }
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
index df47a665049..44a93e339a7 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
@@ -151,7 +151,7 @@ class Peer_Handler : public MT_TASK, public ACE_Handler
 {
 public:
   Peer_Handler (int argc, ACE_TCHAR *argv[]);
-  ~Peer_Handler (void);
+  ~Peer_Handler ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /**
@@ -243,7 +243,7 @@ public:
   virtual int close (u_long = 0);
 
   /// Thread runs here as an active object.
-  int svc (void);
+  int svc ();
 
   int handle_close (ACE_HANDLE,
                     ACE_Reactor_Mask);
@@ -254,7 +254,7 @@ private:
   static void handler (int signum);
 
   /// Helper function to register with the Reactor for thread exit.
-  void register_thread_exit_hook (void);
+  void register_thread_exit_hook ();
 
   /// The STDIN thread has exited.  This means the user hit ^C.  We can
   /// end the event loop.
@@ -297,7 +297,7 @@ Peer_Handler::Peer_Handler (int argc, ACE_TCHAR *argv[])
     }
 }
 
-Peer_Handler::~Peer_Handler (void)
+Peer_Handler::~Peer_Handler ()
 {
 }
 
@@ -471,7 +471,7 @@ STDIN_Handler::close (u_long)
 // Thread runs here.
 
 int
-STDIN_Handler::svc (void)
+STDIN_Handler::svc ()
 {
   this->register_thread_exit_hook ();
 
@@ -512,7 +512,7 @@ STDIN_Handler::svc (void)
 // Register an exit hook with the reactor.
 
 void
-STDIN_Handler::register_thread_exit_hook (void)
+STDIN_Handler::register_thread_exit_hook ()
 {
   // Get a real handle to our thread.
   ACE_Thread_Manager::instance ()->thr_self (this->thr_handle_);
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp
index bc7b068ebde..e346a8bec6f 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp
@@ -28,7 +28,7 @@
 class Timeout_Handler : public ACE_Event_Handler
 {
 public:
-  Timeout_Handler (void)
+  Timeout_Handler ()
     : count_ (0) {}
 
     /// Print out when timeouts occur.
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
index 1999c84271d..0575e55fa0f 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
@@ -17,7 +17,7 @@ static ACE_TCHAR *program_name;
 static unsigned short broadcast_port_number = ACE_DEFAULT_BROADCAST_PORT;
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_OS::fprintf (stderr, "usage: %s [-p broadcast portnum]\n",
                    ACE_TEXT_ALWAYS_CHAR (program_name));
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
index b40cfa5c237..85b5b343f5b 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
@@ -24,7 +24,7 @@ static const ACE_TCHAR *rendezvous_dgram = ACE_TEXT ("/tmp/foo_dgram");
 static const ACE_TCHAR *file_name = ACE_TEXT ("local_data");
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("usage: %s [-r rendezvous_dgram] ")
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
index f962221ca77..c9ef86849e7 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
@@ -21,7 +21,7 @@ static const ACE_TCHAR *rendezvous_fifo = ACE_TEXT("/tmp/foo_fifo");
 static const ACE_TCHAR *file_name = ACE_TEXT("./local_data");
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               "usage: %s [-d] [-f rendezvous_fifo]\n",
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
index 79f193c1fb8..829522f94f0 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
@@ -21,7 +21,7 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_pipe");
 static const ACE_TCHAR *file_name = ACE_TEXT ("local_data");
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"),
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
index c571ab1c927..18109c9cb0d 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
@@ -20,7 +20,7 @@ static const ACE_TCHAR *rendezvous_spipe = ACE_TEXT ("/tmp/foo_spipe");
 static const ACE_TCHAR *file_name = ACE_TEXT ("./local_data");
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("usage: %s [-d] [-r rendezvous_spipe]\n"),
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
index 5151f99c8c1..1b33350b3de 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
@@ -19,7 +19,7 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_stream");
 static const ACE_TCHAR *file_name = ACE_TEXT ("local_data");
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"),
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
index af3067efbca..37efd678c32 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
@@ -20,7 +20,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST;
 // Name of file to send.
 static const ACE_TCHAR *file_name = ACE_TEXT("./remote_data");
 
-static void print_usage_and_die (void)
+static void print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               "usage: %s [-p portnum] [-h host_name] [-f file]\n",
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
index 1dfed4b7de6..66aa05734a2 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
@@ -19,7 +19,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST;
 static int remote_reconfigure = 0;
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               "usage: %n [-p portnum] [-h host_name] [-r]\n"));
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
index 297b9bba245..62f09757075 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
@@ -25,7 +25,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST;
 static const ACE_TCHAR *file_name = ACE_TEXT("./remote_data");
 
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               "usage: %s [-p portnum] [-h host_name] [-f file]\n",
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
index 086cb64c964..edd852437d0 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
@@ -23,7 +23,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST;
 // Name of file to send.
 static const ACE_TCHAR *file_name = ACE_TEXT ("./remote_data");
 
-static void print_usage_and_die (void)
+static void print_usage_and_die ()
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("usage: %s [-p portnum] [-h host_name] [-f file]\n"),
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
index ee07d34fa2f..9bd499624d4 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
@@ -3,21 +3,21 @@
 #if defined (SunOS4)
 extern "C"
 {
-  int init (void);
-  int fini (void);
+  int init ();
+  int fini ();
   void __sti__Handle_Broadcast_C_init_();
   void __std__Handle_Broadcast_C_init_();
 }
 
 int
-init (void)
+init ()
 {
   __sti__Handle_Broadcast_C_init_();
   return 0;
 }
 
 int
-fini (void)
+fini ()
 {
   __std__Handle_Broadcast_C_init_();
   return 0;
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
index dac570674eb..52c04194130 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
@@ -20,8 +20,8 @@
 class ACE_Svc_Export Handle_Broadcast : public ACE_Service_Object, public ACE_SOCK_Dgram
 {
 public:
-  Handle_Broadcast (void);
-  ~Handle_Broadcast (void);
+  Handle_Broadcast ();
+  ~Handle_Broadcast ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
index d7e54b2e4c8..6ceb2201985 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
@@ -21,7 +21,7 @@
 class ACE_Svc_Export Handle_L_CODgram : public ACE_Service_Object, public ACE_LSOCK_CODgram
 {
 public:
-  Handle_L_CODgram (void);
+  Handle_L_CODgram ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
index 53059e67004..323b4b5e1b7 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
@@ -21,7 +21,7 @@
 class ACE_Svc_Export Handle_L_Dgram : public ACE_Service_Object, public ACE_LSOCK_Dgram
 {
 public:
-  Handle_L_Dgram (void);
+  Handle_L_Dgram ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
index e38bab25073..7eff9d9db0c 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
@@ -4,21 +4,21 @@
 #if defined (SunOS4)
 extern "C"
 {
-  int init (void);
-  int fini (void);
+  int init ();
+  int fini ();
   void __sti__Handle_L_FIFO_C_init_();
   void __std__Handle_L_FIFO_C_init_();
 }
 
 int
-init (void)
+init ()
 {
   __sti__Handle_L_FIFO_C_init_();
   return 0;
 }
 
 int
-fini (void)
+fini ()
 {
   __std__Handle_L_FIFO_C_init_();
   return 0;
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
index 989dd102f91..2268c92f2b9 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
@@ -20,7 +20,7 @@
 class ACE_Svc_Export Handle_L_FIFO : public ACE_Service_Object, public ACE_FIFO_Recv_Msg
 {
 public:
-  Handle_L_FIFO (void);
+  Handle_L_FIFO ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
index 3e944acc5e2..5e34a65347f 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
@@ -22,8 +22,8 @@
 class ACE_Svc_Export Handle_L_Pipe : public ACE_Service_Object, public ACE_LSOCK_Acceptor
 {
 public:
-  Handle_L_Pipe (void);
-  ~Handle_L_Pipe (void);
+  Handle_L_Pipe ();
+  ~Handle_L_Pipe ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
index 79fa31707c8..5a247db7e0c 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
@@ -21,7 +21,7 @@
 class ACE_Svc_Export Handle_L_SPIPE : public ACE_Service_Object, public ACE_SPIPE_Acceptor
 {
 public:
-  Handle_L_SPIPE (void);
+  Handle_L_SPIPE ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
index a56631f61e6..54e34be7be9 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
@@ -21,8 +21,8 @@
 class ACE_Svc_Export Handle_L_Stream : public ACE_Service_Object, public ACE_LSOCK_Acceptor
 {
 public:
-  Handle_L_Stream (void);
-  ~Handle_L_Stream (void);
+  Handle_L_Stream ();
+  ~Handle_L_Stream ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
index 4600d5840d1..a21a39e6fe1 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
@@ -3,21 +3,21 @@
 #if defined (SunOS4)
 extern "C"
 {
-  int init (void);
-  int fini (void);
+  int init ();
+  int fini ();
   void __sti__Handle_R_Dgram_C_init_();
   void __std__Handle_R_Dgram_C_init_();
 }
 
 int
-init (void)
+init ()
 {
   __sti__Handle_R_Dgram_C_init_();
   return 0;
 }
 
 int
-fini (void)
+fini ()
 {
   __std__Handle_R_Dgram_C_init_();
   return 0;
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
index 6c0be72cb70..c2181e86b55 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
@@ -19,7 +19,7 @@
 class ACE_Svc_Export Handle_R_Dgram : public ACE_Service_Object, public ACE_SOCK_Dgram
 {
 public:
-  Handle_R_Dgram (void);
+  Handle_R_Dgram ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
index f478d26dcc3..8ce2a3214a2 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
@@ -3,21 +3,21 @@
 #if defined (SunOS4)
 extern "C"
 {
-  int init (void);
-  int fini (void);
+  int init ();
+  int fini ();
   void __sti__Handle_R_Stream_C_recv_n_();
   void __std__Handle_R_Stream_C_recv_n_();
 }
 
 int
-init (void)
+init ()
 {
   __sti__Handle_R_Stream_C_recv_n_();
   return 0;
 }
 
 int
-fini (void)
+fini ()
 {
   __std__Handle_R_Stream_C_recv_n_();
   return 0;
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index e192ccab1c6..3b551e2550c 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -21,7 +21,7 @@
 class ACE_Svc_Export Handle_R_Stream : public ACE_Service_Object, public ACE_SOCK_Acceptor
 {
 public:
-  Handle_R_Stream (void);
+  Handle_R_Stream ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index 41a5d36c25c..172fefacc57 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -21,12 +21,12 @@
 #define PR_ST_2 ACE_PEER_STREAM_2
 
 template <class SVH, PR_AC_1>
-Handle_Thr_Acceptor<SVH, PR_AC_2>::~Handle_Thr_Acceptor (void)
+Handle_Thr_Acceptor<SVH, PR_AC_2>::~Handle_Thr_Acceptor ()
 {
 }
 
 template <class SVH, PR_AC_1>
-Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor (void)
+Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor ()
   : thr_flags_ (THR_DETACHED | THR_NEW_LWP)
 {
 }
@@ -98,7 +98,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
 }
 
 template <class SVH, PR_AC_1> int
-Handle_Thr_Acceptor<SVH, PR_AC_2>::fini (void)
+Handle_Thr_Acceptor<SVH, PR_AC_2>::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
@@ -141,7 +141,7 @@ CLI_Stream<PR_ST_2>::open (void *)
 }
 
 template <PR_ST_1> int
-CLI_Stream<PR_ST_2>::svc (void)
+CLI_Stream<PR_ST_2>::svc ()
 {
   char buf[BUFSIZ];
   char login_name[ACE_MAX_USERID];
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
index 8db8172dca3..13e5b419445 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
@@ -20,8 +20,8 @@ class Handle_Thr_Acceptor : public ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_A
   //   configured <ACE_Thread_Strategy>.
 {
 public:
-  Handle_Thr_Acceptor (void);
-  ~Handle_Thr_Acceptor (void);
+  Handle_Thr_Acceptor ();
+  ~Handle_Thr_Acceptor ();
 
   // = Dynamic linking hooks.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
index a7eb8b74cb8..445dc1c05dd 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
@@ -3,21 +3,21 @@
 #if defined (SunOS4)
 extern "C"
 {
-  int init (void);
-  int fini (void);
+  int init ();
+  int fini ();
   void __sti__Handle_Timeout_C_init_();
   void __std__Handle_Timeout_C_init_();
 }
 
 int
-init (void)
+init ()
 {
   __sti__Handle_Timeout_C_init_();
   return 0;
 }
 
 int
-fini (void)
+fini ()
 {
   __std__Handle_Timeout_C_init_();
   return 0;
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index 5e3ddd628d2..6f56eef2d3f 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -18,7 +18,7 @@
 class ACE_Svc_Export Handle_Timeout : public ACE_Service_Object
 {
 public:
-  Handle_Timeout (void);
+  Handle_Timeout ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini ();
diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp
index 6ce12e216f0..6415f164d97 100644
--- a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp
+++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp
@@ -3,7 +3,7 @@
 #include "ace/Log_Msg.h"
 
 
-Timer_Service_1::Timer_Service_1 (void)
+Timer_Service_1::Timer_Service_1 ()
 {
   ACE_OS::strcpy (this->name_,
                   ACE_TEXT ("Timer_Service_1"));
@@ -104,13 +104,13 @@ Timer_Service_1::handle_close (ACE_HANDLE,
   return 0;
 }
 
-Timer_Service_2::Timer_Service_2 (void)
+Timer_Service_2::Timer_Service_2 ()
 {
   ACE_OS::strcpy (this->name_,
                   ACE_TEXT ("Timer_Service_2"));
 }
 
-Timer_Service_3::Timer_Service_3 (void)
+Timer_Service_3::Timer_Service_3 ()
 {
   ACE_OS::strcpy (this->name_,
                   ACE_TEXT ("Timer_Service_3"));
diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.h b/ACE/examples/Service_Configurator/Misc/Timer_Service.h
index 148278f396d..e886818cf96 100644
--- a/ACE/examples/Service_Configurator/Misc/Timer_Service.h
+++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.h
@@ -16,7 +16,7 @@ class ACE_Svc_Export Timer_Service_1 : public ACE_Service_Object
   //   Demonstrates a simple timer service that can be configured
   //   statically.
 public:
-  Timer_Service_1 (void);
+  Timer_Service_1 ();
   // Default constructor.
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
@@ -50,14 +50,14 @@ private:
 class ACE_Svc_Export Timer_Service_2 : public Timer_Service_1
 {
 public:
-  Timer_Service_2 (void);
+  Timer_Service_2 ();
   // Default constructor.
 };
 
 class ACE_Svc_Export Timer_Service_3 : public Timer_Service_1
 {
 public:
-  Timer_Service_3 (void);
+  Timer_Service_3 ();
   // Default constructor.
 };
 
diff --git a/ACE/examples/Shared_Malloc/Malloc.cpp b/ACE/examples/Shared_Malloc/Malloc.cpp
index 1115e9d1e88..d4a8e0b0fa9 100644
--- a/ACE/examples/Shared_Malloc/Malloc.cpp
+++ b/ACE/examples/Shared_Malloc/Malloc.cpp
@@ -40,7 +40,7 @@ ACE_Allocator *Malloc::instance_ = 0;
 // This is a factory that decides what type of allocator to create.
 
 ACE_Allocator *
-Malloc::instance (void)
+Malloc::instance ()
 {
   if (Malloc::instance_ == 0)
     {
diff --git a/ACE/examples/Shared_Malloc/Malloc.h b/ACE/examples/Shared_Malloc/Malloc.h
index 2cce26fb98e..facf80c8236 100644
--- a/ACE/examples/Shared_Malloc/Malloc.h
+++ b/ACE/examples/Shared_Malloc/Malloc.h
@@ -17,11 +17,11 @@ class Malloc
   //      Allocator Singleton.
 {
 public:
-  static ACE_Allocator *instance (void);
+  static ACE_Allocator *instance ();
   // Returns static instance.
 
 private:
-  Malloc (void);
+  Malloc ();
   // Ensure Singleton.
 
   static ACE_Allocator *instance_;
diff --git a/ACE/examples/Shared_Malloc/Options.cpp b/ACE/examples/Shared_Malloc/Options.cpp
index 4e4a8c300ba..0c8fc3710d2 100644
--- a/ACE/examples/Shared_Malloc/Options.cpp
+++ b/ACE/examples/Shared_Malloc/Options.cpp
@@ -8,7 +8,7 @@
 Options *Options::instance_ = 0;
 
 Options *
-Options::instance (void)
+Options::instance ()
 {
   if (Options::instance_ == 0)
     Options::instance_ = new Options ();
@@ -17,73 +17,73 @@ Options::instance (void)
 }
 
 const char *
-Options::program_name (void)
+Options::program_name ()
 {
   return this->program_name_;
 }
 
 const char *
-Options::slave_name (void)
+Options::slave_name ()
 {
   return this->slave_name_;
 }
 
 int
-Options::debug (void)
+Options::debug ()
 {
   return this->debug_;
 }
 
 int
-Options::exec_slave (void)
+Options::exec_slave ()
 {
   return this->exec_slave_;
 }
 
 size_t
-Options::iteration_count (void)
+Options::iteration_count ()
 {
   return this->iteration_count_;
 }
 
 int
-Options::use_sbrk (void)
+Options::use_sbrk ()
 {
   return this->use_sbrk_;
 }
 
 size_t
-Options::max_msg_size (void)
+Options::max_msg_size ()
 {
   return this->max_msg_size_;
 }
 
 size_t
-Options::spawn_count (void)
+Options::spawn_count ()
 {
   return this->spawn_count_;
 }
 
 int
-Options::spawn_threads (void)
+Options::spawn_threads ()
 {
   return this->spawn_threads_;
 }
 
 int
-Options::use_mmap (void)
+Options::use_mmap ()
 {
   return this->use_mmap_;
 }
 
 int
-Options::use_shmem (void)
+Options::use_shmem ()
 {
   return this->use_shmem_;
 }
 
 int
-Options::child (void)
+Options::child ()
 {
   return this->child_;
 }
@@ -91,7 +91,7 @@ Options::child (void)
 // Explain usage and exit.
 
 void
-Options::print_usage_and_die (void)
+Options::print_usage_and_die ()
 {
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_ERROR ((LM_ERROR,
@@ -112,7 +112,7 @@ Options::print_usage_and_die (void)
   /* NOTREACHED */
 }
 
-Options::Options (void)
+Options::Options ()
   : debug_ (0),
     exec_slave_ (0),
     iteration_count_ (100),
diff --git a/ACE/examples/Shared_Malloc/Options.h b/ACE/examples/Shared_Malloc/Options.h
index 0c23fd3d894..1fd71fde574 100644
--- a/ACE/examples/Shared_Malloc/Options.h
+++ b/ACE/examples/Shared_Malloc/Options.h
@@ -14,34 +14,34 @@ class Options
   //   Options Singleton.
 {
 public:
-  static Options *instance (void);
+  static Options *instance ();
   // Return Singleton.
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the arguments.
 
   // = Accessor methods.
-  const char *program_name (void);
-  const char *slave_name (void);
-  int debug (void);
-  int exec_slave (void);
-  size_t iteration_count (void);
-  int use_sbrk (void);
-  int use_shmem (void);
-  size_t max_msg_size (void);
-  size_t spawn_count (void);
-  int spawn_threads (void);
-  int use_mmap (void);
-  int child (void);
+  const char *program_name ();
+  const char *slave_name ();
+  int debug ();
+  int exec_slave ();
+  size_t iteration_count ();
+  int use_sbrk ();
+  int use_shmem ();
+  size_t max_msg_size ();
+  size_t spawn_count ();
+  int spawn_threads ();
+  int use_mmap ();
+  int child ();
 
 private:
-  Options (void);
+  Options ();
   // Ensure Singleton.
 
   static Options *instance_;
   // Singleton.
 
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
   // Explain usage and exit.
 
   char program_name_[MAXPATHLEN];
diff --git a/ACE/examples/Shared_Malloc/test_malloc.cpp b/ACE/examples/Shared_Malloc/test_malloc.cpp
index fb2fa936954..d0a1bf279f9 100644
--- a/ACE/examples/Shared_Malloc/test_malloc.cpp
+++ b/ACE/examples/Shared_Malloc/test_malloc.cpp
@@ -15,7 +15,7 @@
 
 
 static int
-gen_size (void)
+gen_size ()
 {
 #if defined (ACE_HAS_THREADS)
   unsigned int seed =
@@ -97,7 +97,7 @@ worker (void *arg)
 // Create the appropriate type of process/thread.
 
 static void
-spawn (void)
+spawn ()
 {
   if (Options::instance ()->spawn_threads ())
     {
@@ -168,7 +168,7 @@ spawn (void)
 // Wait for all the child processes/threads to exit.
 
 static void
-wait_for_children (void)
+wait_for_children ()
 {
   if (Options::instance ()->spawn_threads ())
     {
diff --git a/ACE/examples/Shared_Malloc/test_persistence.cpp b/ACE/examples/Shared_Malloc/test_persistence.cpp
index 5635297da03..661d37abb30 100644
--- a/ACE/examples/Shared_Malloc/test_persistence.cpp
+++ b/ACE/examples/Shared_Malloc/test_persistence.cpp
@@ -86,14 +86,14 @@ class GUI_Handler
 public:
   GUI_Handler (void) { menu (); }
 
-  ~GUI_Handler (void)
+  ~GUI_Handler ()
   {
     TEST_MALLOC::MEMORY_POOL &pool =
       shmem_allocator->memory_pool ();
     pool.sync ();
   }
 
-  int service(void)
+  int service()
   {
     char option[BUFSIZ];
     char buf1[BUFSIZ];
@@ -149,7 +149,7 @@ public:
     return 0;
   }
 
-  void menu(void)
+  void menu()
   {
     cout << endl;
     cout << "\t**************************                                  " << endl;
@@ -169,7 +169,7 @@ private:
   int insert_employee (const char *name,
                        u_long id);
   int find_employee (const char *name);
-  int list_employees (void);
+  int list_employees ();
   int delete_employee (const char *name);
 };
 
@@ -219,7 +219,7 @@ GUI_Handler::find_employee (const char *name)
 }
 
 int
-GUI_Handler::list_employees (void)
+GUI_Handler::list_employees ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "The following employees were found.......\n\n"));
diff --git a/ACE/examples/Shared_Memory/test_MM.cpp b/ACE/examples/Shared_Memory/test_MM.cpp
index a589bde588c..03be6b7363a 100644
--- a/ACE/examples/Shared_Memory/test_MM.cpp
+++ b/ACE/examples/Shared_Memory/test_MM.cpp
@@ -8,7 +8,7 @@
 ACE_TCHAR shm_key[] = ACE_TEXT ("/tmp/fooXXXXXX");
 
 static void
-client (void)
+client ()
 {
   ACE_Shared_Memory *shm_client = new ACE_Shared_Memory_MM (shm_key);
   char *shm = (char *) shm_client->malloc ();
@@ -21,7 +21,7 @@ client (void)
 }
 
 static void
-server (void)
+server ()
 {
   ACE_Shared_Memory *shm_server = new ACE_Shared_Memory_MM (shm_key, SHMSZ);
   char *shm = (char *) shm_server->malloc ();
diff --git a/ACE/examples/Shared_Memory/test_SV.cpp b/ACE/examples/Shared_Memory/test_SV.cpp
index 217acf068fc..ac20d33e93a 100644
--- a/ACE/examples/Shared_Memory/test_SV.cpp
+++ b/ACE/examples/Shared_Memory/test_SV.cpp
@@ -6,7 +6,7 @@
 #define SHM_KEY (key_t) 5678
 
 static void
-client (void)
+client ()
 {
   ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ);
   char *shm = (char *) shm_client.malloc ();
@@ -19,7 +19,7 @@ client (void)
 }
 
 static void
-server (void)
+server ()
 {
   ACE_Shared_Memory_SV shm_server (SHM_KEY,
                                    SHMSZ,
diff --git a/ACE/examples/Smart_Pointers/Gadget.cpp b/ACE/examples/Smart_Pointers/Gadget.cpp
index 3ecbe663e2a..f0dc39b0f6d 100644
--- a/ACE/examples/Smart_Pointers/Gadget.cpp
+++ b/ACE/examples/Smart_Pointers/Gadget.cpp
@@ -9,6 +9,6 @@
 
 #include "Gadget.h"
 
-Gadget::~Gadget (void)
+Gadget::~Gadget ()
 {
 }
diff --git a/ACE/examples/Smart_Pointers/Gadget.h b/ACE/examples/Smart_Pointers/Gadget.h
index 9455faa05ef..9fca7c5c22c 100644
--- a/ACE/examples/Smart_Pointers/Gadget.h
+++ b/ACE/examples/Smart_Pointers/Gadget.h
@@ -22,7 +22,7 @@ class Gadget
 {
 public:
   /// Destructor.
-  virtual ~Gadget (void);
+  virtual ~Gadget ();
 
   /// Add a new part to the gadget. The gadget automatically takes shared
   /// responsibility for the ownership of the part object since we are passing
diff --git a/ACE/examples/Smart_Pointers/Gadget_Factory.cpp b/ACE/examples/Smart_Pointers/Gadget_Factory.cpp
index 503e2edce68..5461f7190c6 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Factory.cpp
+++ b/ACE/examples/Smart_Pointers/Gadget_Factory.cpp
@@ -10,7 +10,7 @@
 #include "Gadget_Factory.h"
 #include "Gadget_Impl.h"
 
-Gadget_var Gadget_Factory::create_gadget (void)
+Gadget_var Gadget_Factory::create_gadget ()
 {
   return Gadget_var (new Gadget_Impl);
 }
diff --git a/ACE/examples/Smart_Pointers/Gadget_Factory.h b/ACE/examples/Smart_Pointers/Gadget_Factory.h
index adead6f2d00..42bfce567d3 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Factory.h
+++ b/ACE/examples/Smart_Pointers/Gadget_Factory.h
@@ -24,7 +24,7 @@ public:
   /// transferred to the caller since we return a Gadget_var. This also means
   /// that the object will be deleted automatically if the caller "forgets" to
   /// collect the return value.
-  static Gadget_var create_gadget (void);
+  static Gadget_var create_gadget ();
 };
 
 #endif /* GADGET_FACTORY_H */
diff --git a/ACE/examples/Smart_Pointers/Gadget_Impl.cpp b/ACE/examples/Smart_Pointers/Gadget_Impl.cpp
index 32b7d1167df..d7227c94614 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Impl.cpp
+++ b/ACE/examples/Smart_Pointers/Gadget_Impl.cpp
@@ -10,12 +10,12 @@
 #include "Gadget_Impl.h"
 #include "ace/Log_Msg.h"
 
-Gadget_Impl::Gadget_Impl (void)
+Gadget_Impl::Gadget_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Gadget_Impl constructor\n"));
 }
 
-Gadget_Impl::~Gadget_Impl (void)
+Gadget_Impl::~Gadget_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Gadget_Impl destructor\n"));
 }
@@ -25,7 +25,7 @@ void Gadget_Impl::add_part (Gadget_Part_var part)
   parts_.enqueue_tail (part);
 }
 
-Gadget_Part_var Gadget_Impl::remove_part (void)
+Gadget_Part_var Gadget_Impl::remove_part ()
 {
   Gadget_Part_var removed_part;
   if (parts_.dequeue_head (removed_part) == -1)
@@ -33,7 +33,7 @@ Gadget_Part_var Gadget_Impl::remove_part (void)
   return removed_part;
 }
 
-void Gadget_Impl::list_parts (void)
+void Gadget_Impl::list_parts ()
 {
   ACE_Unbounded_Queue_Iterator<Gadget_Part_var> iter (parts_);
   Gadget_Part_var *current_part;
diff --git a/ACE/examples/Smart_Pointers/Gadget_Impl.h b/ACE/examples/Smart_Pointers/Gadget_Impl.h
index b52663fa2ec..d0731c31b22 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Impl.h
+++ b/ACE/examples/Smart_Pointers/Gadget_Impl.h
@@ -23,10 +23,10 @@ class Gadget_Impl : public Gadget
 {
 public:
   /// Constructor.
-  Gadget_Impl (void);
+  Gadget_Impl ();
 
   /// Destructor.
-  virtual ~Gadget_Impl (void);
+  virtual ~Gadget_Impl ();
 
   /// Add a new part to the gadget. The gadget takes ownership of the part
   /// object.
@@ -34,10 +34,10 @@ public:
 
   /// Remove a random part from the gadget. Ownership of the part is returned
   /// to the caller.
-  virtual Gadget_Part_var remove_part (void);
+  virtual Gadget_Part_var remove_part ();
 
   /// Ask the gadget to print information about the parts that it contains.
-  virtual void list_parts (void);
+  virtual void list_parts ();
 
 private:
   /// The parts which make up this gadget. The set actually contains instances
diff --git a/ACE/examples/Smart_Pointers/Gadget_Part.cpp b/ACE/examples/Smart_Pointers/Gadget_Part.cpp
index b70887f57fb..6aebdecb45d 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Part.cpp
+++ b/ACE/examples/Smart_Pointers/Gadget_Part.cpp
@@ -9,6 +9,6 @@
 
 #include "Gadget_Part.h"
 
-Gadget_Part::~Gadget_Part (void)
+Gadget_Part::~Gadget_Part ()
 {
 }
diff --git a/ACE/examples/Smart_Pointers/Gadget_Part.h b/ACE/examples/Smart_Pointers/Gadget_Part.h
index 5132dfffcff..c2ff23b0df2 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Part.h
+++ b/ACE/examples/Smart_Pointers/Gadget_Part.h
@@ -23,7 +23,7 @@ class Gadget_Part
 {
 public:
   /// Destructor.
-  virtual ~Gadget_Part (void);
+  virtual ~Gadget_Part ();
 
   /// Ask the part to print information about itself.
   virtual void print_info (void) = 0;
diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp
index 30c1b0dc831..cee3b09e548 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp
+++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp
@@ -22,19 +22,19 @@ Gadget_Part_Impl::Gadget_Part_Impl (Gadget_ptr owner,
   ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl constructor\n"));
 }
 
-Gadget_Part_Impl::~Gadget_Part_Impl (void)
+Gadget_Part_Impl::~Gadget_Part_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl destructor\n"));
 
   delete [] name_;
 }
 
-void Gadget_Part_Impl::print_info (void)
+void Gadget_Part_Impl::print_info ()
 {
   ACE_DEBUG ((LM_INFO, "Gadget part: name=%s size=%d\n", name_, size_));
 }
 
-void Gadget_Part_Impl::remove_from_owner (void)
+void Gadget_Part_Impl::remove_from_owner ()
 {
   // Need to guarantee the existence of the owner for the duration of this call.
   Gadget_var owner = owner_;
diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h
index 0b63e139a59..7acd3e631d1 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h
+++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h
@@ -25,13 +25,13 @@ public:
   Gadget_Part_Impl (Gadget_ptr owner, const char* name, int size);
 
   /// Destructor.
-  virtual ~Gadget_Part_Impl (void);
+  virtual ~Gadget_Part_Impl ();
 
   /// Ask the part to print information about itself.
-  virtual void print_info (void);
+  virtual void print_info ();
 
   /// Ask the part to remove itself from the gadget that contains it.
-  virtual void remove_from_owner (void);
+  virtual void remove_from_owner ();
 
 private:
   /// The gadget that contains this part.
diff --git a/ACE/examples/Smart_Pointers/Widget.cpp b/ACE/examples/Smart_Pointers/Widget.cpp
index de56e871a72..92ee6266166 100644
--- a/ACE/examples/Smart_Pointers/Widget.cpp
+++ b/ACE/examples/Smart_Pointers/Widget.cpp
@@ -9,6 +9,6 @@
 
 #include "Widget.h"
 
-Widget::~Widget (void)
+Widget::~Widget ()
 {
 }
diff --git a/ACE/examples/Smart_Pointers/Widget.h b/ACE/examples/Smart_Pointers/Widget.h
index 7c1d1ad85c9..b838fa35877 100644
--- a/ACE/examples/Smart_Pointers/Widget.h
+++ b/ACE/examples/Smart_Pointers/Widget.h
@@ -21,7 +21,7 @@ class Widget
 {
 public:
   /// Destructor.
-  virtual ~Widget (void);
+  virtual ~Widget ();
 
   /// Add a new part to the widget. The widget takes ownership of the part
   /// object.
diff --git a/ACE/examples/Smart_Pointers/Widget_Factory.cpp b/ACE/examples/Smart_Pointers/Widget_Factory.cpp
index e35119d3d51..52921fa0d1f 100644
--- a/ACE/examples/Smart_Pointers/Widget_Factory.cpp
+++ b/ACE/examples/Smart_Pointers/Widget_Factory.cpp
@@ -10,7 +10,7 @@
 #include "Widget_Factory.h"
 #include "Widget_Impl.h"
 
-Widget *Widget_Factory::create_widget (void)
+Widget *Widget_Factory::create_widget ()
 {
   return new Widget_Impl;
 }
diff --git a/ACE/examples/Smart_Pointers/Widget_Factory.h b/ACE/examples/Smart_Pointers/Widget_Factory.h
index e78c05e805a..792da334295 100644
--- a/ACE/examples/Smart_Pointers/Widget_Factory.h
+++ b/ACE/examples/Smart_Pointers/Widget_Factory.h
@@ -22,7 +22,7 @@ class Widget_Factory
 public:
   /// Create an instance of a widget. Ownership of the newly created object is
   /// transferred to the caller.
-  static Widget *create_widget (void);
+  static Widget *create_widget ();
 };
 
 #endif /* WIDGET_FACTORY_H */
diff --git a/ACE/examples/Smart_Pointers/Widget_Impl.cpp b/ACE/examples/Smart_Pointers/Widget_Impl.cpp
index 504fc050892..e62f3ccdd1c 100644
--- a/ACE/examples/Smart_Pointers/Widget_Impl.cpp
+++ b/ACE/examples/Smart_Pointers/Widget_Impl.cpp
@@ -10,12 +10,12 @@
 #include "Widget_Impl.h"
 #include "ace/Log_Msg.h"
 
-Widget_Impl::Widget_Impl (void)
+Widget_Impl::Widget_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Widget_Impl constructor\n"));
 }
 
-Widget_Impl::~Widget_Impl (void)
+Widget_Impl::~Widget_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Widget_Impl destructor\n"));
 }
@@ -28,7 +28,7 @@ void Widget_Impl::add_part (Widget_Part *part)
   parts_.enqueue_tail (new_part);
 }
 
-Widget_Part *Widget_Impl::remove_part (void)
+Widget_Part *Widget_Impl::remove_part ()
 {
   ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> removed_part;
   if (parts_.dequeue_head (removed_part) == -1)
@@ -38,7 +38,7 @@ Widget_Part *Widget_Impl::remove_part (void)
   return removed_part.release();
 }
 
-void Widget_Impl::list_parts (void)
+void Widget_Impl::list_parts ()
 {
   ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> > iter (parts_);
   ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> *current_part;
diff --git a/ACE/examples/Smart_Pointers/Widget_Impl.h b/ACE/examples/Smart_Pointers/Widget_Impl.h
index a8982e77dd5..220c5f752fc 100644
--- a/ACE/examples/Smart_Pointers/Widget_Impl.h
+++ b/ACE/examples/Smart_Pointers/Widget_Impl.h
@@ -28,10 +28,10 @@ class Widget_Impl : public Widget
 {
 public:
   /// Constructor.
-  Widget_Impl (void);
+  Widget_Impl ();
 
   /// Destructor.
-  virtual ~Widget_Impl (void);
+  virtual ~Widget_Impl ();
 
   /// Add a new part to the widget. The widget takes ownership of the part
   /// object.
@@ -39,10 +39,10 @@ public:
 
   /// Remove a random part from the widget. Ownership of the part is returned
   /// to the caller.
-  virtual Widget_Part *remove_part (void);
+  virtual Widget_Part *remove_part ();
 
   /// Ask the widget to print information about the parts that it contains.
-  virtual void list_parts (void);
+  virtual void list_parts ();
 
 private:
   /// The parts which make up this widget. The set actually contains instances
diff --git a/ACE/examples/Smart_Pointers/Widget_Part.cpp b/ACE/examples/Smart_Pointers/Widget_Part.cpp
index cea74f60aae..7f0f81b6fb5 100644
--- a/ACE/examples/Smart_Pointers/Widget_Part.cpp
+++ b/ACE/examples/Smart_Pointers/Widget_Part.cpp
@@ -9,6 +9,6 @@
 
 #include "Widget_Part.h"
 
-Widget_Part::~Widget_Part (void)
+Widget_Part::~Widget_Part ()
 {
 }
diff --git a/ACE/examples/Smart_Pointers/Widget_Part.h b/ACE/examples/Smart_Pointers/Widget_Part.h
index 2b251ec6e6f..818ebe7685a 100644
--- a/ACE/examples/Smart_Pointers/Widget_Part.h
+++ b/ACE/examples/Smart_Pointers/Widget_Part.h
@@ -19,7 +19,7 @@ class Widget_Part
 {
 public:
   /// Destructor.
-  virtual ~Widget_Part (void);
+  virtual ~Widget_Part ();
 
   /// Ask the part to print information about itself.
   virtual void print_info (void) = 0;
diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp
index b0433a99746..bc55b76be7f 100644
--- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp
+++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp
@@ -22,19 +22,19 @@ Widget_Part_Impl::Widget_Part_Impl (Widget *owner, const char* name, int size)
   ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl constructor\n"));
 }
 
-Widget_Part_Impl::~Widget_Part_Impl (void)
+Widget_Part_Impl::~Widget_Part_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl destructor\n"));
 
   delete [] name_;
 }
 
-void Widget_Part_Impl::print_info (void)
+void Widget_Part_Impl::print_info ()
 {
   ACE_DEBUG ((LM_INFO, "Widget part: name=%s size=%d\n", name_, size_));
 }
 
-void Widget_Part_Impl::remove_from_owner (void)
+void Widget_Part_Impl::remove_from_owner ()
 {
   // Since we only have a raw pointer to refer to the owner, we have no way of
   // checking whether the owner still exists, and if it does guaranteeing that
diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h
index 28adb326fb3..01df1b593d4 100644
--- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h
+++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h
@@ -25,13 +25,13 @@ public:
   Widget_Part_Impl (Widget *owner, const char* name, int size);
 
   /// Destructor.
-  virtual ~Widget_Part_Impl (void);
+  virtual ~Widget_Part_Impl ();
 
   /// Ask the part to print information about itself.
-  virtual void print_info (void);
+  virtual void print_info ();
 
   /// Ask the part to remove itself from the widget that contains it.
-  virtual void remove_from_owner (void);
+  virtual void remove_from_owner ();
 
 private:
   /// The widget that contains this part.
diff --git a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp
index 0bbbc7eea4f..aa0ef26866c 100644
--- a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp
+++ b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp
@@ -9,7 +9,7 @@
 #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM)
 
 static void
-client (void)
+client ()
 {
   ACE_SV_Shared_Memory shm_client;
 
@@ -25,7 +25,7 @@ client (void)
 }
 
 static void
-server (void)
+server ()
 {
   ACE_SV_Shared_Memory shm_server;
 
diff --git a/ACE/examples/Threads/TSS_Obj.h b/ACE/examples/Threads/TSS_Obj.h
index 07ba7a6a5fd..0940110cab7 100644
--- a/ACE/examples/Threads/TSS_Obj.h
+++ b/ACE/examples/Threads/TSS_Obj.h
@@ -26,8 +26,8 @@
 class TSS_Obj
 {
 public:
-  TSS_Obj (void);
-  ~TSS_Obj (void);
+  TSS_Obj ();
+  ~TSS_Obj ();
 
 private:
  static ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> count_;
diff --git a/ACE/examples/Threads/TSS_Task.h b/ACE/examples/Threads/TSS_Task.h
index 2fe503f2e1c..0804e8f9b82 100644
--- a/ACE/examples/Threads/TSS_Task.h
+++ b/ACE/examples/Threads/TSS_Task.h
@@ -22,8 +22,8 @@
 class Test_Task
 {
 public:
-  Test_Task (void);
-  ~Test_Task (void);
+  Test_Task ();
+  ~Test_Task ();
 
   int open (void *arg);
 
diff --git a/ACE/examples/Threads/barrier2.cpp b/ACE/examples/Threads/barrier2.cpp
index 2c5866aa306..112590a6392 100644
--- a/ACE/examples/Threads/barrier2.cpp
+++ b/ACE/examples/Threads/barrier2.cpp
@@ -28,7 +28,7 @@ public:
                int n_threads,
                int inp_serialize = 1);
 
-  virtual int producer (void);
+  virtual int producer ();
   // produce input for workers
 
   virtual int input (ACE_Message_Block *mb);
@@ -139,7 +139,7 @@ Worker_Task<BARRIER>::service (ACE_Message_Block *mb,
 // for all other threads to complete this iteration.
 
 template <class BARRIER> int
-Worker_Task<BARRIER>::svc (void)
+Worker_Task<BARRIER>::svc ()
 {
   // Note that the <ACE_Task::svc_run> method automatically adds us to
   // the Thread_Manager when the thread begins.
@@ -187,7 +187,7 @@ Worker_Task<BARRIER>::svc (void)
 }
 
 template <class BARRIER> int
-Worker_Task<BARRIER>::producer (void)
+Worker_Task<BARRIER>::producer ()
 {
   // Keep reading stdin, until we reach EOF.
 
diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp
index f1e57c6f7c3..92f8387a135 100644
--- a/ACE/examples/Threads/future1.cpp
+++ b/ACE/examples/Threads/future1.cpp
@@ -53,7 +53,7 @@ class Scheduler : public ACE_Task_Base
   friend class Method_RequestWork;
 public:
   Scheduler (const char *, Scheduler * = 0);
-  virtual ~Scheduler (void);
+  virtual ~Scheduler ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
@@ -63,11 +63,11 @@ public:
   virtual int svc ();
 
   ACE_Future<u_long> work (u_long param, int count = 1);
-  ACE_Future<const char*> name (void);
-  void end (void);
+  ACE_Future<const char*> name ();
+  void end ();
 
   u_long work_i (u_long, int);
-  const char *name_i (void);
+  const char *name_i ();
 
 private:
   char *name_;
@@ -84,8 +84,8 @@ class Method_Request_work : public ACE_Method_Request
 {
 public:
   Method_Request_work (Scheduler *, u_long, int, ACE_Future<u_long> &);
-  virtual ~Method_Request_work (void);
-  virtual int call (void);
+  virtual ~Method_Request_work ();
+  virtual int call ();
 
 private:
   Scheduler *scheduler_;
@@ -107,14 +107,14 @@ Method_Request_work::Method_Request_work (Scheduler* new_Scheduler,
               "(%t) Method_Request_work created\n"));
 }
 
-Method_Request_work::~Method_Request_work (void)
+Method_Request_work::~Method_Request_work ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) Method_Request_work will be deleted.\n"));
 }
 
 
 int
-Method_Request_work::call (void)
+Method_Request_work::call ()
 {
   return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
 }
@@ -128,8 +128,8 @@ class Method_Request_name : public ACE_Method_Request
 {
 public:
   Method_Request_name (Scheduler *, ACE_Future<const char*> &);
-  virtual ~Method_Request_name (void);
-  virtual int call (void);
+  virtual ~Method_Request_name ();
+  virtual int call ();
 
 private:
   Scheduler *scheduler_;
@@ -145,14 +145,14 @@ Method_Request_name::Method_Request_name (Scheduler *new_scheduler,
               "(%t) Method_Request_name created\n"));
 }
 
-Method_Request_name::~Method_Request_name (void)
+Method_Request_name::~Method_Request_name ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) Method_Request_name will be deleted.\n"));
 }
 
 int
-Method_Request_name::call (void)
+Method_Request_name::call ()
 {
   return future_result_.set (scheduler_->name_i ());
 }
@@ -185,7 +185,7 @@ Scheduler::Scheduler (const char *newname,
 }
 
 // Destructor
-Scheduler::~Scheduler (void)
+Scheduler::~Scheduler ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s will be destroyed\n", this->name_));
   delete [] this->name_;
@@ -211,7 +211,7 @@ Scheduler::close (u_long)
 
 // service..
 int
-Scheduler::svc (void)
+Scheduler::svc ()
 {
   for (;;)
     {
@@ -231,7 +231,7 @@ Scheduler::svc (void)
 }
 
 void
-Scheduler::end (void)
+Scheduler::end ()
 {
   this->activation_queue_.enqueue (new Method_Request_end (this));
 }
@@ -248,7 +248,7 @@ Scheduler::work_i (u_long param,
 }
 
 const char *
-Scheduler::name_i (void)
+Scheduler::name_i ()
 {
   char *the_name;
 
@@ -259,7 +259,7 @@ Scheduler::name_i (void)
 }
 
 ACE_Future<const char *>
-Scheduler::name (void)
+Scheduler::name ()
 {
   if (this->scheduler_)
     // Delegate to the Scheduler.
diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp
index a136de35ff5..f90f14b2382 100644
--- a/ACE/examples/Threads/future2.cpp
+++ b/ACE/examples/Threads/future2.cpp
@@ -48,7 +48,7 @@ class Scheduler : public ACE_Task_Base
   friend class Method_Request_end;
 public:
   Scheduler (const char *, Scheduler * = 0);
-  virtual ~Scheduler (void);
+  virtual ~Scheduler ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// The method that is used to start the active object.
@@ -58,8 +58,8 @@ public:
   // = Here are the methods exported by the class. They return an
   // <ACE_Future>.
   ACE_Future<u_long> work (u_long param, int count = 1);
-  ACE_Future<char*> name (void);
-  void end (void);
+  ACE_Future<char*> name ();
+  void end ();
 
 private:
   //FUZZ: disable check_for_lack_ACE_OS
@@ -72,7 +72,7 @@ private:
 
   // = Implementation methods.
   u_long work_i (u_long, int);
-  char *name_i (void);
+  char *name_i ();
 
   char *name_;
   ACE_Activation_Queue activation_queue_;
@@ -88,8 +88,8 @@ class Method_Request_work : public ACE_Method_Request
 {
 public:
   Method_Request_work (Scheduler *, u_long, int, ACE_Future<u_long> &);
-  virtual ~Method_Request_work (void);
-  virtual int call (void);
+  virtual ~Method_Request_work ();
+  virtual int call ();
 
 private:
   Scheduler *scheduler_;
@@ -109,12 +109,12 @@ Method_Request_work::Method_Request_work (Scheduler* new_Scheduler,
 {
 }
 
-Method_Request_work::~Method_Request_work (void)
+Method_Request_work::~Method_Request_work ()
 {
 }
 
 int
-Method_Request_work::call (void)
+Method_Request_work::call ()
 {
   return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
 }
@@ -128,8 +128,8 @@ class Method_Request_name : public ACE_Method_Request
 {
 public:
   Method_Request_name (Scheduler *, ACE_Future<char*> &);
-  virtual ~Method_Request_name (void);
-  virtual int call (void);
+  virtual ~Method_Request_name ();
+  virtual int call ();
 
 private:
   Scheduler *scheduler_;
@@ -146,14 +146,14 @@ Method_Request_name::Method_Request_name (Scheduler *new_scheduler,
               " (%t) Method_Request_name created\n"));
 }
 
-Method_Request_name::~Method_Request_name (void)
+Method_Request_name::~Method_Request_name ()
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%t) Method_Request_name will be deleted.\n"));
 }
 
 int
-Method_Request_name::call (void)
+Method_Request_name::call ()
 {
   return future_result_.set (scheduler_->name_i ());
 }
@@ -185,7 +185,7 @@ Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler)
 }
 
 // Destructor
-Scheduler::~Scheduler (void)
+Scheduler::~Scheduler ()
 {
   ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s will be destroyed\n", this->name_));
 }
@@ -207,7 +207,7 @@ Scheduler::close (u_long)
 }
 
 int
-Scheduler::svc (void)
+Scheduler::svc ()
 {
   // Main event loop for this active object.
   for (;;)
@@ -228,7 +228,7 @@ Scheduler::svc (void)
 }
 
 void
-Scheduler::end (void)
+Scheduler::end ()
 {
   this->activation_queue_.enqueue (new Method_Request_end (this));
 }
@@ -244,7 +244,7 @@ Scheduler::work_i (u_long param,
 }
 
 char *
-Scheduler::name_i (void)
+Scheduler::name_i ()
 {
   char *the_name;
 
@@ -255,7 +255,7 @@ Scheduler::name_i (void)
 }
 
 ACE_Future<char *>
-Scheduler::name (void)
+Scheduler::name ()
 {
   if (this->scheduler_)
     // Delegate to the other scheduler
@@ -307,7 +307,7 @@ Scheduler::work (u_long newparam, int newcount)
 }
 
 static int
-determine_iterations (void)
+determine_iterations ()
 {
   int n_iterations;
 
diff --git a/ACE/examples/Threads/manual_event.cpp b/ACE/examples/Threads/manual_event.cpp
index a3647c2351e..8642d6da3ad 100644
--- a/ACE/examples/Threads/manual_event.cpp
+++ b/ACE/examples/Threads/manual_event.cpp
@@ -36,7 +36,7 @@ public:
   Pseudo_Barrier (u_long count);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  int wait (void);
+  int wait ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -50,7 +50,7 @@ Pseudo_Barrier::Pseudo_Barrier (u_long count)
 }
 
 int
-Pseudo_Barrier::wait (void)
+Pseudo_Barrier::wait ()
 {
   if (--this->counter_ == 0)
     return this->event_.signal ();
diff --git a/ACE/examples/Threads/process_manager.cpp b/ACE/examples/Threads/process_manager.cpp
index c7cbc2f36d1..4e9ebe88d10 100644
--- a/ACE/examples/Threads/process_manager.cpp
+++ b/ACE/examples/Threads/process_manager.cpp
@@ -32,7 +32,7 @@ public:
   ExitHandler (const char *name);
 
   /// Called when object is removed from the <ACE_Reactor>.
-  virtual ~ExitHandler (void);
+  virtual ~ExitHandler ();
   virtual int handle_exit (ACE_Process *proc);
   virtual int handle_timeout (const ACE_Time_Value &tv,
                               const void *arg = 0);
@@ -48,7 +48,7 @@ ExitHandler::ExitHandler (const char *name)
 {
 }
 
-ExitHandler::~ExitHandler (void)
+ExitHandler::~ExitHandler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t@%T) ExitHandler \"%s\" destroyed\n",
diff --git a/ACE/examples/Threads/reader_writer.cpp b/ACE/examples/Threads/reader_writer.cpp
index 8f403319d32..b9677035feb 100644
--- a/ACE/examples/Threads/reader_writer.cpp
+++ b/ACE/examples/Threads/reader_writer.cpp
@@ -39,7 +39,7 @@ static ACE_Thread_Manager thr_mgr;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n"));
diff --git a/ACE/examples/Threads/recursive_mutex.cpp b/ACE/examples/Threads/recursive_mutex.cpp
index 55d4c057ac6..522a4ce7bfa 100644
--- a/ACE/examples/Threads/recursive_mutex.cpp
+++ b/ACE/examples/Threads/recursive_mutex.cpp
@@ -18,7 +18,7 @@ static size_t n_threads = 4;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "usage: %n [-t n_threads] [-n iteration_count]\n"));
diff --git a/ACE/examples/Threads/task_five.cpp b/ACE/examples/Threads/task_five.cpp
index 5d8d686a215..9122a3e060a 100644
--- a/ACE/examples/Threads/task_five.cpp
+++ b/ACE/examples/Threads/task_five.cpp
@@ -37,13 +37,13 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   int open (void * = 0);
-  int svc (void);
+  int svc ();
   int close (u_long);
 
   ///FUZZ: enable check_for_lack_ACE_OS
-  int shutdown (void);
+  int shutdown ();
 
-  int synch (void);
+  int synch ();
 };
 
 Test_Task::Test_Task (ACE_Thread_Manager *thrmgr)
@@ -66,7 +66,7 @@ Test_Task::open (void *)
 }
 
 int
-Test_Task::svc (void)
+Test_Task::svc ()
 {
   while (thr_mgr_->testcancel (ACE_OS::thr_self ()) == 0)
     // Sleep for 350 msecs.
@@ -83,13 +83,13 @@ Test_Task::close (u_long)
 }
 
 int
-Test_Task::shutdown (void)
+Test_Task::shutdown ()
 {
   return thr_mgr_->cancel_grp (grp_id_);
 }
 
 int
-Test_Task::synch (void)
+Test_Task::synch ()
 {
   return thr_mgr_->wait_grp (grp_id_);
 }
diff --git a/ACE/examples/Threads/task_four.cpp b/ACE/examples/Threads/task_four.cpp
index e1f06fa7d1f..200aa17f52c 100644
--- a/ACE/examples/Threads/task_four.cpp
+++ b/ACE/examples/Threads/task_four.cpp
@@ -119,7 +119,7 @@ Worker_Task::open (void *)
 }
 
 int
-Worker_Task::svc (void)
+Worker_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%t) in worker %d\n",
@@ -167,7 +167,7 @@ Invoker_Task::Invoker_Task (ACE_Thread_Manager *thr_mgr,
 // for all other threads to complete this iteration.
 
 int
-Invoker_Task::svc (void)
+Invoker_Task::svc ()
 {
   // Note that the ACE_Task::svc_run () method automatically adds us
   // to the Thread_Manager when the thread begins.
diff --git a/ACE/examples/Threads/task_one.cpp b/ACE/examples/Threads/task_one.cpp
index a30478a7ab4..e2dab9b6369 100644
--- a/ACE/examples/Threads/task_one.cpp
+++ b/ACE/examples/Threads/task_one.cpp
@@ -49,7 +49,7 @@ Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr,
 // for all other threads to complete this iteration.
 
 int
-Barrier_Task::svc (void)
+Barrier_Task::svc ()
 {
   // Note that the ACE_Task::svc_run() method automatically adds us to
   // the Thread_Manager when the thread begins.
diff --git a/ACE/examples/Threads/task_three.cpp b/ACE/examples/Threads/task_three.cpp
index eda453579fe..89d118daba0 100644
--- a/ACE/examples/Threads/task_three.cpp
+++ b/ACE/examples/Threads/task_three.cpp
@@ -32,8 +32,8 @@ static const size_t TASK_COUNT = 130;
 class Test_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  Test_Task (void);
-  ~Test_Task (void);
+  Test_Task ();
+  ~Test_Task ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   virtual int open (void *args = 0);
@@ -55,7 +55,7 @@ size_t Test_Task::done_cnt_ = 0;
 
 static ACE_Thread_Mutex Lock;
 
-Test_Task::Test_Task (void)
+Test_Task::Test_Task ()
 {
   ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock);
 
@@ -66,7 +66,7 @@ Test_Task::Test_Task (void)
               Test_Task::current_count_));
 }
 
-Test_Task::~Test_Task (void)
+Test_Task::~Test_Task ()
 {
   ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock);
 
@@ -95,7 +95,7 @@ Test_Task::close (u_long)
 }
 
 int
-Test_Task::svc (void)
+Test_Task::svc ()
 {
   // Every thread must register the same stream to write to file.
   if (out_stream)
diff --git a/ACE/examples/Threads/task_two.cpp b/ACE/examples/Threads/task_two.cpp
index e0dadf0bd44..47ccea2ae98 100644
--- a/ACE/examples/Threads/task_two.cpp
+++ b/ACE/examples/Threads/task_two.cpp
@@ -67,7 +67,7 @@ Task_Test::close (u_long)
 }
 
 int
-Task_Test::svc (void)
+Task_Test::svc ()
 {
   wait_count++;
   max_count++;
diff --git a/ACE/examples/Threads/thread_pool.cpp b/ACE/examples/Threads/thread_pool.cpp
index 4b3124d3aa2..9ea0488c330 100644
--- a/ACE/examples/Threads/thread_pool.cpp
+++ b/ACE/examples/Threads/thread_pool.cpp
@@ -34,7 +34,7 @@ public:
                int n_threads);
   // Constructor activates <n_threads> in the thread pool.
 
-  ~Thread_Pool (void);
+  ~Thread_Pool ();
   // Destructor...
 
   virtual int svc ();
@@ -72,7 +72,7 @@ Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr,
                 "activate failed"));
 }
 
-Thread_Pool::~Thread_Pool (void)
+Thread_Pool::~Thread_Pool ()
 {
 }
 
@@ -89,7 +89,7 @@ Thread_Pool::put (ACE_Message_Block *mb,
 // for all other threads to complete this iteration.
 
 int
-Thread_Pool::svc (void)
+Thread_Pool::svc ()
 {
   // Note that the <ACE_Task::svc_run> method automatically adds us to
   // the Thread_Manager when the thread begins.
diff --git a/ACE/examples/Threads/thread_specific.h b/ACE/examples/Threads/thread_specific.h
index fbc18d450f7..f17c21a8751 100644
--- a/ACE/examples/Threads/thread_specific.h
+++ b/ACE/examples/Threads/thread_specific.h
@@ -21,7 +21,7 @@ public:
 
   // Errno::flags_ is a static variable, so we've got to protect it
   // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void)
+  int flags ()
   {
     ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1);
 
diff --git a/ACE/examples/Threads/token.cpp b/ACE/examples/Threads/token.cpp
index 391a7adafa3..411b37fbdf7 100644
--- a/ACE/examples/Threads/token.cpp
+++ b/ACE/examples/Threads/token.cpp
@@ -39,7 +39,7 @@ My_Task::sleep_hook (void *)
 // Test out the behavior of the ACE_Token class.
 
 int
-My_Task::svc (void)
+My_Task::svc ()
 {
   for (size_t i = 0; i < 100; i++)
     {
diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp
index 5b00898aba3..4a41d84f596 100644
--- a/ACE/examples/Threads/tss1.cpp
+++ b/ACE/examples/Threads/tss1.cpp
@@ -57,7 +57,7 @@ public:
 };
 
 template <ACE_SYNCH_DECL> int
-Tester<ACE_SYNCH_USE>::svc (void)
+Tester<ACE_SYNCH_USE>::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) svc: setting error code to 1\n"));
diff --git a/ACE/examples/Threads/tss2.cpp b/ACE/examples/Threads/tss2.cpp
index 8abd9de1f0a..eba9b59e29d 100644
--- a/ACE/examples/Threads/tss2.cpp
+++ b/ACE/examples/Threads/tss2.cpp
@@ -35,26 +35,26 @@ static ACE_Token token;
 
 ACE_Atomic_Op<ACE_Thread_Mutex, int> TSS_Obj::count_ = 0;
 
-TSS_Obj::TSS_Obj (void)
+TSS_Obj::TSS_Obj ()
 {
   TSS_Obj::count_++;
   ACE_DEBUG ((LM_DEBUG, "(%t) TSS_Obj+: %d\n", TSS_Obj::count_.value ()));
 }
 
-TSS_Obj::~TSS_Obj (void)
+TSS_Obj::~TSS_Obj ()
 {
   TSS_Obj::count_--;
   ACE_DEBUG ((LM_DEBUG, "(%t) TSS_Obj-: %d\n", TSS_Obj::count_.value ()));
 }
 
-Test_Task::Test_Task (void)
+Test_Task::Test_Task ()
 {
   Test_Task::count_++;
   ACE_DEBUG ((LM_DEBUG,
               "(%t) Test_Task+: %d\n", Test_Task::count_.value ()));
 }
 
-Test_Task::~Test_Task (void)
+Test_Task::~Test_Task ()
 {
   Test_Task::count_--;
 
diff --git a/ACE/examples/Threads/wfmo.cpp b/ACE/examples/Threads/wfmo.cpp
index 65aad644704..08ee7eb82de 100644
--- a/ACE/examples/Threads/wfmo.cpp
+++ b/ACE/examples/Threads/wfmo.cpp
@@ -46,7 +46,7 @@ WFMO_Test::open (void *arg)
 }
 
 int
-WFMO_Test::svc (void)
+WFMO_Test::svc ()
 {
   while(1)
     {
diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
index 8a39ab6c705..b1e1f1367bf 100644
--- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
+++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
@@ -43,7 +43,7 @@ Async_Timer_Queue *Async_Timer_Queue::instance_ = 0;
 
 // Implement the Singleton logic.
 Async_Timer_Queue *
-Async_Timer_Queue::instance (void)
+Async_Timer_Queue::instance ()
 {
   if (Async_Timer_Queue::instance_ == 0)
     {
@@ -69,7 +69,7 @@ Async_Timer_Queue::Async_Timer_Queue (ACE_Sig_Set *ss) :
 // Dump the contents of the queue when we receive ^C.
 
 void
-Async_Timer_Queue::dump (void)
+Async_Timer_Queue::dump ()
 {
   ACE_DEBUG ((LM_DEBUG, "begin dumping timer queue\n"));
 
@@ -196,7 +196,7 @@ signal_handler (int signum)
 // However, SIGQUIT is never blocked...
 
 static void
-register_signal_handlers (void)
+register_signal_handlers ()
 {
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
   // Register SIGQUIT (never blocked).
@@ -219,14 +219,14 @@ register_signal_handlers (void)
 
 // constructor
 
-Async_Timer_Queue_Test_Driver::Async_Timer_Queue_Test_Driver (void)
+Async_Timer_Queue_Test_Driver::Async_Timer_Queue_Test_Driver ()
 {
 }
 
 // displays the menu of options.
 
 int
-Async_Timer_Queue_Test_Driver::display_menu (void)
+Async_Timer_Queue_Test_Driver::display_menu ()
 {
   // The menu of options provided to the user.
   static char menu[] =
@@ -243,7 +243,7 @@ Async_Timer_Queue_Test_Driver::display_menu (void)
 // Initializes the test driver.
 
 int
-Async_Timer_Queue_Test_Driver::init (void)
+Async_Timer_Queue_Test_Driver::init ()
 {
   typedef Command<Async_Timer_Queue, Async_Timer_Queue::ACTION> CMD;
 
diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h
index 9e4c74bd4c5..69d4568118f 100644
--- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h
+++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h
@@ -56,7 +56,7 @@ public:
   typedef int (Async_Timer_Queue::*ACTION) (void *);
 
    /// Singleton access point.
-  static Async_Timer_Queue *instance (void);
+  static Async_Timer_Queue *instance ();
 
   /// Schedule a timer to expire <microsecs> in the future.
   void schedule (u_int microsecs);
@@ -65,7 +65,7 @@ public:
   void cancel (long timer_id);
 
   /// Dump the contents of the queue.
-  void dump (void);
+  void dump ();
 
   /// hook method to schedule a timer.  Called from
   /// <Timer_Queue_Test_Driver>
@@ -108,13 +108,13 @@ private:
 class ACE_Svc_Export Async_Timer_Queue_Test_Driver : public Timer_Queue_Test_Driver <Async_Timer_Queue *, Async_Timer_Queue, Async_Timer_Queue::ACTION>
 {
 public:
-  Async_Timer_Queue_Test_Driver (void);
+  Async_Timer_Queue_Test_Driver ();
 
   /// Print menu of options.
-  virtual int display_menu (void);
+  virtual int display_menu ();
 
   /// Initializes the driver's internal variables inherited from the parent
-  virtual int init (void);
+  virtual int init ();
 };
 
 #endif /* _ASYNC_TIMER_QUEUE_TEST_H_ */
diff --git a/ACE/examples/Timer_Queue/Custom_Handler.cpp b/ACE/examples/Timer_Queue/Custom_Handler.cpp
index 9fa50ffdc3e..5e7357260e9 100644
--- a/ACE/examples/Timer_Queue/Custom_Handler.cpp
+++ b/ACE/examples/Timer_Queue/Custom_Handler.cpp
@@ -19,7 +19,7 @@ Custom_Handler::Custom_Handler(const ACE_Time_Value &expiration_time)
 {
 }
 
-Custom_Handler::~Custom_Handler (void)
+Custom_Handler::~Custom_Handler ()
 {
 }
 
diff --git a/ACE/examples/Timer_Queue/Custom_Handler.h b/ACE/examples/Timer_Queue/Custom_Handler.h
index e1454379314..3da0b1aab32 100644
--- a/ACE/examples/Timer_Queue/Custom_Handler.h
+++ b/ACE/examples/Timer_Queue/Custom_Handler.h
@@ -31,7 +31,7 @@ class Custom_Handler
     public:
         Custom_Handler (const ACE_Time_Value &expiration_time);
 
-        virtual ~Custom_Handler (void);
+        virtual ~Custom_Handler ();
 
         // Set the custom handler's id
         void set_id (int id);
diff --git a/ACE/examples/Timer_Queue/Driver.cpp b/ACE/examples/Timer_Queue/Driver.cpp
index 3b7ff955884..345a1fc68f1 100644
--- a/ACE/examples/Timer_Queue/Driver.cpp
+++ b/ACE/examples/Timer_Queue/Driver.cpp
@@ -33,7 +33,7 @@ Command<RECEIVER, ACTION>::Command (RECEIVER &recvr,
 
 // destructor
 template <class RECEIVER, class ACTION>
-Command<RECEIVER, ACTION>::~Command (void)
+Command<RECEIVER, ACTION>::~Command ()
 {
 }
 
@@ -48,12 +48,12 @@ Command<RECEIVER, ACTION>::execute (void *arg)
 // gets the next request from the user input.
 
 template <class TQ, class RECEIVER, class ACTION>
-Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::~Timer_Queue_Test_Driver (void)
+Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::~Timer_Queue_Test_Driver ()
 {
 }
 
 template <class TQ, class RECEIVER, class ACTION> int
-Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::get_next_request (void)
+Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::get_next_request ()
 {
   char buf[BUFSIZ];
 
@@ -73,7 +73,7 @@ Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::get_next_request (void)
 // Runs the test.
 
 template <class TQ, class RECEIVER, class ACTION> int
-Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::run_test (void)
+Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::run_test ()
 {
   this->init ();
 
diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h
index 2a570dd8247..86bd29fe908 100644
--- a/ACE/examples/Timer_Queue/Driver.h
+++ b/ACE/examples/Timer_Queue/Driver.h
@@ -46,7 +46,7 @@ public:
   /// <action_> of the Command to <action>.
   Command (RECEIVER &recvr, ACTION action);
 
-  virtual ~Command (void);
+  virtual ~Command ();
 
   /// Invokes the method <action_> from the object <receiver_>.
   virtual int execute (void *arg);
@@ -77,7 +77,7 @@ class Timer_Queue_Test_Driver
 {
 public:
   /// Default destructor
-  virtual ~Timer_Queue_Test_Driver (void);
+  virtual ~Timer_Queue_Test_Driver ();
 
   /// Breaks up the input string buffer into pieces and executes
   /// the appropriate method to handle that operation.
@@ -88,11 +88,11 @@ public:
    * of the class should normally invoke this method.
    * Returns 0 when successful, or 0 otherwise.
    */
-  virtual int run_test (void);
+  virtual int run_test ();
 
   /// This internal method gets the next request from the user.
   /// Returns -1 when user wants to exit.  Returns 0 otherwise.
-  virtual int get_next_request (void);
+  virtual int get_next_request ();
 
   /**
    * Reads input from the user into the buffer <buf> with a maximum
diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
index 007fd06e849..6d668f9edc8 100644
--- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
+++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
@@ -50,7 +50,7 @@ Input_Handler::Input_Handler (ACE_Timer_Queue *tq,
 }
 
 int
-Input_Handler::done (void)
+Input_Handler::done ()
 {
   return this->done_;
 }
@@ -127,19 +127,19 @@ Input_Handler::handle_input (ACE_HANDLE)
   return driver_.get_next_request ();
 }
 
-Reactor_Timer_Queue_Test_Driver::Reactor_Timer_Queue_Test_Driver (void)
+Reactor_Timer_Queue_Test_Driver::Reactor_Timer_Queue_Test_Driver ()
   : thandler_ (&timer_queue_, *this)
 {
 }
 
-Reactor_Timer_Queue_Test_Driver::~Reactor_Timer_Queue_Test_Driver (void)
+Reactor_Timer_Queue_Test_Driver::~Reactor_Timer_Queue_Test_Driver ()
 {
   // unhook our timer queue
   ACE_Reactor::instance ()->timer_queue (0);
 }
 
 int
-Reactor_Timer_Queue_Test_Driver::display_menu (void)
+Reactor_Timer_Queue_Test_Driver::display_menu ()
 {
   static char menu[] =
     "\n*****\n"
@@ -156,7 +156,7 @@ Reactor_Timer_Queue_Test_Driver::display_menu (void)
 }
 
 int
-Reactor_Timer_Queue_Test_Driver::init (void)
+Reactor_Timer_Queue_Test_Driver::init ()
 {
   typedef Command<Input_Handler, Input_Handler::ACTION> CMD;
 
@@ -192,7 +192,7 @@ Reactor_Timer_Queue_Test_Driver::init (void)
 // run test was overrun due to the reactive way of handling input.
 
 int
-Reactor_Timer_Queue_Test_Driver::run_test (void)
+Reactor_Timer_Queue_Test_Driver::run_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "TIMER TEST STARTED\n"));
diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
index fc39a412a2c..33b74a1fb5c 100644
--- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
+++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
@@ -61,7 +61,7 @@ public:
    * exiting the program.A value of 0 indicates that we are NOT done,
    * 1 otherwise.
    */
-  int done (void);
+  int done ();
 
   // = Hook methods to be called from <Reactor_Timer_Queue_Test_Driver>
 
@@ -112,23 +112,23 @@ public:
    * methods are the common factored out code from other
    * implementations of timer queues.
    */
-  Reactor_Timer_Queue_Test_Driver (void);
+  Reactor_Timer_Queue_Test_Driver ();
 
   /// Default destructor
-  virtual ~Reactor_Timer_Queue_Test_Driver (void);
+  virtual ~Reactor_Timer_Queue_Test_Driver ();
 
   /// Prints the menu of options.
-  virtual int display_menu (void);
+  virtual int display_menu ();
 
   /**
    * Sets the timer queue that the REACTOR will use; registers the
    * stdin input handler with the REACTOR and sets the <Command>s that
    * the <Timer_Queue_Test_Driver> will execute().
    */
-  virtual int init (void);
+  virtual int init ();
 
   /// Main entry point to the test driver implementation.
-  virtual int run_test (void);
+  virtual int run_test ();
 
 private:
   /// This is the stdin handler.
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp
index 43f8ab11b51..8f6bae445ad 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp
@@ -35,7 +35,7 @@ Custom_Handler_Input_Task::Custom_Handler_Input_Task (Thread_Timer_Queue *queue,
 // user.
 
 int
-Custom_Handler_Input_Task::svc (void)
+Custom_Handler_Input_Task::svc ()
 {
   for (;;)
     // call back to the driver's implementation on how to read and
@@ -127,7 +127,7 @@ Custom_Handler_Input_Task::shutdown_timer (void *)
 }
 
 void
-Custom_Handler_Input_Task::dump (void)
+Custom_Handler_Input_Task::dump ()
 {
   ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->queue_->mutex ());
 
@@ -145,24 +145,24 @@ Custom_Handler_Input_Task::dump (void)
 
 // constructor
 
-Thread_Timer_Queue_Custom_Handler_Test::Thread_Timer_Queue_Custom_Handler_Test (void)
+Thread_Timer_Queue_Custom_Handler_Test::Thread_Timer_Queue_Custom_Handler_Test ()
   : input_task_ (&timer_queue_, *this)
 {
 }
 
-Thread_Timer_Queue_Custom_Handler_Test::~Thread_Timer_Queue_Custom_Handler_Test (void)
+Thread_Timer_Queue_Custom_Handler_Test::~Thread_Timer_Queue_Custom_Handler_Test ()
 {
 }
 
 int
-Thread_Timer_Queue_Custom_Handler_Test::run_test (void)
+Thread_Timer_Queue_Custom_Handler_Test::run_test ()
 {
   this->init ();
   return 0;
 }
 
 int
-Thread_Timer_Queue_Custom_Handler_Test::display_menu (void)
+Thread_Timer_Queue_Custom_Handler_Test::display_menu ()
 {
   static char menu[] =
     "Usage:\n"
@@ -178,7 +178,7 @@ Thread_Timer_Queue_Custom_Handler_Test::display_menu (void)
 }
 
 int
-Thread_Timer_Queue_Custom_Handler_Test::init (void)
+Thread_Timer_Queue_Custom_Handler_Test::init ()
 {
   typedef Command<Custom_Handler_Input_Task, Custom_Handler_Input_Task::ACTION> CMD;
 
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
index 6a357be66c9..452543671f9 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
@@ -81,7 +81,7 @@ public:
   int shutdown_timer (void *);
 
   /// Dump the state of the timer queue.
-  void dump (void);
+  void dump ();
 
 private:
   /// The timer queue implementation.
@@ -108,12 +108,12 @@ private:
 class ACE_Svc_Export Thread_Timer_Queue_Custom_Handler_Test : public Timer_Queue_Test_Driver <Thread_Timer_Queue, Custom_Handler_Input_Task, Custom_Handler_Input_Task::ACTION>
 {
 public:
-  Thread_Timer_Queue_Custom_Handler_Test (void);
-  ~Thread_Timer_Queue_Custom_Handler_Test (void);
+  Thread_Timer_Queue_Custom_Handler_Test ();
+  ~Thread_Timer_Queue_Custom_Handler_Test ();
 
-  virtual int display_menu (void);
-  virtual int init (void);
-  virtual int run_test (void);
+  virtual int display_menu ();
+  virtual int init ();
+  virtual int run_test ();
 
 private:
   /// Subclassed from ACE_Task.
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
index 8af8cfdccf5..5c238e99af1 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
@@ -30,7 +30,7 @@ Handler::Handler(const ACE_Time_Value &expiration_time)
 {
 }
 
-Handler::~Handler (void)
+Handler::~Handler ()
 {
 }
 
@@ -75,7 +75,7 @@ Input_Task::Input_Task (Thread_Timer_Queue *queue,
 // user.
 
 int
-Input_Task::svc (void)
+Input_Task::svc ()
 {
   for (;;)
     // call back to the driver's implementation on how to read and
@@ -167,7 +167,7 @@ Input_Task::shutdown_timer (void *)
 }
 
 void
-Input_Task::dump (void)
+Input_Task::dump ()
 {
   ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->queue_->mutex ());
 
@@ -185,24 +185,24 @@ Input_Task::dump (void)
 
 // constructor
 
-Thread_Timer_Queue_Test_Driver::Thread_Timer_Queue_Test_Driver (void)
+Thread_Timer_Queue_Test_Driver::Thread_Timer_Queue_Test_Driver ()
   : input_task_ (&timer_queue_, *this)
 {
 }
 
-Thread_Timer_Queue_Test_Driver::~Thread_Timer_Queue_Test_Driver (void)
+Thread_Timer_Queue_Test_Driver::~Thread_Timer_Queue_Test_Driver ()
 {
 }
 
 int
-Thread_Timer_Queue_Test_Driver::run_test (void)
+Thread_Timer_Queue_Test_Driver::run_test ()
 {
   this->init ();
   return 0;
 }
 
 int
-Thread_Timer_Queue_Test_Driver::display_menu (void)
+Thread_Timer_Queue_Test_Driver::display_menu ()
 {
   static char menu[] =
     "Usage:\n"
@@ -218,7 +218,7 @@ Thread_Timer_Queue_Test_Driver::display_menu (void)
 }
 
 int
-Thread_Timer_Queue_Test_Driver::init (void)
+Thread_Timer_Queue_Test_Driver::init ()
 {
   typedef Command<Input_Task, Input_Task::ACTION> CMD;
 
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
index 10e8443ad8c..abdabe082a2 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
@@ -83,7 +83,7 @@ public:
   int shutdown_timer (void *);
 
   /// Dump the state of the timer queue.
-  void dump (void);
+  void dump ();
 
 private:
   /// The timer queue implementation.
@@ -110,12 +110,12 @@ private:
 class ACE_Svc_Export Thread_Timer_Queue_Test_Driver : public Timer_Queue_Test_Driver <Thread_Timer_Queue, Input_Task, Input_Task::ACTION>
 {
 public:
-  Thread_Timer_Queue_Test_Driver (void);
-  ~Thread_Timer_Queue_Test_Driver (void);
+  Thread_Timer_Queue_Test_Driver ();
+  ~Thread_Timer_Queue_Test_Driver ();
 
-  virtual int display_menu (void);
-  virtual int init (void);
-  virtual int run_test (void);
+  virtual int display_menu ();
+  virtual int init ();
+  virtual int run_test ();
 
 private:
   /// Subclassed from ACE_Task.
@@ -134,7 +134,7 @@ class Handler : public ACE_Event_Handler
 {
 public:
   Handler (const ACE_Time_Value &expiration_time);
-  ~Handler (void);
+  ~Handler ();
 
   /// Store an "id" for the Handler, which is only use to print better
   /// messages.
diff --git a/ACE/examples/Web_Crawler/Command_Processor.cpp b/ACE/examples/Web_Crawler/Command_Processor.cpp
index e2f59ebd460..e629a4a0ded 100644
--- a/ACE/examples/Web_Crawler/Command_Processor.cpp
+++ b/ACE/examples/Web_Crawler/Command_Processor.cpp
@@ -6,7 +6,7 @@
 #include "URL_Visitor.h"
 
 
-Command::~Command (void)
+Command::~Command ()
 {
 }
 
@@ -16,7 +16,7 @@ URL_Command::URL_Command (URL *url)
 }
 
 int
-URL_Command::execute (void)
+URL_Command::execute ()
 {
   ACE_CString check_string
     (ACE_TEXT_ALWAYS_CHAR (this->url_->url_addr ().get_path_name ()));
@@ -54,28 +54,28 @@ URL_Command::execute (void)
 }
 
 int
-URL_Command::destroy (void)
+URL_Command::destroy ()
 {
   delete this;
   return 0;
 }
-Command_Processor::Command_Processor (void)
+Command_Processor::Command_Processor ()
 {
 }
 
-Command_Processor::~Command_Processor (void)
+Command_Processor::~Command_Processor ()
 {
 }
 
 int
-Command_Processor::destroy (void)
+Command_Processor::destroy ()
 {
   delete this;
   return 0;
 }
 
 int
-Command_Processor::execute (void)
+Command_Processor::execute ()
 {
   Command *command;
   while (this->url_queue_.is_empty () != 1)
diff --git a/ACE/examples/Web_Crawler/Command_Processor.h b/ACE/examples/Web_Crawler/Command_Processor.h
index d0d8cd8860a..f6bff11ff74 100644
--- a/ACE/examples/Web_Crawler/Command_Processor.h
+++ b/ACE/examples/Web_Crawler/Command_Processor.h
@@ -33,7 +33,7 @@ class Command
 {
 public:
   /// Virtual destructor.
-  virtual ~Command (void);
+  virtual ~Command ();
 
   /// This is the entry point to execute the command.
   virtual int execute (void) = 0;
@@ -54,10 +54,10 @@ public:
   URL_Command (URL *);
 
   /// Execute the URL command.
-  virtual int execute (void);
+  virtual int execute ();
 
   /// Commit suicide.
-  int destroy (void);
+  int destroy ();
 private:
   /// Pointer to the URL.
   URL *url_;
@@ -73,20 +73,20 @@ private:
 class Command_Processor
 {
 public:
-  Command_Processor (void);
+  Command_Processor ();
 
   /// Insert a new <Command> into the <Command_Processor>'s queue.
   int insert (Command *);
 
   /// Execute all the <Commands> in the queue.
-  int execute (void);
+  int execute ();
 
   /// Destroy the <Command_Processor>.
-  int destroy (void);
+  int destroy ();
 
 protected:
   /// Ensure dynamic allocation.
-  ~Command_Processor (void);
+  ~Command_Processor ();
 
 private:
   // @@ You fill in here...
diff --git a/ACE/examples/Web_Crawler/HTTP_URL.cpp b/ACE/examples/Web_Crawler/HTTP_URL.cpp
index f146ac108e1..3a0206d04f8 100644
--- a/ACE/examples/Web_Crawler/HTTP_URL.cpp
+++ b/ACE/examples/Web_Crawler/HTTP_URL.cpp
@@ -21,7 +21,7 @@ HTTP_URL::HTTP_URL (const ACE_URL_Addr &url_addr,
 }
 
 ssize_t
-HTTP_URL::send_request (void)
+HTTP_URL::send_request ()
 {
   size_t commandsize =
     ACE_OS::strlen (this->url_addr ().get_path_name ())
@@ -76,7 +76,7 @@ HTTP_URL::accept (URL_Visitor *visitor)
 }
 
 int
-HTTP_URL::destroy (void)
+HTTP_URL::destroy ()
 {
   delete this;
   return 0;
diff --git a/ACE/examples/Web_Crawler/HTTP_URL.h b/ACE/examples/Web_Crawler/HTTP_URL.h
index 87ab46b56a5..817a5f1119e 100644
--- a/ACE/examples/Web_Crawler/HTTP_URL.h
+++ b/ACE/examples/Web_Crawler/HTTP_URL.h
@@ -47,13 +47,13 @@ public:
 
   /// Send a <GET> command to fetch the contents in the URI from the
   /// server.
-  virtual ssize_t send_request (void);
+  virtual ssize_t send_request ();
 
   /// Returns the URL that we represent.
   virtual const ACE_URL_Addr &url_addr () const;
 
   /// Commit suicide
-  int destroy (void);
+  int destroy ();
 private:
   /// Address of the URL we're connected to.
   ACE_URL_Addr url_addr_;
diff --git a/ACE/examples/Web_Crawler/Iterators.cpp b/ACE/examples/Web_Crawler/Iterators.cpp
index 67485251b98..d5edd7a5f12 100644
--- a/ACE/examples/Web_Crawler/Iterators.cpp
+++ b/ACE/examples/Web_Crawler/Iterators.cpp
@@ -2,12 +2,12 @@
 #include "Options.h"
 #include "Iterators.h"
 
-URL_Iterator::~URL_Iterator (void)
+URL_Iterator::~URL_Iterator ()
 {
 }
 
 int
-URL_Iterator::destroy (void)
+URL_Iterator::destroy ()
 {
   // Commit suicide.
   delete this;
diff --git a/ACE/examples/Web_Crawler/Iterators.h b/ACE/examples/Web_Crawler/Iterators.h
index 936af00cc4d..a799f97f286 100644
--- a/ACE/examples/Web_Crawler/Iterators.h
+++ b/ACE/examples/Web_Crawler/Iterators.h
@@ -32,7 +32,7 @@ class URL_Iterator
 {
 public:
   /// "virtual" destructor.
-  virtual int destroy (void);
+  virtual int destroy ();
 
   // = Iterator methods.
   /// Pass back the next <string> that hasn't been seen yet.  Returns 0
@@ -41,7 +41,7 @@ public:
 
 protected:
   /// C++ destructor.
-  virtual ~URL_Iterator (void);
+  virtual ~URL_Iterator ();
 };
 
 /**
diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp
index 1f5b68164ea..47a0f54e1f2 100644
--- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp
+++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp
@@ -6,7 +6,7 @@
 
 
 ACE_SOCK_Stream &
-Mem_Map_Stream::stream (void)
+Mem_Map_Stream::stream ()
 {
   return svc_handler_->peer ();
 }
@@ -24,7 +24,7 @@ Mem_Map_Stream::eof () const
 }
 
 int
-Mem_Map_Stream::get_char (void)
+Mem_Map_Stream::get_char ()
 {
   if (this->eof () && this->grow_file_and_remap () == -1)
     return EOF;
@@ -33,7 +33,7 @@ Mem_Map_Stream::get_char (void)
 }
 
 int
-Mem_Map_Stream::rewind (void)
+Mem_Map_Stream::rewind ()
 {
   this->recv_pos_ =
     reinterpret_cast<char *> (this->mem_map_.addr ());
@@ -126,7 +126,7 @@ Mem_Map_Stream::seek (ACE_OFF_T offset, int whence)
 }
 
 Mem_Map_Stream::Svc_Handler *
-Mem_Map_Stream::svc_handler (void)
+Mem_Map_Stream::svc_handler ()
 {
   return this->svc_handler_;
 }
@@ -179,7 +179,7 @@ Mem_Map_Stream::open (STRAT_CONNECTOR *connector,
 }
 
 int
-Mem_Map_Stream::grow_file_and_remap (void)
+Mem_Map_Stream::grow_file_and_remap ()
 {
   char buf[BUFSIZ + 1];
 
@@ -230,7 +230,7 @@ Mem_Map_Stream::grow_file_and_remap (void)
   return 0;
 }
 
-Mem_Map_Stream::~Mem_Map_Stream (void)
+Mem_Map_Stream::~Mem_Map_Stream ()
 {
   // Remove the mapping and the file.
   this->mem_map_.remove ();
diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.h b/ACE/examples/Web_Crawler/Mem_Map_Stream.h
index 2089256f3d8..f2e9195ce61 100644
--- a/ACE/examples/Web_Crawler/Mem_Map_Stream.h
+++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.h
@@ -57,18 +57,18 @@ public:
                                ACE_SOCK_CONNECTOR>
         STRAT_CONNECTOR;
 
-  // Mem_Map_Stream (void);
+  // Mem_Map_Stream ();
   // constructor added:KIRTHIKA
   /// Initialize this object.
   virtual int open (STRAT_CONNECTOR *connector,
                     const ACE_INET_Addr &);
 
   /// Destructor.
-  virtual ~Mem_Map_Stream (void);
+  virtual ~Mem_Map_Stream ();
 
   // = Accessor.
   /// Returns the underlying <ACE_SOCK_Stream>.
-  ACE_SOCK_Stream &stream (void);
+  ACE_SOCK_Stream &stream ();
 
   // = I/O methods.
 
@@ -83,7 +83,7 @@ public:
    * position.  Returns EOF when the <get> position reaches the end of
    * the HTTP stream.
    */
-  virtual int get_char (void);
+  virtual int get_char ();
 
   /**
    * Returns a pointer to array of at most <len> characters starting
@@ -108,7 +108,7 @@ public:
    * stream.  This works since all the data has been cached in the
    * memory-mapped backing store.
    */
-  virtual int rewind (void);
+  virtual int rewind ();
 
   /**
    * Returns the nth character <offset> from the <get> position in the
@@ -154,7 +154,7 @@ public:
                                     ACE_SYNCH_NULL_MUTEX>
                                     CACHED_CONNECT_STRATEGY;*/
 
-  Svc_Handler *svc_handler (void);
+  Svc_Handler *svc_handler ();
 
 private:
   /**
@@ -162,7 +162,7 @@ private:
    * extend the mapping to cover this chunk.  Returns -1 on failure or
    * EOF, else 0.
    */
-  int grow_file_and_remap (void);
+  int grow_file_and_remap ();
 
   //ACE_SOCK_Stream stream_;
 
diff --git a/ACE/examples/Web_Crawler/Options.cpp b/ACE/examples/Web_Crawler/Options.cpp
index 34d1cf47ef0..824b4b784db 100644
--- a/ACE/examples/Web_Crawler/Options.cpp
+++ b/ACE/examples/Web_Crawler/Options.cpp
@@ -172,7 +172,7 @@ Options::visitor (URL_Visitor *v)
 }
 
 int
-Options::handle_limit (void)
+Options::handle_limit ()
 {
   return this->handle_limit_;
 }
diff --git a/ACE/examples/Web_Crawler/Options.h b/ACE/examples/Web_Crawler/Options.h
index 7a8b9f02f48..c4b1537f0e4 100644
--- a/ACE/examples/Web_Crawler/Options.h
+++ b/ACE/examples/Web_Crawler/Options.h
@@ -76,7 +76,7 @@ public:
   void visitor (URL_Visitor *);
 
   // Get the handle_limit.
-  int handle_limit (void);
+  int handle_limit ();
 private:
   /// Are we recursving.
   int recurse_;
diff --git a/ACE/examples/Web_Crawler/URL.cpp b/ACE/examples/Web_Crawler/URL.cpp
index 69a36d6acbb..c9eb6fd7382 100644
--- a/ACE/examples/Web_Crawler/URL.cpp
+++ b/ACE/examples/Web_Crawler/URL.cpp
@@ -2,17 +2,17 @@
 
 
 Mem_Map_Stream &
-URL::stream (void)
+URL::stream ()
 {
   return this->stream_;
 }
 
-URL::~URL (void)
+URL::~URL ()
 {
 }
 
 const URL_Status &
-URL::reply_status (void)
+URL::reply_status ()
 {
   return this->reply_status_;
 }
@@ -24,7 +24,7 @@ URL::reply_status (const URL_Status &rs)
 }
 
 const ACE_CString &
-URL::content_type (void)
+URL::content_type ()
 {
   return this->content_type_;
 }
diff --git a/ACE/examples/Web_Crawler/URL.h b/ACE/examples/Web_Crawler/URL.h
index 529747dd89d..9d6c517bd82 100644
--- a/ACE/examples/Web_Crawler/URL.h
+++ b/ACE/examples/Web_Crawler/URL.h
@@ -38,7 +38,7 @@ class URL
 {
 public:
   /// Destructor.
-  virtual ~URL (void);
+  virtual ~URL ();
 
   /**
    * Accept the visitor, which will then perform a particular
@@ -55,14 +55,14 @@ public:
   virtual const ACE_URL_Addr &url_addr () const = 0;
 
   /// Returns the <Mem_Map_Stream>.
-  virtual Mem_Map_Stream &stream (void);
+  virtual Mem_Map_Stream &stream ();
 
   // = Get/set the reply status.
-  virtual const URL_Status &reply_status (void);
+  virtual const URL_Status &reply_status ();
   virtual void reply_status (const URL_Status &);
 
   // = Get/set the reply status.
-  virtual const ACE_CString &content_type (void);
+  virtual const ACE_CString &content_type ();
   virtual void content_type (const ACE_CString &);
 
 
diff --git a/ACE/examples/Web_Crawler/URL_Addr.cpp b/ACE/examples/Web_Crawler/URL_Addr.cpp
index f7d92b2c13e..bf9e9d439eb 100644
--- a/ACE/examples/Web_Crawler/URL_Addr.cpp
+++ b/ACE/examples/Web_Crawler/URL_Addr.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_Memory.h"
 
-ACE_URL_Addr::ACE_URL_Addr (void)
+ACE_URL_Addr::ACE_URL_Addr ()
   : path_name_ (0),
     addr_string_ (0),
     addr_string_len_ (0)
@@ -210,7 +210,7 @@ ACE_URL_Addr::get_path_name () const
   return this->path_name_;
 }
 
-ACE_URL_Addr::~ACE_URL_Addr (void)
+ACE_URL_Addr::~ACE_URL_Addr ()
 {
   ACE_OS::free (reinterpret_cast<void *> (const_cast<ACE_TCHAR *>
                                                       (this->path_name_)));
@@ -220,7 +220,7 @@ ACE_URL_Addr::~ACE_URL_Addr (void)
 }
 
 int
-ACE_URL_Addr::destroy (void)
+ACE_URL_Addr::destroy ()
 {
   // Commit suicide.
   delete this;
diff --git a/ACE/examples/Web_Crawler/URL_Addr.h b/ACE/examples/Web_Crawler/URL_Addr.h
index 565b1d068e7..2b27dd181df 100644
--- a/ACE/examples/Web_Crawler/URL_Addr.h
+++ b/ACE/examples/Web_Crawler/URL_Addr.h
@@ -30,7 +30,7 @@ class ACE_URL_Addr : public ACE_INET_Addr
 {
 public:
   /// Constructor.
-  ACE_URL_Addr (void);
+  ACE_URL_Addr ();
 
   ACE_URL_Addr (const ACE_TCHAR *host_name,
                 const ACE_TCHAR *path_name,
@@ -82,7 +82,7 @@ public:
   void operator= (const ACE_URL_Addr &addr);
 
   /// Destructor.
-  ~ACE_URL_Addr (void);
+  ~ACE_URL_Addr ();
 
   /**
    * Compare two addresses for equality.  The addresses are considered
@@ -101,7 +101,7 @@ public:
   const ACE_TCHAR *get_path_name () const;
 
   /// Commit suicide.
-  int destroy (void);
+  int destroy ();
 private:
   /// Our path name.
   ACE_TCHAR *path_name_;
diff --git a/ACE/examples/Web_Crawler/URL_Status.cpp b/ACE/examples/Web_Crawler/URL_Status.cpp
index c58153b7ce7..6ccb29c422a 100644
--- a/ACE/examples/Web_Crawler/URL_Status.cpp
+++ b/ACE/examples/Web_Crawler/URL_Status.cpp
@@ -30,7 +30,7 @@ URL_Status::status (URL_Status::STATUS_CODE s)
   this->status_ = s;
 }
 
-int URL_Status::destroy (void)
+int URL_Status::destroy ()
 {
   delete this;
   return 0;
diff --git a/ACE/examples/Web_Crawler/URL_Status.h b/ACE/examples/Web_Crawler/URL_Status.h
index 08760a3ee27..a9054470b37 100644
--- a/ACE/examples/Web_Crawler/URL_Status.h
+++ b/ACE/examples/Web_Crawler/URL_Status.h
@@ -50,7 +50,7 @@ public:
   STATUS_CODE status () const;
   void status (int);
   void status (STATUS_CODE);
-  int destroy (void);
+  int destroy ();
 private:
   STATUS_CODE status_;
 };
diff --git a/ACE/examples/Web_Crawler/URL_Visitor.cpp b/ACE/examples/Web_Crawler/URL_Visitor.cpp
index bf6ef871193..8f6ed5af3e0 100644
--- a/ACE/examples/Web_Crawler/URL_Visitor.cpp
+++ b/ACE/examples/Web_Crawler/URL_Visitor.cpp
@@ -11,12 +11,12 @@ URL_Processing_Strategy::URL_Processing_Strategy (URL &url,
 {
 }
 
-URL_Processing_Strategy::~URL_Processing_Strategy (void)
+URL_Processing_Strategy::~URL_Processing_Strategy ()
 {
 }
 
 int
-URL_Processing_Strategy::destroy (void)
+URL_Processing_Strategy::destroy ()
 {
   // Commit suicide.
   delete this;
@@ -30,7 +30,7 @@ URL_Download_Strategy::URL_Download_Strategy (URL &url,
 }
 
 int
-URL_Download_Strategy::execute (void)
+URL_Download_Strategy::execute ()
 {
   ACE_CString buffer;
 
@@ -51,7 +51,7 @@ HTTP_Header_Processing_Strategy::HTTP_Header_Processing_Strategy (URL &url,
 }
 
 int
-HTTP_Header_Processing_Strategy::execute (void)
+HTTP_Header_Processing_Strategy::execute ()
 {
   // Set the get() position.Necessary since later a peek is done.
   if (this->url_.stream ().get_char () == 0)
@@ -106,7 +106,7 @@ HTML_Body_Validation_Strategy::HTML_Body_Validation_Strategy (URL &url,
 }
 
 int
-HTML_Body_Validation_Strategy::execute (void)
+HTML_Body_Validation_Strategy::execute ()
 {
   char host_name_buf[BUFSIZ + 1];
   ACE_CString host_name (host_name_buf);
@@ -184,7 +184,7 @@ HTML_Body_Validation_Strategy::execute (void)
 }
 
 URL_Iterator *
-URL_Validation_Visitation_Strategy_Factory::make_header_iterator (void)
+URL_Validation_Visitation_Strategy_Factory::make_header_iterator ()
 {
   URL_Iterator *i;
   ACE_NEW_RETURN (i,
@@ -194,7 +194,7 @@ URL_Validation_Visitation_Strategy_Factory::make_header_iterator (void)
 }
 
 URL_Iterator *
-URL_Validation_Visitation_Strategy_Factory::make_body_iterator (void)
+URL_Validation_Visitation_Strategy_Factory::make_body_iterator ()
 {
   URL_Iterator *i;
   ACE_NEW_RETURN (i,
@@ -227,18 +227,18 @@ URL_Validation_Visitation_Strategy_Factory::make_body_strategy (URL_Iterator &it
 }
 
 int
-URL_Validation_Visitation_Strategy_Factory::destroy (void)
+URL_Validation_Visitation_Strategy_Factory::destroy ()
 {
   // Commit suicide.
   delete this;
   return 0;
 }
 
-URL_Visitor::~URL_Visitor (void)
+URL_Visitor::~URL_Visitor ()
 {
 }
 
-URL_Validation_Visitor::URL_Validation_Visitor (void)
+URL_Validation_Visitor::URL_Validation_Visitor ()
 {
   ACE_NEW (this->caching_connect_strategy_,
            CACHED_CONNECT_STRATEGY (this->caching_strategy_));
@@ -254,7 +254,7 @@ URL_Validation_Visitor::URL_Validation_Visitor (void)
 
 }
 
-URL_Validation_Visitor::~URL_Validation_Visitor (void)
+URL_Validation_Visitor::~URL_Validation_Visitor ()
 {
   this->strat_connector_ = 0;
   if (this->caching_connect_strategy_ != 0)
@@ -262,7 +262,7 @@ URL_Validation_Visitor::~URL_Validation_Visitor (void)
 }
 
 URL_Validation_Visitor::URL_CACHE &
-URL_Validation_Visitor::url_cache (void)
+URL_Validation_Visitor::url_cache ()
 {
   return this->url_cache_;
 }
@@ -329,7 +329,7 @@ URL_Validation_Visitor::make_visitation_strategy_factory (URL &url)
 }
 
 int
-URL_Validation_Visitor::destroy (void)
+URL_Validation_Visitor::destroy ()
 {
   delete this->strat_connector_;
   // Commit suicide.
@@ -412,7 +412,7 @@ URL_Validation_Visitor::visit (HTTP_URL &http_url)
 }
 
 int
-URL_Download_Visitation_Strategy_Factory::destroy (void)
+URL_Download_Visitation_Strategy_Factory::destroy ()
 {
   // Commit suicide.
   delete this;
@@ -420,13 +420,13 @@ URL_Download_Visitation_Strategy_Factory::destroy (void)
 }
 
 URL_Iterator *
-URL_Download_Visitation_Strategy_Factory::make_header_iterator (void)
+URL_Download_Visitation_Strategy_Factory::make_header_iterator ()
 {
   return 0;
 }
 
 URL_Iterator *
-URL_Download_Visitation_Strategy_Factory::make_body_iterator (void)
+URL_Download_Visitation_Strategy_Factory::make_body_iterator ()
 {
   URL_Iterator *i;
   ACE_NEW_RETURN (i,
@@ -460,7 +460,7 @@ URL_Visitation_Strategy_Factory::URL_Visitation_Strategy_Factory (URL *url)
 {
 }
 
-URL_Visitation_Strategy_Factory::~URL_Visitation_Strategy_Factory (void)
+URL_Visitation_Strategy_Factory::~URL_Visitation_Strategy_Factory ()
 {
 }
 
@@ -498,7 +498,7 @@ URL_Download_Visitor::make_visitation_strategy_factory (URL &url)
 }
 
 int
-URL_Download_Visitor::destroy (void)
+URL_Download_Visitor::destroy ()
 {
   // Commit suicide.
   delete this;
diff --git a/ACE/examples/Web_Crawler/URL_Visitor.h b/ACE/examples/Web_Crawler/URL_Visitor.h
index 2e4f816a2bc..88fcd023325 100644
--- a/ACE/examples/Web_Crawler/URL_Visitor.h
+++ b/ACE/examples/Web_Crawler/URL_Visitor.h
@@ -42,12 +42,12 @@ public:
   URL_Processing_Strategy (URL &,
                            URL_Iterator &);
 
-  virtual ~URL_Processing_Strategy (void);
+  virtual ~URL_Processing_Strategy ();
 
   /// Perform the strategy.
   virtual int execute (void) = 0;
 
-  virtual int destroy (void);
+  virtual int destroy ();
 
   // Close down the resources.
 
@@ -72,7 +72,7 @@ public:
                                    URL_Iterator &);
 
   /// Perform the strategy for processing an HTTP header.
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 /**
@@ -96,7 +96,7 @@ public:
    * iterates over the HTML file and recursively visits embedded links
    * to process them, as well.
    */
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   /// This is the context of the visit.
@@ -118,7 +118,7 @@ public:
                          URL_Iterator &);
 
   /// Perform the strategy for downloading a URL to a temporary file.
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 /**
@@ -132,7 +132,7 @@ public:
   URL_Visitation_Strategy_Factory (URL *);
 
   /// Destructor.
-  virtual ~URL_Visitation_Strategy_Factory (void);
+  virtual ~URL_Visitation_Strategy_Factory ();
 
   // = Factory Methods.
   /// Factory Method that makes the header iterator.
@@ -168,10 +168,10 @@ public:
 
   // = Factory Methods.
   /// Factory Method that makes an <HTTP_Header_Iterator>.
-  virtual URL_Iterator *make_header_iterator (void);
+  virtual URL_Iterator *make_header_iterator ();
 
   /// Factory Method that makes an <HTML_Body_Iterator>.
-  virtual URL_Iterator *make_body_iterator (void);
+  virtual URL_Iterator *make_body_iterator ();
 
   /// Factory Method that makes the header processing strategy.
   virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &);
@@ -180,7 +180,7 @@ public:
   virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &);
 
   /// Close down the resources.
-  virtual int destroy (void);
+  virtual int destroy ();
 };
 
 /**
@@ -197,10 +197,10 @@ public:
 
   // = Factory Methods.
   /// Factory Method that makes an <HTTP_Header_Iterator>.
-  virtual URL_Iterator *make_header_iterator (void);
+  virtual URL_Iterator *make_header_iterator ();
 
   /// Factory Method that makes an <HTML_Body_Iterator>.
-  virtual URL_Iterator *make_body_iterator (void);
+  virtual URL_Iterator *make_body_iterator ();
 
   /// Factory Method that makes the header processing strategy.
   virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &);
@@ -209,7 +209,7 @@ public:
   virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &);
 
   /// Close down the resources.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 private:
   /// Context of the visitor.
@@ -226,7 +226,7 @@ private:
 class URL_Visitor
 {
 public:
-  virtual ~URL_Visitor (void);
+  virtual ~URL_Visitor ();
 
   /// Visit an <HTTP_URL>.
   virtual int visit (HTTP_URL &http_url) = 0;
@@ -310,16 +310,16 @@ public:
   // virtual int visit (FTP_URL &http_url);
 
   /// Cleanup the resources.
-  URL_Validation_Visitor (void);
-  virtual int destroy (void);
+  URL_Validation_Visitor ();
+  virtual int destroy ();
 
   /// Returns a reference to the URL cache.
-  URL_CACHE &url_cache (void);
+  URL_CACHE &url_cache ();
 
 protected:
   /// Factory Method that makes a
   /// <URL_Validation_Visitation_Strategy_Factory>.
-  virtual ~URL_Validation_Visitor (void);
+  virtual ~URL_Validation_Visitor ();
   virtual URL_Visitation_Strategy_Factory *make_visitation_strategy_factory (URL &);
 
   /// Cache the status of URLs we've already validated.
@@ -364,7 +364,7 @@ public:
   // virtual int visit (FTP_URL &http_url);
 
   /// Cleanup the resources.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 protected:
   /// Factory Method that makes a <URL_Download_Visitation_Strategy_Factory>.
@@ -394,7 +394,7 @@ public:
       this->t_->destroy ();
     this->t_ = t;
   }
-  ~Auto_Destroyer (void)
+  ~Auto_Destroyer ()
   {
     if (this->t_ != 0)
       t_->destroy ();
diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp b/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp
index aadb46732d2..8978411ddea 100644
--- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp
+++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp
@@ -1,12 +1,12 @@
 /* -*- C++ -*- */
 #include "URL_Visitor_Factory.h"
 
-URL_Visitor_Factory::~URL_Visitor_Factory (void)
+URL_Visitor_Factory::~URL_Visitor_Factory ()
 {
 }
 
 URL_Visitor *
-URL_Validation_Visitor_Factory::make_visitor (void)
+URL_Validation_Visitor_Factory::make_visitor ()
 {
   URL_Visitor *v;
 
@@ -18,7 +18,7 @@ URL_Validation_Visitor_Factory::make_visitor (void)
 }
 
 Command_Processor *
-URL_Validation_Visitor_Factory::make_command_processor (void)
+URL_Validation_Visitor_Factory::make_command_processor ()
 {
   Command_Processor *cp;
 
@@ -29,7 +29,7 @@ URL_Validation_Visitor_Factory::make_command_processor (void)
 }
 
 URL_Visitor *
-URL_Download_Visitor_Factory::make_visitor (void)
+URL_Download_Visitor_Factory::make_visitor ()
 {
   URL_Visitor *v;
 
@@ -40,7 +40,7 @@ URL_Download_Visitor_Factory::make_visitor (void)
 }
 
 Command_Processor *
-URL_Download_Visitor_Factory::make_command_processor (void)
+URL_Download_Visitor_Factory::make_command_processor ()
 {
   return 0;
 }
diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h
index 5bfd1834b53..af0d48a8317 100644
--- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h
+++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h
@@ -31,7 +31,7 @@ class URL_Visitor_Factory
 {
 public:
   /// Destructor.
-  virtual ~URL_Visitor_Factory (void);
+  virtual ~URL_Visitor_Factory ();
 
   /// Factory Method that makes the appropriate type of <URL_Visitor>.
   virtual URL_Visitor *make_visitor (void) = 0;
@@ -50,10 +50,10 @@ class URL_Validation_Visitor_Factory : public URL_Visitor_Factory
 {
 public:
   /// Factory Method that makes a <URL_Validation_Visitor>.
-  virtual URL_Visitor *make_visitor (void);
+  virtual URL_Visitor *make_visitor ();
 
   /// Factory Method that makes a <FIFO_Command_Processor>.
-  virtual Command_Processor *make_command_processor (void);
+  virtual Command_Processor *make_command_processor ();
 };
 
 /**
@@ -65,10 +65,10 @@ class URL_Download_Visitor_Factory : public URL_Visitor_Factory
 {
 public:
   /// Factory Method that makes a <URL_Download_Visitor>.
-  virtual URL_Visitor *make_visitor (void);
+  virtual URL_Visitor *make_visitor ();
 
   /// Factory Method that makes a <FIFO_Command_Processor>.
-  virtual Command_Processor *make_command_processor (void);
+  virtual Command_Processor *make_command_processor ();
 };
 
 #endif /* _URL_VISITOR_FACTORY_H */
diff --git a/ACE/examples/Web_Crawler/Web_Crawler.cpp b/ACE/examples/Web_Crawler/Web_Crawler.cpp
index 9a6f06fa5a4..29a6ad3ed9f 100644
--- a/ACE/examples/Web_Crawler/Web_Crawler.cpp
+++ b/ACE/examples/Web_Crawler/Web_Crawler.cpp
@@ -3,12 +3,12 @@
 #include "Web_Crawler.h"
 
 
-Web_Crawler::~Web_Crawler (void)
+Web_Crawler::~Web_Crawler ()
 {
   delete this->url_visitor_factory_;
 }
 
-Web_Crawler::Web_Crawler (void)
+Web_Crawler::Web_Crawler ()
   : url_visitor_factory_ (0)
 {
 }
@@ -30,7 +30,7 @@ Web_Crawler::open (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Web_Crawler::run (void)
+Web_Crawler::run ()
 {
   // Make the appropriate <URL_Visitor>.
   Auto_Destroyer<URL_Visitor> visitor (this->url_visitor_factory_->make_visitor ());
diff --git a/ACE/examples/Web_Crawler/Web_Crawler.h b/ACE/examples/Web_Crawler/Web_Crawler.h
index b799cc151cf..a63ba252d75 100644
--- a/ACE/examples/Web_Crawler/Web_Crawler.h
+++ b/ACE/examples/Web_Crawler/Web_Crawler.h
@@ -35,10 +35,10 @@ class Web_Crawler
 {
 public:
   /// Constructor.
-  Web_Crawler (void);
+  Web_Crawler ();
 
   /// Destructor.
-  ~Web_Crawler (void);
+  ~Web_Crawler ();
 
   /// Parses the command-line options and initializes the
   /// <URL_Visitor_Factory>.
@@ -46,7 +46,7 @@ public:
 
   /// Run the Web Crawler and carries out whatever visitation strategy
   /// is configured.  Returns -1 on failure and 0 on success.
-  int run (void);
+  int run ();
 
 private:
   /**
diff --git a/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp b/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp
index c4d48a685f2..0fb055c0503 100644
--- a/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -16,22 +16,22 @@
 // Get the instance of Name_Service using Dynamic_Service
 
 //inline Name_Service *
-//NAME_SERVICE (void)
+//NAME_SERVICE ()
 
 inline ACE_Naming_Context *
-NAMING_CONTEXT (void)
+NAMING_CONTEXT ()
 {
   return ACE_Dynamic_Service<ACE_Naming_Context>::instance ("ACE_Naming_Context");
 }
 
-Client_Test::Client_Test (void)
+Client_Test::Client_Test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Client_Test::Client_Test\n"));
 }
 
 int
-Client_Test::open (void)
+Client_Test::open ()
 {
   // Cache the name options.
   this->name_options_ = NAMING_CONTEXT ()->name_options ();
@@ -50,7 +50,7 @@ Client_Test::open (void)
 
 
 int
-Client_Test::close (void)
+Client_Test::close ()
 {
   // Deregister this handler with the ACE_Reactor.
   return ACE_Reactor::instance ()->remove_handler
@@ -222,7 +222,7 @@ Client_Test::handle_input (ACE_HANDLE)
 }
 
 void
-Client_Test::display_menu (void)
+Client_Test::display_menu ()
 {
   ACE_DEBUG ((LM_DEBUG, "\n"));
   this->list_options ();
@@ -246,7 +246,7 @@ Client_Test::display_menu (void)
 }
 
 void
-Client_Test::list_options (void)
+Client_Test::list_options ()
 {
   switch (this->name_options_->context ())
     {
@@ -276,7 +276,7 @@ Client_Test::list_options (void)
 }
 
 int
-Client_Test::set_proc_local (void)
+Client_Test::set_proc_local ()
 {
   // Close down original name space
   NAMING_CONTEXT ()->close ();
@@ -286,7 +286,7 @@ Client_Test::set_proc_local (void)
 }
 
 int
-Client_Test::set_node_local (void)
+Client_Test::set_node_local ()
 {
   // Close down original name space
   NAMING_CONTEXT ()->close ();
diff --git a/ACE/netsvcs/clients/Naming/Client/Client_Test.h b/ACE/netsvcs/clients/Naming/Client/Client_Test.h
index 8332e06b8da..1a2b0738d06 100644
--- a/ACE/netsvcs/clients/Naming/Client/Client_Test.h
+++ b/ACE/netsvcs/clients/Naming/Client/Client_Test.h
@@ -9,18 +9,18 @@
 class Client_Test : public ACE_Event_Handler
 {
 public:
-  Client_Test (void);
+  Client_Test ();
 
-  int open (void);
+  int open ();
   // Cache reactor and then register self with reactor
 
-  int close (void);
+  int close ();
   // Close things down and free up resources.
 
   virtual int handle_input (ACE_HANDLE handle);
   // Handle user entered commands
 
-  void list_options (void);
+  void list_options ();
   // Print name options
 
   int bind (const char *key,
@@ -61,13 +61,13 @@ private:
   ACE_Name_Options *name_options_;
   // Name Options associated with the Naming Context
 
-  void display_menu (void);
+  void display_menu ();
   // Display user menu
 
-  int set_proc_local (void);
+  int set_proc_local ();
   // Set options to use PROC_LOCAL naming context
 
-  int set_node_local (void);
+  int set_node_local ();
   // Set options to use NODE_LOCAL naming context
 
   int set_host (const char *hostname, int port);
diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
index 7d060ed3a35..9572f57efa0 100644
--- a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
+++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
@@ -56,7 +56,7 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[])
                 ACE_TEXT ("register_stdin_handler")));
 }
 
-Dump_Restore::~Dump_Restore (void)
+Dump_Restore::~Dump_Restore ()
 {
   // Deregister this handler with the ACE_Reactor.
   ACE_Reactor::instance ()->remove_handler
@@ -135,7 +135,7 @@ Dump_Restore::handle_input (ACE_HANDLE)
 }
 
 void
-Dump_Restore::display_menu (void)
+Dump_Restore::display_menu ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n")));
@@ -195,7 +195,7 @@ Dump_Restore::display_menu (void)
 
 
 int
-Dump_Restore::set_proc_local (void)
+Dump_Restore::set_proc_local ()
 {
   // Set Name Options
   this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
@@ -223,7 +223,7 @@ Dump_Restore::set_proc_local (void)
 }
 
 int
-Dump_Restore::set_node_local (void)
+Dump_Restore::set_node_local ()
 {
   // Set Name Options
   this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
@@ -441,13 +441,13 @@ Dump_Restore::rebind (const char *key,
 }
 
 int
-Dump_Restore::quit (void)
+Dump_Restore::quit ()
 {
   return ACE_OS::kill (ACE_OS::getpid (), SIGINT);
 }
 
 void
-Dump_Restore::dump (void)
+Dump_Restore::dump ()
 {
   ofstream output_file (dump_filename_);
 
diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
index b833a6bf29f..901aba05813 100644
--- a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
+++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
@@ -20,24 +20,24 @@ public:
   Dump_Restore (int argc, ACE_TCHAR *argv[]);
   // Initialize name options and naming context
 
-  ~Dump_Restore (void);
+  ~Dump_Restore ();
 
   virtual int handle_input (ACE_HANDLE handle);
   // Handle user entered commands
 
-  void dump (void);
+  void dump ();
 
 private:
   ACE_TCHAR hostname_[MAXHOSTNAMELEN + 1];
   // Cache the hostname and port number for remote case
 
-  void display_menu (void);
+  void display_menu ();
   // Display user menu.
 
-  int set_proc_local (void);
+  int set_proc_local ();
   // Set options to use PROC_LOCAL naming context.
 
-  int set_node_local (void);
+  int set_node_local ();
   // Set options to use NODE_LOCAL naming context.
 
   int set_host (const ACE_TCHAR *hostname,
@@ -45,7 +45,7 @@ private:
   // Set options to use NET_LOCAL naming context specifying host name
   // and port number.
 
-  int quit (void);
+  int quit ();
   // Gracefully exit.
 
   int populate (Dump_Restore::Operation_Type op);
diff --git a/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index e6f4b2826c9..4818fb99785 100644
--- a/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -200,7 +200,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-mutex_test (void)
+mutex_test ()
 {
   ACE_Thread_Manager thr_mgr;
 
@@ -242,7 +242,7 @@ mutex_test (void)
 }
 
 static int
-rwlock_test (void)
+rwlock_test ()
 {
   ACE_Thread_Manager thr_mgr;
 
diff --git a/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp b/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp
index 55d7b02ee4e..47da7c085b6 100644
--- a/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp
+++ b/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp
@@ -91,7 +91,7 @@ run_mutex (void *)
 }
 
 static int
-run_final_test (void)
+run_final_test ()
 {
   ACE_DEBUG ((LM_DEBUG, "starting mutex tests 1 & 2\n"));
 
diff --git a/ACE/netsvcs/clients/Tokens/manual/manual.cpp b/ACE/netsvcs/clients/Tokens/manual/manual.cpp
index 0f204851456..329a40b765e 100644
--- a/ACE/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/ACE/netsvcs/clients/Tokens/manual/manual.cpp
@@ -36,7 +36,7 @@ class STDIN_Token : public ACE_Event_Handler
 {
 public:
   /// Construction.
-  STDIN_Token (void);
+  STDIN_Token ();
 
   /// Parse command-line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -54,7 +54,7 @@ public:
 
 private:
   /// Display options.
-  void display_menu (void);
+  void display_menu ();
 
   /// Get or make a proxy to <token> with a <tid> client id.
   ACE_Token_Proxy *get_proxy (const char *tid, const char *token, char type);
@@ -85,7 +85,7 @@ private:
   int remote_;
 };
 
-STDIN_Token::STDIN_Token (void)
+STDIN_Token::STDIN_Token ()
   : server_host_ (ACE_DEFAULT_SERVER_HOST),
     server_port_ (ACE_DEFAULT_SERVER_PORT),
     ignore_deadlock_ (0),
@@ -249,7 +249,7 @@ STDIN_Token::handle_input (ACE_HANDLE fd)
 }
 
 void
-STDIN_Token::display_menu (void)
+STDIN_Token::display_menu ()
 {
   ACE_OS::printf ("<tid> <token> <type> <operation>\n");
 }
diff --git a/ACE/netsvcs/lib/Base_Optimizer.cpp b/ACE/netsvcs/lib/Base_Optimizer.cpp
index 56c025d6312..d007a639aee 100644
--- a/ACE/netsvcs/lib/Base_Optimizer.cpp
+++ b/ACE/netsvcs/lib/Base_Optimizer.cpp
@@ -4,7 +4,7 @@
 #include "Base_Optimizer.h"
 
 template<class Base, class Member>
-Base_Optimizer<Base, Member>::Base_Optimizer (void)
+Base_Optimizer<Base, Member>::Base_Optimizer ()
 {
 }
 
diff --git a/ACE/netsvcs/lib/Base_Optimizer.h b/ACE/netsvcs/lib/Base_Optimizer.h
index 82e6d97810c..f4a648f09b3 100644
--- a/ACE/netsvcs/lib/Base_Optimizer.h
+++ b/ACE/netsvcs/lib/Base_Optimizer.h
@@ -27,7 +27,7 @@ template<class Base, class Member>
 class Base_Optimizer : public Base
 {
 public:
-  Base_Optimizer (void);
+  Base_Optimizer ();
   Base_Optimizer (const Base &base);
   Base_Optimizer (const Base &base,
                   const Member &member);
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index 87c1ff3266f..ceef4fccbb8 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -428,7 +428,7 @@ class ACE_Client_Logging_Acceptor : public ACE_Acceptor<ACE_Client_Logging_Handl
   //     This class contains the service-specific methods that can't
   //     easily be factored into the <ACE_Acceptor>.
 public:
-  ACE_Client_Logging_Acceptor (void);
+  ACE_Client_Logging_Acceptor ();
   // Default constructor.
 
 protected:
@@ -446,8 +446,8 @@ protected:
   // Factory that always returns the <handler_>.
 
   // = Scheduling hooks.
-  virtual int suspend (void);
-  virtual int resume (void);
+  virtual int suspend ();
+  virtual int resume ();
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -477,7 +477,7 @@ private:
 };
 
 int
-ACE_Client_Logging_Acceptor::fini (void)
+ACE_Client_Logging_Acceptor::fini ()
 {
   this->close ();
 
@@ -520,7 +520,7 @@ ACE_Client_Logging_Acceptor::info (ACE_TCHAR **strp, size_t length) const
   return ACE_OS::strlen (buf);
 }
 
-ACE_Client_Logging_Acceptor::ACE_Client_Logging_Acceptor (void)
+ACE_Client_Logging_Acceptor::ACE_Client_Logging_Acceptor ()
   : server_host_ (ACE_OS::strdup (ACE_DEFAULT_SERVER_HOST)),
     server_port_ (ACE_DEFAULT_LOGGING_SERVER_PORT),
     logger_key_ (ACE_OS::strdup (ACE_DEFAULT_LOGGER_KEY)),
@@ -682,14 +682,14 @@ ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_Client_Logging_Acceptor::suspend (void)
+ACE_Client_Logging_Acceptor::suspend ()
 {
   // To be done...
   return 0;
 }
 
 int
-ACE_Client_Logging_Acceptor::resume (void)
+ACE_Client_Logging_Acceptor::resume ()
 {
   // To be done...
   return 0;
diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.cpp b/ACE/netsvcs/lib/Log_Message_Receiver.cpp
index a5a611183cb..c775f77074b 100644
--- a/ACE/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/ACE/netsvcs/lib/Log_Message_Receiver.cpp
@@ -40,14 +40,14 @@ template<ACE_SYNCH_DECL>
 ACE_SYNCH_MUTEX_T Log_Message_Receiver_Impl<ACE_SYNCH_USE>::copy_lock_;
 
 template<ACE_SYNCH_DECL>
-Log_Message_Receiver_Impl<ACE_SYNCH_USE>::Log_Message_Receiver_Impl (void)
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::Log_Message_Receiver_Impl ()
   : count_ (0)
 {
 }
 
 template<ACE_SYNCH_DECL>
 Log_Message_Receiver_Impl<ACE_SYNCH_USE> *
-Log_Message_Receiver_Impl<ACE_SYNCH_USE>::create (void)
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::create ()
 {
   return new Log_Message_Receiver_Impl<ACE_SYNCH_USE>;
 }
@@ -103,13 +103,13 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname,
 }
 
 template<ACE_SYNCH_DECL>
-Log_Message_Receiver_Impl<ACE_SYNCH_USE>::~Log_Message_Receiver_Impl (void)
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::~Log_Message_Receiver_Impl ()
 {
   ACE_ASSERT (count_ == 0 - 1);
 }
 
 template<ACE_SYNCH_DECL>
-Log_Message_Receiver<ACE_SYNCH_USE>::Log_Message_Receiver (void)
+Log_Message_Receiver<ACE_SYNCH_USE>::Log_Message_Receiver ()
   : receiver_impl_ (Log_Message_Receiver_Impl<ACE_SYNCH_USE>::create ())
 {
   ACE_ASSERT (receiver_impl_ != 0);
@@ -142,7 +142,7 @@ Log_Message_Receiver<ACE_SYNCH_USE>::log_output(const ACE_TCHAR *hostname,
 }
 
 template<ACE_SYNCH_DECL>
-Log_Message_Receiver<ACE_SYNCH_USE>::~Log_Message_Receiver (void)
+Log_Message_Receiver<ACE_SYNCH_USE>::~Log_Message_Receiver ()
 {
   ACE_ASSERT (receiver_impl_ != 0);
   Log_Message_Receiver_Impl<ACE_SYNCH_USE>::detach (receiver_impl_);
diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h
index b4b26b31240..30b9cbf0d9d 100644
--- a/ACE/netsvcs/lib/Log_Message_Receiver.h
+++ b/ACE/netsvcs/lib/Log_Message_Receiver.h
@@ -146,9 +146,9 @@ class Log_Message_Receiver
 {
 public:
   /// Creates a new Log_Message_Receiver
-  Log_Message_Receiver (void);
+  Log_Message_Receiver ();
   Log_Message_Receiver(Log_Message_Receiver<ACE_SYNCH_USE> const &rhs);
-  ~Log_Message_Receiver (void);
+  ~Log_Message_Receiver ();
 
   void log_record (const ACE_TCHAR *hostname,
                    ACE_Log_Record &record);
@@ -173,7 +173,7 @@ class Log_Message_Receiver_Impl
 {
 public:
   // Methods for handling reference count and instance lifetime
-  static Log_Message_Receiver_Impl *create (void);
+  static Log_Message_Receiver_Impl *create ();
   static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
   static void detach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
 
@@ -184,8 +184,8 @@ public:
                   ostream *output);
 
 protected:
-  Log_Message_Receiver_Impl (void);
-  ~Log_Message_Receiver_Impl (void);
+  Log_Message_Receiver_Impl ();
+  ~Log_Message_Receiver_Impl ();
 
   /// Attributes
   int count_;
diff --git a/ACE/netsvcs/lib/Name_Handler.cpp b/ACE/netsvcs/lib/Name_Handler.cpp
index cef63c56bd6..05a91eb309e 100644
--- a/ACE/netsvcs/lib/Name_Handler.cpp
+++ b/ACE/netsvcs/lib/Name_Handler.cpp
@@ -207,7 +207,7 @@ ACE_Name_Handler::send_request (ACE_Name_Request &request)
 // unexpectedly).
 
 /* VIRTUAL */ int
-ACE_Name_Handler::abandon (void)
+ACE_Name_Handler::abandon ()
 {
   ACE_TRACE ("ACE_Name_Handler::abandon");
   return this->send_reply (-1, errno);
@@ -234,7 +234,7 @@ ACE_Name_Handler::get_handle () const
 // Dispatch the appropriate operation to handle the client request.
 
 /* VIRTUAL */ int
-ACE_Name_Handler::dispatch (void)
+ACE_Name_Handler::dispatch ()
 {
   ACE_TRACE ("ACE_Name_Handler::dispatch");
   // Dispatch the appropriate request.
@@ -254,7 +254,7 @@ ACE_Name_Handler::dispatch (void)
 // should use non-blocking I/O.
 
 /* VIRTUAL */ int
-ACE_Name_Handler::recv_request (void)
+ACE_Name_Handler::recv_request ()
 {
   ACE_TRACE ("ACE_Name_Handler::recv_request");
   // Read the first 4 bytes to get the length of the message This
@@ -336,14 +336,14 @@ ACE_Name_Handler::handle_input (ACE_HANDLE)
 }
 
 int
-ACE_Name_Handler::bind (void)
+ACE_Name_Handler::bind ()
 {
   ACE_TRACE ("ACE_Name_Handler::bind");
   return this->shared_bind (0);
 }
 
 int
-ACE_Name_Handler::rebind (void)
+ACE_Name_Handler::rebind ()
 {
   ACE_TRACE ("ACE_Name_Handler::rebind");
   int result = this->shared_bind (1);
@@ -388,7 +388,7 @@ ACE_Name_Handler::shared_bind (int rebind)
 }
 
 int
-ACE_Name_Handler::resolve (void)
+ACE_Name_Handler::resolve ()
 {
   ACE_TRACE ("ACE_Name_Handler::resolve");
 #if 0
@@ -421,7 +421,7 @@ ACE_Name_Handler::resolve (void)
 }
 
 int
-ACE_Name_Handler::unbind (void)
+ACE_Name_Handler::unbind ()
 {
   ACE_TRACE ("ACE_Name_Handler::unbind");
 #if 0
@@ -472,7 +472,7 @@ ACE_Name_Handler::type_request (ACE_NS_WString *one_type)
 }
 
 int
-ACE_Name_Handler::lists (void)
+ACE_Name_Handler::lists ()
 {
   ACE_TRACE ("ACE_Name_Handler::lists");
 
@@ -523,7 +523,7 @@ ACE_Name_Handler::lists (void)
 }
 
 int
-ACE_Name_Handler::lists_entries (void)
+ACE_Name_Handler::lists_entries ()
 {
   ACE_TRACE ("ACE_Name_Handler::lists_entries");
   ACE_BINDING_SET set;
@@ -612,18 +612,18 @@ ACE_Name_Handler::lists_entries (void)
 }
 
 ACE_Naming_Context *
-ACE_Name_Handler::naming_context (void)
+ACE_Name_Handler::naming_context ()
 {
   return naming_context_;
 }
 
 ACE_Naming_Context *
-ACE_Name_Acceptor::naming_context (void)
+ACE_Name_Acceptor::naming_context ()
 {
   return &naming_context_;
 }
 
-ACE_Name_Handler::~ACE_Name_Handler (void)
+ACE_Name_Handler::~ACE_Name_Handler ()
 {
   ACE_TRACE ("ACE_Name_Handler::~ACE_Name_Handler");
 #if 0
diff --git a/ACE/netsvcs/lib/Name_Handler.h b/ACE/netsvcs/lib/Name_Handler.h
index 217bc71048a..7d499b3f65c 100644
--- a/ACE/netsvcs/lib/Name_Handler.h
+++ b/ACE/netsvcs/lib/Name_Handler.h
@@ -50,7 +50,7 @@ class ACE_Svc_Export ACE_Name_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM,
 {
 public:
   /// Pointer to a member function of ACE_Name_Handler returning int
-  typedef int (ACE_Name_Handler::*OPERATION) (void);
+  typedef int (ACE_Name_Handler::*OPERATION) ();
 
   /// Pointer to a member function of ACE_Naming_Context returning int
   typedef int (ACE_Naming_Context::*LIST_OP) (ACE_PWSTRING_SET &, const ACE_NS_WString &);
@@ -70,17 +70,17 @@ protected:
 
   /// Give up waiting (e.g., when a timeout occurs or a client shuts
   /// down unexpectedly).
-  virtual int abandon (void);
+  virtual int abandon ();
 
   // = Low level routines for framing requests, dispatching
   // operations, and returning replies.
 
   /// Receive, frame, and decode the client's request.
-  virtual int recv_request (void);
+  virtual int recv_request ();
 
   /// Dispatch the appropriate operation to handle the client's
   /// request.
-  virtual int dispatch (void);
+  virtual int dispatch ();
 
   /// Create and send a reply to the client.
   virtual int send_reply (ACE_INT32 status,
@@ -102,7 +102,7 @@ protected:
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
 
   /// Ensure dynamic allocation...
-  ~ACE_Name_Handler (void);
+  ~ACE_Name_Handler ();
 
 private:
   /// Table of pointers to member functions
@@ -141,29 +141,29 @@ private:
   ///  Naming Context
   ACE_Naming_Context *naming_context_;
 
-  ACE_Naming_Context *naming_context (void);
+  ACE_Naming_Context *naming_context ();
 
   /// Handle binds.
-  int bind (void);
+  int bind ();
 
   /// Handle rebinds.
-  int rebind (void);
+  int rebind ();
 
   /// Handle binds and rebinds.
   int shared_bind (int rebind);
 
   /// Handle find requests.
-  int resolve (void);
+  int resolve ();
 
   /// Handle unbind requests.
-  int unbind (void);
+  int unbind ();
 
   /// Handle LIST_NAMES, LIST_VALUES, and LIST_TYPES requests.
-  int lists (void);
+  int lists ();
 
   /// Handle LIST_NAME_ENTRIES, LIST_VALUE_ENTRIES, and
   /// LIST_TYPE_ENTRIES requests.
-  int lists_entries (void);
+  int lists_entries ();
 
   /// Create a name request.
   ACE_Name_Request name_request (ACE_NS_WString *one_name);
@@ -191,7 +191,7 @@ public:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Naming context for acceptor /for the listening port/
-  ACE_Naming_Context *naming_context (void);
+  ACE_Naming_Context *naming_context ();
 
 private:
   /// The scheduling strategy is designed for Reactive services.
diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
index a76b7cba727..73c6f7dc5e9 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -39,7 +39,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
 }
 
 template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const ACE_TCHAR *
-ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::host_name (void)
+ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::host_name ()
 {
 #if !defined (__GNUG__)
   return this->receiver_.m_.fast_rep ();
@@ -245,7 +245,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
 // established.
 
 template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> int
-ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::open_common (void)
+ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::open_common ()
 {
   // Shut off non-blocking IO if it was enabled...
   if (this->peer ().disable (ACE_NONBLOCK) == -1)
@@ -279,18 +279,18 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::op
 }
 
 template<class SLH, class LMR, class SST>
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::ACE_Server_Logging_Acceptor_T (void)
+ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::ACE_Server_Logging_Acceptor_T ()
 {
 }
 
 template<class SLH, class LMR, class SST> LMR &
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::receiver (void)
+ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::receiver ()
 {
   return receiver_;
 }
 
 template<class SLH, class LMR, class SST> SST &
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::scheduling_strategy (void)
+ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::scheduling_strategy ()
 {
 #if !defined (__GNUG__)
   return receiver_.m_;
@@ -446,7 +446,7 @@ ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::open (void *)
 // Process remote logging records.
 
 template<class LOG_MESSAGE_RECEIVER> int
-ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::svc (void)
+ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::svc ()
 {
   int result = 0;
 
diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.h b/ACE/netsvcs/lib/Server_Logging_Handler_T.h
index 1a86b75c824..06b113c71bb 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.h
@@ -55,11 +55,11 @@ public:
 
 protected:
   /// Receive the logging record from a client.
-  int handle_logging_record (void);
+  int handle_logging_record ();
 
   /// Common parts of open function, sets hostname and diables NONBLOCK in peer
   /// called from derived classes open method.
-  int open_common (void);
+  int open_common ();
 
   /// Count the number of logging records that arrive.
   static COUNTER request_count_;
@@ -76,7 +76,7 @@ protected:
   ACE_TString host_name_;
 #endif /* ! __GNUG__ */
   /// Name of the host we are connected to.
-  const ACE_TCHAR *host_name (void);
+  const ACE_TCHAR *host_name ();
 
   /// The receiver of log records
   LOG_MESSAGE_RECEIVER &receiver (void){ return receiver_; }
@@ -105,7 +105,7 @@ class ACE_Server_Logging_Acceptor_T : public ACE_Strategy_Acceptor<SERVER_LOGGIN
 {
 public:
   /// Dynamic linking hook.
-  ACE_Server_Logging_Acceptor_T (void);
+  ACE_Server_Logging_Acceptor_T ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
 protected:
@@ -143,10 +143,10 @@ private:
 #endif /* ! __GNUG__ */
 
   /// The scheduling strategy for the service.
-  SCHEDULE_STRATEGY &scheduling_strategy (void);
+  SCHEDULE_STRATEGY &scheduling_strategy ();
 
   /// The receiver of log records
-  LOG_MESSAGE_RECEIVER &receiver (void);
+  LOG_MESSAGE_RECEIVER &receiver ();
 };
 
 /**
diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
index 34b046631a7..0eb0a41db39 100644
--- a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -30,7 +30,7 @@ ACE_TS_Clerk_Handler::state (ACE_TS_Clerk_Handler::State state)
 
 // Get the connection state
 ACE_TS_Clerk_Handler::State
-ACE_TS_Clerk_Handler::state (void)
+ACE_TS_Clerk_Handler::state ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Handler::state");
   return this->state_;
@@ -51,7 +51,7 @@ ACE_TS_Clerk_Handler::timeout (long to)
 // backoff.  Returns the original timeout (i.e., before the
 // recalculation).
 long
-ACE_TS_Clerk_Handler::timeout (void)
+ACE_TS_Clerk_Handler::timeout ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Handler::timeout");
   long old_timeout = this->timeout_;
@@ -80,7 +80,7 @@ ACE_TS_Clerk_Handler::max_timeout (long mto)
 
 // Gets the max timeout delay.
 long
-ACE_TS_Clerk_Handler::max_timeout (void)
+ACE_TS_Clerk_Handler::max_timeout ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout");
   return this->max_timeout_;
@@ -146,7 +146,7 @@ ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE,
 }
 
 int
-ACE_TS_Clerk_Handler::reinitiate_connection (void)
+ACE_TS_Clerk_Handler::reinitiate_connection ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Handler::reinitiate_connection");
   // Skip over deactivated descriptors.
@@ -223,7 +223,7 @@ ACE_TS_Clerk_Handler::remote_addr (ACE_INET_Addr &addr)
 }
 
 ACE_INET_Addr &
-ACE_TS_Clerk_Handler::remote_addr (void)
+ACE_TS_Clerk_Handler::remote_addr ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr");
   return this->remote_addr_;
@@ -323,7 +323,7 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor ()
 }
 
 void
-ACE_TS_Clerk_Processor::alloc (void)
+ACE_TS_Clerk_Processor::alloc ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Processor::alloc");
   ACE_NEW (this->shmem_, ALLOCATOR (this->poolname_));
@@ -424,7 +424,7 @@ ACE_TS_Clerk_Processor::update_time ()
 
 
 int
-ACE_TS_Clerk_Processor::fini (void)
+ACE_TS_Clerk_Processor::fini ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Processor::fini");
 
@@ -608,14 +608,14 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_TS_Clerk_Processor::suspend (void)
+ACE_TS_Clerk_Processor::suspend ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Processor::suspend");
   return 0;
 }
 
 int
-ACE_TS_Clerk_Processor::resume (void)
+ACE_TS_Clerk_Processor::resume ()
 {
   ACE_TRACE ("ACE_TS_Clerk_Processor::resume");
   return 0;
diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.h b/ACE/netsvcs/lib/TS_Clerk_Handler.h
index 3cf26f5d241..135276bd91d 100644
--- a/ACE/netsvcs/lib/TS_Clerk_Handler.h
+++ b/ACE/netsvcs/lib/TS_Clerk_Handler.h
@@ -80,15 +80,15 @@ public:
   };
 
   // = Set/get the current state.
-  State state (void);
+  State state ();
   void state (State);
 
   // = Set/get the current retry timeout delay.
-  long timeout (void);
+  long timeout ();
   void timeout (long);
 
   // = Set/get the maximum retry timeout delay.
-  long max_timeout (void);
+  long max_timeout ();
   void max_timeout (long);
 
   /// Activate this instance of the <ACE_TS_Clerk_Handler>
@@ -111,7 +111,7 @@ public:
 
   /// Get/Set remote addr
   void remote_addr (ACE_INET_Addr &addr);
-  ACE_INET_Addr &remote_addr (void);
+  ACE_INET_Addr &remote_addr ();
 
   /// Send request for time update to the server as well as return the
   /// current time info by reference.
@@ -135,7 +135,7 @@ private:
   int recv_reply (ACE_Time_Request &reply);
 
   /// Reinitiate connection with the server
-  int reinitiate_connection (void);
+  int reinitiate_connection ();
 
   /// The current state of the connection
   State state_;
@@ -179,7 +179,7 @@ class ACE_TS_Clerk_Processor : public ACE_Connector <ACE_TS_Clerk_Handler, ACE_S
 {
 public:
   /// Default constructor
-  ACE_TS_Clerk_Processor (void);
+  ACE_TS_Clerk_Processor ();
 
   /// Query servers for time periodically (timeout value)
   virtual int handle_timeout (const ACE_Time_Value &tv,
@@ -201,15 +201,15 @@ protected:
   virtual int info (ACE_TCHAR **strp, size_t length) const;
 
   // = Scheduling hooks.
-  virtual int suspend (void);
-  virtual int resume (void);
+  virtual int suspend ();
+  virtual int resume ();
 
 private:
   /// Parse svc.conf arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Allocate entry in shared memory for system time
-  void alloc (void);
+  void alloc ();
 
   /// Update delta_time using times obtained from all servers
   int update_time ();
diff --git a/ACE/netsvcs/lib/TS_Server_Handler.cpp b/ACE/netsvcs/lib/TS_Server_Handler.cpp
index 8b81e9f9ced..5bc042dc4f6 100644
--- a/ACE/netsvcs/lib/TS_Server_Handler.cpp
+++ b/ACE/netsvcs/lib/TS_Server_Handler.cpp
@@ -146,7 +146,7 @@ ACE_TS_Server_Handler::send_request (ACE_Time_Request &request)
 // unexpectedly).
 
 /* VIRTUAL */ int
-ACE_TS_Server_Handler::abandon (void)
+ACE_TS_Server_Handler::abandon ()
 {
   ACE_TRACE ("ACE_TS_Server_Handler::abandon");
 
@@ -176,7 +176,7 @@ ACE_TS_Server_Handler::get_handle () const
 // Dispatch the appropriate operation to handle the client request.
 
 /* VIRTUAL */ int
-ACE_TS_Server_Handler::dispatch (void)
+ACE_TS_Server_Handler::dispatch ()
 {
   ACE_TRACE ("ACE_TS_Server_Handler::dispatch");
   // Get the system time and then create an ACE_Time_Request
@@ -189,7 +189,7 @@ ACE_TS_Server_Handler::dispatch (void)
 // should use non-blocking I/O.
 
 /* VIRTUAL */ int
-ACE_TS_Server_Handler::recv_request (void)
+ACE_TS_Server_Handler::recv_request ()
 {
   ACE_TRACE ("ACE_TS_Server_Handler::recv_request");
   ssize_t const bytes_expected = this->time_request_.size ();
@@ -248,7 +248,7 @@ ACE_TS_Server_Handler::handle_input (ACE_HANDLE)
     return this->dispatch ();
 }
 
-ACE_TS_Server_Handler::~ACE_TS_Server_Handler (void)
+ACE_TS_Server_Handler::~ACE_TS_Server_Handler ()
 {
   ACE_TRACE ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler");
   ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/netsvcs/lib/TS_Server_Handler.h b/ACE/netsvcs/lib/TS_Server_Handler.h
index a4eb7fd8551..7d9e8937146 100644
--- a/ACE/netsvcs/lib/TS_Server_Handler.h
+++ b/ACE/netsvcs/lib/TS_Server_Handler.h
@@ -45,23 +45,23 @@ public:
 
 protected:
   /// Must be allocated dynamically.
-  ~ACE_TS_Server_Handler (void);
+  ~ACE_TS_Server_Handler ();
 
   // = Helper routines for the operations exported to clients.
 
   /// Give up waiting (e.g., when a timeout occurs or a client shuts
   /// down unexpectedly).
-  virtual int abandon (void);
+  virtual int abandon ();
 
   // = Low level routines for framing requests, dispatching
   // operations, and returning replies.
 
   /// Receive, frame, and decode the client's request.
-  virtual int recv_request (void);
+  virtual int recv_request ();
 
   /// Dispatch the appropriate operation to handle the client's
   /// request.
-  virtual int dispatch (void);
+  virtual int dispatch ();
 
   /// Special kind of reply
   virtual int send_request (ACE_Time_Request &);
diff --git a/ACE/netsvcs/lib/Time_Request_Reply.cpp b/ACE/netsvcs/lib/Time_Request_Reply.cpp
index e04d5212b8e..9ba8213d6d8 100644
--- a/ACE/netsvcs/lib/Time_Request_Reply.cpp
+++ b/ACE/netsvcs/lib/Time_Request_Reply.cpp
@@ -8,7 +8,7 @@
 #include "Time_Request_Reply.h"
 
 // Default "do nothing" constructor.
-ACE_Time_Request::ACE_Time_Request (void)
+ACE_Time_Request::ACE_Time_Request ()
 {
   ACE_TRACE ("ACE_Time_Request::ACE_Time_Request");
 }
@@ -135,7 +135,7 @@ ACE_Time_Request::encode (void *&buf)
 // Decode the transfer buffer into host byte byte order
 // so that it can be used by the server.
 int
-ACE_Time_Request::decode (void)
+ACE_Time_Request::decode ()
 {
   ACE_TRACE ("ACE_Time_Request::decode");
   // Decode
diff --git a/ACE/netsvcs/lib/Time_Request_Reply.h b/ACE/netsvcs/lib/Time_Request_Reply.h
index 3ef13b3e221..729848a774f 100644
--- a/ACE/netsvcs/lib/Time_Request_Reply.h
+++ b/ACE/netsvcs/lib/Time_Request_Reply.h
@@ -44,7 +44,7 @@ public:
   };
 
   /// Default constructor.
-  ACE_Time_Request (void);
+  ACE_Time_Request ();
 
   /**
    * Create a ACE_Time_Request message.
@@ -87,7 +87,7 @@ public:
   int encode (void *&);
 
   /// Decode message after reception.
-  int decode (void);
+  int decode ();
 
   /// Print out the values of the message for debugging purposes.
   void dump () const;
diff --git a/ACE/netsvcs/lib/Token_Handler.cpp b/ACE/netsvcs/lib/Token_Handler.cpp
index 81f77765e00..9bce275923d 100644
--- a/ACE/netsvcs/lib/Token_Handler.cpp
+++ b/ACE/netsvcs/lib/Token_Handler.cpp
@@ -293,7 +293,7 @@ ACE_Token_Handler::handle_timeout (const ACE_Time_Value &,
 // Dispatch the appropriate operation to handle the client request.
 
 ACE_Token_Proxy *
-ACE_Token_Handler::get_proxy (void)
+ACE_Token_Handler::get_proxy ()
 {
   ACE_TRACE ("ACE_Token_Handler::get_proxy");
 
@@ -325,7 +325,7 @@ ACE_Token_Handler::get_proxy (void)
 }
 
 ACE_Token_Proxy *
-ACE_Token_Handler::create_proxy (void)
+ACE_Token_Handler::create_proxy ()
 {
   ACE_TRACE ("ACE_Token_Handler::create_proxy");
 
@@ -362,7 +362,7 @@ ACE_Token_Handler::create_proxy (void)
 }
 
 int
-ACE_Token_Handler::dispatch (void)
+ACE_Token_Handler::dispatch ()
 {
   ACE_TRACE ("ACE_Token_Handler::dispatch");
   ACE_Token_Proxy *proxy = this->get_proxy ();
@@ -394,7 +394,7 @@ ACE_Token_Handler::dispatch (void)
 // Note, this method should use non-blocking I/O.
 
 /* VIRTUAL */ int
-ACE_Token_Handler::recv_request (void)
+ACE_Token_Handler::recv_request ()
 {
   ACE_TRACE ("ACE_Token_Handler::recv_request");
   ssize_t n;
@@ -478,7 +478,7 @@ ACE_Token_Handler::handle_input (ACE_HANDLE)
 }
 
 void
-ACE_Token_Handler::sleep_hook (void)
+ACE_Token_Handler::sleep_hook ()
 {
   ACE_TRACE ("ACE_Token_Handler::sleep_hook");
   // @@ what should we do?
@@ -541,7 +541,7 @@ ACE_TS_Mutex::ACE_TS_Mutex (const ACE_TS_Mutex &m)
 }
 
 void
-ACE_TS_Mutex::sleep_hook (void)
+ACE_TS_Mutex::sleep_hook ()
 {
   ACE_TRACE ("ACE_TS_Mutex::sleep_hook");
   th_->sleep_hook ();
@@ -585,7 +585,7 @@ ACE_TS_RLock::ACE_TS_RLock (const ACE_TS_RLock &r)
 }
 
 void
-ACE_TS_RLock::sleep_hook (void)
+ACE_TS_RLock::sleep_hook ()
 {
   ACE_TRACE ("ACE_TS_RLock::sleep_hook");
   th_->sleep_hook ();
@@ -630,7 +630,7 @@ ACE_TS_WLock::ACE_TS_WLock (const ACE_TS_WLock &w)
 }
 
 void
-ACE_TS_WLock::sleep_hook (void)
+ACE_TS_WLock::sleep_hook ()
 {
   ACE_TRACE ("ACE_TS_WLock::sleep_hook");
   th_->sleep_hook ();
diff --git a/ACE/netsvcs/lib/Token_Handler.h b/ACE/netsvcs/lib/Token_Handler.h
index ea737191e1b..162b3b9bc7a 100644
--- a/ACE/netsvcs/lib/Token_Handler.h
+++ b/ACE/netsvcs/lib/Token_Handler.h
@@ -77,7 +77,7 @@ public:
 
   /// Called by TS_[Mutex,RLock,WLock] when we hold the mutex and
   /// someone wants it.
-  void sleep_hook (void);
+  void sleep_hook ();
 
   /// Called by TS_[Mutex,RLock,WLock] when we are waiting and acquire
   /// the mutex.
@@ -91,11 +91,11 @@ protected:
   virtual int abandon (int send_error);
 
   /// Receive, frame, and decode the client's request.
-  virtual int recv_request (void);
+  virtual int recv_request ();
 
   /// Dispatch the appropriate operation to handle the client's
   /// request.
-  virtual int dispatch (void);
+  virtual int dispatch ();
 
   /// Create and send a reply to the client.
   virtual int send_reply (ACE_UINT32 errnum);
@@ -110,12 +110,12 @@ protected:
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
 
   /// return a proxy for the calling client_id and token name.
-  ACE_Token_Proxy *get_proxy (void);
+  ACE_Token_Proxy *get_proxy ();
 
 private:
   /// Switches on the type of token_request_ and creates a new
   /// Token_Proxy.
-  virtual ACE_Token_Proxy *create_proxy (void);
+  virtual ACE_Token_Proxy *create_proxy ();
 
   /// Keeps track of the synchronization options (i.e., the timeout
   /// interval).
@@ -160,7 +160,7 @@ public:
 
 protected:
   /// Somebody wants our token!
-  virtual void sleep_hook (void);
+  virtual void sleep_hook ();
 
   /**
    * We've been taken off the waiters list and given the token!  Call
@@ -195,7 +195,7 @@ public:
 
 protected:
   /// Somebody wants our token!
-  virtual void sleep_hook (void);
+  virtual void sleep_hook ();
 
   /**
    * We've been taken off the waiters list and given the token!  Call
@@ -230,7 +230,7 @@ public:
 
 protected:
   /// Somebody wants our token!
-  virtual void sleep_hook (void);
+  virtual void sleep_hook ();
 
   /**
    * We've been taken off the waiters list and given the token!  Call
diff --git a/ACE/performance-tests/Misc/basic_perf.cpp b/ACE/performance-tests/Misc/basic_perf.cpp
index 559f6d6bcf0..990c7140660 100644
--- a/ACE/performance-tests/Misc/basic_perf.cpp
+++ b/ACE/performance-tests/Misc/basic_perf.cpp
@@ -70,24 +70,24 @@ class Basic_Test
 public:
   Basic_Test (ACE_High_Res_Timer &timer,
               ACE_hrtime_t empty_iteration_time);
-  virtual ~Basic_Test (void);
+  virtual ~Basic_Test ();
 
   virtual void run (void) = 0;
 
-  double iteration_time (void);
+  double iteration_time ();
 
   void print_iteration_time (const char *message);
 
 protected:
   ACE_hrtime_t elapsed_time_;
 
-  void start_timing (void)
+  void start_timing ()
   {
     timer_.reset ();
     timer_.start ();
   }
 
-  void stop_timing (void)
+  void stop_timing ()
   {
     timer_.stop ();
     timer_.elapsed_time (elapsed_time_);
@@ -98,7 +98,7 @@ private:
   ACE_hrtime_t empty_iteration_time_;
 
   // Require the timer reference.
-  Basic_Test (void);
+  Basic_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Basic_Test (const Basic_Test &);
@@ -113,12 +113,12 @@ Basic_Test::Basic_Test (ACE_High_Res_Timer &timer,
 {
 }
 
-Basic_Test::~Basic_Test (void)
+Basic_Test::~Basic_Test ()
 {
 }
 
 double
-Basic_Test::iteration_time (void)
+Basic_Test::iteration_time ()
 {
   return per_iteration (elapsed_time_ > empty_iteration_time_  ?
                           elapsed_time_ - empty_iteration_time_  :
@@ -145,7 +145,7 @@ public:
   Empty_Iteration_Test (ACE_High_Res_Timer &timer) : Basic_Test (timer, 0) {}
   virtual ~Empty_Iteration_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
   ACE_hrtime_t empty_iteration_time () const
     {
@@ -154,7 +154,7 @@ public:
 
 private:
   // Require the timer reference.
-  Empty_Iteration_Test (void);
+  Empty_Iteration_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Empty_Iteration_Test (const Empty_Iteration_Test &);
@@ -162,7 +162,7 @@ private:
 };
 
 void
-Empty_Iteration_Test::run (void)
+Empty_Iteration_Test::run ()
 {
   this->start_timing ();
 
@@ -188,11 +188,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Inline_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Inline_Call_Test (void);
+  Inline_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Inline_Call_Test (const Inline_Call_Test &);
@@ -200,7 +200,7 @@ private:
 };
 
 void
-Inline_Call_Test::run (void)
+Inline_Call_Test::run ()
 {
   this->start_timing ();
 
@@ -224,11 +224,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Noninline_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Noninline_Call_Test (void);
+  Noninline_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Noninline_Call_Test (const Noninline_Call_Test &);
@@ -236,7 +236,7 @@ private:
 };
 
 void
-Noninline_Call_Test::run (void)
+Noninline_Call_Test::run ()
 {
   this->start_timing ();
 
@@ -260,11 +260,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Inline_Member_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Inline_Member_Call_Test (void);
+  Inline_Member_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Inline_Member_Call_Test (const Inline_Member_Call_Test &);
@@ -272,7 +272,7 @@ private:
 };
 
 void
-Inline_Member_Call_Test::run (void)
+Inline_Member_Call_Test::run ()
 {
   this->start_timing ();
 
@@ -296,11 +296,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Noninline_Member_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Noninline_Member_Call_Test (void);
+  Noninline_Member_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Noninline_Member_Call_Test (const Noninline_Member_Call_Test &);
@@ -308,7 +308,7 @@ private:
 };
 
 void
-Noninline_Member_Call_Test::run (void)
+Noninline_Member_Call_Test::run ()
 {
   this->start_timing ();
 
@@ -332,11 +332,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Inline_Member_With_Virtual_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Inline_Member_With_Virtual_Call_Test (void);
+  Inline_Member_With_Virtual_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Inline_Member_With_Virtual_Call_Test (
@@ -346,7 +346,7 @@ private:
 };
 
 void
-Inline_Member_With_Virtual_Call_Test::run (void)
+Inline_Member_With_Virtual_Call_Test::run ()
 {
   this->start_timing ();
 
@@ -370,11 +370,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Noninline_Member_With_Virtual_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Noninline_Member_With_Virtual_Call_Test (void);
+  Noninline_Member_With_Virtual_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Noninline_Member_With_Virtual_Call_Test
@@ -384,7 +384,7 @@ private:
 };
 
 void
-Noninline_Member_With_Virtual_Call_Test::run (void)
+Noninline_Member_With_Virtual_Call_Test::run ()
 {
   this->start_timing ();
 
@@ -408,11 +408,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Virtual_Member_Optimizable_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Virtual_Member_Optimizable_Call_Test (void);
+  Virtual_Member_Optimizable_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Virtual_Member_Optimizable_Call_Test (
@@ -422,7 +422,7 @@ private:
 };
 
 void
-Virtual_Member_Optimizable_Call_Test::run (void)
+Virtual_Member_Optimizable_Call_Test::run ()
 {
   Foo_v &fv_o = foo_v;
 
@@ -448,11 +448,11 @@ public:
     : Basic_Test (timer, empty_iteration_time) {}
   virtual ~Virtual_Member_Call_Test (void) {};
 
-  virtual void run (void);
+  virtual void run ();
 
 private:
   // Require the timer reference.
-  Virtual_Member_Call_Test (void);
+  Virtual_Member_Call_Test ();
 
   // Force construction of independent instances by prohibiting copying.
   Virtual_Member_Call_Test (const Virtual_Member_Call_Test &);
@@ -460,7 +460,7 @@ private:
 };
 
 void
-Virtual_Member_Call_Test::run (void)
+Virtual_Member_Call_Test::run ()
 {
   Foo_v *fv;
 
diff --git a/ACE/performance-tests/Misc/preempt.cpp b/ACE/performance-tests/Misc/preempt.cpp
index f2331b979f9..22ba8d31661 100644
--- a/ACE/performance-tests/Misc/preempt.cpp
+++ b/ACE/performance-tests/Misc/preempt.cpp
@@ -77,14 +77,14 @@ ACE_hrtime_t starttime;
 class High_Priority_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
-  High_Priority_Task (void);
-  ~High_Priority_Task (void);
+  High_Priority_Task ();
+  ~High_Priority_Task ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   int open (void *);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  int svc (void);
+  int svc ();
   int done () const { return done_; }
   void print_times () const;
 
@@ -94,7 +94,7 @@ private:
   u_long *time_;
 };
 
-High_Priority_Task::High_Priority_Task (void)
+High_Priority_Task::High_Priority_Task ()
   : ACE_Task<ACE_SYNCH> (ACE_Thread_Manager::instance ()),
     priority_ (ACE_Sched_Params::next_priority (
                  ACE_SCHED_FIFO,
@@ -106,7 +106,7 @@ High_Priority_Task::High_Priority_Task (void)
   ACE_NEW (time_, u_long[high_iterations]);
 }
 
-High_Priority_Task::~High_Priority_Task (void)
+High_Priority_Task::~High_Priority_Task ()
 {
   delete [] time_;
   time_ = 0;
@@ -141,7 +141,7 @@ High_Priority_Task::open (void *)
 }
 
 int
-High_Priority_Task::svc (void)
+High_Priority_Task::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -199,7 +199,7 @@ public:
   int open (void *);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  int svc (void);
+  int svc ();
 
 private:
   int priority_;
@@ -242,7 +242,7 @@ Low_Priority_Task::open (void *)
 }
 
 int
-Low_Priority_Task::svc (void)
+Low_Priority_Task::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
diff --git a/ACE/performance-tests/Misc/test_guard.cpp b/ACE/performance-tests/Misc/test_guard.cpp
index d56886b56d0..4e676ba8ff7 100644
--- a/ACE/performance-tests/Misc/test_guard.cpp
+++ b/ACE/performance-tests/Misc/test_guard.cpp
@@ -18,11 +18,11 @@ enum
 };
 
 ACE_Thread_Mutex lock_;
-typedef void (*guard_func)(void);
+typedef void (*guard_func)();
 int test_type = TEST_GUARD;
 int dummy = 0;
 
-void guard (void)
+void guard ()
 {
   ACE_GUARD (ACE_Thread_Mutex, _ace_mon, lock_);
   dummy++;
diff --git a/ACE/performance-tests/Misc/test_mutex.cpp b/ACE/performance-tests/Misc/test_mutex.cpp
index a342405afb1..f94cc003668 100644
--- a/ACE/performance-tests/Misc/test_mutex.cpp
+++ b/ACE/performance-tests/Misc/test_mutex.cpp
@@ -58,33 +58,33 @@ static const int DEFAULT_ITERATIONS = 100000000;
 class Thread_Mutex
 {
 public:
-  Thread_Mutex (void);
-  ~Thread_Mutex (void);
-  int acquire (void);
-  int release (void);
+  Thread_Mutex ();
+  ~Thread_Mutex ();
+  int acquire ();
+  int release ();
 
 private:
   ACE_mutex_t mutex_;
 };
 
-Thread_Mutex::Thread_Mutex (void)
+Thread_Mutex::Thread_Mutex ()
 {
   ACE_OS::mutex_init (&this->mutex_);
 }
 
-Thread_Mutex::~Thread_Mutex (void)
+Thread_Mutex::~Thread_Mutex ()
 {
   ACE_OS::mutex_destroy (&this->mutex_);
 }
 
 inline int
-Thread_Mutex::acquire (void)
+Thread_Mutex::acquire ()
 {
   return ACE_OS::mutex_lock (&this->mutex_);
 }
 
 inline int
-Thread_Mutex::release (void)
+Thread_Mutex::release ()
 {
   return ACE_OS::mutex_unlock (&this->mutex_);
 }
@@ -93,12 +93,12 @@ Thread_Mutex::release (void)
 class Mutex_Base
 {
 public:
-  virtual ~Mutex_Base (void);
+  virtual ~Mutex_Base ();
   virtual int acquire (void) = 0;
   virtual int release (void) = 0;
 };
 
-Mutex_Base::~Mutex_Base (void)
+Mutex_Base::~Mutex_Base ()
 {
 }
 
@@ -106,33 +106,33 @@ Mutex_Base::~Mutex_Base (void)
 class Thread_Mutex_Derived : public Mutex_Base
 {
 public:
-  Thread_Mutex_Derived (void);
-  virtual ~Thread_Mutex_Derived (void);
-  virtual int acquire (void);
-  virtual int release (void);
+  Thread_Mutex_Derived ();
+  virtual ~Thread_Mutex_Derived ();
+  virtual int acquire ();
+  virtual int release ();
 
 private:
   ACE_mutex_t mutex_;
 };
 
-Thread_Mutex_Derived::Thread_Mutex_Derived (void)
+Thread_Mutex_Derived::Thread_Mutex_Derived ()
 {
   ACE_OS::mutex_init (&this->mutex_);
 }
 
-Thread_Mutex_Derived::~Thread_Mutex_Derived (void)
+Thread_Mutex_Derived::~Thread_Mutex_Derived ()
 {
   ACE_OS::mutex_destroy (&this->mutex_);
 }
 
 inline int
-Thread_Mutex_Derived::acquire (void)
+Thread_Mutex_Derived::acquire ()
 {
   return ACE_OS::mutex_lock (&this->mutex_);
 }
 
 inline int
-Thread_Mutex_Derived::release (void)
+Thread_Mutex_Derived::release ()
 {
   return ACE_OS::mutex_unlock (&this->mutex_);
 }
diff --git a/ACE/performance-tests/Misc/test_singleton.cpp b/ACE/performance-tests/Misc/test_singleton.cpp
index 904ab434ae0..44c026f80f5 100644
--- a/ACE/performance-tests/Misc/test_singleton.cpp
+++ b/ACE/performance-tests/Misc/test_singleton.cpp
@@ -43,7 +43,7 @@ class Mutex_Singleton
 public:
   Mutex_Singleton (void) {}
   void svc (void) {}
-  static Mutex_Singleton *instance (void);
+  static Mutex_Singleton *instance ();
 
 private:
   static ACE_SYNCH_MUTEX lock_;
@@ -55,7 +55,7 @@ ACE_SYNCH_MUTEX Mutex_Singleton::lock_;
 Mutex_Singleton *Mutex_Singleton::instance_;
 
 Mutex_Singleton *
-Mutex_Singleton::instance (void)
+Mutex_Singleton::instance ()
 {
   // Acquire the lock every time in.
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, Mutex_Singleton::lock_, 0);
@@ -71,7 +71,7 @@ ACE_SYNCH_MUTEX DC_Singleton::lock_;
 DC_Singleton *DC_Singleton::instance_;
 
 DC_Singleton *
-DC_Singleton::instance (void)
+DC_Singleton::instance ()
 {
   if (DC_Singleton::instance_ == 0)
     {
diff --git a/ACE/performance-tests/Misc/test_singleton.h b/ACE/performance-tests/Misc/test_singleton.h
index 15da34e6bd1..a8670dd4a41 100644
--- a/ACE/performance-tests/Misc/test_singleton.h
+++ b/ACE/performance-tests/Misc/test_singleton.h
@@ -12,7 +12,7 @@ class DC_Singleton
 public:
   DC_Singleton (void) {}
   void svc (void) {}
-  static DC_Singleton *instance (void);
+  static DC_Singleton *instance ();
 
 private:
   static ACE_SYNCH_MUTEX lock_;
diff --git a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h
index a998bcba21c..723d287a33d 100644
--- a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h
+++ b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h
@@ -1,7 +1,7 @@
 class Latency_Stats
 {
 public:
-  Latency_Stats (void);
+  Latency_Stats ();
 
   void dump_results (const ACE_TCHAR* test_name,
                      const ACE_TCHAR* sub_test);
@@ -20,7 +20,7 @@ private:
 };
 
 inline
-Latency_Stats::Latency_Stats (void)
+Latency_Stats::Latency_Stats ()
   :  n_ (0),
      sum_ (0),
      sum2_ (0),
@@ -98,12 +98,12 @@ Latency_Stats::accumulate (const Latency_Stats& rhs)
 class Throughput_Stats
 {
 public:
-  Throughput_Stats (void);
+  Throughput_Stats ();
 
   void dump_results (const ACE_TCHAR* test_name,
                      const ACE_TCHAR* sub_test);
 
-  void sample (void);
+  void sample ();
   // An event has been received
 
   void accumulate (const Throughput_Stats& stats);
@@ -166,7 +166,7 @@ Throughput_Stats::dump_results (const ACE_TCHAR *test_name,
 }
 
 inline
-Throughput_Stats::Throughput_Stats (void)
+Throughput_Stats::Throughput_Stats ()
   : n_ (0),
     start_ (),
     stop_ ()
@@ -174,7 +174,7 @@ Throughput_Stats::Throughput_Stats (void)
 }
 
 inline void
-Throughput_Stats::sample (void)
+Throughput_Stats::sample ()
 {
   if (this->n_ == 0)
     {
@@ -185,7 +185,7 @@ Throughput_Stats::sample (void)
 }
 
 inline void
-move_to_rt_class (void)
+move_to_rt_class ()
 {
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   int priority =
diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
index 4274659d253..9eedb672dd5 100644
--- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
+++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
@@ -39,7 +39,7 @@ ACE_High_Res_Timer test_timer;
 
 /*******************************************************************/
 // Constructor for Synchronisers
-Synchronisers::Synchronisers (void)
+Synchronisers::Synchronisers ()
   : mutex_ (),
     condition_ (mutex_),
     event_ ()
@@ -48,7 +48,7 @@ Synchronisers::Synchronisers (void)
 
 
 int
-Synchronisers::start_synchronization (void)
+Synchronisers::start_synchronization ()
 {
   // Hold the lock and increment the global variable to indicate
   // number of ready threads
@@ -89,7 +89,7 @@ Synchronisers::start_synchronization (void)
 }
 
 int
-Synchronisers::end_synchronization (void)
+Synchronisers::end_synchronization ()
 {
   // Hold the lock and increment the global variable to indicate
   // number of ready threads
@@ -139,13 +139,13 @@ Leader_Follower_Task::Leader_Follower_Task (Synchronisers &synch)
 }
 
 int
-Leader_Follower_Task::processed (void)
+Leader_Follower_Task::processed ()
 {
   return this->messages_consumed_;
 }
 
 int
-Leader_Follower_Task::svc (void)
+Leader_Follower_Task::svc ()
 {
   (void) this->synch_.start_synchronization ();
 
diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h
index ff2d42aec5d..a34a75d641a 100644
--- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h
+++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h
@@ -47,10 +47,10 @@ public:
   friend class Leader_Follower_Task;
 
   /// Ctor
-  Synchronisers (void);
+  Synchronisers ();
 
-  int  start_synchronization (void);
-  int  end_synchronization (void);
+  int  start_synchronization ();
+  int  end_synchronization ();
 
 private:
   /// The mutex and condition variable that is used for
@@ -82,10 +82,10 @@ public:
   Leader_Follower_Task (Synchronisers &synch);
 
   /// Messages consumed
-  int processed (void);
+  int processed ();
 
   /// Method that is run by a daemon thread
-  int svc (void);
+  int svc ();
 
 private:
   /// Number of messages processed by this thread
diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
index ee29140c103..9fb9e34cda1 100644
--- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
@@ -37,7 +37,7 @@ class Leader_Follower_Task : public TASK
 public:
   Leader_Follower_Task (ACE_SYNCH_MUTEX &mutex,
                         ACE_SYNCH_CONDITION &condition);
-  int svc (void);
+  int svc ();
 
   size_t messages_consumed_;
   ACE_SYNCH_MUTEX &mutex_;
@@ -56,7 +56,7 @@ Leader_Follower_Task::Leader_Follower_Task (ACE_SYNCH_MUTEX &mutex,
 }
 
 int
-Leader_Follower_Task::svc (void)
+Leader_Follower_Task::svc ()
 {
   for (;;)
     {
diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
index 5204a996263..e86f7247039 100644
--- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
+++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
@@ -35,7 +35,7 @@ ACE_Data_Block *data_block = 0;
 
 /*******************************************************************/
 // Constructor for Synchronisers
-Synchronisers::Synchronisers (void)
+Synchronisers::Synchronisers ()
   : mutex_ (),
     event_ ()
 {
@@ -43,7 +43,7 @@ Synchronisers::Synchronisers (void)
 
 
 int
-Synchronisers::start_synchronization (void)
+Synchronisers::start_synchronization ()
 {
   // Hold the lock and increment the global variable to indicate
   // number of ready threads
@@ -91,7 +91,7 @@ Synchronisers::start_synchronization (void)
 }
 
 int
-Synchronisers::end_synchronization (void)
+Synchronisers::end_synchronization ()
 {
   // Hold the lock and increment the global variable to indicate
   // number of ready threads
@@ -149,7 +149,7 @@ Worker_Task::Worker_Task (Message_Queue *mq,
 }
 
 int
-Worker_Task::svc (void)
+Worker_Task::svc ()
 {
   // Start synchronization
   (void) this->synch_.start_synchronization ();
@@ -246,7 +246,7 @@ Worker_Task::svc (void)
 }
 
 int
-Worker_Task::processed (void)
+Worker_Task::processed ()
 {
   return this->messages_processed_;
 }
@@ -261,7 +261,7 @@ Input_Task::Input_Task (Message_Queue *mq,
 }
 
 int
-Input_Task::svc (void)
+Input_Task::svc ()
 {
   // Synchronise threads
   (void) this->synch_.start_synchronization ();
@@ -343,7 +343,7 @@ Output_Task::Output_Task (Message_Queue *mq,
 }
 
 int
-Output_Task::svc (void)
+Output_Task::svc ()
 {
   // Synchronise threads
   (void) this->synch_.start_synchronization ();
diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h
index 3b796e8d72b..ed2187b7e05 100644
--- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h
+++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h
@@ -57,10 +57,10 @@ public:
   };
 
   /// Ctor
-  Synchronisers (void);
+  Synchronisers ();
 
-  int  start_synchronization (void);
-  int  end_synchronization (void);
+  int  start_synchronization ();
+  int  end_synchronization ();
 
 private:
   /// The mutex that is used for synchronisation.
@@ -87,7 +87,7 @@ public:
               Synchronisers &synch);
 
   /// The thread runs inside this method..
-  int svc (void);
+  int svc ();
 
 private:
   /// Our referance to Synchronisers
@@ -110,7 +110,7 @@ public:
               Synchronisers &synch);
 
   /// The thread runs inside this method..
-  int svc (void);
+  int svc ();
 
   /// Need to overload this method to do anything useful..
   virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
@@ -137,10 +137,10 @@ public:
                Synchronisers &synch);
 
   /// Methods in which the threads run on
-  int svc (void);
+  int svc ();
 
   /// Processed messages
-  int processed (void);
+  int processed ();
 private:
   /// Our referance to Synchronisers
   Synchronisers &synch_;
diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index 455c9b74afc..f393b1637bd 100644
--- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -48,7 +48,7 @@ class Worker_Task : public TASK
 {
 public:
   Worker_Task (ACE_Message_Queue<ACE_SYNCH> *mq);
-  int svc (void);
+  int svc ();
 
   size_t messages_dequeued_;
 
@@ -60,7 +60,7 @@ class IO_Task : public TASK
 {
 public:
   IO_Task (ACE_Message_Queue<ACE_SYNCH> *mq);
-  int svc (void);
+  int svc ();
 };
 
 Worker_Task::Worker_Task (ACE_Message_Queue<ACE_SYNCH> *mq)
@@ -70,7 +70,7 @@ Worker_Task::Worker_Task (ACE_Message_Queue<ACE_SYNCH> *mq)
 }
 
 int
-Worker_Task::svc (void)
+Worker_Task::svc ()
 {
   for (;;)
     {
@@ -157,7 +157,7 @@ IO_Task::IO_Task (ACE_Message_Queue<ACE_SYNCH> *mq)
 }
 
 int
-IO_Task::svc (void)
+IO_Task::svc ()
 {
   size_t i = 0;
   size_t messages_queued = 1;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index 35533276dc8..a03bfa0f1bc 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -17,7 +17,7 @@ Baseline_Test_Options baseline_options;
 // Static Baseline Options holds the test configuration information
 // and the test statistics.
 
-Baseline_Test_Base::Baseline_Test_Base (void)
+Baseline_Test_Base::Baseline_Test_Base ()
   : Benchmark_Base (Benchmark_Base::BASELINE),
     yield_method_ (Baseline_Test_Options::USE_SLEEP_ZERO),
     iteration_ (DEFAULT_ITERATIONS),
@@ -76,7 +76,7 @@ Baseline_Test_Base::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Baseline_Test_Base::yield (void)
+Baseline_Test_Base::yield ()
 {
   if (this->yield_method_ == Baseline_Test_Options::USE_SLEEP_ZERO)
     ACE_OS::sleep (0);
@@ -84,7 +84,7 @@ Baseline_Test_Base::yield (void)
     ACE_OS::thr_yield ();
 }
 
-Baseline_Test_Options::Baseline_Test_Options (void)
+Baseline_Test_Options::Baseline_Test_Options ()
   : test_try_lock_ (0),
     verbose_ (0),
     current_yield_method_ (0),
@@ -132,7 +132,7 @@ Baseline_Test_Options::reset_params (size_t iteration,
 }
 
 void
-Baseline_Test_Options::print_result (void)
+Baseline_Test_Options::print_result ()
 {
   ACE_Time_Value tv;
   ACE_hrtime_t nsec;
@@ -148,7 +148,7 @@ Baseline_Test_Options::print_result (void)
               (int) (nsec / this->current_iteration_)));
 }
 
-Baseline_Test::Baseline_Test (void)
+Baseline_Test::Baseline_Test ()
   : current_test_ (0),
     get_lock_ (2),
     let_go_lock_ (2)
@@ -183,7 +183,7 @@ Baseline_Test::pre_run_test (Benchmark_Base *bb)
 }
 
 int
-Baseline_Test::run_test (void)
+Baseline_Test::run_test ()
 {
   if (baseline_options.test_try_lock ())
     return this->current_test_->test_try_lock ();
@@ -192,7 +192,7 @@ Baseline_Test::run_test (void)
 }
 
 int
-Baseline_Test::post_run_test (void)
+Baseline_Test::post_run_test ()
 {
   if (baseline_options.test_try_lock ())
     {
diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
index 9bca30c4764..3477e79e0d3 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
@@ -43,11 +43,11 @@ public:
   virtual void yield ();
   // Yield to other thread.
 
-  size_t iteration (void);
+  size_t iteration ();
   // Access methods.
 
 protected:
-  Baseline_Test_Base (void);
+  Baseline_Test_Base ();
 
   int yield_method_;
   // Should we your thr_yield or sleep (0).
@@ -72,7 +72,7 @@ public:
     USE_THR_YIELD
   };
 
-  Baseline_Test_Options (void);
+  Baseline_Test_Options ();
   // ctor.
 
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -81,20 +81,20 @@ public:
   int reset_params (size_t iteration, int yield);
   // Reset test parameters for next round.
 
-  int test_try_lock (void);
+  int test_try_lock ();
   // Return test configuration.
 
-  void start_inc_timer (void);
-  void stop_inc_timer (void);
+  void start_inc_timer ();
+  void stop_inc_timer ();
   // Start/stop measuring time.
 
-  int inc_loop_counter (void);
+  int inc_loop_counter ();
   // Returns
 
-  size_t current_iteration (void);
+  size_t current_iteration ();
   // Return <iteration_>.
 
-  void print_result (void);
+  void print_result ();
   // Print out the result.
 
 private:
@@ -123,11 +123,11 @@ extern Baseline_Test_Options baseline_options;
 class ACE_Svc_Export Baseline_Test : public Benchmark_Method_Base
 {
 public:
-  Baseline_Test (void);
+  Baseline_Test ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int pre_run_test (Benchmark_Base *bp);
-  virtual int run_test (void);
-  virtual int post_run_test (void);
+  virtual int run_test ();
+  virtual int post_run_test ();
   virtual int valid_test_object (Benchmark_Base *);
 
   static void *hold_lock (void * arg);
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp
index 34e8aaa5eaf..ca93041aaf1 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp
@@ -7,7 +7,7 @@
 ACE_Lock *Adaptive_Lock_Performance_Test_Base::lock_ = 0;
 
 int
-Adaptive_Lock_Performance_Test_Base::fini (void)
+Adaptive_Lock_Performance_Test_Base::fini ()
 {
   delete Adaptive_Lock_Performance_Test_Base::lock_;
   Adaptive_Lock_Performance_Test_Base::lock_ = 0;
@@ -15,7 +15,7 @@ Adaptive_Lock_Performance_Test_Base::fini (void)
 }
 
 int
-Adaptive_Lock_Performance_Test_Base::svc (void)
+Adaptive_Lock_Performance_Test_Base::svc ()
 {
   // Extract out the unique thread-specific value to be used as an
   // index...
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
index f1665b07d07..4b1dddbe9d8 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
@@ -12,13 +12,13 @@ int buffer;
 /* static */
 sig_atomic_t Benchmark_Performance::done_ = 0;
 
-Benchmark_Performance_Test_Base::Benchmark_Performance_Test_Base (void)
+Benchmark_Performance_Test_Base::Benchmark_Performance_Test_Base ()
   : Benchmark_Base (Benchmark_Base::PERFORMANCE)
 {
 }
 
 sig_atomic_t
-Benchmark_Performance::done (void)
+Benchmark_Performance::done ()
 {
   return Benchmark_Performance::done_;
 }
@@ -42,7 +42,7 @@ Benchmark_Performance::info (ACE_TCHAR **, size_t) const
 }
 
 int
-Benchmark_Performance::fini (void)
+Benchmark_Performance::fini ()
 {
   return -1;
 }
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
index c3b963a0a28..fdb5d81e345 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
@@ -18,7 +18,7 @@ class ACE_Svc_Export Benchmark_Performance_Test_Base : public Benchmark_Base
   // = TITLE
   //     This class identifies itself as Benmarking Performance Test class.
 protected:
-  Benchmark_Performance_Test_Base (void);
+  Benchmark_Performance_Test_Base ();
 };
 
 class ACE_Svc_Export Benchmark_Performance : public Benchmark_Performance_Test_Base
@@ -36,7 +36,7 @@ public:
   // = Set/get flag that controls how the tests are shut down
   // gracefully.
   static void done (sig_atomic_t);
-  static sig_atomic_t done (void);
+  static sig_atomic_t done ();
 
 protected:
   static sig_atomic_t done_;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
index 9c83e5068c5..e7db4e909a2 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
@@ -10,7 +10,7 @@
 #include "ace/Service_Repository.h"
 #include "ace/Reactor.h"
 
-Performance_Test::Performance_Test (void)
+Performance_Test::Performance_Test ()
   : n_lwps_ (0),
     orig_n_lwps_ (0)
 {
@@ -47,7 +47,7 @@ Performance_Test::pre_run_test (Benchmark_Base *bb)
 }
 
 int
-Performance_Test::run_test (void)
+Performance_Test::run_test ()
 {
   // Tell the threads that we are not finished.
   Benchmark_Performance::done (0);
@@ -70,7 +70,7 @@ Performance_Test::run_test (void)
 }
 
 int
-Performance_Test::post_run_test (void)
+Performance_Test::post_run_test ()
 {
   // Stop thread(s) from making any further progress.
   ACE_Thread_Manager::instance ()->suspend_all ();
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
index 77e8207091a..79e2cee9cf6 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
@@ -11,11 +11,11 @@
 class ACE_Svc_Export Performance_Test : public Benchmark_Method_Base
 {
 public:
-  Performance_Test (void);
+  Performance_Test ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int pre_run_test (Benchmark_Base *bp);
-  virtual int run_test (void);
-  virtual int post_run_test (void);
+  virtual int run_test ();
+  virtual int post_run_test ();
   virtual int valid_test_object (Benchmark_Base *);
 private:
   int n_lwps_;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
index 0b06ba68623..626db592f8a 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
@@ -7,7 +7,7 @@
 Performance_Test_Options performance_test_options;
 
 size_t
-Performance_Test_Options::count (void)
+Performance_Test_Options::count ()
 {
   size_t total = 0;
 
@@ -28,13 +28,13 @@ Performance_Test_Options::count (void)
 }
 
 void
-Performance_Test_Options::init (void)
+Performance_Test_Options::init ()
 {
   for (int i = 0; i < this->thr_wc_size; i++)
     this->thr_work_count[i] = 0;
 }
 
-Performance_Test_Options::Performance_Test_Options (void)
+Performance_Test_Options::Performance_Test_Options ()
                  : thr_wc_size (10000),
                    _service_entry (0),
                    _mapped_file (0),
@@ -280,7 +280,7 @@ Performance_Test_Options::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Performance_Test_Options::print_results (void)
+Performance_Test_Options::print_results ()
 {
   ACE_Profile_Timer::ACE_Elapsed_Time et;
   this->_itimer.elapsed_time (et);
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
index 1ba69c09cba..14c0d1e8e2e 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
@@ -21,73 +21,73 @@
 class ACE_Svc_Export Performance_Test_Options
 {
 public:
-  Performance_Test_Options (void);
+  Performance_Test_Options ();
   void   parse_args (int argc, ACE_TCHAR *argv[]);
 
-  void   init (void);
+  void   init ();
 
-  void   start_timer (void);
-  void   stop_timer (void);
+  void   start_timer ();
+  void   stop_timer ();
 
   void   thr_count (size_t count);
-  size_t thr_count (void);
+  size_t thr_count ();
 
   void   pipe_addr (ACE_TCHAR pipe[]);
-  ACE_TCHAR *pipe_addr (void);
+  ACE_TCHAR *pipe_addr ();
 
   void   mapped_file (ACE_TCHAR filename[]);
-  ACE_TCHAR *mapped_file (void);
+  ACE_TCHAR *mapped_file ();
 
   void   service_entry (ACE_TCHAR *service_entry);
-  ACE_TCHAR *service_entry (void);
+  ACE_TCHAR *service_entry ();
 
   void   sleep_time (size_t count);
-  size_t sleep_time (void);
+  size_t sleep_time ();
 
   void   logical_connections (size_t count);
-  size_t logical_connections (void);
+  size_t logical_connections ();
 
   void   physical_connections (size_t count);
-  size_t physical_connections (void);
+  size_t physical_connections ();
 
   void   consecutive_ports (size_t count);
-  size_t consecutive_ports (void);
+  size_t consecutive_ports ();
 
   void   initial_queue_length (size_t length);
-  size_t initial_queue_length (void);
+  size_t initial_queue_length ();
 
   void   high_water_mark (size_t size);
-  size_t high_water_mark (void);
+  size_t high_water_mark ();
 
   void   low_water_mark (size_t size);
-  size_t low_water_mark (void);
+  size_t low_water_mark ();
 
   void   msg_size (size_t size);
-  size_t msg_size (void);
+  size_t msg_size ();
 
   void   iterations (size_t n);
-  size_t iterations (void);
+  size_t iterations ();
 
   void   n_lwps (size_t n);
-  size_t n_lwps (void);
+  size_t n_lwps ();
 
   void   t_flags (long flag);
-  long   t_flags (void);
-
-  size_t count (void);
-
-  int    debug (void);
-  int    verbose (void);
-  int    do_checksum (void);
-  int    do_generate (void);
-  int    do_ack (void);
-  int    do_delete (void);
-  int    do_eager_exit (void);
-  int    do_print_summary (void);
-  int    do_udp (void);
-  int    do_xdr (void);
-  int    do_zero_copy (void);
-  void   print_results (void);
+  long   t_flags ();
+
+  size_t count ();
+
+  int    debug ();
+  int    verbose ();
+  int    do_checksum ();
+  int    do_generate ();
+  int    do_ack ();
+  int    do_delete ();
+  int    do_eager_exit ();
+  int    do_print_summary ();
+  int    do_udp ();
+  int    do_xdr ();
+  int    do_zero_copy ();
+  void   print_results ();
 
   ACE_Atomic_Op<ACE_Thread_Mutex, size_t> msg_count;        // Keep track of number of messages atomically.
   int *thr_work_count;  // Count activity per-thread.
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
index 5de752a85b1..c71d3eb6bfb 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
@@ -23,7 +23,7 @@ ACE_Condition_Thread_Mutex Cond_Brdcast_Test::notfull (Cond_Brdcast_Test::mutex)
 ACE_Condition_Thread_Mutex Cond_Brdcast_Test::notempty (Cond_Brdcast_Test::mutex);
 
 int
-Cond_Brdcast_Test::svc (void)
+Cond_Brdcast_Test::svc ()
 {
   int ni = this->thr_id ();
   synch_count = 2;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
index 17882016d2a..66bea60448d 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
@@ -23,7 +23,7 @@ ACE_Condition_Thread_Mutex Cond_Signal_Test::notfull (Cond_Signal_Test::mutex);
 ACE_Condition_Thread_Mutex Cond_Signal_Test::notempty (Cond_Signal_Test::mutex);
 
 int
-Cond_Signal_Test::svc (void)
+Cond_Signal_Test::svc ()
 {
   int ni = this->thr_id ();
   synch_count = 2;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
index ba507128c87..23c6542dfa4 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
@@ -11,7 +11,7 @@ public:
 };
 
 int
-Context_Test::svc (void)
+Context_Test::svc ()
 {
   int ni = this->thr_id ();
 
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
index 45c136989bf..29427e1abba 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
@@ -59,7 +59,7 @@ Guard_Test::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Guard_Test::svc (void)
+Guard_Test::svc ()
 {
   // Extract out the unique thread-specific value to be used as an
   // index...
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
index e5446a721ce..8d871b45259 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
@@ -13,7 +13,7 @@ public:
 };
 
 int
-Memory_Test::svc (void)
+Memory_Test::svc ()
 {
   int ni = this->thr_id ();
   size_t length = performance_test_options.msg_size ();
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
index 1bfca0accc0..0d4f4e3f8f3 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
@@ -16,7 +16,7 @@ private:
 ACE_Thread_Mutex Mutex_Test::mutex;
 
 int
-Mutex_Test::svc (void)
+Mutex_Test::svc ()
 {
   // Extract out the unique thread-specific value to be used as an
   // index...
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
index 291ef0d6f23..4ba9eefba76 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
@@ -55,7 +55,7 @@ Pipe_Proc_Test::reader (ACE_HANDLE handle)
 
 
 int
-Pipe_Proc_Test::svc (void)
+Pipe_Proc_Test::svc ()
 {
   ssize_t length = performance_test_options.msg_size ();
   int ni = this->thr_id ();
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
index 3f0a3b432fc..c63cbd2af1f 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
@@ -51,7 +51,7 @@ Pipe_Thr_Test::init (int, ACE_TCHAR **)
 }
 
 int
-Pipe_Thr_Test::svc (void)
+Pipe_Thr_Test::svc ()
 {
   ssize_t length = performance_test_options.msg_size ();
   ACE_HANDLE handle = this->pipe_handles[1];
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
index 97b731c24ee..73bc23239b9 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
@@ -17,7 +17,7 @@ private:
 ACE_Recursive_Thread_Mutex Recursive_Lock_Test::mutex;
 
 int
-Recursive_Lock_Test::svc (void)
+Recursive_Lock_Test::svc ()
 {
   int ni = this->thr_id ();
   synch_count = 2;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
index 118ddcd47ca..12ee04bf97e 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
@@ -17,7 +17,7 @@ private:
 ACE_RW_Mutex RWRD_Test::rw_lock;
 
 int
-RWRD_Test::svc (void)
+RWRD_Test::svc ()
 {
   int ni = this->thr_id ();
   synch_count = 2;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
index de143e21170..635b6c6e0f0 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
@@ -17,7 +17,7 @@ private:
 ACE_RW_Mutex RWWR_Test::rw_lock;
 
 int
-RWWR_Test::svc (void)
+RWWR_Test::svc ()
 {
   int ni = this->thr_id ();
   synch_count = 2;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
index fd0af5d8bb4..8020f16bae6 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
@@ -17,7 +17,7 @@ private:
 ACE_Semaphore Sema_Test::sema (1);
 
 int
-Sema_Test::svc (void)
+Sema_Test::svc ()
 {
   int ni      = this->thr_id ();
   synch_count = 2;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp
index 5a366d8dafa..63ba5d8f891 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp
@@ -31,14 +31,14 @@ SYSVSema_Test::init (int, ACE_TCHAR *[])
 }
 
 int
-SYSVSema_Test::fini (void)
+SYSVSema_Test::fini ()
 {
   delete SYSVSema_Test::sema;
   return 0;
 }
 
 int
-SYSVSema_Test::svc (void)
+SYSVSema_Test::svc ()
 {
   int ni      = this->thr_id ();
   synch_count = 2;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp
index 1bc1136424d..45e462a7792 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp
@@ -17,7 +17,7 @@ private:
 ACE_Token Token_Test::token;
 
 int
-Token_Test::svc (void)
+Token_Test::svc ()
 {
   // Extract out the unique thread-specific value to be used as an
   // index...
diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp
index f7e77a834d7..43bd16d38e2 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp
@@ -16,13 +16,13 @@ Benchmark_Base::Benchmark_Base (int type)
 }
 
 int
-Benchmark_Base::benchmark_type (void)
+Benchmark_Base::benchmark_type ()
 {
   return this->benchmark_type_;
 }
 
 int
-Benchmark_Base::thr_id (void)
+Benchmark_Base::thr_id ()
 {
 #if defined (ACE_HAS_PTHREADS) || defined (VXWORKS)
   // This invokes the thread-specific storage smart pointer.
@@ -32,7 +32,7 @@ Benchmark_Base::thr_id (void)
 #endif /* ACE_HAS_PTHREADS || VXWORKS */
 }
 
-Benchmark_Method_Base::Benchmark_Method_Base (void)
+Benchmark_Method_Base::Benchmark_Method_Base ()
   : Benchmark_Base (Benchmark_Base::METHOD)
 {
 }
@@ -69,13 +69,13 @@ Benchmark_Method_Base::exec (ACE_Service_Repository_Iterator *sri)
 /* static */
 MT_INT Thr_ID::thread_id_ (0);
 
-Thr_ID::Thr_ID (void)
+Thr_ID::Thr_ID ()
   : thr_id_ (++Thr_ID::thread_id_)
 {
 }
 
 int
-Thr_ID::thr_id (void)
+Thr_ID::thr_id ()
 {
   return this->thr_id_;
 }
diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h
index 5c26b3ad204..7c0e23b8db4 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h
@@ -33,8 +33,8 @@ class Thr_ID
   //   emulate this ourselves with this class (gag).
 {
 public:
-  Thr_ID (void);
-  int thr_id (void);
+  Thr_ID ();
+  int thr_id ();
   void thr_id (int);
 
 private:
@@ -61,10 +61,10 @@ public:
     PERFORMANCE
   };
 
-  int benchmark_type (void);
+  int benchmark_type ();
   // RTTI information of this module.
 
-  int thr_id (void);
+  int thr_id ();
   // Returns our thread id;
 
 protected:
@@ -105,7 +105,7 @@ public:
   // Check if we got a valid test to perform.
 
 protected:
-  Benchmark_Method_Base (void);
+  Benchmark_Method_Base ();
 };
 
 # endif /* ACE_HAS_THREADS */
diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp
index ce04311b7e4..46811436f73 100644
--- a/ACE/performance-tests/TCP/tcp_test.cpp
+++ b/ACE/performance-tests/TCP/tcp_test.cpp
@@ -66,7 +66,7 @@ enum {
 
 
 static void
-usage (void)
+usage ()
 {
   ACE_ERROR ((LM_ERROR,
               "tcp_test\n"
@@ -94,7 +94,7 @@ class Client : public ACE_Event_Handler
 public:
   Client (const ACE_INET_Addr &remote_addr);
 
-  virtual ~Client (void);
+  virtual ~Client ();
 
   // = Override <ACE_Event_Handler> methods.
   virtual ACE_HANDLE get_handle () const;
@@ -111,11 +111,11 @@ public:
   int get_response (char *buf, size_t len);
 
   /// Send messages to server and record statistics.
-  int run (void);
+  int run ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Send shutdown message to server.
-  int shutdown (void);
+  int shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -149,7 +149,7 @@ Client::Client (const ACE_INET_Addr &remote_addr)
     }
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
 }
 
@@ -201,7 +201,7 @@ Client::get_response (char *buf, size_t len)
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   ACE_OS::memset (sbuf, 0, bufsz);
   ACE_OS::memset (rbuf, 0, bufsz);
@@ -268,7 +268,7 @@ Client::run (void)
 }
 
 int
-Client::shutdown (void)
+Client::shutdown ()
 {
   const char buf = 'S';
   int n = this->endpoint_.send (&buf, 1u);
@@ -292,7 +292,7 @@ class Server : public ACE_Event_Handler
 public:
   Server (const ACE_INET_Addr &addr);
 
-  virtual ~Server (void);
+  virtual ~Server ();
 
   // = Override <ACE_Event_Handler> methods.
   virtual ACE_HANDLE get_handle () const;
@@ -365,7 +365,7 @@ Server::Server (const ACE_INET_Addr &addr)
                 "close failed"));
 }
 
-Server::~Server (void)
+Server::~Server ()
 {
   this->endpoint_.close ();
 }
diff --git a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
index b84300798a8..863d8643d60 100644
--- a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
+++ b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
@@ -178,7 +178,7 @@ void err (char *s);
 void mes (char *s);
 void pattern (register char *cp, register int cnt);
 char *outfmt (double b);
-void prep_timer (void);
+void prep_timer ();
 double read_timer (char *str, int len);
 static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
 static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
diff --git a/ACE/performance-tests/TTCP/C/new-ttcp.cpp b/ACE/performance-tests/TTCP/C/new-ttcp.cpp
index cafde7cb170..8edfb790c45 100644
--- a/ACE/performance-tests/TTCP/C/new-ttcp.cpp
+++ b/ACE/performance-tests/TTCP/C/new-ttcp.cpp
@@ -185,7 +185,7 @@ void mes (char *s);
 void pattern (register char *cp, register int cnt);
 char *outfmt (double b);
 static void getrusage (int ignored, register struct rusage *ru);
-void prep_timer (void);
+void prep_timer ();
 double read_timer (char *str, int len);
 static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
 static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp
index 753f9f15fcd..c6a187b54ea 100644
--- a/ACE/performance-tests/UDP/udp_test.cpp
+++ b/ACE/performance-tests/UDP/udp_test.cpp
@@ -54,7 +54,7 @@ ACE_hrtime_t total_ltime;
 ACE_hrtime_t ltime;
 
 static void
-usage (void)
+usage ()
 {
   ACE_ERROR ((LM_ERROR,
               "%s\n"
@@ -86,7 +86,7 @@ public:
   Client (const ACE_INET_Addr &addr,
           const ACE_INET_Addr &remote_addr);
 
-  virtual ~Client (void);
+  virtual ~Client ();
 
   // = Override <ACE_Event_Handler> methods.
   virtual ACE_HANDLE get_handle () const;
@@ -103,11 +103,11 @@ public:
   int get_response (char *buf, size_t len);
 
   /// Send messages to server and record statistics.
-  int run (void);
+  int run ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Send shutdown message to server.
-  int shutdown (void);
+  int shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -136,7 +136,7 @@ Client::Client (const ACE_INET_Addr &addr,
     }
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
 }
 
@@ -190,7 +190,7 @@ Client::get_response (char *buf, size_t len)
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   int ndist = 0;
   int i;
@@ -447,7 +447,7 @@ Client::run (void)
 }
 
 int
-Client::shutdown (void)
+Client::shutdown ()
 {
   const char buf = 'S';
   const int n = endpoint_.send (&buf, 1u, remote_addr_);
@@ -469,7 +469,7 @@ class Server : public ACE_Event_Handler
 public:
   Server (const ACE_INET_Addr &addr);
 
-  virtual ~Server (void);
+  virtual ~Server ();
 
   // = Override <ACE_Event_Handler> methods.
   virtual ACE_HANDLE get_handle () const;
@@ -499,7 +499,7 @@ Server::Server (const ACE_INET_Addr &addr)
     }
 }
 
-Server::~Server (void)
+Server::~Server ()
 {
 }
 
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
index b39b6976fab..b7c6ca1caab 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -95,7 +95,7 @@ ACE::HTBP::Channel::Channel (ACE_HANDLE h)
 }
 
 /// Destructor.
-ACE::HTBP::Channel::~Channel (void)
+ACE::HTBP::Channel::~Channel ()
 {
   delete this->notifier_;
   delete this->filter_;
@@ -108,7 +108,7 @@ ACE::HTBP::Channel::dump () const
 }
 
 unsigned long
-ACE::HTBP::Channel::request_count (void)
+ACE::HTBP::Channel::request_count ()
 {
   return this->request_count_++;
 }
@@ -135,7 +135,7 @@ ACE::HTBP::Channel::register_notifier (ACE_Reactor *r)
 }
 
 ACE::HTBP::Notifier *
-ACE::HTBP::Channel::notifier (void)
+ACE::HTBP::Channel::notifier ()
 {
   return this->notifier_;
 }
@@ -158,7 +158,7 @@ ACE::HTBP::Channel::data_consumed (size_t n)
 }
 
 int
-ACE::HTBP::Channel::load_buffer (void)
+ACE::HTBP::Channel::load_buffer ()
 {
   this->leftovers_.crunch();
   if (this->state() == Detached ||
@@ -203,7 +203,7 @@ ACE::HTBP::Channel::load_buffer (void)
 }
 
 int
-ACE::HTBP::Channel::flush_buffer (void)
+ACE::HTBP::Channel::flush_buffer ()
 {
   if (this->session_)
     return this->session_->flush_outbound_queue();
@@ -211,13 +211,13 @@ ACE::HTBP::Channel::flush_buffer (void)
 }
 
 int
-ACE::HTBP::Channel::send_ack (void)
+ACE::HTBP::Channel::send_ack ()
 {
   return this->filter_->send_ack(this);
 }
 
 int
-ACE::HTBP::Channel::recv_ack (void)
+ACE::HTBP::Channel::recv_ack ()
 {
   if (load_buffer() == -1)
     return -1;
@@ -236,7 +236,7 @@ ACE::HTBP::Channel::state (ACE::HTBP::Channel::State s)
 }
 
 int
-ACE::HTBP::Channel::consume_error (void)
+ACE::HTBP::Channel::consume_error ()
 {
   if (error_buffer_ == 0)
     {
@@ -293,7 +293,7 @@ ACE::HTBP::Channel::consume_error (void)
 /// one direction on one stream.
 
 int
-ACE::HTBP::Channel::pre_recv(void)
+ACE::HTBP::Channel::pre_recv()
 {
   if (ACE::debug())
     ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h
index b1b59f0b295..790f104c039 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h
@@ -86,7 +86,7 @@ namespace ACE
       Channel (ACE_HANDLE h);
 
       /// Destructor.
-      ~Channel (void);
+      ~Channel ();
 
       enum State {
         Init,
@@ -158,17 +158,17 @@ namespace ACE
 
       // = Selectively close endpoints.
       /// Close down the reader.
-      int close_reader (void);
+      int close_reader ();
 
       /// Close down the writer.
-      int close_writer (void);
+      int close_writer ();
 
       /**
        * Close down the socket (we need this to make things work correctly
        * on Win32, which requires use to do a <close_writer> before doing
        * the close to avoid losing data).
        */
-      int close (void);
+      int close ();
 
       // = Meta-type info
       typedef ACE_INET_Addr PEER_ADDR;
@@ -183,14 +183,14 @@ namespace ACE
       Session *session () const;
       void session (Session *);
 
-      Notifier *notifier (void);
+      Notifier *notifier ();
 
       void register_notifier (ACE_Reactor *r);
 
       ACE_HANDLE get_handle () const;
 
       const ACE_SOCK_Stream &ace_stream () const;
-      ACE_SOCK_Stream &ace_stream (void);
+      ACE_SOCK_Stream &ace_stream ();
 
       ///@notes Added the following methods to continue with
       /// current compilation of HTIOP. Might not be needed in
@@ -214,22 +214,22 @@ namespace ACE
       //@}
 
       // buffer related methods.
-      ACE_Message_Block &leftovers (void);
+      ACE_Message_Block &leftovers ();
       size_t data_len () const;
       void data_len (size_t n);
       size_t data_consumed () const;
       void data_consumed (size_t n);
-      int load_buffer (void);
-      int flush_buffer (void);
-      int recv_ack (void);
-      int send_ack (void);
+      int load_buffer ();
+      int flush_buffer ();
+      int recv_ack ();
+      int send_ack ();
       unsigned long request_count();
       Filter *filter () const;
       void filter (Filter *);
       State state () const;
       void state (Channel::State s);
-      int pre_recv(void);
-      int consume_error (void);
+      int pre_recv();
+      int consume_error ();
 
     private:
       /// The filter_ is a pluggable component used to manage the
diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.h b/ACE/protocols/ace/HTBP/HTBP_Environment.h
index 8e8d88691bf..37e0ccd9910 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Environment.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Environment.h
@@ -39,7 +39,7 @@ namespace ACE
       ~Environment ();
 
       /// removes all htbp related values from the configuration
-      void clear (void);
+      void clear ();
 
       /// Accessors to HTID URL
       /// Returns 0 on success
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
index b63151e30f1..c4add8cb672 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
@@ -9,7 +9,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE::HTBP::Filter::Filter (void)
+ACE::HTBP::Filter::Filter ()
   :http_code_ (0)
 {
 }
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Filter.h
index 2e2b458ded6..537514c5f38 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.h
@@ -47,7 +47,7 @@ namespace ACE
     class HTBP_Export Filter
     {
     public:
-      Filter (void);
+      Filter ();
 
       virtual ~Filter (void) = default;
 
@@ -75,10 +75,10 @@ namespace ACE
       virtual ssize_t recv_data_trailer(Channel *ch);
 
       /// reset the http_code_ in anticipation of a new message.
-      void reset_http_code (void);
+      void reset_http_code ();
 
       /// get the value of the most recent http result code
-      int http_code (void);
+      int http_code ();
 
     protected:
       char *header_complete (Channel *ch);
diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
index 08915e26f5a..a6da5c0fbb5 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
@@ -44,7 +44,7 @@ namespace ACE
     {
     public:
       /// Destructor.
-      virtual ~Inside_Squid_Filter (void);
+      virtual ~Inside_Squid_Filter ();
 
       /// Inside and outside Send filters need to supply a data header
       /// that sets the stage before sending the data body, and then
diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
index eda0a2b6ca2..8aaff832e57 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
@@ -72,7 +72,7 @@ ACE::HTBP::Notifier::handle_output (ACE_HANDLE )
 }
 
 void
-ACE::HTBP::Notifier::unregister (void)
+ACE::HTBP::Notifier::unregister ()
 {
   if (this->reactor())
     this->reactor()->remove_handler(this,
diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.h b/ACE/protocols/ace/HTBP/HTBP_Notifier.h
index ef17804fdcb..1670b23a61f 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Notifier.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.h
@@ -36,7 +36,7 @@ namespace ACE
       int handle_input(ACE_HANDLE );
       int handle_output(ACE_HANDLE );
 
-      void unregister (void);
+      void unregister ();
 
       ACE_HANDLE get_handle () const;
 
diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
index 95dfe9d8f38..15a557bdd24 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
@@ -45,7 +45,7 @@ namespace ACE
     {
     public:
       /// Destructor.
-      virtual ~Outside_Squid_Filter (void);
+      virtual ~Outside_Squid_Filter ();
 
       /// Outside and outside Send filters need to supply a data header that
       /// sets the stage before sending the data body, and then (maybe) send a
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
index 7f13e9ef770..8a20862d479 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
@@ -56,7 +56,7 @@ ACE::HTBP::Session::find_session (const ACE::HTBP::Session_Id_t &sid, ACE::HTBP:
 }
 
 //----------------------------------------------------------------------------
-ACE::HTBP::Session::Session (void)
+ACE::HTBP::Session::Session ()
   : proxy_addr_ (0),
     destroy_proxy_addr_ (0),
     inbound_ (0),
@@ -133,7 +133,7 @@ ACE::HTBP::Session::operator= (const ACE::HTBP::Session &)
   return *this;
 }
 
-ACE::HTBP::Session::~Session (void)
+ACE::HTBP::Session::~Session ()
 {
   if (destroy_proxy_addr_)
     delete proxy_addr_;
@@ -143,7 +143,7 @@ ACE::HTBP::Session::~Session (void)
 }
 
 int
-ACE::HTBP::Session::close (void)
+ACE::HTBP::Session::close ()
 {
   if (this->inbound_)
     this->inbound_->close();
@@ -198,7 +198,7 @@ ACE::HTBP::Session::reconnect_i (ACE::HTBP::Channel *s) const
 }
 
 ACE_Event_Handler *
-ACE::HTBP::Session::handler (void)
+ACE::HTBP::Session::handler ()
 {
   return this->handler_;
 }
@@ -238,7 +238,7 @@ ACE::HTBP::Session::enqueue (ACE_Message_Block *msg)
 }
 
 int
-ACE::HTBP::Session::flush_outbound_queue (void)
+ACE::HTBP::Session::flush_outbound_queue ()
 {
   int result = 0;
   if (this->outbound_queue_.message_count() > 0)
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.h b/ACE/protocols/ace/HTBP/HTBP_Session.h
index 0632dd74483..37e9bb78d24 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.h
@@ -72,7 +72,7 @@ namespace ACE
     public:
       // Initialization and termination methods.
       /// Constructor.
-      Session (void);
+      Session ();
 
       /// Constructor (sets the underlying session id with <sid>).
       Session (const Addr& peer,
@@ -88,7 +88,7 @@ namespace ACE
       Session& operator= (const Session &other);
 
       /// Destructor.
-      ~Session (void);
+      ~Session ();
 
       /// The following methods are specific to the Session
       static ACE_UINT32 next_session_id ();
@@ -102,7 +102,7 @@ namespace ACE
       void stream (Stream *);
 
       int enqueue (ACE_Message_Block *msg);
-      int flush_outbound_queue (void);
+      int flush_outbound_queue ();
 
       int close_inbound () const;
       int close_outbound () const;
@@ -137,9 +137,9 @@ namespace ACE
       void local_addr (const Addr &);
 
       /// invoke close on both streams, then remove self from session map
-      int close (void);
+      int close ();
 
-      ACE_Event_Handler *handler (void);
+      ACE_Event_Handler *handler ();
       void handler (ACE_Event_Handler *);
       void reactor (ACE_Reactor *);
       void detach (Channel *);
diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
index 0479a0040e0..75da921bbda 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
@@ -28,7 +28,7 @@ ACE::HTBP::Stream::Stream (ACE::HTBP::Session *s)
 }
 
 /// Destructor.
-ACE::HTBP::Stream::~Stream (void)
+ACE::HTBP::Stream::~Stream ()
 {
 }
 
@@ -284,19 +284,19 @@ ACE::HTBP::Stream::sendv_n (const iovec [],
 }
 
 int
-ACE::HTBP::Stream::close_reader (void)
+ACE::HTBP::Stream::close_reader ()
 {
   return this->session_->close_inbound();
 }
 
 int
-ACE::HTBP::Stream::close_writer (void)
+ACE::HTBP::Stream::close_writer ()
 {
   return this->session_->close_outbound();
 }
 
 int
-ACE::HTBP::Stream::close (void)
+ACE::HTBP::Stream::close ()
 {
   return this->session_->close();
 }
diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.h b/ACE/protocols/ace/HTBP/HTBP_Stream.h
index 50630da7720..4ec5198baef 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.h
@@ -90,7 +90,7 @@ namespace ACE
       Stream (Session *s = 0);
 
       /// Destructor.
-      ~Stream (void);
+      ~Stream ();
 
       // = I/O functions.
 
@@ -211,17 +211,17 @@ namespace ACE
                        size_t *bytes_transferred = 0) const;
 
       // = Selectively close endpoints.  / Close down the reader.
-      int close_reader (void);
+      int close_reader ();
 
       /// Close down the writer.
-      int close_writer (void);
+      int close_writer ();
 
       /**
        * Close down the socket (we need this to make things work correctly
        * on Win32, which requires use to do a <close_writer> before doing
        * the close to avoid losing data).
        */
-      int close (void);
+      int close ();
 
       // = Meta-type info
       typedef Addr PEER_ADDR;
diff --git a/ACE/protocols/ace/INet/HTTPS_Context.h b/ACE/protocols/ace/INet/HTTPS_Context.h
index 41e46cde316..f0e533c09c6 100644
--- a/ACE/protocols/ace/INet/HTTPS_Context.h
+++ b/ACE/protocols/ace/INet/HTTPS_Context.h
@@ -52,7 +52,7 @@ namespace ACE
 
               bool operator ! () const;
 
-              ACE_SSL_Context& ssl_context (void);
+              ACE_SSL_Context& ssl_context ();
 
               const ACE_SSL_Context& ssl_context () const;
 
diff --git a/ACE/protocols/ace/INet/INet_Log.cpp b/ACE/protocols/ace/INet/INet_Log.cpp
index e52a835986e..11cc0af024b 100644
--- a/ACE/protocols/ace/INet/INet_Log.cpp
+++ b/ACE/protocols/ace/INet/INet_Log.cpp
@@ -10,7 +10,7 @@ namespace ACE
   {
     unsigned int INet_Log::debug_level_ = INet_Log::Initializer ();
 
-    unsigned int INet_Log::Initializer(void)
+    unsigned int INet_Log::Initializer()
       {
         unsigned int debug_level = 0;
         bool trace = false;
diff --git a/ACE/protocols/ace/INet/INet_Log.h b/ACE/protocols/ace/INet/INet_Log.h
index 5ee5c160a33..ce5b18d5c22 100644
--- a/ACE/protocols/ace/INet/INet_Log.h
+++ b/ACE/protocols/ace/INet/INet_Log.h
@@ -25,7 +25,7 @@ namespace ACE
 
         static unsigned int debug_level_;
 
-        static unsigned int Initializer (void);
+        static unsigned int Initializer ();
     };
   }
 
diff --git a/ACE/protocols/ace/INet/SSL_CertificateCallback.h b/ACE/protocols/ace/INet/SSL_CertificateCallback.h
index 1dc8ba499d0..f6f49912f53 100644
--- a/ACE/protocols/ace/INet/SSL_CertificateCallback.h
+++ b/ACE/protocols/ace/INet/SSL_CertificateCallback.h
@@ -36,7 +36,7 @@ namespace ACE
 
               const ACE_SSL_Context& context () const;
 
-              SSL_X509Cert& certificate (void);
+              SSL_X509Cert& certificate ();
 
               int error_depth () const;
 
diff --git a/ACE/protocols/ace/INet/SSL_X509Cert.h b/ACE/protocols/ace/INet/SSL_X509Cert.h
index db032cea7b3..d030af4b9ce 100644
--- a/ACE/protocols/ace/INet/SSL_X509Cert.h
+++ b/ACE/protocols/ace/INet/SSL_X509Cert.h
@@ -37,7 +37,7 @@ namespace ACE
               SSL_X509Cert& operator= (::X509* ssl_cert);
               SSL_X509Cert& operator= (const SSL_X509Cert& ssl_cert);
 
-              ::X509* operator & (void);
+              ::X509* operator & ();
 
             private:
               ::X509* ssl_cert_;
diff --git a/ACE/protocols/ace/INet/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h
index 9e080a744da..e71cda5c94f 100644
--- a/ACE/protocols/ace/INet/StreamInterceptor.h
+++ b/ACE/protocols/ace/INet/StreamInterceptor.h
@@ -50,7 +50,7 @@ namespace ACE
               virtual void before_read (std::streamsize length_to_read);
               virtual void after_read (const char_type* buffer,
                                        int length_read);
-              virtual void on_eof (void);
+              virtual void on_eof ();
           };
 
         typedef StreamInterceptorBase<char> StreamInterceptor;
diff --git a/ACE/protocols/examples/INet/FTP_Simple_exec.cpp b/ACE/protocols/examples/INet/FTP_Simple_exec.cpp
index 9350edb99c0..b2db0f45abf 100644
--- a/ACE/protocols/examples/INet/FTP_Simple_exec.cpp
+++ b/ACE/protocols/examples/INet/FTP_Simple_exec.cpp
@@ -13,7 +13,7 @@ ACE_CString password;
 bool do_active = false;
 
 void
-usage (void)
+usage ()
 {
   std::cout << "usage: ftp_simple_wget [options] <url>\n";
   std::cout << "Executes an FTP download request and sends the result to STDOUT or file\n";
diff --git a/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp b/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp
index 0c4f2e24754..35abddb6b89 100644
--- a/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp
+++ b/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp
@@ -25,7 +25,7 @@ ACE_CString ca_location;
 #endif
 
 void
-usage (void)
+usage ()
 {
   std::cout << "usage: http_simple_wget [options] <url>\n";
   std::cout << "Executes an HTTP GET request and sends the result to STDOUT or file\n";
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
index d2bc3bb661a..5f46b6f30bc 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
@@ -54,7 +54,7 @@ class Accept_Handler : public ACE_Event_Handler
 {
 public:
   Accept_Handler (ACE_SOCK_Acceptor& a);
-  virtual ~Accept_Handler (void);
+  virtual ~Accept_Handler ();
   virtual int handle_input (ACE_HANDLE );
 private:
   ACE_SOCK_Acceptor& acceptor_;
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
index 67e46f054e8..6f3c476fb71 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
@@ -153,17 +153,17 @@ const size_t ACE_MAX_THREADS = 4;
 class ACE_Test_Output
 {
 public:
-  ACE_Test_Output (void);
-  ~ACE_Test_Output (void);
+  ACE_Test_Output ();
+  ~ACE_Test_Output ();
   int set_output (const ACE_TCHAR *filename, int append = 0);
-  OFSTREAM *output_file (void);
-  void close (void);
+  OFSTREAM *output_file ();
+  void close ();
 
 private:
   OFSTREAM *output_file_;
 };
 
-inline ACE_Test_Output::ACE_Test_Output (void)
+inline ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -171,7 +171,7 @@ inline ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-inline ACE_Test_Output::~ACE_Test_Output (void)
+inline ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -186,7 +186,7 @@ inline ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 inline OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -268,7 +268,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 }
 
 inline void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();
diff --git a/ACE/tests/ACE_Init_Test.h b/ACE/tests/ACE_Init_Test.h
index 2af1f698866..9850939feda 100644
--- a/ACE/tests/ACE_Init_Test.h
+++ b/ACE/tests/ACE_Init_Test.h
@@ -28,7 +28,7 @@
 class CACE_Init_TestApp : public CWinApp
 {
 public:
-  CACE_Init_TestApp (void);
+  CACE_Init_TestApp ();
 
   // Overrides
   // ClassWizard generated virtual function overrides
diff --git a/ACE/tests/Based_Pointer_Test_Lib.cpp b/ACE/tests/Based_Pointer_Test_Lib.cpp
index 1b27fdead9c..555bd2d98c7 100644
--- a/ACE/tests/Based_Pointer_Test_Lib.cpp
+++ b/ACE/tests/Based_Pointer_Test_Lib.cpp
@@ -17,10 +17,10 @@
 #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 (void)
+get_based_pointer_repo_inst ()
 #else
 extern "C" ACE_Svc_Export void *
-get_based_pointer_repository_instance (void)
+get_based_pointer_repository_instance ()
 #endif
 {
     void* baddr = ACE_BASED_POINTER_REPOSITORY::instance();
diff --git a/ACE/tests/Bound_Ptr_Test.h b/ACE/tests/Bound_Ptr_Test.h
index cad39282236..250c8283c25 100644
--- a/ACE/tests/Bound_Ptr_Test.h
+++ b/ACE/tests/Bound_Ptr_Test.h
@@ -49,7 +49,7 @@ class Scheduler : public ACE_Task<ACE_SYNCH>
   friend class Method_Request_end;
 public:
   /// Constructor.
-  Scheduler (void);
+  Scheduler ();
 
   /// Initializer.
   virtual int open (void *args = 0);
@@ -58,11 +58,11 @@ public:
   virtual int close (u_long flags = 0);
 
   /// Destructor.
-  virtual ~Scheduler (void);
+  virtual ~Scheduler ();
 
   // = These methods are part of the Active Object Proxy interface.
   void print (Printer_var &printer);
-  void end (void);
+  void end ();
 
 protected:
   /// Runs the Scheduler's event loop, which dequeues <Method_Requests>
diff --git a/ACE/tests/Bug_2980_Regression_Dll.cpp b/ACE/tests/Bug_2980_Regression_Dll.cpp
index 2e65a687374..0aaa591c175 100644
--- a/ACE/tests/Bug_2980_Regression_Dll.cpp
+++ b/ACE/tests/Bug_2980_Regression_Dll.cpp
@@ -4,7 +4,7 @@
 
 extern "C"
 {
-ACE_Proper_Export_Flag int capi_init(void)
+ACE_Proper_Export_Flag int capi_init()
 {
   int ret = ACE::init();
   ACE_START_TEST (ACE_TEXT ("Bug_2980_Regression_Test"));
@@ -15,7 +15,7 @@ ACE_Proper_Export_Flag int capi_init(void)
 }
 
 
-ACE_Proper_Export_Flag int capi_fini(void)
+ACE_Proper_Export_Flag int capi_fini()
 {
   ACE_START_TEST (ACE_TEXT ("Bug_2980_Regression_Test"));
   ACE_DEBUG ((LM_INFO,
@@ -26,7 +26,7 @@ ACE_Proper_Export_Flag int capi_fini(void)
 }
 
 
-ACE_Proper_Export_Flag int capi_dosomething(void)
+ACE_Proper_Export_Flag int capi_dosomething()
 {
   ACE_START_TEST (ACE_TEXT ("Bug_2980_Regression_Test"));
 
diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h
index 9581f92c7bd..39d680c87e1 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.h
+++ b/ACE/tests/Cached_Accept_Conn_Test.h
@@ -122,7 +122,7 @@ protected:
   typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY_BASE;
 
   /// Handler for removing cached connections.
-  int out_of_sockets_handler (void);
+  int out_of_sockets_handler ();
 
   CACHED_CONNECT_STRATEGY &caching_connect_strategy_;
 };
diff --git a/ACE/tests/Conn_Test.h b/ACE/tests/Conn_Test.h
index af870826380..637466d19fd 100644
--- a/ACE/tests/Conn_Test.h
+++ b/ACE/tests/Conn_Test.h
@@ -45,10 +45,10 @@ public:
   virtual int recycle (void * = 0);
 
   /// Send data to server.
-  void send_data (void);
+  void send_data ();
 
   /// Recv data from client.
-  void recv_data (void);
+  void recv_data ();
 
   /// Shutdown the <Svc_Handler>.
   int close (u_long = 0);
diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp
index 9a442d42a10..06df42125ff 100644
--- a/ACE/tests/FlReactor_Test.cpp
+++ b/ACE/tests/FlReactor_Test.cpp
@@ -46,11 +46,11 @@ public:
 
   int sides () const;
   void sides (int s);
-  void incr_sides (void);
+  void incr_sides ();
 
 private:
   /// from the Fl_Gl_Window...
-  virtual void draw (void);
+  virtual void draw ();
 
   int sides_;
 };
@@ -77,7 +77,7 @@ Test_Window::sides (int s)
 }
 
 void
-Test_Window::incr_sides (void)
+Test_Window::incr_sides ()
 {
   this->sides_++;
   if (this->sides_ > 10)
@@ -86,7 +86,7 @@ Test_Window::incr_sides (void)
 }
 
 void
-Test_Window::draw (void)
+Test_Window::draw ()
 {
   // the valid() property may be used to avoid reinitializing your
   // GL transformation for each redraw:
diff --git a/ACE/tests/Framework_Component_Test.h b/ACE/tests/Framework_Component_Test.h
index 92b5202d49f..5a77fb7f623 100644
--- a/ACE/tests/Framework_Component_Test.h
+++ b/ACE/tests/Framework_Component_Test.h
@@ -20,11 +20,11 @@
 class Simple_Service
 {
 public:
-  Simple_Service (void)
+  Simple_Service ()
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Service::Simple_Service\n")));
     }
-  virtual ~Simple_Service (void)
+  virtual ~Simple_Service ()
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Service::~Simple_Service\n")));
     }
diff --git a/ACE/tests/IOStream_Test.cpp b/ACE/tests/IOStream_Test.cpp
index a9c51dfe39f..313c54fb014 100644
--- a/ACE/tests/IOStream_Test.cpp
+++ b/ACE/tests/IOStream_Test.cpp
@@ -383,7 +383,7 @@ server (void *arg = 0)
 }
 
 static int
-spawn (void)
+spawn ()
 {
   // Acceptor;
   ACE_SOCK_Acceptor acceptor;
diff --git a/ACE/tests/MEM_Stream_Test.h b/ACE/tests/MEM_Stream_Test.h
index cbba67d5562..adc7cdd0dd6 100644
--- a/ACE/tests/MEM_Stream_Test.h
+++ b/ACE/tests/MEM_Stream_Test.h
@@ -38,7 +38,7 @@ public:
   /// The Svc_Handler callbacks.
   Echo_Handler (ACE_Thread_Manager *thr_mgr = 0);
   virtual int open (void *);
-  static void reset_handler (void);
+  static void reset_handler ();
   virtual int handle_input (ACE_HANDLE h);
   virtual int handle_close (ACE_HANDLE handle,
                             ACE_Reactor_Mask close_mask);
diff --git a/ACE/tests/MT_Reactor_Timer_Test.h b/ACE/tests/MT_Reactor_Timer_Test.h
index fe8ffeebce4..7302db9a3b2 100644
--- a/ACE/tests/MT_Reactor_Timer_Test.h
+++ b/ACE/tests/MT_Reactor_Timer_Test.h
@@ -33,11 +33,11 @@
 class Time_Handler : public ACE_Task<ACE_SYNCH>
 {
 public:
-  Time_Handler (void);
+  Time_Handler ();
 
-  void setup (void);
+  void setup ();
 
-  int verify_results(void);
+  int verify_results();
 
   /// Run by a daemon thread to handle deferred processing.
   virtual int svc ();
@@ -77,7 +77,7 @@ private:
 class Dispatch_Count_Handler : public ACE_Event_Handler
 {
 public:
-  Dispatch_Count_Handler (void);
+  Dispatch_Count_Handler ();
 
   /// Clean up resources from the Reactor.
   int handle_close (ACE_HANDLE h,
@@ -94,7 +94,7 @@ public:
   virtual int handle_exception (ACE_HANDLE);
 
   /// Verify that the expected events did happen.
-  int verify_results (void);
+  int verify_results ();
 
 private:
   /// Provide something to trigger I/O.
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index d2bc5852106..8c7161e9342 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -311,7 +311,7 @@ child ()
 // run time check and run the NT4-or-better code unless we're on
 // CE or something other than NT4 (Pharlap reports itself as NT 3.51).
 static void
-get_base_addrs (void)
+get_base_addrs ()
 {
 #   if defined(__clang__)
 #     pragma clang diagnostic push
diff --git a/ACE/tests/Map_Test.h b/ACE/tests/Map_Test.h
index b330b8f8f47..0574733260c 100644
--- a/ACE/tests/Map_Test.h
+++ b/ACE/tests/Map_Test.h
@@ -38,7 +38,7 @@ typedef ACE_Array<char> KEY;
 class Key_Generator
 {
 public:
-  Key_Generator (void)
+  Key_Generator ()
     : counter_ (0)
     {
     }
diff --git a/ACE/tests/Message_Queue_Test_Ex.h b/ACE/tests/Message_Queue_Test_Ex.h
index bee0a36c50f..e30b4415194 100644
--- a/ACE/tests/Message_Queue_Test_Ex.h
+++ b/ACE/tests/Message_Queue_Test_Ex.h
@@ -60,10 +60,10 @@ struct Receive_Messages;
 class MQ_Ex_N_Tester
 {
 public:
-  int single_thread_performance_test (void);
+  int single_thread_performance_test ();
 
 #if defined (ACE_HAS_THREADS)
-  int performance_test (void);
+  int performance_test ();
 
   /// Sender runs with an autonomous thread
   static ACE_THR_FUNC_RETURN sender (void *);
@@ -80,8 +80,8 @@ public:
 
 private:
   /// Helper methods
-  int test_enqueue_head (void);
-  int test_enqueue_tail (void);
+  int test_enqueue_head ();
+  int test_enqueue_tail ();
 };
 
 #endif /* ACE_TESTS_MESSAGE_QUEUE_TEST_EX_H */
diff --git a/ACE/tests/Network_Adapters_Test.h b/ACE/tests/Network_Adapters_Test.h
index c49a81410c8..2541e6eafed 100644
--- a/ACE/tests/Network_Adapters_Test.h
+++ b/ACE/tests/Network_Adapters_Test.h
@@ -35,10 +35,10 @@ class Echo_Handler : public ACE_Event_Handler
 {
 public:
   /// Default constructor
-  Echo_Handler (void);
+  Echo_Handler ();
 
   /// Destructor
-  virtual ~Echo_Handler (void);
+  virtual ~Echo_Handler ();
 
   /**
    * Initialization of a handler, performing echo-checks against a
@@ -117,11 +117,11 @@ public:
   int dispatch_echo_checks (int first_call = 0);
 
   /// Access to ping_socket.
-  ACE_Ping_Socket& ping_socket (void);
+  ACE_Ping_Socket& ping_socket ();
 
   /// Returns 1 if a single char of success_status_ is 0
   /// (connected).
-  int does_echo_test_successful (void);
+  int does_echo_test_successful ();
 
 private:
   /// Wrapper for sending/receiving ICMPs.
@@ -171,10 +171,10 @@ public:
   Stop_Handler (ACE_Reactor * const reactor = ACE_Reactor::instance ());
 
   // Destructor.
-  virtual ~Stop_Handler (void);
+  virtual ~Stop_Handler ();
 
   // Initialization. Registers this for SIGINT, SIGTERM and SIGQUIT.
-  virtual int open (void);
+  virtual int open ();
 
   // De-registers this from the reactor and stops reactors event_loop.
   virtual int handle_close (ACE_HANDLE handle,
@@ -218,10 +218,10 @@ class Repeats_Handler : public ACE_Event_Handler
 {
 public:
   // Constructor.
-  Repeats_Handler (void);
+  Repeats_Handler ();
 
   // Destructor.
-  virtual ~Repeats_Handler (void);
+  virtual ~Repeats_Handler ();
 
   // Initialization.
   virtual int open (Echo_Handler *check_handler,
diff --git a/ACE/tests/Object_Manager_Flipping_Test.cpp b/ACE/tests/Object_Manager_Flipping_Test.cpp
index 0531220c232..12f72e0ea9d 100644
--- a/ACE/tests/Object_Manager_Flipping_Test.cpp
+++ b/ACE/tests/Object_Manager_Flipping_Test.cpp
@@ -26,7 +26,7 @@ static u_int *ip;
 
 extern "C"
 void
-hook1 (void)
+hook1 ()
 {
   delete ip;
   ip = 0;
diff --git a/ACE/tests/Object_Manager_Test.cpp b/ACE/tests/Object_Manager_Test.cpp
index b34eee97e24..790647e3954 100644
--- a/ACE/tests/Object_Manager_Test.cpp
+++ b/ACE/tests/Object_Manager_Test.cpp
@@ -20,7 +20,7 @@ static u_int *ip;
 
 extern "C"
 void
-hook1 (void)
+hook1 ()
 {
   delete ip;
   ip = 0;
diff --git a/ACE/tests/Priority_Reactor_Test.h b/ACE/tests/Priority_Reactor_Test.h
index 10a7ba3cd01..7bdc5ff9d1d 100644
--- a/ACE/tests/Priority_Reactor_Test.h
+++ b/ACE/tests/Priority_Reactor_Test.h
@@ -42,7 +42,7 @@ public:
   static void set_countdown (int nchildren);
 
   /// Get the number of children we are still waiting for.
-  static int get_countdown (void);
+  static int get_countdown ();
 
   /// The Svc_Handler callbacks.
   virtual int open (void *);
diff --git a/ACE/tests/Proactor_Scatter_Gather_Test.cpp b/ACE/tests/Proactor_Scatter_Gather_Test.cpp
index 785576e9c6d..e2c1d3b4054 100644
--- a/ACE/tests/Proactor_Scatter_Gather_Test.cpp
+++ b/ACE/tests/Proactor_Scatter_Gather_Test.cpp
@@ -247,13 +247,13 @@ class Acceptor : public ACE_Asynch_Acceptor<Receiver>
   friend class Receiver;
 
 public:
-  Acceptor (void);
-  virtual ~Acceptor (void);
+  Acceptor ();
+  virtual ~Acceptor ();
 
-  void stop (void);
+  void stop ();
 
   // Virtual from ACE_Asynch_Acceptor
-  virtual Receiver *make_handler (void);
+  virtual Receiver *make_handler ();
 
   int get_number_sessions (void) { return this->sessions_; }
 
@@ -275,7 +275,7 @@ class Receiver : public ACE_Service_Handler
 
 public:
   Receiver  (Acceptor *acceptor = 0, int index = -1);
-  virtual ~Receiver (void);
+  virtual ~Receiver ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// This is called after the new connection has been accepted.
@@ -289,9 +289,9 @@ protected:
   virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result);
 
 private:
-  int initiate_read_stream (void);
+  int initiate_read_stream ();
 
-  void check_destroy (void);
+  void check_destroy ();
 
   Acceptor *acceptor_;
   int index_;
@@ -317,11 +317,11 @@ class Writer : public ACE_Handler
   friend class Receiver;
 
 public:
-  Writer (void);
-  virtual ~Writer (void);
+  Writer ();
+  virtual ~Writer ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void open (void);
+  void open ();
   //FUZZ: enable check_for_lack_ACE_OS
 
   // this is *not* a callback from the framework
@@ -338,7 +338,7 @@ protected:
   virtual void handle_write_file (const ACE_Asynch_Write_File::Result &result);
 
 private:
-  int initiate_write_file (void);
+  int initiate_write_file ();
 
 private:
    // Output file
@@ -384,7 +384,7 @@ Receiver::Receiver (Acceptor * acceptor, int index)
     this->acceptor_->on_new_receiver (*this);
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Receiver::~Receiver\n")));
@@ -405,7 +405,7 @@ Receiver::~Receiver (void)
 }
 
 void
-Receiver::check_destroy (void)
+Receiver::check_destroy ()
 {
   if (this->io_count_ <= 0)
     delete this;
@@ -433,7 +433,7 @@ Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Receiver::initiate_read_stream (void)
+Receiver::initiate_read_stream ()
 {
   if (!Receiver::writer_)
     return -1;
@@ -571,21 +571,21 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 //   Acceptor Impl
 // *************************************************************
 
-Acceptor::Acceptor (void)
+Acceptor::Acceptor ()
   : sessions_ (0)
 {
   for (int i = 0; i < RECEIVERS; ++i)
      this->list_receivers_[i] = 0;
 }
 
-Acceptor::~Acceptor (void)
+Acceptor::~Acceptor ()
 {
   this->stop ();
 }
 
 
 void
-Acceptor::stop (void)
+Acceptor::stop ()
 {
   // This method can be called only after proactor event loop is done
   // in all threads.
@@ -621,7 +621,7 @@ Acceptor::on_delete_receiver (Receiver & rcvr)
 }
 
 Receiver *
-Acceptor::make_handler (void)
+Acceptor::make_handler ()
 {
   if (this->sessions_ >= RECEIVERS)
     return 0;
@@ -644,7 +644,7 @@ Acceptor::make_handler (void)
 //   Writer Impl
 // *************************************************************
 
-Writer::Writer (void)
+Writer::Writer ()
 : output_file_handle_ (ACE_INVALID_HANDLE),
   writing_file_offset_ (0),
   reported_file_offset_ (0),
@@ -655,7 +655,7 @@ Writer::Writer (void)
 {
 }
 
-Writer::~Writer (void)
+Writer::~Writer ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Writer::~Writer\n")));
@@ -693,7 +693,7 @@ Writer::on_delete_receiver ()
 }
 
 void
-Writer::open (void)
+Writer::open ()
 {
   // Open the file for output
   if (ACE_INVALID_HANDLE == (this->output_file_handle_ = ACE_OS::open (output_file,
@@ -728,7 +728,7 @@ Writer::handle_read_chunks_chain (ACE_Message_Block *mb,
 }
 
 int
-Writer::initiate_write_file (void)
+Writer::initiate_write_file ()
 {
   // find out how much can we merge
   ACE_Message_Block *dummy_last = 0;
@@ -891,17 +891,17 @@ class Connector : public ACE_Asynch_Connector<Sender>
   friend class Sender;
 
 public:
-  Connector (void);
-  virtual ~Connector (void);
+  Connector ();
+  virtual ~Connector ();
 
   // Address to pass to Sender for secondary connect.
   void set_address (const ACE_INET_Addr &addr);
-  const ACE_INET_Addr &get_address (void);
+  const ACE_INET_Addr &get_address ();
 
-  void stop (void);
+  void stop ();
 
   // Virtual from ACE_Asynch_Connector
-  virtual Sender *make_handler (void);
+  virtual Sender *make_handler ();
 
 private:
   void on_new_sender  (Sender &rcvr);
@@ -918,7 +918,7 @@ class Sender : public ACE_Service_Handler
 public:
   Sender  (Connector *connector = 0, int index = -1);
 
-  virtual ~Sender (void);
+  virtual ~Sender ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// This is called after the new connection has been established.
@@ -935,9 +935,9 @@ public:
   virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
 
 private:
-  void check_destroy (void);
+  void check_destroy ();
 
-  int initiate_read_file (void);
+  int initiate_read_file ();
 
   int initiate_write_stream (ACE_Message_Block &mb);
 
@@ -961,14 +961,14 @@ private:
 //   Connector Impl
 // *************************************************************
 
-Connector::Connector (void)
+Connector::Connector ()
   : sessions_ (0)
 {
   for (int i = 0; i < SENDERS; ++i)
      this->list_senders_[i] = 0;
 }
 
-Connector::~Connector (void)
+Connector::~Connector ()
 {
   this->stop ();
 }
@@ -981,13 +981,13 @@ Connector::set_address (const ACE_INET_Addr &addr)
 }
 
 const ACE_INET_Addr &
-Connector::get_address (void)
+Connector::get_address ()
 {
   return this->addr_;
 }
 
 void
-Connector::stop (void)
+Connector::stop ()
 {
   // This method can be called only after proactor event loop is done
   // in all threads.
@@ -1024,7 +1024,7 @@ Connector::on_delete_sender (Sender &sndr)
 }
 
 Sender *
-Connector::make_handler (void)
+Connector::make_handler ()
 {
   if (this->sessions_ >= SENDERS)
     return 0;
@@ -1060,7 +1060,7 @@ Sender::Sender (Connector * connector, int index)
     this->connector_->on_new_sender (*this);
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Sender::~Sender\n")));
@@ -1083,7 +1083,7 @@ Sender::~Sender (void)
 
 //  return true if we alive, false  we commited suicide
 void
-Sender::check_destroy (void)
+Sender::check_destroy ()
 {
   if (this->io_count_ <= 0)
     delete this;
@@ -1150,7 +1150,7 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Sender::initiate_read_file (void)
+Sender::initiate_read_file ()
 {
   ACE_TEST_ASSERT (0 == this->file_offset_ % chunk_size);
 
diff --git a/ACE/tests/Proactor_Test.h b/ACE/tests/Proactor_Test.h
index 94b51d30584..76f479df749 100644
--- a/ACE/tests/Proactor_Test.h
+++ b/ACE/tests/Proactor_Test.h
@@ -25,7 +25,7 @@ class Server : public ACE_Service_Handler
 public:
   Server ();
   Server (TestData *tester, int id);
-  ~Server (void);
+  ~Server ();
 
   int id (void) { return this->id_; }
   size_t get_total_snd (void) { return this->total_snd_; }
@@ -57,7 +57,7 @@ protected:
   virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
 
 private:
-  int initiate_read_stream (void);
+  int initiate_read_stream ();
   int initiate_write_stream (ACE_Message_Block &mb, size_t nbytes);
 
   TestData *tester_;
@@ -89,7 +89,7 @@ public:
 
   Client ();
   Client (TestData *tester, int id);
-  ~Client (void);
+  ~Client ();
 
   int id (void) { return this->id_; }
   size_t get_total_snd (void) { return this->total_snd_; }
@@ -107,12 +107,12 @@ public:
   /// This is called when asynchronous writes from the socket complete
   virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
 
-  void cancel (void);
+  void cancel ();
 
 private:
-  int initiate_read_stream (void);
-  int initiate_write_stream (void);
-  void close (void);
+  int initiate_read_stream ();
+  int initiate_write_stream ();
+  void close ();
 
   TestData *tester_;
   int id_;
diff --git a/ACE/tests/Process_Strategy_Test.h b/ACE/tests/Process_Strategy_Test.h
index dafc57487ae..a5a6c731d9d 100644
--- a/ACE/tests/Process_Strategy_Test.h
+++ b/ACE/tests/Process_Strategy_Test.h
@@ -54,10 +54,10 @@ protected:
 
   // = Operations corresponding to requests from the client.
   /// Execute the read operation on the file.
-  int read (void);
+  int read ();
 
   /// Execute the increment operation on the file.
-  int inc (void);
+  int inc ();
 
   // = Hooks called by <Reactor> and <Strategy_Acceptor>.
 
@@ -79,7 +79,7 @@ public:
                     int flags = 0);
 
   // Destructor
-  ~Process_Strategy (void);
+  ~Process_Strategy ();
 
   // Overwrite the process creation method to include connection
   // counting
@@ -96,10 +96,10 @@ class Options : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Options (void);
+  Options ();
 
   /// Destructor.
-  ~Options (void);
+  ~Options ();
 
   /// Read command-line arguments and initialize options.
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -112,17 +112,17 @@ public:
   };
 
   // = Get/set concurrency type.
-  Concurrency_Type concurrency_type (void);
+  Concurrency_Type concurrency_type ();
   void concurrency_type (Concurrency_Type);
 
   /// Returns the file lock.
-  ACE_File_Lock &file_lock (void);
+  ACE_File_Lock &file_lock ();
 
   /// Returns the filename that we're using as the lock.
-  const ACE_TCHAR *filename (void);
+  const ACE_TCHAR *filename ();
 
   /// Returns the concurrency strategy.
-  ACE_Concurrency_Strategy <Counting_Service> *concurrency_strategy (void);
+  ACE_Concurrency_Strategy <Counting_Service> *concurrency_strategy ();
 
 private:
   /// Concurrency strategy that we're running.
diff --git a/ACE/tests/RB_Tree_Test.h b/ACE/tests/RB_Tree_Test.h
index 911ca6c37c0..1ba8030c899 100644
--- a/ACE/tests/RB_Tree_Test.h
+++ b/ACE/tests/RB_Tree_Test.h
@@ -43,28 +43,28 @@ public:
                     int order_index []);
 
   /// Destructor.
-  ~ACE_RB_Tree_Test (void);
+  ~ACE_RB_Tree_Test ();
 
   /// Run the individual interface and iteration tests in order.
-  void run_test (void);
+  void run_test ();
 
 private:
   /// Tests stable and deprecated insertion interfaces.
-  void test_tree_insertion (void);
+  void test_tree_insertion ();
 
   /// Tests forward and reverse iteration after insertion in both
   /// trees.
-  void test_post_insertion_iteration (void);
+  void test_post_insertion_iteration ();
 
   ///Tests forward and reverse partial iteration
-  void test_partial_iteration(void);
+  void test_partial_iteration();
 
   /// Tests stable and deprecated deletion interfaces.
-  void test_tree_deletion (void);
+  void test_tree_deletion ();
 
   /// Tests forward and reverse iteration after deletions in both
   /// trees.
-  void test_post_deletion_iteration (void);
+  void test_post_deletion_iteration ();
 
   /// Tree for testing stable interface.
   TREE stable_tree_;
diff --git a/ACE/tests/Reactor_Performance_Test.h b/ACE/tests/Reactor_Performance_Test.h
index f7282864f73..5fa44547edd 100644
--- a/ACE/tests/Reactor_Performance_Test.h
+++ b/ACE/tests/Reactor_Performance_Test.h
@@ -55,7 +55,7 @@ class Write_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
 {
 public:
   virtual int open (void *);
-  virtual int send_data (void);
+  virtual int send_data ();
 };
 
 #endif /* ACE_TESTS_REACTOR_PERFORMANCE_TEST_H */
diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.h b/ACE/tests/Refcounted_Auto_Ptr_Test.h
index bc723826f68..c16d4dcba13 100644
--- a/ACE/tests/Refcounted_Auto_Ptr_Test.h
+++ b/ACE/tests/Refcounted_Auto_Ptr_Test.h
@@ -22,7 +22,7 @@ struct Printer
   Printer (const char *message);
   ~Printer (void) ;
 
-  void print (void);
+  void print ();
 
   const char *message_;
   unsigned int which_;
diff --git a/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp b/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp
index b93f38ef479..567077e5807 100644
--- a/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp
+++ b/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp
@@ -313,7 +313,7 @@ server (void *arg)
 
 #if defined (ACE_HAS_IPV6)
 static void
-spawn (void)
+spawn ()
 {
   // Acceptor
   ACE_SOCK_Acceptor peer_acceptor;
diff --git a/ACE/tests/SOCK_Test_IPv6.cpp b/ACE/tests/SOCK_Test_IPv6.cpp
index 652d0a41dde..1723b383a5e 100644
--- a/ACE/tests/SOCK_Test_IPv6.cpp
+++ b/ACE/tests/SOCK_Test_IPv6.cpp
@@ -208,7 +208,7 @@ server (void *arg)
 }
 
 static void
-spawn (void)
+spawn ()
 {
   // Acceptor
   ACE_SOCK_Acceptor peer_acceptor;
diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
index b85526f970e..3038a1b8e3f 100644
--- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
+++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
@@ -104,7 +104,7 @@ typedef ACE_Singleton<Client_Proactor_Task, ACE_SYNCH_RECURSIVE_MUTEX>
 #define CLIENT_PROACTOR_TASK Client_Proactor_Task_Singleton::instance()
 
 int
-Client_Proactor_Task::svc (void)
+Client_Proactor_Task::svc ()
 {
   // Keep RT signals on POSIX from killing us.
   disable_signal (ACE_SIGRTMIN, ACE_SIGRTMAX);
@@ -133,7 +133,7 @@ typedef ACE_Singleton<Server_Proactor_Task, ACE_SYNCH_RECURSIVE_MUTEX>
 #define SERVER_PROACTOR_TASK Server_Proactor_Task_Singleton::instance ()
 
 int
-Server_Proactor_Task::svc (void)
+Server_Proactor_Task::svc ()
 {
   // Keep RT signals on POSIX from killing us.
   disable_signal (ACE_SIGRTMIN, ACE_SIGRTMAX);
@@ -213,7 +213,7 @@ tmp_dh_callback (SSL *s, int is_export, int keylength)
 }
 
 bool
-init_ssl (void)
+init_ssl ()
 {
   SSL_CTX_set_quiet_shutdown (ACE_SSL_Context::instance ()->context(), 1);
   SSL_CTX_set_options (ACE_SSL_Context::instance ()->context(),
@@ -240,9 +240,9 @@ init_ssl (void)
 class Server_Service_Handler : public ACE_Service_Handler
 {
 public:
-  Server_Service_Handler (void);
+  Server_Service_Handler ();
 
-  virtual ~Server_Service_Handler (void);
+  virtual ~Server_Service_Handler ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   virtual void open (ACE_HANDLE h, ACE_Message_Block&);
@@ -254,13 +254,13 @@ public:
   virtual void handle_write_stream (
     const ACE_Asynch_Write_Stream::Result &result);
 
-  virtual void handle_wakeup (void);
+  virtual void handle_wakeup ();
 
-  void cancel_and_close (void);
+  void cancel_and_close ();
 
-  int read_data (void);
+  int read_data ();
 
-  int write_data (void);
+  int write_data ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   int read (ACE_Message_Block &mb, size_t bytes_to_read);
@@ -290,7 +290,7 @@ Server_Service_Handler::Server_Service_Handler (void) :
 {
 }
 
-Server_Service_Handler::~Server_Service_Handler (void)
+Server_Service_Handler::~Server_Service_Handler ()
 {
   if (ACE_INVALID_HANDLE != this->handle ())
   {
@@ -432,7 +432,7 @@ Server_Service_Handler::handle_write_stream (
 }
 
 void
-Server_Service_Handler::handle_wakeup (void)
+Server_Service_Handler::handle_wakeup ()
 {
   ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_);
 
@@ -440,7 +440,7 @@ Server_Service_Handler::handle_wakeup (void)
 }
 
 void
-Server_Service_Handler::cancel_and_close (void)
+Server_Service_Handler::cancel_and_close ()
 {
   ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_);
 
@@ -450,7 +450,7 @@ Server_Service_Handler::cancel_and_close (void)
 }
 
 int
-Server_Service_Handler::read_data (void)
+Server_Service_Handler::read_data ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1);
 
@@ -470,7 +470,7 @@ Server_Service_Handler::read_data (void)
 }
 
 int
-Server_Service_Handler::write_data (void)
+Server_Service_Handler::write_data ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1);
 
@@ -543,16 +543,16 @@ Server_Service_Handler::safe_to_delete () const
 class Acceptor : public ACE_Asynch_Acceptor<Server_Service_Handler>
 {
 public:
-  Acceptor (void);
+  Acceptor ();
 
-  virtual ~Acceptor (void);
+  virtual ~Acceptor ();
 
-  virtual int cancel (void);
+  virtual int cancel ();
 
   virtual int validate_connection (const ACE_Asynch_Accept::Result& result,
     const ACE_INET_Addr &remote, const ACE_INET_Addr& local);
 
-  virtual Server_Service_Handler *make_handler (void);
+  virtual Server_Service_Handler *make_handler ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   virtual int accept (size_t bytes_to_read = 0, const void *act = 0);
@@ -580,12 +580,12 @@ Acceptor::Acceptor (void) :
 {
 }
 
-Acceptor::~Acceptor (void)
+Acceptor::~Acceptor ()
 {
 }
 
 int
-Acceptor::cancel (void)
+Acceptor::cancel ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1);
 
@@ -635,7 +635,7 @@ Acceptor::validate_connection (const ACE_Asynch_Accept::Result& result,
 }
 
 Server_Service_Handler*
-Acceptor::make_handler (void)
+Acceptor::make_handler ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, 0);
 
@@ -679,9 +679,9 @@ Acceptor::handle_accept (const ACE_Asynch_Accept::Result &result)
 class Client_Service_Handler : public ACE_Service_Handler
 {
 public:
-  Client_Service_Handler (void);
+  Client_Service_Handler ();
 
-  virtual ~Client_Service_Handler (void);
+  virtual ~Client_Service_Handler ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   virtual void open (ACE_HANDLE h, ACE_Message_Block&);
@@ -693,13 +693,13 @@ public:
   virtual void handle_write_stream (
     const ACE_Asynch_Write_Stream::Result &result);
 
-  virtual void handle_wakeup (void);
+  virtual void handle_wakeup ();
 
-  void cancel_and_close (void);
+  void cancel_and_close ();
 
-  int read_data (void);
+  int read_data ();
 
-  int write_data (void);
+  int write_data ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   int read (ACE_Message_Block &mb, size_t bytes_to_read);
@@ -741,7 +741,7 @@ Client_Service_Handler::Client_Service_Handler (void) :
 {
 }
 
-Client_Service_Handler::~Client_Service_Handler (void)
+Client_Service_Handler::~Client_Service_Handler ()
 {
   if (ACE_INVALID_HANDLE != this->handle ())
   {
@@ -893,7 +893,7 @@ Client_Service_Handler::handle_write_stream (
 }
 
 void
-Client_Service_Handler::handle_wakeup (void)
+Client_Service_Handler::handle_wakeup ()
 {
   ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_);
 
@@ -901,7 +901,7 @@ Client_Service_Handler::handle_wakeup (void)
 }
 
 void
-Client_Service_Handler::cancel_and_close (void)
+Client_Service_Handler::cancel_and_close ()
 {
   ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_);
 
@@ -911,7 +911,7 @@ Client_Service_Handler::cancel_and_close (void)
 }
 
 int
-Client_Service_Handler::read_data (void)
+Client_Service_Handler::read_data ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1);
 
@@ -931,7 +931,7 @@ Client_Service_Handler::read_data (void)
 }
 
 int
-Client_Service_Handler::write_data (void)
+Client_Service_Handler::write_data ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1);
 
@@ -1022,9 +1022,9 @@ Client_Service_Handler::read_successful () const
 class Connector : public ACE_Asynch_Connector<Client_Service_Handler>
 {
 public:
-  Connector (void);
+  Connector ();
 
-  virtual ~Connector (void);
+  virtual ~Connector ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   virtual int connect (
@@ -1047,7 +1047,7 @@ public:
 protected:
   virtual void handle_connect (const ACE_Asynch_Connect::Result &result);
 
-  virtual Client_Service_Handler* make_handler (void);
+  virtual Client_Service_Handler* make_handler ();
 
   mutable ACE_SYNCH_RECURSIVE_MUTEX  mtx_;
   Client_Service_Handler *service_handler_;
@@ -1062,7 +1062,7 @@ Connector::Connector (void) :
 {
 }
 
-Connector::~Connector (void)
+Connector::~Connector ()
 {
 }
 
@@ -1111,7 +1111,7 @@ Connector::handle_connect (const ACE_Asynch_Connect::Result &result)
 }
 
 Client_Service_Handler*
-Connector::make_handler (void)
+Connector::make_handler ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, 0);
 
diff --git a/ACE/tests/STL_algorithm_Test_T.cpp b/ACE/tests/STL_algorithm_Test_T.cpp
index 12cd2766165..50c830ed1ec 100644
--- a/ACE/tests/STL_algorithm_Test_T.cpp
+++ b/ACE/tests/STL_algorithm_Test_T.cpp
@@ -9,7 +9,7 @@ template <typename T>
 class Element_Counter
 {
 public:
-  Element_Counter (void)
+  Element_Counter ()
     : count_ (0)
   {
   }
diff --git a/ACE/tests/Service_Config_DLL.h b/ACE/tests/Service_Config_DLL.h
index e2bdf906c9d..be3e9db1a1a 100644
--- a/ACE/tests/Service_Config_DLL.h
+++ b/ACE/tests/Service_Config_DLL.h
@@ -35,7 +35,7 @@ class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base
 {
 public:
   /// Constructor.
-  Service_Config_DLL (void);
+  Service_Config_DLL ();
 
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/ACE/tests/Service_Config_Stream_DLL.cpp b/ACE/tests/Service_Config_Stream_DLL.cpp
index 377c4d71ecc..4b65e329d84 100644
--- a/ACE/tests/Service_Config_Stream_DLL.cpp
+++ b/ACE/tests/Service_Config_Stream_DLL.cpp
@@ -47,41 +47,41 @@ ACE_FACTORY_DEFINE (Service_Config_Stream_DLL, Test_Task)
 
 // Dynamically linked functions used to control configuration.
 
-extern "C" Service_Config_Stream_DLL_Export MT_Stream *make_stream (void);
-extern "C" Service_Config_Stream_DLL_Export MT_Module *make_da (void);
-extern "C" Service_Config_Stream_DLL_Export MT_Module *make_ea (void);
-extern "C" Service_Config_Stream_DLL_Export MT_Module *make_mr (void);
-extern "C" Service_Config_Stream_DLL_Export MT_Module *make_close (void);
+extern "C" Service_Config_Stream_DLL_Export MT_Stream *make_stream ();
+extern "C" Service_Config_Stream_DLL_Export MT_Module *make_da ();
+extern "C" Service_Config_Stream_DLL_Export MT_Module *make_ea ();
+extern "C" Service_Config_Stream_DLL_Export MT_Module *make_mr ();
+extern "C" Service_Config_Stream_DLL_Export MT_Module *make_close ();
 
 MT_Stream *
-make_stream (void)
+make_stream ()
 {
   return new MT_Stream;
 }
 
 MT_Module *
-make_da (void)
+make_da ()
 {
   return new MT_Module (ACE_TEXT ("Device_Adapter"),
                         new Test_Task, new Test_Task);
 }
 
 MT_Module *
-make_ea (void)
+make_ea ()
 {
   return new MT_Module (ACE_TEXT ("Event_Analyzer"),
                         new Test_Task, new Test_Task);
 }
 
 MT_Module *
-make_mr (void)
+make_mr ()
 {
   return new MT_Module (ACE_TEXT ("Multicast_Router"),
                         new Test_Task, new Test_Task);
 }
 
 MT_Module *
-make_close (void)
+make_close ()
 {
   return new MT_Module (ACE_TEXT ("Close_Test_Module"),
                         new Test_Task, new Test_Task);
diff --git a/ACE/tests/TP_Reactor_Test.h b/ACE/tests/TP_Reactor_Test.h
index d9c8f608dec..0790c402cb9 100644
--- a/ACE/tests/TP_Reactor_Test.h
+++ b/ACE/tests/TP_Reactor_Test.h
@@ -40,7 +40,7 @@ class Receiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
 public:
   Receiver (Acceptor * acceptor=0, size_t index=MAX_RECEIVERS+1);
 
-  ~Receiver (void);
+  ~Receiver ();
 
   long get_total_snd (void) { return this->total_snd_; }
   long get_total_rcv (void) { return this->total_rcv_; }
@@ -58,7 +58,7 @@ public:
 private:
   int  terminate_io (ACE_Reactor_Mask mask);
   int  initiate_io (ACE_Reactor_Mask mask);
-  int  check_destroy (void);
+  int  check_destroy ();
 
   Acceptor * acceptor_;
   size_t index_;
@@ -83,10 +83,10 @@ public:
   long get_total_w   (void) { return this->total_w_; }
   long get_total_r   (void) { return this->total_r_; }
 
-  Acceptor (void);
-  virtual ~Acceptor (void);
+  Acceptor ();
+  virtual ~Acceptor ();
 
-  void stop (void);
+  void stop ();
   int start (const ACE_INET_Addr & addr);
 
   // virtual from ACE_Acceptor<Receiver,ACE_SOCK_ACCEPTOR>
@@ -119,7 +119,7 @@ class Sender : public ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_MT_SYNCH>
 public:
   Sender (Connector * connector=0, size_t index=MAX_SENDERS+1);
 
-  ~Sender (void);
+  ~Sender ();
 
   long get_total_snd (void) { return this->total_snd_; }
   long get_total_rcv (void) { return this->total_rcv_; }
@@ -138,7 +138,7 @@ private:
   int  terminate_io (ACE_Reactor_Mask mask);
   int  initiate_io (ACE_Reactor_Mask mask);
   int  initiate_write ();
-  int  check_destroy (void);
+  int  check_destroy ();
 
   Connector * connector_;
   size_t  index_;
diff --git a/ACE/tests/TSS_Static_Test.cpp b/ACE/tests/TSS_Static_Test.cpp
index b08f33ebee2..c86f1e4fee6 100644
--- a/ACE/tests/TSS_Static_Test.cpp
+++ b/ACE/tests/TSS_Static_Test.cpp
@@ -25,11 +25,11 @@
 class Some_Object
 {
 public:
-  Some_Object (void);
-  ~Some_Object (void);
+  Some_Object ();
+  ~Some_Object ();
 };
 
-Some_Object::Some_Object (void)
+Some_Object::Some_Object ()
 {
   ACE::init ();
 
@@ -45,7 +45,7 @@ Some_Object::Some_Object (void)
 }
 
 
-Some_Object::~Some_Object (void)
+Some_Object::~Some_Object ()
 {
   ACE::fini ();
 }
diff --git a/ACE/tests/TSS_Test_Errno.h b/ACE/tests/TSS_Test_Errno.h
index 2964351b743..bf60ac19c45 100644
--- a/ACE/tests/TSS_Test_Errno.h
+++ b/ACE/tests/TSS_Test_Errno.h
@@ -47,7 +47,7 @@ public:
 
   // Errno::flags_ is a static variable, so we've got to protect it
   // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void)
+  int flags ()
   {
     ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_Mon, *Errno::lock_, -1));
 
@@ -61,12 +61,12 @@ public:
     return 0;
   }
 
-  static int created (void)
+  static int created ()
   {
     return created_;
   }
 
-  static int deleted (void)
+  static int deleted ()
   {
     return deleted_;
   }
@@ -74,7 +74,7 @@ public:
 #if defined (ACE_HAS_THREADS)
   static
   ACE_Thread_Mutex *
-  allocate_lock (void)
+  allocate_lock ()
   {
     ACE_NEW_RETURN (Errno::lock_, ACE_Thread_Mutex, 0);
     return Errno::lock_;
diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h
index 41d00f74901..67b95e0ccb9 100644
--- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h
+++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h
@@ -35,14 +35,14 @@ public:
   Request_Handler (ACE_Thread_Manager *tm = 0);
 
   /// Dtor..
-  ~Request_Handler (void);
+  ~Request_Handler ();
 
   virtual int open (void * = 0);
 
 protected:
   virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
   virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask = 0);
-  virtual int resume_handler (void);
+  virtual int resume_handler ();
 
 private:
   size_t  nr_msgs_rcvd_;
diff --git a/ACE/tests/Upgradable_RW_Test.h b/ACE/tests/Upgradable_RW_Test.h
index 24ae64d5e30..f27f18995f9 100644
--- a/ACE/tests/Upgradable_RW_Test.h
+++ b/ACE/tests/Upgradable_RW_Test.h
@@ -53,7 +53,7 @@ public:
   {
   }
 
-  ACE_CString *value (void)
+  ACE_CString *value ()
   {
     return this->item_;
   }
@@ -74,7 +74,7 @@ typedef ACE_Double_Linked_List<Element> Linked_List;
 class Time_Calculation
 {
 public:
-  Time_Calculation (void)
+  Time_Calculation ()
     : reported_times_ (0)
   {
     times_.real_time = 0;
@@ -85,7 +85,7 @@ public:
   /// take the time of the thread and add it to
   void report_time (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
 
-  void print_stats (void);
+  void print_stats ();
 
 private:
   /// add the times incrementally
diff --git a/ACE/tests/WFMO_Reactor_Test.cpp b/ACE/tests/WFMO_Reactor_Test.cpp
index e76d831ee6d..d1058c1d6c5 100644
--- a/ACE/tests/WFMO_Reactor_Test.cpp
+++ b/ACE/tests/WFMO_Reactor_Test.cpp
@@ -25,7 +25,7 @@ class Event_Handler : public ACE_Event_Handler
 public:
   Event_Handler (ACE_Reactor &reactor);
 
-  ~Event_Handler (void);
+  ~Event_Handler ();
 
   ACE_Pipe pipe_;
 };
@@ -58,7 +58,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor)
   ACE_TEST_ASSERT (result == 0);
 }
 
-Event_Handler::~Event_Handler (void)
+Event_Handler::~Event_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in ~Event_Handler() is %d\n",
@@ -68,7 +68,7 @@ Event_Handler::~Event_Handler (void)
 }
 
 void
-test (void)
+test ()
 {
   int result = 0;
   int i = 0;
diff --git a/ACE/tests/XtAthenaReactor_Test.cpp b/ACE/tests/XtAthenaReactor_Test.cpp
index 7a506993e53..49941d2e895 100644
--- a/ACE/tests/XtAthenaReactor_Test.cpp
+++ b/ACE/tests/XtAthenaReactor_Test.cpp
@@ -200,7 +200,7 @@ public:
 };
 
 #if defined (HummingBird_X)
-extern "C" void HCLXmInit (void);
+extern "C" void HCLXmInit ();
 #endif /* HummingBird_X */
 
 int
diff --git a/ACE/tests/XtMotifReactor_Test.cpp b/ACE/tests/XtMotifReactor_Test.cpp
index 3223d1c6232..4cc1ef9436f 100644
--- a/ACE/tests/XtMotifReactor_Test.cpp
+++ b/ACE/tests/XtMotifReactor_Test.cpp
@@ -203,7 +203,7 @@ public:
 };
 
 #if defined (HummingBird_X)
-extern "C" void HCLXmInit (void);
+extern "C" void HCLXmInit ();
 #endif /* HummingBird_X */
 
 int
diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h
index e606f048a21..f9e845d5ac7 100644
--- a/ACE/tests/test_config.h
+++ b/ACE/tests/test_config.h
@@ -175,15 +175,15 @@ size_t const ACE_MAX_THREADS = 4;
 class Test_Output_Export ACE_Test_Output
 {
 public:
-  ACE_Test_Output (void);
-  ~ACE_Test_Output (void);
-  static ACE_Test_Output *instance (void);
+  ACE_Test_Output ();
+  ~ACE_Test_Output ();
+  static ACE_Test_Output *instance ();
   int set_output (const ACE_TCHAR *filename, int append = 0);
-  OFSTREAM *output_file (void);
-  void close (void);
-  const ACE_TCHAR *dll_name (void);
-  const ACE_TCHAR *name (void);
-  static void close_singleton (void);
+  OFSTREAM *output_file ();
+  void close ();
+  const ACE_TCHAR *dll_name ();
+  const ACE_TCHAR *name ();
+  static void close_singleton ();
 
 private:
   static ACE_Test_Output *instance_;
diff --git a/ACE/websvcs/lib/URL_Addr.cpp b/ACE/websvcs/lib/URL_Addr.cpp
index 7439bdd4f7d..5e5a02c9b1f 100644
--- a/ACE/websvcs/lib/URL_Addr.cpp
+++ b/ACE/websvcs/lib/URL_Addr.cpp
@@ -51,7 +51,7 @@ static size_t gopher_size = sizeof(gopher)/sizeof(gopher[0]) - 1;
 #  define ACE_PRINTF_S ACE_TEXT ("%ls")
 #endif
 
-ACE_URL_Addr::ACE_URL_Addr (void)
+ACE_URL_Addr::ACE_URL_Addr ()
   : url_ (0)
 {
 }
@@ -157,7 +157,7 @@ ACE_URL_Addr::known_scheme (const ACE_TCHAR *url)
 
 // ****************************************************************
 
-ACE_URL_Addr_Visitor::~ACE_URL_Addr_Visitor (void)
+ACE_URL_Addr_Visitor::~ACE_URL_Addr_Visitor ()
 {
 }
 
@@ -187,7 +187,7 @@ ACE_URL_Addr_Visitor::visit (ACE_Mailto_Addr*)
 
 // ****************************************************************
 
-ACE_HTTP_Addr::ACE_HTTP_Addr (void)
+ACE_HTTP_Addr::ACE_HTTP_Addr ()
   :  hostname_ (0),
      port_number_ (0),
      path_ (0),
@@ -217,7 +217,7 @@ ACE_HTTP_Addr::ACE_HTTP_Addr (const ACE_HTTP_Addr &addr)
   this->set (addr);
 }
 
-ACE_HTTP_Addr::~ACE_HTTP_Addr (void)
+ACE_HTTP_Addr::~ACE_HTTP_Addr ()
 {
   this->clear ();
   this->hostname_ = 0;
@@ -278,7 +278,7 @@ ACE_HTTP_Addr::set (const ACE_HTTP_Addr &addr)
 }
 
 void
-ACE_HTTP_Addr::clear (void)
+ACE_HTTP_Addr::clear ()
 {
   if (this->hostname_ != 0)
     ACE_OS::free (this->hostname_);
@@ -565,7 +565,7 @@ ACE_HTTP_Addr::accept (ACE_URL_Addr_Visitor *visitor)
 
 // ****************************************************************
 
-ACE_FTP_Addr::ACE_FTP_Addr (void)
+ACE_FTP_Addr::ACE_FTP_Addr ()
   :  user_ (0),
      password_ (0),
      hostname_ (0),
@@ -595,7 +595,7 @@ ACE_FTP_Addr::ACE_FTP_Addr (const ACE_FTP_Addr& addr)
   this->set (addr);
 }
 
-ACE_FTP_Addr::~ACE_FTP_Addr (void)
+ACE_FTP_Addr::~ACE_FTP_Addr ()
 {
   this->clear ();
 }
@@ -652,7 +652,7 @@ ACE_FTP_Addr::set (const ACE_FTP_Addr& addr)
 }
 
 void
-ACE_FTP_Addr::clear (void)
+ACE_FTP_Addr::clear ()
 {
   if (this->hostname_ != 0)
     ACE_OS::free (this->hostname_);
@@ -805,7 +805,7 @@ ACE_FTP_Addr::accept (ACE_URL_Addr_Visitor* visitor)
 
 // ****************************************************************
 
-ACE_Mailto_Addr::ACE_Mailto_Addr (void)
+ACE_Mailto_Addr::ACE_Mailto_Addr ()
   :  user_ (0),
      hostname_ (0),
      headers_ (0)
@@ -831,7 +831,7 @@ ACE_Mailto_Addr::ACE_Mailto_Addr (const ACE_Mailto_Addr &addr)
   this->set (addr);
 }
 
-ACE_Mailto_Addr::~ACE_Mailto_Addr (void)
+ACE_Mailto_Addr::~ACE_Mailto_Addr ()
 {
   this->clear ();
 }
@@ -877,7 +877,7 @@ ACE_Mailto_Addr::set (const ACE_Mailto_Addr &addr)
 }
 
 void
-ACE_Mailto_Addr::clear (void)
+ACE_Mailto_Addr::clear ()
 {
   if (this->user_ != 0)
     ACE_OS::free (this->user_);
diff --git a/ACE/websvcs/lib/URL_Addr.h b/ACE/websvcs/lib/URL_Addr.h
index a3e2ba7ba40..2cf9fe638ff 100644
--- a/ACE/websvcs/lib/URL_Addr.h
+++ b/ACE/websvcs/lib/URL_Addr.h
@@ -34,7 +34,7 @@ class ACE_WEBSVCS_Export ACE_URL_Addr : public ACE_Addr
 {
 public:
   /// Constructor.
-  ACE_URL_Addr (void);
+  ACE_URL_Addr ();
 
   /// The copy constructor.
   ACE_URL_Addr (const ACE_URL_Addr& address);
@@ -43,7 +43,7 @@ public:
   ACE_URL_Addr& operator= (const ACE_URL_Addr& address);
 
   /// destructor
-  virtual ~ACE_URL_Addr (void);
+  virtual ~ACE_URL_Addr ();
 
   /// Get the original URL
   const ACE_TCHAR *get_url () const;
@@ -124,7 +124,7 @@ class ACE_WEBSVCS_Export ACE_URL_Addr_Visitor
 {
 public:
   /// Destructor
-  virtual ~ACE_URL_Addr_Visitor (void);
+  virtual ~ACE_URL_Addr_Visitor ();
 
   /**
    * The visit methods for all the hierarchy.
@@ -159,7 +159,7 @@ class ACE_WEBSVCS_Export ACE_HTTP_Addr : public ACE_URL_Addr
 {
 public:
   /// Constructor
-  ACE_HTTP_Addr (void);
+  ACE_HTTP_Addr ();
 
   /// Construct an HTTP URL from the host, path, query and port.
   ACE_HTTP_Addr (const ACE_TCHAR *host_name,
@@ -183,7 +183,7 @@ public:
   int set (const ACE_HTTP_Addr &addr);
 
   /// Destructor
-  virtual ~ACE_HTTP_Addr (void);
+  virtual ~ACE_HTTP_Addr ();
 
   /**
    * Build the INET_Address implicit in the URL, notice that we
@@ -231,7 +231,7 @@ private:
   size_t url_size (int flags = 0) const;
 
   /// Helper method to cleanup resources
-  void clear (void);
+  void clear ();
 
 private:
   /// The host:port component in the URL
@@ -262,7 +262,7 @@ class ACE_WEBSVCS_Export ACE_FTP_Addr : public ACE_URL_Addr
 {
 public:
   /// Constructor
-  ACE_FTP_Addr (void);
+  ACE_FTP_Addr ();
 
   /// Construct an FTP URL from the host_name, the path, the username
   /// and the password.
@@ -287,7 +287,7 @@ public:
   int set (const ACE_FTP_Addr &addr);
 
   /// Destructor
-  virtual ~ACE_FTP_Addr (void);
+  virtual ~ACE_FTP_Addr ();
 
   /// Get the host name component in the URL
   const ACE_TCHAR *get_hostname () const;
@@ -318,7 +318,7 @@ private:
   size_t url_size (int flags = 0) const;
 
   /// Helper method to release the internal resources
-  void clear (void);
+  void clear ();
 
 private:
   /// The login name
@@ -345,7 +345,7 @@ class ACE_WEBSVCS_Export ACE_Mailto_Addr : public ACE_URL_Addr
 {
 public:
   /// Constructor
-  ACE_Mailto_Addr (void);
+  ACE_Mailto_Addr ();
 
   /// Construct an FTP URL from the host, path and headers.
   ACE_Mailto_Addr (const ACE_TCHAR *user,
@@ -367,7 +367,7 @@ public:
   int set (const ACE_Mailto_Addr &addr);
 
   /// Destructor
-  virtual ~ACE_Mailto_Addr (void);
+  virtual ~ACE_Mailto_Addr ();
 
   /// Get the username component in the URL
   const ACE_TCHAR *get_user () const;
@@ -395,7 +395,7 @@ private:
   size_t url_size (int flags = 0) const;
 
   /// Helper method to cleanup resources
-  void clear (void);
+  void clear ();
 
 private:
   ACE_TCHAR *user_;
diff --git a/ACE/websvcs/tests/Test_URL_Addr.cpp b/ACE/websvcs/tests/Test_URL_Addr.cpp
index eac973ec5d4..d41958f28cb 100644
--- a/ACE/websvcs/tests/Test_URL_Addr.cpp
+++ b/ACE/websvcs/tests/Test_URL_Addr.cpp
@@ -2,10 +2,10 @@
 #include "ace/Log_Msg.h"
 
 
-void test_http_addr (void);
-void test_ftp_addr (void);
-void test_mailto_addr (void);
-void test_url_addr (void);
+void test_http_addr ();
+void test_ftp_addr ();
+void test_mailto_addr ();
+void test_url_addr ();
 
 int ACE_TMAIN (int, ACE_TCHAR*[])
 {
@@ -42,7 +42,7 @@ int ACE_TMAIN (int, ACE_TCHAR*[])
 #define URL_TEST_ARRAY \
     ACE_TEXT("file:/etc/passwd")
 
-void test_http_addr (void)
+void test_http_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     HTTP_TEST_ARRAY
@@ -82,7 +82,7 @@ void test_http_addr (void)
     }
 }
 
-void test_ftp_addr (void)
+void test_ftp_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     FTP_TEST_ARRAY
@@ -122,7 +122,7 @@ void test_ftp_addr (void)
     }
 }
 
-void test_mailto_addr (void)
+void test_mailto_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     MAILTO_TEST_ARRAY
@@ -162,7 +162,7 @@ void test_mailto_addr (void)
     }
 }
 
-void test_url_addr (void)
+void test_url_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     HTTP_TEST_ARRAY,
diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
index 64b16d70739..25dfe5dfa71 100644
--- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "AMH_Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-AMH_Messenger_i::AMH_Messenger_i (void)
+AMH_Messenger_i::AMH_Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-AMH_Messenger_i::~AMH_Messenger_i (void)
+AMH_Messenger_i::~AMH_Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
index 58fa8170f74..5de0c49ce58 100644
--- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
+++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
@@ -21,10 +21,10 @@ class  AMH_Messenger_i : public virtual POA_DevGuide::AMH_Messenger
 {
 public:
   //Constructor
-  AMH_Messenger_i (void);
+  AMH_Messenger_i ();
 
   //Destructor
-  virtual ~AMH_Messenger_i (void);
+  virtual ~AMH_Messenger_i ();
 
   virtual void send_message (
     DevGuide::AMH_MessengerResponseHandler_ptr _tao_rh,
diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.cpp b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
index ff63085ba51..561794f3ea9 100644
--- a/TAO/DevGuideExamples/AMH/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.h b/TAO/DevGuideExamples/AMH/Messenger_i.h
index 440732375dd..90c00311c25 100644
--- a/TAO/DevGuideExamples/AMH/Messenger_i.h
+++ b/TAO/DevGuideExamples/AMH/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
index e4d990f9161..b9a85db840c 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
@@ -10,7 +10,7 @@ Inner_callback_i::Inner_callback_i (PortableServer::POA_ptr p,
 }
 
 // Implementation skeleton destructor
-Inner_callback_i::~Inner_callback_i (void)
+Inner_callback_i::~Inner_callback_i ()
 {
   std::cout << "Inner_callback_i destroying" << std::endl;
 }
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
index 1c5da919e7b..578a169a046 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
@@ -13,7 +13,7 @@ public:
                     AMH_MiddleResponseHandler_ptr rh);
 
   //Destructor
-  virtual ~Inner_callback_i(void);
+  virtual ~Inner_callback_i();
 
   virtual void answer (const char * ami_return_val);
 
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
index a5a5752bec4..4ce8f917281 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
index c5e1efee908..63b295106db 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
index 37d68bd61df..a92e246f1b9 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
@@ -2,12 +2,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
index b3cfc6c83e8..edf9c1c9991 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
@@ -14,10 +14,10 @@ class  Messenger_i : public virtual Messenger,
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
index 57c1b902c7c..dad7a4481b4 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
@@ -19,12 +19,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
index 8b6d57bd407..adeb8fa5ee0 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
@@ -30,10 +30,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
index 0b0ab15cd8c..f2e1d7865b6 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
@@ -10,7 +10,7 @@ MessengerHandler::MessengerHandler (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-MessengerHandler::~MessengerHandler (void)
+MessengerHandler::~MessengerHandler ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
index 951028cf9e4..aa36a1377f4 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
@@ -10,7 +10,7 @@ public:
   MessengerHandler (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~MessengerHandler (void);
+  virtual ~MessengerHandler ();
 
 virtual void send_message (
     CORBA::Boolean ami_return_val,
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
index 7fd597c9f45..ce960aed3b0 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
@@ -20,7 +20,7 @@ Messenger_i::Messenger_i (unsigned int seconds_to_wait,
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
index 4f64f81be01..32dc3a7aa0d 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
@@ -25,7 +25,7 @@ public:
                CORBA::Boolean throw_exception = 0);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
index bd8302bd79e..1237e79659b 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
@@ -12,12 +12,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
index 440732375dd..90c00311c25 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
index a5a5752bec4..4ce8f917281 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
index c5e1efee908..63b295106db 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
index 4674176a963..a28018a9ee8 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
@@ -15,7 +15,7 @@ public:
   MessengerServer (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~MessengerServer (void);
+  virtual ~MessengerServer ();
 
   // parse arguments
   int parse_args (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
index 6a002f1adbe..c366adf61a8 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
@@ -16,7 +16,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
index dd2ae33a614..ad49fec836e 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
@@ -24,7 +24,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
index fd6851b32b2..6874b232e05 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
index 440732375dd..90c00311c25 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
index b43707e7210..745132f4916 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
@@ -14,12 +14,12 @@
 #include <sstream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
index 440732375dd..90c00311c25 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
index b43707e7210..745132f4916 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
@@ -14,12 +14,12 @@
 #include <sstream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
index 440732375dd..90c00311c25 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
index 006e75da92e..dc1627055d0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
@@ -2,7 +2,7 @@
 #include "ClientInterceptor.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
index 33c23248a43..d43b9f57b5a 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
@@ -10,7 +10,7 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
index 44fb5acca7c..d111a653ff0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
@@ -7,13 +7,13 @@
 const CORBA::ULong service_ctx_id = 0xdeed;
 
 ClientInterceptor::
-ClientInterceptor (void)
+ClientInterceptor ()
   : myname_ ("Client_Authentication_Interceptor")
 {
   std::cout << "Calling ClientInterceptor constructor." << std::endl;
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
index 74397da414d..2a2fb385a43 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
@@ -10,7 +10,7 @@ class ClientInterceptor
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInterceptor (void);
+  ClientInterceptor ();
 
   virtual ~ClientInterceptor ();
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
index 3842ab53dc2..12ea090e3f7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
index 8ab4755edce..cf27ff521a1 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
                                        const char * user_name,
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
index 6cb15bed351..d1f802011aa 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
@@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] =
   {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0};
 const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"};
 
-ServerInterceptor::ServerInterceptor (void)
+ServerInterceptor::ServerInterceptor ()
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
index a8da1affe95..3e8e46e14a9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
@@ -8,7 +8,7 @@ class ServerInterceptor
 : public PortableInterceptor::ServerRequestInterceptor
 {
  public:
-  ServerInterceptor (void);
+  ServerInterceptor ();
 
   ~ServerInterceptor ();
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
index 5bb6f8ea7c7..ef9543c5d75 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
@@ -2,7 +2,7 @@
 #include "ClientInterceptor.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
index ee05418e97d..c9a56901d89 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
@@ -10,7 +10,7 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
index 711e6188f93..36ae3a4bf34 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
@@ -24,7 +24,7 @@ ClientInterceptor (IOP::CodecFactory_var cf)
   this->codec = cf->create_codec (encoding);
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
index 07e184ac27c..fcc2add53e9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
@@ -4,12 +4,12 @@
 #include "Messenger_i.h"
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
index 413c1cd8b64..465d2f1a851 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
@@ -12,10 +12,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
  public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 
   virtual void send_message (const CORBA::OctetSeq & user_name);
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
index b8ee6b53248..0bc539cf374 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
@@ -3,7 +3,7 @@
 #include "MessengerC.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
  : slot_ (0),
    current_ (PortableInterceptor::Current::_nil())
 {
@@ -41,7 +41,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 }
 
 void
-ClientInitializer::set_slot_data (void)
+ClientInitializer::set_slot_data ()
 {
   // Set the recursion flag
   CORBA::Any flag;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
index 4870f1877c3..c3d497c1008 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
@@ -11,10 +11,10 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
-  void set_slot_data (void);
+  void set_slot_data ();
 
  private:
    PortableInterceptor::SlotId slot_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
index b42c29831c5..5321a7e460f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
@@ -19,7 +19,7 @@ ClientInterceptor (Messenger_var theMessenger,
   this->slot = theSlot;
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
index 7bfb4963b32..576ff21b0fc 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
@@ -12,12 +12,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -34,7 +34,7 @@ CORBA::Boolean Messenger_i::send_message (
   return true;
 }
 
-char * Messenger_i::get_time (void)
+char * Messenger_i::get_time ()
 {
   time_t thetime;
   struct tm * timeinfo = 0;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
index 68e056019b7..7a63cb2c5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
@@ -21,17 +21,17 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message);
 
-  virtual char * get_time (void);
+  virtual char * get_time ();
 };
 
 #endif /* MESSENGERI_H_  */
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
index bdce4bc6029..a6f879eb1dc 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
@@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] =
   {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0};
 const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"};
 
-ServerInterceptor::ServerInterceptor (void)
+ServerInterceptor::ServerInterceptor ()
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
index a8da1affe95..3e8e46e14a9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
@@ -8,7 +8,7 @@ class ServerInterceptor
 : public PortableInterceptor::ServerRequestInterceptor
 {
  public:
-  ServerInterceptor (void);
+  ServerInterceptor ();
 
   ~ServerInterceptor ();
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
index 84dae2a1ed6..504fd1a67df 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
@@ -1,7 +1,7 @@
 #include "ClientInitializer.h"
 #include "ClientInterceptor.h"
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
index ee05418e97d..c9a56901d89 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
@@ -10,7 +10,7 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
index bfefd32bb06..e083f001718 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
@@ -22,7 +22,7 @@ ClientInterceptor (IOP::CodecFactory_var cf)
   this->codec = cf->create_codec (encoding);
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
index cb3646a5051..6abb6149707 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
@@ -4,12 +4,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
index 0b7ddbfbb9e..6508d56c77c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
@@ -12,10 +12,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
  public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 
   virtual void send_message (const CORBA::OctetSeq & user_name);
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
index 077bd43a8b2..fc686f11a34 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
@@ -2,12 +2,12 @@
 #include "ace/OS_NS_time.h"
 #include <iostream>
 
-Logger_i::Logger_i (void)
+Logger_i::Logger_i ()
 {
   log_file.open("Logger.txt");
 }
 
-Logger_i::~Logger_i (void)
+Logger_i::~Logger_i ()
 {
   log_file.close();
 }
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.h b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
index d23787a08e9..cacf61448fc 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.h
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
@@ -12,8 +12,8 @@
 class  Logger_i : public virtual POA_Logger
 {
 public:
-  Logger_i (void);
-  virtual ~Logger_i (void);
+  Logger_i ();
+  virtual ~Logger_i ();
 private:
   ofstream log_file;      // Output file stream to which messages are logged.
   time_t log_time;        // Needed for creating a time stamp.
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
index 32349ed7f16..09098dc809f 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
index e2cd0fc8925..63ad758730f 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
index b5d4854dfb1..198181714d2 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
@@ -34,7 +34,7 @@ MessageImpl::MessageImpl
 }
 
 ::CORBA::ValueBase *
-MessageImpl::_copy_value (void)
+MessageImpl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
index f762e101cf1..0c3114d373a 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
@@ -25,7 +25,7 @@ public:
     const char* txt
     );
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   virtual ::Message::AddrList* getAddresses();
   virtual void addAddress(const char*);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
index 2c2565bc19b..37a47bca364 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
@@ -29,7 +29,7 @@ public:
   be_visitor_array_cdr_op_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_cdr_op_ci (void);
+  ~be_visitor_array_cdr_op_ci ();
 
   /// visit array
   virtual int visit_array (be_array *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
index c8a3e0b3a96..eb419b9481c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
@@ -23,7 +23,7 @@ class be_visitor_exception_ctor : public be_visitor_scope
 {
 public:
   be_visitor_exception_ctor (be_visitor_context *ctx);
-  ~be_visitor_exception_ctor (void);
+  ~be_visitor_exception_ctor ();
 
   virtual int post_process (be_decl *);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
index 996d29b3c75..c28b7c675ee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
@@ -30,7 +30,7 @@ public:
   be_visitor_valuetype_cdr_op_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_cdr_op_ci (void);
+  ~be_visitor_valuetype_cdr_op_ci ();
 
   /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index 66dff08f611..4f8615a1a40 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -146,8 +146,8 @@
 #include <fe_utils.h>
 
 void tao_yyerror (const char *);
-int tao_yylex (void);
-extern "C" int tao_yywrap (void);
+int tao_yylex ();
+extern "C" int tao_yywrap ();
 
 extern char tao_yytext[];
 extern int tao_yyleng;
@@ -2479,7 +2479,7 @@ int yynerrs;
 `----------*/
 
 int
-yyparse (void)
+yyparse ()
 {
     yy_state_fast_t yystate = 0;
     /* Number of tokens to shift before error messages enabled.  */
@@ -10901,7 +10901,7 @@ yyreturn:
  * ???
  */
 int
-tao_yywrap (void)
+tao_yywrap ()
 {
   return 1;
 }
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index c2bfaf9678d..c23a831d94d 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -1614,9 +1614,9 @@ static int input ( void );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int yylex (void);
+extern int yylex ();
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int yylex ()
 #endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -2712,7 +2712,7 @@ ECHO;
  *    EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *    EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
+static int yy_get_next_buffer ()
 {
         char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
     char *source = (yytext_ptr);
@@ -2819,7 +2819,7 @@ static int yy_get_next_buffer (void)
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state (void)
+    static yy_state_type yy_get_previous_state ()
 {
     yy_state_type yy_current_state;
     char *yy_cp;
@@ -2913,9 +2913,9 @@ static int yy_get_next_buffer (void)
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-    static int yyinput (void)
+    static int yyinput ()
 #else
-    static int input  (void)
+    static int input  ()
 #endif
 
 {
@@ -3038,7 +3038,7 @@ static int yy_get_next_buffer (void)
     (yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void yy_load_buffer_state  (void)
+static void yy_load_buffer_state  ()
 {
         (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
     (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
@@ -3185,7 +3185,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
  *  The next element becomes the new top.
  *
  */
-void yypop_buffer_state (void)
+void yypop_buffer_state ()
 {
         if (!YY_CURRENT_BUFFER)
         return;
@@ -3204,7 +3204,7 @@ void yypop_buffer_state (void)
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void yyensure_buffer_stack (void)
+static void yyensure_buffer_stack ()
 {
     yy_size_t num_to_alloc;
 
@@ -3362,7 +3362,7 @@ static void yynoreturn yy_fatal_error (const char* msg )
 /** Get the current line number.
  *
  */
-int yyget_lineno  (void)
+int yyget_lineno  ()
 {
     return yylineno;
 }
@@ -3370,7 +3370,7 @@ int yyget_lineno  (void)
 /** Get the input stream.
  *
  */
-FILE *yyget_in  (void)
+FILE *yyget_in  ()
 {
         return yyin;
 }
@@ -3378,7 +3378,7 @@ FILE *yyget_in  (void)
 /** Get the output stream.
  *
  */
-FILE *yyget_out  (void)
+FILE *yyget_out  ()
 {
         return yyout;
 }
@@ -3386,7 +3386,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  *
  */
-int yyget_leng  (void)
+int yyget_leng  ()
 {
         return yyleng;
 }
@@ -3395,7 +3395,7 @@ int yyget_leng  (void)
  *
  */
 
-char *yyget_text  (void)
+char *yyget_text  ()
 {
         return yytext;
 }
@@ -3425,7 +3425,7 @@ void yyset_out (FILE *  _out_str )
         yyout = _out_str ;
 }
 
-int yyget_debug  (void)
+int yyget_debug  ()
 {
         return yy_flex_debug;
 }
@@ -3435,7 +3435,7 @@ void yyset_debug (int  _bdebug )
         yy_flex_debug = _bdebug ;
 }
 
-static int yy_init_globals (void)
+static int yy_init_globals ()
 {
         /* Initialization is the same as for the non-reentrant scanner.
      * This function is called from yylex_destroy(), so don't allocate here.
@@ -3469,7 +3469,7 @@ static int yy_init_globals (void)
 }
 
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
+int yylex_destroy  ()
 {
     /* Pop the buffer stack, destroying each element. */
     while(YY_CURRENT_BUFFER){
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index 7cf9c1ae5b9..40171e90be4 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -12,7 +12,7 @@ public:
   void connect (CosEventChanneAdmin::ConsumerAdmin_ptr consumer_admin);
 
   void push (const CORBA::Any& data);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
 private:
 };
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index 337409350ee..836bdff3939 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -41,7 +41,7 @@ Stock_Consumer::push (const CORBA::Any& data)
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (void)
+Stock_Consumer::disconnect_push_consumer ()
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index 8fd4162b954..b5cb7b1d334 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -16,7 +16,7 @@ public:
   // Disconnect from the event channel.
 
   void push (const CORBA::Any& data);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
 private:
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
index 9bc325773f4..c7a7008f896 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
@@ -42,7 +42,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (void)
+Quoter_Stock_i::disconnect_push_supplier ()
 {
   // Forget about the consumer it is not there anymore
   this->consumer_proxy_ =
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
index fdac1364844..e23c712b60d 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
@@ -19,7 +19,7 @@ public:
   CORBA::Double price ();
   void set_price (CORBA::Double new_price);
 
-  void disconnect_push_supplier (void);
+  void disconnect_push_supplier ();
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
index dd802e0045b..c87cb018e8a 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
@@ -55,7 +55,7 @@ Stock_StockBroker_i::Stock_StockBroker_i (CORBA::ORB_ptr orb,
 }
 
 // Implementation skeleton destructor
-Stock_StockBroker_i::~Stock_StockBroker_i (void)
+Stock_StockBroker_i::~Stock_StockBroker_i ()
 {
 }
 
@@ -83,7 +83,7 @@ void Stock_StockBroker_i::connect_quoter_info (::Stock::StockQuoter_ptr c)
 }
 
 void
-Stock_StockBroker_i::shutdown (void)
+Stock_StockBroker_i::shutdown ()
 {
   // Unsubscribe
   ACE_DEBUG ((LM_DEBUG, "Shutdown unsubscribing notifiers\n"));
@@ -126,7 +126,7 @@ Stock_StockBrokerHome_i::Stock_StockBrokerHome_i (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i (void)
+Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i ()
 {
 }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
index 2d7fd13d37d..245e5bb3c43 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
@@ -37,7 +37,7 @@ public:
                        const char *stock_name);
 
   /// Destructor
-  virtual ~Stock_StockBroker_i (void);
+  virtual ~Stock_StockBroker_i ();
 
   /**
    * Return the StockNameConsumer object created by the Constructor.
@@ -108,7 +108,7 @@ public:
   Stock_StockBrokerHome_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~Stock_StockBrokerHome_i (void);
+  virtual ~Stock_StockBrokerHome_i ();
 
   /**
    * Return the StockBroker object created by the Constructor.
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
index afb3d13f713..11b281a5f22 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
@@ -27,7 +27,7 @@ StockDistributor_i::StockDistributor_i (RTPortableServer::POA_ptr poa)
 }
 
 // Implementation skeleton destructor
-StockDistributor_i::~StockDistributor_i (void)
+StockDistributor_i::~StockDistributor_i ()
 {
   this->active_ = false;
 }
@@ -241,12 +241,12 @@ StockDistributor_i::operator () (std::vector <std::string> &stocks)
 }
 
 // Implementation skeleton constructor
-StockQuoter_i::StockQuoter_i (void)
+StockQuoter_i::StockQuoter_i ()
 {
 }
 
 // Implementation skeleton destructor
-StockQuoter_i::~StockQuoter_i (void)
+StockQuoter_i::~StockQuoter_i ()
 {
 }
 
@@ -350,7 +350,7 @@ StockDistributorHome_i::StockDistributorHome_i (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-StockDistributorHome_i::~StockDistributorHome_i (void)
+StockDistributorHome_i::~StockDistributorHome_i ()
 {
 }
 
@@ -407,7 +407,7 @@ StockDistributorHome_i::handle_signal (int,
 }
 
 void
-StockDistributorHome_i::create_distributor (void)
+StockDistributorHome_i::create_distributor ()
 {
   // Create a new instance of the <StockDistributor_i>. Then
   // activate the <distributor> under the located POA. This will cause
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
index 9d8e072b74e..55db5024adb 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
@@ -43,7 +43,7 @@ public:
   StockDistributor_i (RTPortableServer::POA_ptr poa);
 
   /// Destructor
-  virtual ~StockDistributor_i (void);
+  virtual ~StockDistributor_i ();
 
   /**
    * Insert StockNameConsumer object and its priority into the StockDistributor
@@ -90,19 +90,19 @@ public:
    * Set the active state of the StockDistributor object to true and create a thread
    * to publish the stock information to the Stock Broker clients.
    */
-  virtual void start (void);
+  virtual void start ();
 
   /**
    * Set the active state of StockDistributor object to false.
    */
-  virtual void stop (void);
+  virtual void stop ();
 
   virtual void shutdown ();
 
   /// Callback for stock database.
   void operator () (std::vector <std::string> &stocks);
 
-  int svn (void);
+  int svn ();
 
   /// The map that stores the subscribed StockNameConsumer object.
   typedef std::map <std::string,
@@ -137,10 +137,10 @@ class  StockQuoter_i
 {
 public:
   /// Constructor.
-  StockQuoter_i (void);
+  StockQuoter_i ();
 
   /// Destructor.
-  virtual ~StockQuoter_i (void);
+  virtual ~StockQuoter_i ();
 
   /**
    * Get detailed stock information.
@@ -170,7 +170,7 @@ public:
   StockDistributorHome_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~StockDistributorHome_i (void);
+  virtual ~StockDistributorHome_i ();
 
   /**
    * Return the StockDistributor object created by the Constructor.
@@ -183,7 +183,7 @@ public:
                              siginfo_t * = 0,
                              ucontext_t * = 0);
 private:
-  void create_distributor (void);
+  void create_distributor ();
 
   /// Cached ORB used to shut down the system
   CORBA::ORB_var orb_;
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
index 167b035f472..7373c49bc1e 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
@@ -11,7 +11,7 @@ Stock_StockNameConsumer_i::Stock_StockNameConsumer_i (Stock_StockBroker_i &conte
 }
 
 // Implementation skeleton destructor
-Stock_StockNameConsumer_i::~Stock_StockNameConsumer_i (void)
+Stock_StockNameConsumer_i::~Stock_StockNameConsumer_i ()
 {
 }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
index 9636f90e23b..239a382d4ce 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
@@ -47,7 +47,7 @@ public:
                              const char *stock_name);
 
   /// Destructor.
-  virtual ~Stock_StockNameConsumer_i (void);
+  virtual ~Stock_StockNameConsumer_i ();
 
   /**
    * Push an event to the consumer.
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
index 97f06a54d54..cf88000c2e4 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
@@ -66,7 +66,7 @@ public:
 
   struct StockInfo
   {
-    StockInfo (void)
+    StockInfo ()
       : name_(""), high_ (0), low_ (0), last_ (0)
     {};
 
@@ -98,10 +98,10 @@ public:
   void update_rate (u_int rate);
 
   /// Launch the active object
-  void start (void);
+  void start ();
 
   /// Stop the active object
-  void stop (void);
+  void stop ();
 
   typedef std::map <std::string, StockInfo> Stock_Map;
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
index 4eac82cfc32..6a6559a1fd3 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
@@ -7,7 +7,7 @@
 //
 // Stock::Priority_Mapping
 //
-Stock::Priority_Mapping::Priority_Mapping (void)
+Stock::Priority_Mapping::Priority_Mapping ()
   : TAO_Linear_Priority_Mapping (ACE_SCHED_OTHER)
 {
 }
@@ -15,7 +15,7 @@ Stock::Priority_Mapping::Priority_Mapping (void)
 //
 // ~Stock::Priority_Mapping
 //
-Stock::Priority_Mapping::~Priority_Mapping (void)
+Stock::Priority_Mapping::~Priority_Mapping ()
 {
 }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
index 7bfce34d745..ff8d218587f 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
@@ -30,10 +30,10 @@ namespace Stock
   {
   public:
     /// Default constructor.
-    Priority_Mapping (void);
+    Priority_Mapping ();
 
     /// Default destructor.
-    virtual ~Priority_Mapping (void);
+    virtual ~Priority_Mapping ();
 
     /// Stock priorities.
     enum Priority
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
index 0a841e5a7d6..75b122b801d 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
@@ -47,7 +47,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data)
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (void)
+Stock_Consumer::disconnect_push_consumer ()
 {
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index 670b9829912..e493fd2d1df 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -18,7 +18,7 @@ public:
   // Disconnect from the event channel.
 
   void push (const RtecEventComm::EventSet& data);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
 private:
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
index ebdbf22b52f..fc37e331163 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
@@ -14,12 +14,12 @@ protected:
       ref_count_(0) {}
 
 public:
-  virtual void _add_ref (void)
+  virtual void _add_ref ()
   {
     ++this->ref_count_;
   }
 
-  virtual void _remove_ref (void)
+  virtual void _remove_ref ()
   {
     CORBA::ULong new_count = --this->ref_count_;
 
@@ -38,7 +38,7 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
   this->data_.price = price;
 }
 
-Quoter_Stock_i::~Quoter_Stock_i (void)
+Quoter_Stock_i::~Quoter_Stock_i ()
 {
   if (consumer_proxy_.in ())
     consumer_proxy_->disconnect_push_consumer ();
@@ -90,7 +90,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (void)
+Quoter_Stock_i::disconnect_push_supplier ()
 {
   // Forget about the consumer it is not there anymore
   this->consumer_proxy_ =
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
index 6d4318d4b02..b9190335beb 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
@@ -13,14 +13,14 @@ public:
   Quoter_Stock_i (const char *symbol,
                   const char *full_name,
                   CORBA::Double price);
-  ~Quoter_Stock_i (void);
+  ~Quoter_Stock_i ();
 
   char *symbol ();
   char *full_name ();
   CORBA::Double price ();
   void set_price (CORBA::Double new_price);
 
-  void disconnect_push_supplier (void);
+  void disconnect_push_supplier ();
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index fa2aaabfe7f..3a57123dae8 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -19,7 +19,7 @@ AMH_Servant::AMH_Servant (CORBA::ORB_ptr orb)
   this->reactor_ = orb->orb_core ()->reactor ();
 }
 
-AMH_Servant::~AMH_Servant (void)
+AMH_Servant::~AMH_Servant ()
 {
 }
 
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
index 5ccffa8d0fb..e94e132c5d6 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
@@ -24,7 +24,7 @@ class AMH_Servant
 public:
   AMH_Servant (CORBA::ORB_ptr orb);
 
-  virtual ~AMH_Servant (void);
+  virtual ~AMH_Servant ();
 
   /// parse arguments from command line for sleep time
   virtual int parse_args (int &argc, ACE_TCHAR **argv);
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index 19a8ab7a5f3..23511c46da6 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -18,12 +18,12 @@ Base_Server::Base_Server (int &argc, ACE_TCHAR **argv)
 {
 }
 
-Base_Server::~Base_Server (void)
+Base_Server::~Base_Server ()
 {
 }
 
 int
-Base_Server::parse_args (void)
+Base_Server::parse_args ()
 {
   // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux
   // systems!!! ***
@@ -64,7 +64,7 @@ Base_Server::parse_args (void)
 }
 
 void
-Base_Server::try_RT_scheduling (void)
+Base_Server::try_RT_scheduling ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -90,7 +90,7 @@ Base_Server::try_RT_scheduling (void)
 }
 
 int
-Base_Server::shutdown_orb_and_poa (void)
+Base_Server::shutdown_orb_and_poa ()
 {
   try
     {
@@ -112,7 +112,7 @@ Base_Server::shutdown_orb_and_poa (void)
 }
 
 int
-Base_Server::start_orb_and_poa (void)
+Base_Server::start_orb_and_poa ()
 {
   try
     {
@@ -165,7 +165,7 @@ Base_Server::register_servant (AMH_Servant *servant)
 
 
 void
-Base_Server::run_event_loop (void)
+Base_Server::run_event_loop ()
 {
   try
     {
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h
index c6ea1f74654..09b43d569ad 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.h
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.h
@@ -44,25 +44,25 @@ public:
   // entry in the vtbl) and if, by chance, someone does delete a
   // derived-class though this classes ptr, we are still safe.  The
   // short answer to your question is : I don't know. :)
-  virtual ~Base_Server (void);
+  virtual ~Base_Server ();
 
   // Just parse the command line for the output-file (-o) option.
   // return -1 if -o option is not present
-  virtual int parse_args (void);
+  virtual int parse_args ();
 
   /// try and schedule using FIFO
-  void try_RT_scheduling (void);
+  void try_RT_scheduling ();
 
   /// ORB inititalisation stuff
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
-  int shutdown_orb_and_poa (void);
+  int shutdown_orb_and_poa ();
 
   /// register the servant with the poa
   virtual void register_servant (AMH_Servant *servant);
 
   /// orb-perform_work () abstraction
-  virtual void run_event_loop (void);
+  virtual void run_event_loop ();
 
 public:
   // @@ Mayur, please put inlined methods in a separate `.inl' file,
@@ -71,7 +71,7 @@ public:
   // Mayur: A separate file for just one method? AAAGH. OK.
 
   /// Accesor method (for servants) to the initialised ORB
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 protected:
   int &argc_;
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index a04b0456469..4025854a4e9 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (int &argc, ACE_TCHAR **argv)
 }
 
 int
-Client_Task::parse_args (void)
+Client_Task::parse_args ()
 {
     ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:O:");
     int c;
@@ -53,7 +53,7 @@ Client_Task::parse_args (void)
 }
 
 void
-Client_Task::try_RT_scheduling (void)
+Client_Task::try_RT_scheduling ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -106,7 +106,7 @@ Client_Task::narrow_servant (CORBA::ORB_ptr orb)
 }
 
 int
-Client_Task::run_test (void)
+Client_Task::run_test ()
 {
   ACE_hrtime_t test_start = 0;
   ACE_hrtime_t test_end = 0;
@@ -147,7 +147,7 @@ Client_Task::run_test (void)
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.h b/TAO/examples/AMH/Sink_Server/Client_Task.h
index 1eff57f05a6..fcfc9e8fd7f 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.h
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.h
@@ -28,13 +28,13 @@ public:
   /// Constructor
   Client_Task (int &argc, ACE_TCHAR **argv);
 
-  int parse_args (void);
+  int parse_args ();
 
-  void try_RT_scheduling (void);
+  void try_RT_scheduling ();
 
   int narrow_servant (CORBA::ORB_ptr orb);
 
-  int run_test (void);
+  int run_test ();
 
 protected:
   /// The service method
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index ef942c56540..b3a17de1124 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -10,7 +10,7 @@ MT_AMH_Server::MT_AMH_Server (int &argc, ACE_TCHAR **argv)
 {
 }
 
-MT_AMH_Server::~MT_AMH_Server (void)
+MT_AMH_Server::~MT_AMH_Server ()
 {
 }
 
@@ -32,7 +32,7 @@ MT_AMH_Server::usage (const char *message)
 
 
 int
-MT_AMH_Server::parse_args (void)
+MT_AMH_Server::parse_args ()
 {
   // Let the base server parse it's argumrents first
   if (Base_Server::parse_args () != 1)
@@ -76,7 +76,7 @@ MT_AMH_Server::parse_args (void)
 }
 
 void
-MT_AMH_Server::start_threads (void)
+MT_AMH_Server::start_threads ()
 {
   // Each of this thread runs the event loop
   this->activate (THR_NEW_LWP | THR_JOINABLE, this->nthreads_, 1);
@@ -84,7 +84,7 @@ MT_AMH_Server::start_threads (void)
 }
 
 int
-MT_AMH_Server::svc (void)
+MT_AMH_Server::svc ()
 {
   run_event_loop ();
   return 1;
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
index 098cc852039..9e80fdea655 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
@@ -25,19 +25,19 @@ class MT_AMH_Server
 public:
   MT_AMH_Server (int &argc, ACE_TCHAR **argv);
 
-  ~MT_AMH_Server (void);
+  ~MT_AMH_Server ();
 
   // print usage text
   void usage (const char *message);
 
   // We need to parse an extra thread_count parameter for
   // multi-threraded server.
-  int parse_args (void);
+  int parse_args ();
 
-  void start_threads (void);
+  void start_threads ();
 
   // the service method
-  int svc (void);
+  int svc ();
 
 private:
   int nthreads_;
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 738ca29e114..a64e45258b3 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -24,22 +24,22 @@ Peer_Handler_i::request_excep (
 }
 
 void
-Peer_Handler_i::start (void)
+Peer_Handler_i::start ()
 {
 }
 
 void
-Peer_Handler_i::shutdown (void)
+Peer_Handler_i::shutdown ()
 
 {
 }
 
-Peer_i::Peer_i (void)
+Peer_i::Peer_i ()
   :  reply_handler_ (this)
 {
 }
 
-Peer_i::~Peer_i (void)
+Peer_i::~Peer_i ()
 {
 }
 
@@ -91,7 +91,7 @@ Peer_i::start (const PeerSet &the_peers,
 }
 
 void
-Peer_i::shutdown (void)
+Peer_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -112,7 +112,7 @@ Peer_Task::Peer_Task (const PeerSet& the_peers,
 }
 
 int
-Peer_Task::svc (void)
+Peer_Task::svc ()
 {
   for (int i = 0; i != this->iterations_; ++i)
     {
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index 77c00e57588..91e6debb516 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -26,9 +26,9 @@ public:
 
   virtual void request_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void start (void);
+  virtual void start ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The real implementation
@@ -39,10 +39,10 @@ class Peer_i : public POA_Peer
 {
 public:
   /// Constructor
-  Peer_i (void);
+  Peer_i ();
 
   /// Destructor
-  virtual ~Peer_i (void);
+  virtual ~Peer_i ();
 
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
@@ -58,7 +58,7 @@ public:
   void start (const PeerSet& the_peers,
               CORBA::Long iterations);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The reply_handler
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 681573b7627..6b4643b44ed 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -33,7 +33,7 @@ public:
   CORBA::Long bind (Peer_ptr a_peer);
 
   /// Start the peers...
-  void start (void);
+  void start ();
 
 private:
   /// The callback method
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 18a884e8675..c4dcc225ef7 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -157,7 +157,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting event loop\n"));
   this->orb_->run ();
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index a47c32f9579..2bc56efe05e 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -22,7 +22,7 @@
 
 TimeOfDay
 Time_impl::
-get_gmt (void)
+get_gmt ()
 {
   time_t time_now = ACE_OS::time (0);
   struct tm *time_p = ACE_OS::gmtime (&time_now);
diff --git a/TAO/examples/Advanced/ch_3/server.h b/TAO/examples/Advanced/ch_3/server.h
index a61cc86259e..afeefeb30c9 100644
--- a/TAO/examples/Advanced/ch_3/server.h
+++ b/TAO/examples/Advanced/ch_3/server.h
@@ -19,7 +19,7 @@
 class Time_impl : public virtual POA_Time
 {
 public:
-  virtual TimeOfDay get_gmt (void);
+  virtual TimeOfDay get_gmt ();
 };
 
 #endif /* server_HH_ */
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
index 996a0865fb6..a73397fcaec 100644
--- a/TAO/examples/Borland/ChatClient.cpp
+++ b/TAO/examples/Borland/ChatClient.cpp
@@ -8,13 +8,13 @@ USEFORM("ChatClientWnd.cpp", ChatClientWindow);
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 
-void ace_init(void)
+void ace_init()
 {
   ACE::init();
 }
 #pragma startup ace_init
 
-void ace_fini(void)
+void ace_fini()
 {
   ACE::fini();
 }
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index 099e0c9c51d..f3412e15a68 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -69,7 +69,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void)
+  void shutdown ()
   {
   }
   //FUZZ: enable check_for_lack_ACE_OS
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index 3ec9498c709..69c6ad2c7ef 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -17,7 +17,7 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h
index eadcac9b5c0..082c495bb58 100644
--- a/TAO/examples/Buffered_AMI/test_i.h
+++ b/TAO/examples/Buffered_AMI/test_i.h
@@ -28,7 +28,7 @@ public:
   void method (CORBA::ULong request_number,
                CORBA::ULong_out reply_number);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index 332bfb5d808..e9a575b0587 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -15,7 +15,7 @@ test_i::method (CORBA::ULong request_number)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h
index 42cbe3f40a6..7abab357bf2 100644
--- a/TAO/examples/Buffered_Oneways/test_i.h
+++ b/TAO/examples/Buffered_Oneways/test_i.h
@@ -27,7 +27,7 @@ public:
   // = The test interface methods.
   void method (CORBA::ULong request_number);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index 07ca85edae2..8b42daabd9f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -22,7 +22,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -39,7 +39,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -65,14 +65,14 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ++this->count_op5_;
 }
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index b1f1585613b..a1040204585 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -12,17 +12,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
index b688a1991d9..baf65e459b6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
@@ -69,7 +69,7 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa)
 
 
 void
-FooServantList::client_done(void)
+FooServantList::client_done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index efab29f4187..03e77be65a7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -18,7 +18,7 @@ public:
 
   void create_and_activate(PortableServer::POA_ptr poa);
 
-  void client_done(void);
+  void client_done();
 
 private:
   PortableServer::ServantBase_var* servants_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index eca9c5e79db..12bf846557a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -20,7 +20,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -37,7 +37,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -63,14 +63,14 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ++this->count_op5_;
 }
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index d0159af88c7..b8ba20b54a2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -14,17 +14,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const ACE_TCHAR* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
index f7d79613a9d..1f87afbdb21 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
@@ -15,7 +15,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
 }
 
@@ -28,7 +28,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   return this->value_;
 }
@@ -42,14 +42,14 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   throw FooException();
 }
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index 25c7b138359..230ca09f03f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -10,17 +10,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
   private:
     CORBA::Long value_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index ad8d5d9c2f1..453918983b5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -19,7 +19,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -36,7 +36,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -62,7 +62,7 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n"));
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Increment counter.\n"));
@@ -223,7 +223,7 @@ Foo_i::test_callback (
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   static ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients = 2;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index 05c782300ef..eb1bd9de1eb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -15,15 +15,15 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
@@ -77,7 +77,7 @@ class Foo_i : public virtual POA_Foo
     virtual void test_callback (
       );
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 00a50947930..3a985f08026 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -130,7 +130,7 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
 
 
 void
-FooServantList::client_done(void)
+FooServantList::client_done()
 {
   unsigned num_left;
 
@@ -158,7 +158,7 @@ FooServantList::collocated_client () const
 
 
 void
-FooServantList::deactivate_servant (void)
+FooServantList::deactivate_servant ()
 {
   for (unsigned i = 0; i < this->num_servants_; i++)
     {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index e819f7e3a1a..e0779ed05fd 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -23,11 +23,11 @@ class FooServantList
     void create_and_activate(CORBA::ORB_ptr orb,
                              PortableServer::POA_ptr poa);
 
-    void client_done(void);
+    void client_done();
 
     ClientTask* collocated_client () const;
 
-    void deactivate_servant (void);
+    void deactivate_servant ();
 
   private:
     Foo_i** servants_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index 7a5925b63b9..227b8faa73a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -21,7 +21,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -38,7 +38,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
 
@@ -70,7 +70,7 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ++this->count_op5_;
   throw FooException();
@@ -228,7 +228,7 @@ Foo_i::test_callback (
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index 3e127b18a6c..1a940771368 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -14,15 +14,15 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
@@ -63,7 +63,7 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_callback ();
 
-    virtual void done(void);
+    virtual void done();
 
     void active (bool flag);
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index a5a2f905d7e..f2caf9a65ff 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -23,7 +23,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -40,7 +40,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -66,7 +66,7 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ++this->count_op5_;
   throw FooException();
@@ -74,7 +74,7 @@ Foo_i::op5(void)
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
index fa8776f57d8..ef2f2f41a20 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
@@ -10,17 +10,17 @@ class Foo_i
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index c3d2dd11196..05cb15b5bc7 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -16,7 +16,7 @@ Content_Iterator_i::Content_Iterator_i (const char *pathname,
   // Nothing else
 }
 
-Content_Iterator_i::~Content_Iterator_i (void)
+Content_Iterator_i::~Content_Iterator_i ()
 {
   (void) this->file_io_.close ();
 }
@@ -101,7 +101,7 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 }
 
 void
-Content_Iterator_i::destroy (void)
+Content_Iterator_i::destroy ()
 {
   (void) this->file_io_.close ();
 
@@ -121,7 +121,7 @@ Content_Iterator_i::destroy (void)
 }
 
 int
-Content_Iterator_i::init (void)
+Content_Iterator_i::init ()
 {
   // Open the requested file.
   ACE_FILE_Connector connector;
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index ac038fbfb01..8224a10bf50 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -42,7 +42,7 @@ public:
   Content_Iterator_i (const char *filename, CORBA::ULongLong file_size);
 
   /// Destructor
-  ~Content_Iterator_i (void);
+  ~Content_Iterator_i ();
 
   /// This operation returns the next <chunk> of the file starting at
   /// <offset>.  If there are no more bindings, false is returned.
@@ -50,11 +50,11 @@ public:
                                      Web_Server::Chunk_Type_out chunk);
 
   /// Destroy the iterator.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   /// Initialize the Content_Iterator.
-  int init (void);
+  int init ();
 
 private:
   /// The Addr representing the requested file.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 26d18d23418..398e56f31ae 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-Iterator_Handler::Iterator_Handler (void)
+Iterator_Handler::Iterator_Handler ()
   : file_ (ACE_sap_any_cast (const ACE_FILE_Addr &)),
     file_io_ (),
     contents_ (),
@@ -20,7 +20,7 @@ Iterator_Handler::Iterator_Handler (void)
   // Nothing else
 }
 
-Iterator_Handler::~Iterator_Handler (void)
+Iterator_Handler::~Iterator_Handler ()
 {
   (void) this->file_io_.close ();
 }
@@ -68,7 +68,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
     }
 }
 void
-Iterator_Handler::destroy (void)
+Iterator_Handler::destroy ()
 {
   // Deactivate this reply handler.
   this->deactivate ();
@@ -125,7 +125,7 @@ Iterator_Handler::initialize_content_iterator
 }
 
 void
-Iterator_Handler::deactivate (void)
+Iterator_Handler::deactivate ()
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa =
@@ -207,7 +207,7 @@ Iterator_Handler::get_viewer (char *viewer,
 }
 
 int
-Iterator_Handler::spawn_viewer (void)
+Iterator_Handler::spawn_viewer ()
 {
   char viewer[BUFSIZ];
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index 9e54c08e93c..0818d41e4a7 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -43,7 +43,7 @@ class Iterator_Handler
 public:
   /// Constructor that creates a content iterator corresponding to the
   /// name of the file being retrieved from the web server.
-  Iterator_Handler (void);
+  Iterator_Handler ();
 
   virtual void next_chunk (CORBA::Boolean pending_data,
                    const Web_Server::Chunk_Type & chunk);
@@ -52,7 +52,7 @@ public:
       ::Messaging::ExceptionHolder *)
     {}
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void destroy_excep (
       ::Messaging::ExceptionHolder *)
@@ -71,21 +71,21 @@ public:
 private:
   /// Destructor (private to ensure that Iterator_Handler is allocated
   /// on the heap).
-  ~Iterator_Handler (void);
+  ~Iterator_Handler ();
 
   /// Initialize the Content Iterator used to retrieve the file.
   void initialize_content_iterator (const char *pathname,
                                     Web_Server::Iterator_Factory_ptr factory);
 
   /// Deactivate this reply handler.
-  void deactivate (void);
+  void deactivate ();
 
   /// Get the name of the viewer associated with the file being
   /// retrieved.
   int get_viewer (char *viewer, size_t length);
 
   /// Spawn an external view to display the retrieved file.
-  int spawn_viewer (void);
+  int spawn_viewer ();
 
 private:
   /// The Addr corresponding to the retrieved file.
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 2688d83ebf3..643fa24c04e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -18,13 +18,13 @@ Callback_Handler::Callback_Handler (const char *pathname,
   // Nothing else
 }
 
-Callback_Handler::~Callback_Handler (void)
+Callback_Handler::~Callback_Handler ()
 {
   // Nothing else
 }
 
 void
-Callback_Handler::next_chunk (void)
+Callback_Handler::next_chunk ()
 {
   if (this->last_chunk_ == 1)
     {
@@ -97,7 +97,7 @@ Callback_Handler::next_chunk_excep
 }
 
 void
-Callback_Handler::run (void)
+Callback_Handler::run ()
 {
   // Open the file to be downloaded
   this->open_file ();
@@ -112,7 +112,7 @@ Callback_Handler::run (void)
 }
 
 void
-Callback_Handler::open_file (void)
+Callback_Handler::open_file ()
 {
   // Create a temporary file to store the retrieved data.
   ACE_FILE_Connector connector;
@@ -128,7 +128,7 @@ Callback_Handler::open_file (void)
 }
 
 void
-Callback_Handler::deactivate (void)
+Callback_Handler::deactivate ()
 {
   // Close the file that was sent to the client.
   (void) this->file_io_.close ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
index d89f3f3a9ee..7166c1fc5cb 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -72,7 +72,7 @@ public:
                     Web_Server::Callback_ptr callback);
 
   /// The callback for this reply handler.
-  virtual void next_chunk (void);
+  virtual void next_chunk ();
 
   virtual void next_chunk_excep (::Messaging::ExceptionHolder *);
 
@@ -82,18 +82,18 @@ public:
    * incremented when file retrieval begins, and decremented when file
    * retrieval completes.
    */
-  void run (void);
+  void run ();
 
 private:
   /// Destructor (private to ensure that Callback_Handler is allocated
   /// on the heap).
-  ~Callback_Handler (void);
+  ~Callback_Handler ();
 
   /// Open the file to be uploaded to the client callback.
-  void open_file (void);
+  void open_file ();
 
   /// Deactivate this reply handler.
-  void deactivate (void);
+  void deactivate ();
 
 private:
   /// The Addr corresponding to the retrieved file.
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 1741f68d52e..8cf23b7d6e7 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -36,7 +36,7 @@ Callback_i::Callback_i (int *request_count)
     (*this->request_count_)++;
 }
 
-Callback_i::~Callback_i (void)
+Callback_i::~Callback_i ()
 {
   (void) this->file_io_.close ();
 }
@@ -133,7 +133,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
 }
 
 int
-Callback_i::metadata_received (void)
+Callback_i::metadata_received ()
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
@@ -144,7 +144,7 @@ Callback_i::metadata_received (void)
 }
 
 int
-Callback_i::content_received (void)
+Callback_i::content_received ()
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
@@ -221,7 +221,7 @@ Callback_i::get_viewer (char *viewer,
 }
 
 int
-Callback_i::spawn_viewer (void)
+Callback_i::spawn_viewer ()
 {
   char viewer[BUFSIZ];
 
@@ -264,7 +264,7 @@ Callback_i::spawn_viewer (void)
 }
 
 void
-Callback_i::deactivate (void)
+Callback_i::deactivate ()
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
index a4545d7f237..4ea944f7467 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
@@ -65,25 +65,25 @@ public:
 private:
   /// Destructor must be private to ensure that this object is
   /// allocated on the heap.
-  ~Callback_i (void);
+  ~Callback_i ();
 
   /// Returns one if the metadata was received, and zero otherwise.
-  int metadata_received (void);
+  int metadata_received ();
 
   /// Returns one if the entire content was received, and zero
   /// otherwise.
-  int content_received (void);
+  int content_received ();
 
   /// Get the name of the viewer associated with the file being
   /// retrieved.
   int get_viewer (char *viewer, size_t length);
 
   /// Spawn an external view to display the retrieved file.
-  int spawn_viewer (void);
+  int spawn_viewer ();
 
 private:
   /// Deactivate this Callback servant.
-  void deactivate (void);
+  void deactivate ();
 
 private:
   /// The Addr corresponding to the retrieved file.
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index ad1b852321c..54be9932254 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -6,7 +6,7 @@
 #include "Push_Iterator_Handler.h"
 #include "Callback_i.h"
 
-Push_Iterator_Handler::Push_Iterator_Handler (void)
+Push_Iterator_Handler::Push_Iterator_Handler ()
   : callback_servant_ (0),
     callback_ (),
     ami_handler_ ()
@@ -14,7 +14,7 @@ Push_Iterator_Handler::Push_Iterator_Handler (void)
   // Nothing else
 }
 
-Push_Iterator_Handler::~Push_Iterator_Handler (void)
+Push_Iterator_Handler::~Push_Iterator_Handler ()
 {
   // Nothing else
 }
@@ -56,7 +56,7 @@ Push_Iterator_Handler::run (int *request_count,
 }
 
 void
-Push_Iterator_Handler::deactivate (void)
+Push_Iterator_Handler::deactivate ()
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
index 035c890c3b2..5f5ba8cf76e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -52,7 +52,7 @@ class Push_Iterator_Handler
 public:
   /// Constructor that creates a content iterator corresponding to the
   /// name of the file being retrieved from the web server.
-  Push_Iterator_Handler (void);
+  Push_Iterator_Handler ();
 
   /**
    * Activate and run this Reply Handler.  The contents (not the
@@ -67,7 +67,7 @@ public:
 private:
   /// Destructor  (private to ensure that Iterator_Handler is allocated
   /// on the heap).
-  ~Push_Iterator_Handler (void);
+  ~Push_Iterator_Handler ();
 
   /// AMI callback that is invoked when a response from the
   /// corresponding server method is received.
@@ -79,7 +79,7 @@ private:
     {}
 
   /// Deactivate this handler.
-  void deactivate (void);
+  void deactivate ();
 
 private:
   /// The servant that accepts data pushed from the content server.
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index a7959b0db0a..1b43df34587 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -15,7 +15,7 @@ Content_Iterator_i::Content_Iterator_i (const char *pathname,
   // Nothing else
 }
 
-Content_Iterator_i::~Content_Iterator_i (void)
+Content_Iterator_i::~Content_Iterator_i ()
 {
   (void) this->file_io_.close ();
 }
@@ -110,7 +110,7 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 }
 
 void
-Content_Iterator_i::destroy (void)
+Content_Iterator_i::destroy ()
 {
   (void) this->file_io_.close ();
 
@@ -128,7 +128,7 @@ Content_Iterator_i::destroy (void)
 }
 
 int
-Content_Iterator_i::init (void)
+Content_Iterator_i::init ()
 {
   // Open the requested file.
   ACE_FILE_Connector connector;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
index ac038fbfb01..8224a10bf50 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
@@ -42,7 +42,7 @@ public:
   Content_Iterator_i (const char *filename, CORBA::ULongLong file_size);
 
   /// Destructor
-  ~Content_Iterator_i (void);
+  ~Content_Iterator_i ();
 
   /// This operation returns the next <chunk> of the file starting at
   /// <offset>.  If there are no more bindings, false is returned.
@@ -50,11 +50,11 @@ public:
                                      Web_Server::Chunk_Type_out chunk);
 
   /// Destroy the iterator.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   /// Initialize the Content_Iterator.
-  int init (void);
+  int init ();
 
 private:
   /// The Addr representing the requested file.
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 61640350ea0..df271e744ca 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -1,7 +1,7 @@
 #include "Consumer_Handler.h"
 #include "tao/ORB_Core.h"
 
-Consumer_Handler::Consumer_Handler (void)
+Consumer_Handler::Consumer_Handler ()
   : receiver_ (0),
     notifier_ (0),
     shutdowncallback (0)
@@ -71,7 +71,7 @@ Consumer_Handler::init (int argc,
 }
 
 int
-Consumer_Handler::get_notifier (void)
+Consumer_Handler::get_notifier ()
 {
   try
     {
@@ -104,13 +104,13 @@ Consumer_Handler::get_notifier (void)
 }
 
 void
-Consumer_Handler::close (void)
+Consumer_Handler::close ()
 {
   this->orb_->shutdown ();
 }
 
 void
-Consumer_Handler::shutdown (void)
+Consumer_Handler::shutdown ()
 {
   ACE_ASSERT (this->shutdowncallback != 0);
 
@@ -118,7 +118,7 @@ Consumer_Handler::shutdown (void)
 }
 
 int
-Consumer_Handler::run (void)
+Consumer_Handler::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the Consumer...\n"));
@@ -135,7 +135,7 @@ Consumer_Handler::run (void)
 }
 
 ACE_Reactor*
-Consumer_Handler::reactor(void)
+Consumer_Handler::reactor()
 {
   // @@ Please see if there's a way to get to the Reactor without
   // using the TAO_ORB_Core_instance().
@@ -143,13 +143,13 @@ Consumer_Handler::reactor(void)
 }
 
 Event_Comm::Consumer_ptr
-Consumer_Handler::receiver (void)
+Consumer_Handler::receiver ()
 {
   return this->receiver_.in ();
 }
 
 Event_Comm::Notifier_ptr
-Consumer_Handler::notifier (void)
+Consumer_Handler::notifier ()
 {
   return this->notifier_.in ();
 }
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h
index afca7a3f04c..de31459a273 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Handler.h
@@ -32,7 +32,7 @@ class Consumer_Handler
 {
 public:
   /// Constructor.
-  Consumer_Handler (void);
+  Consumer_Handler ();
 
   /// Destructor.
  virtual ~Consumer_Handler (void) = default;
@@ -42,25 +42,25 @@ public:
   int init (int argc, ACE_TCHAR *argv[], ShutdownCallback *_shutdowncallback);
 
   /// runs the ORB.
-  int run (void);
+  int run ();
 
   /// shutdown the orb.
-  void close (void);
+  void close ();
 
   /// called to shutdown the consumer application.
-  void shutdown (void);
+  void shutdown ();
 
   // = Accessors
-  Event_Comm::Consumer *receiver (void);
-  Event_Comm::Notifier *notifier (void);
+  Event_Comm::Consumer *receiver ();
+  Event_Comm::Notifier *notifier ();
 
   /// returns the ORB's reactor.
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
 private:
   /// gets the notifier reference from the naming service.
   /// returns 0 on success, -1 on error.
-  int get_notifier (void);
+  int get_notifier ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index 444f3f5a02e..d20b3ce6fa1 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -3,7 +3,7 @@
 
 #include "tao/ORB_Core.h"
 
-Consumer_Input_Handler::Consumer_Input_Handler (void)
+Consumer_Input_Handler::Consumer_Input_Handler ()
   : receiver_handler_ (0),
     consumer_initiated_shutdown_ (0)
 {
@@ -11,7 +11,7 @@ Consumer_Input_Handler::Consumer_Input_Handler (void)
 }
 
 int
-Consumer_Input_Handler::consumer_initiated_shutdown (void)
+Consumer_Input_Handler::consumer_initiated_shutdown ()
 {
   return this->consumer_initiated_shutdown_;
 }
@@ -23,7 +23,7 @@ Consumer_Input_Handler::consumer_initiated_shutdown (int c)
 }
 
 int
-Consumer_Input_Handler::close (void)
+Consumer_Input_Handler::close ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "closing down Consumer::Input_Handler\n"));
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.h b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
index cd58c3a3f38..43a37afbbfe 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
@@ -37,7 +37,7 @@ class Consumer_Input_Handler : public ACE_Event_Handler
 public:
   // Initialization and termination methods.
   /// Constructor.
-  Consumer_Input_Handler(void);
+  Consumer_Input_Handler();
 
   /// Destructor.
   ~Consumer_Input_Handler (void) = default;
@@ -50,10 +50,10 @@ public:
   virtual int handle_input (ACE_HANDLE);
 
   /// Close down the handler.
-  int close (void);
+  int close ();
 
   /// Report whether the Consumer initiated the shutdown.
-  int consumer_initiated_shutdown (void);
+  int consumer_initiated_shutdown ();
 
   /// Indicate that the Consumer initiated the shutdown.
   void consumer_initiated_shutdown (int);
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index 1f251648a07..befc7c1d7bc 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -12,19 +12,19 @@ public:
                   const char *filtering_criteria);
   // Constructor.
 
-  ~Consumer_Entry (void);
+  ~Consumer_Entry ();
   // Descriptor.
 
   // = Set/get filtering criteria.
   void criteria (const char *criteria);
-  const char *criteria (void);
+  const char *criteria ();
 
   // = Set/get Event_Comm::Consumer object reference.
-  Event_Comm::Consumer *consumer (void);
+  Event_Comm::Consumer *consumer ();
   void consumer (Event_Comm::Consumer *);
 
   // = Set/get the compiled regular expression buffer.
-  const char *regexp (void);
+  const char *regexp ();
   void regexp (char *);
 
 private:
@@ -50,7 +50,7 @@ Consumer_Entry::criteria (const char *criteria)
 }
 
 const char *
-Consumer_Entry::criteria (void)
+Consumer_Entry::criteria ()
 {
   return this->filtering_criteria_;
 }
@@ -58,7 +58,7 @@ Consumer_Entry::criteria (void)
 // = Set/get Event_Comm::Consumer object reference.
 
 Event_Comm::Consumer *
-Consumer_Entry::consumer (void)
+Consumer_Entry::consumer ()
 {
   return this->consumer_;
 }
@@ -70,7 +70,7 @@ Consumer_Entry::consumer (Event_Comm::Consumer *consumer)
 }
 
 const char *
-Consumer_Entry::regexp (void)
+Consumer_Entry::regexp ()
 {
   return this->compiled_regexp_;
 }
@@ -121,7 +121,7 @@ Consumer_Entry::Consumer_Entry (Event_Comm::Consumer *consumer,
   this->consumer_ = Event_Comm::Consumer::_duplicate (this->consumer_);
 }
 
-Consumer_Entry::~Consumer_Entry (void)
+Consumer_Entry::~Consumer_Entry ()
 {
   ACE_OS::free ((void *) this->filtering_criteria_);
   ACE_OS::free ((void *) this->compiled_regexp_);
@@ -373,20 +373,20 @@ Notifier_i::push (const Event_Comm::Event &event)
 
 // -------------
 
-ShutdownCallback::~ShutdownCallback (void)
+ShutdownCallback::~ShutdownCallback ()
 {
 }
 
 // -------------
 
 //FUZZ: disable check_for_lack_ACE_OS
-Consumer_i::Consumer_i (void)
+Consumer_i::Consumer_i ()
   : shutdown (0)
 {
 }
 //FUZZ: enable check_for_lack_ACE_OS
 
-Consumer_i::~Consumer_i (void)
+Consumer_i::~Consumer_i ()
 {
 }
 
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index de2509e181a..4f45b0de3bd 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -33,7 +33,7 @@ class ShutdownCallback
 {
 public:
   /// Destructor.
-  virtual ~ShutdownCallback (void);
+  virtual ~ShutdownCallback ();
 
   /// This method is to be called to shutdown the application.
   virtual void close (void) = 0;
@@ -48,10 +48,10 @@ class Consumer_i : public POA_Event_Comm::Consumer
 {
 public:
   /// Constructor.
-  Consumer_i (void);
+  Consumer_i ();
 
   /// Destructor.
-  ~Consumer_i (void);
+  ~Consumer_i ();
 
   /// set the ACE_Reactor to use when quitting.
   void set_reactor (ACE_Reactor *reactor);
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h
index f3bf37bd881..6ed203716ca 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.h
+++ b/TAO/examples/Event_Comm/Notifier_Handler.h
@@ -41,20 +41,20 @@ public:
   int init (int argc, ACE_TCHAR *argv[], ShutdownCallback* _shutdowncallback);
 
   // = Accessors.
-  Event_Comm::Notifier *notifier (void);
+  Event_Comm::Notifier *notifier ();
   void notifier (Event_Comm::Notifier *);
 
   /// runs the ORB.
-  int run (void);
+  int run ();
 
   /// Close down the handler.
-  int close (void);
+  int close ();
 
   /// called to request application shutdown.
-  void shutdown (void);
+  void shutdown ();
 
   /// returns the ORB's reactor.
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
 private:
   /// Remember our orb.
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index ece19d92bfa..74eb3eacffe 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -4,18 +4,18 @@
 #include "tao/ORB_Core.h"
 
 // Constructor.
-Notifier_Server::Notifier_Server (void)
+Notifier_Server::Notifier_Server ()
 {
 }
 
 // Destructor.
 
-Notifier_Server::~Notifier_Server (void)
+Notifier_Server::~Notifier_Server ()
 {
 }
 
 int
-Notifier_Server::close (void)
+Notifier_Server::close ()
 {
   try
     {
@@ -45,7 +45,7 @@ Notifier_Server::close (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Server::init_naming_service (void)
+Notifier_Server::init_naming_service ()
 {
   try
     {
@@ -110,7 +110,7 @@ Notifier_Server::init (int argc,
 }
 
 int
-Notifier_Server::run (void)
+Notifier_Server::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the notifier server...\n"));
@@ -122,7 +122,7 @@ Notifier_Server::run (void)
 }
 
 ACE_Reactor *
-Notifier_Server::reactor (void)
+Notifier_Server::reactor ()
 {
   return TAO_ORB_Core_instance ()->reactor ();
 }
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index 46822e33240..6a1e382a98f 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -27,27 +27,27 @@ class Notifier_Server
 {
 public:
   /// Constructor.
-  Notifier_Server (void);
+  Notifier_Server ();
 
   /// Destructor.
-  ~Notifier_Server (void);
+  ~Notifier_Server ();
 
   /// Initialize the Server state.
  int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Close the naming service.
-  int close (void);
+  int close ();
 
   /// Reactor accessor.
-  ACE_Reactor *reactor(void);
+  ACE_Reactor *reactor();
 
 private:
   /// Initialises the name server and registers the Notifier server
   /// object name with the name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index f185296101e..18265894ed8 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -9,14 +9,14 @@ Supplier_Input_Handler::Supplier_Input_Handler ()
   // No-Op.
 }
 
-Supplier_Input_Handler::~Supplier_Input_Handler (void)
+Supplier_Input_Handler::~Supplier_Input_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "closing down Supplier_Input_Handler::~Supplier_Input_Handler\n"));
 }
 
 int
-Supplier_Input_Handler::close (void)
+Supplier_Input_Handler::close ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "closing down Supplier::Supplier_Input_Handler\n"));
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.h b/TAO/examples/Event_Comm/Supplier_Input_Handler.h
index b18d79a4e75..344c03f81ff 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.h
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.h
@@ -36,10 +36,10 @@ class Supplier_Input_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Supplier_Input_Handler (void);
+  Supplier_Input_Handler ();
 
   /// Destructor.
-  ~Supplier_Input_Handler (void);
+  ~Supplier_Input_Handler ();
 
   /// Initialization.
   int initialize (Notifier_Handler *);
@@ -48,7 +48,7 @@ public:
   virtual int handle_input (ACE_HANDLE);
 
   /// Close down the handler.
-  int close (void);
+  int close ();
 
 protected:
   /// Pointer to a <Notifier_Handler> that's used to inform Consumers
diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp
index 9a9a516fde2..d368c5262db 100644
--- a/TAO/examples/Event_Comm/consumer.cpp
+++ b/TAO/examples/Event_Comm/consumer.cpp
@@ -56,7 +56,7 @@ Consumer::handle_signal (int signum,
 }
 
 void
-Consumer::close (void)
+Consumer::close ()
 {
   // clean up the input handler.
   ih_.close ();
@@ -65,7 +65,7 @@ Consumer::close (void)
 }
 
 int
-Consumer::run (void)
+Consumer::run ()
 {
   // Run the <Consumer_Handler>'s ORB.
   return ch_.run ();
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index 7596f378a0f..6dff921e6f5 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -14,7 +14,7 @@ Notifier::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 void
-Notifier::run (void)
+Notifier::run ()
 {
   try
     {
@@ -45,7 +45,7 @@ Notifier::Notifier (int argc, ACE_TCHAR *argv[])
                 "register_handler"));
 }
 
-Notifier::~Notifier (void)
+Notifier::~Notifier ()
 {
   // Cleanup.
   this->ns_.close ();
diff --git a/TAO/examples/Event_Comm/notifier.h b/TAO/examples/Event_Comm/notifier.h
index 009cc015967..46d15aca84b 100644
--- a/TAO/examples/Event_Comm/notifier.h
+++ b/TAO/examples/Event_Comm/notifier.h
@@ -20,10 +20,10 @@ class Notifier : public ACE_Event_Handler
   Notifier (int argc, ACE_TCHAR *argv[]);
 
   /// Destructor.
-  ~Notifier (void);
+  ~Notifier ();
 
   /// Execute the notifier.
-  void run (void);
+  void run ();
 
  private:
   /// Handle signals that shut us down.
diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp
index 43afde34e07..3e99cd2a8f1 100644
--- a/TAO/examples/Event_Comm/supplier.cpp
+++ b/TAO/examples/Event_Comm/supplier.cpp
@@ -14,7 +14,7 @@ Supplier::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 void
-Supplier::run (void)
+Supplier::run ()
 {
   if (nh_.run () == -1)
     ACE_ERROR ((LM_ERROR,
@@ -23,7 +23,7 @@ Supplier::run (void)
 }
 
 void
-Supplier::close (void)
+Supplier::close ()
 {
   ih_.close ();
   nh_.close ();
diff --git a/TAO/examples/Event_Comm/supplier.h b/TAO/examples/Event_Comm/supplier.h
index a35775ec598..e67879e34fa 100644
--- a/TAO/examples/Event_Comm/supplier.h
+++ b/TAO/examples/Event_Comm/supplier.h
@@ -28,10 +28,10 @@ public:
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Execute the supplier.
-  void run (void);
+  void run ();
 
   /// Shutdown the application.
-  virtual void close (void);
+  virtual void close ();
 
 private:
   /// Handle shutdown signals.
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 9f4fb10550e..3250eeba1fb 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -13,7 +13,7 @@
 using namespace std;
 
 EDF_Scheduling::SchedulingParameter
-EDF_Sched_Param_Policy::value (void)
+EDF_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -73,12 +73,12 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb,
   codec_ = codec_factory->create_codec (encoding);
 }
 
-EDF_Scheduler::~EDF_Scheduler (void)
+EDF_Scheduler::~EDF_Scheduler ()
 {
 }
 
 void
-EDF_Scheduler::shutdown (void)
+EDF_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   DSUI_EVENT_LOG (EDF_SCHED_FAM, DISPATCHER_SHUTDOWN, 0, 0, 0);
@@ -675,7 +675,7 @@ EDF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-EDF_Scheduler::scheduling_policies (void)
+EDF_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -687,13 +687,13 @@ EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-EDF_Scheduler::poa_policies (void)
+EDF_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-EDF_Scheduler::scheduling_discipline_name (void)
+EDF_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
index e60038a6f32..dfd9e9d0a01 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
@@ -48,7 +48,7 @@ public EDF_Scheduling::SchedulingParameterPolicy,
        public ::CORBA::LocalObject
 {
  public:
-    EDF_Scheduling::SchedulingParameter value (void);
+    EDF_Scheduling::SchedulingParameter value ();
 
     void value (const EDF_Scheduling::SchedulingParameter & value);
 
@@ -66,13 +66,13 @@ public ::CORBA::LocalObject
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~EDF_Scheduler (void);
+  ~EDF_Scheduler ();
 
 
   virtual EDF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
@@ -120,13 +120,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 16c4ddb6595..e2b8374f601 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -20,7 +20,7 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
 }
 
 FP_Scheduling::SegmentSchedulingParameter
-FP_Segment_Sched_Param_Policy::value (void)
+FP_Segment_Sched_Param_Policy::value ()
 {
   return value_;
 }
@@ -33,7 +33,7 @@ FP_Segment_Sched_Param_Policy::value (
 }
 
 CORBA::Policy_ptr
-FP_Segment_Sched_Param_Policy::copy (void)
+FP_Segment_Sched_Param_Policy::copy ()
 {
   FP_Segment_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
@@ -44,13 +44,13 @@ FP_Segment_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-FP_Segment_Sched_Param_Policy::policy_type (void)
+FP_Segment_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-FP_Segment_Sched_Param_Policy::destroy (void)
+FP_Segment_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -102,13 +102,13 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
   codec_ = codec_factory->create_codec (encoding);
 }
 
-Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
+Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler ()
 {
   //  delete kokyu_dispatcher_;
 }
 
 void
-Fixed_Priority_Scheduler::shutdown (void)
+Fixed_Priority_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n"));
@@ -569,7 +569,7 @@ Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::scheduling_policies (void)
+Fixed_Priority_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -581,13 +581,13 @@ Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::poa_policies (void)
+Fixed_Priority_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-Fixed_Priority_Scheduler::scheduling_discipline_name (void)
+Fixed_Priority_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
index b511e81505b..71d2309ef35 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
@@ -52,7 +52,7 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
 
      virtual CORBA::Policy_ptr copy ();
 
-     virtual CORBA::PolicyType policy_type (void);
+     virtual CORBA::PolicyType policy_type ();
 
      virtual void destroy ();
 
@@ -70,9 +70,9 @@ public ::CORBA::LocalObject
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~Fixed_Priority_Scheduler (void);
+  ~Fixed_Priority_Scheduler ();
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (
@@ -125,13 +125,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index c08e2b92487..2e1a8e98a6d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -21,7 +21,7 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
 }
 
 MIF_Scheduling::SchedulingParameter
-MIF_Sched_Param_Policy::value (void)
+MIF_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -33,7 +33,7 @@ MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value)
 }
 
 CORBA::Policy_ptr
-MIF_Sched_Param_Policy::copy (void)
+MIF_Sched_Param_Policy::copy ()
 {
   MIF_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -45,13 +45,13 @@ MIF_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-MIF_Sched_Param_Policy::policy_type (void)
+MIF_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-MIF_Sched_Param_Policy::destroy (void)
+MIF_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -101,13 +101,13 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
   codec_ = codec_factory->create_codec (encoding);
 }
 
-MIF_Scheduler::~MIF_Scheduler (void)
+MIF_Scheduler::~MIF_Scheduler ()
 {
   //  delete kokyu_dispatcher_;
 }
 
 void
-MIF_Scheduler::shutdown (void)
+MIF_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n"));
@@ -566,7 +566,7 @@ MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (void)
+MIF_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -578,13 +578,13 @@ MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::poa_policies (void)
+MIF_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-MIF_Scheduler::scheduling_discipline_name (void)
+MIF_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
index b2ba9ae5b95..987ae99dca6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
@@ -43,13 +43,13 @@ public MIF_Scheduling::SchedulingParameterPolicy,
      MIF_Sched_Param_Policy ();
      MIF_Sched_Param_Policy (const MIF_Sched_Param_Policy &rhs);
 
-    MIF_Scheduling::SchedulingParameter value (void);
+    MIF_Scheduling::SchedulingParameter value ();
 
     void value (const MIF_Scheduling::SchedulingParameter & value);
 
      virtual CORBA::Policy_ptr copy ();
 
-     virtual CORBA::PolicyType policy_type (void);
+     virtual CORBA::PolicyType policy_type ();
 
      virtual void destroy ();
 
@@ -67,13 +67,13 @@ public ::CORBA::LocalObject
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~MIF_Scheduler (void);
+  ~MIF_Scheduler ();
 
 
   virtual MIF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
@@ -121,13 +121,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 25c94ab6f75..fe0b50123cc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -21,7 +21,7 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy (
 }
 
 MUF_Scheduling::SchedulingParameter
-MUF_Sched_Param_Policy::value (void)
+MUF_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -33,7 +33,7 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value)
 }
 
 CORBA::Policy_ptr
-MUF_Sched_Param_Policy::copy (void)
+MUF_Sched_Param_Policy::copy ()
 {
   MUF_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -45,13 +45,13 @@ MUF_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-MUF_Sched_Param_Policy::policy_type (void)
+MUF_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-MUF_Sched_Param_Policy::destroy (void)
+MUF_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -102,12 +102,12 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
   codec_ = codec_factory->create_codec (encoding);
 }
 
-MUF_Scheduler::~MUF_Scheduler (void)
+MUF_Scheduler::~MUF_Scheduler ()
 {
 }
 
 void
-MUF_Scheduler::shutdown (void)
+MUF_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n"));
@@ -616,7 +616,7 @@ MUF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-MUF_Scheduler::scheduling_policies (void)
+MUF_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -628,13 +628,13 @@ MUF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-MUF_Scheduler::poa_policies (void)
+MUF_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-MUF_Scheduler::scheduling_discipline_name (void)
+MUF_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
index 9e279f3a909..d493d5d2914 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
@@ -59,13 +59,13 @@ public MUF_Scheduling::SchedulingParameterPolicy,
     MUF_Sched_Param_Policy ();
     MUF_Sched_Param_Policy (const MUF_Sched_Param_Policy &rhs);
 
-    MUF_Scheduling::SchedulingParameter value (void);
+    MUF_Scheduling::SchedulingParameter value ();
 
     void value (const MUF_Scheduling::SchedulingParameter & value);
 
      virtual CORBA::Policy_ptr copy ();
 
-     virtual CORBA::PolicyType policy_type (void);
+     virtual CORBA::PolicyType policy_type ();
 
      virtual void destroy ();
 
@@ -83,13 +83,13 @@ public ::CORBA::LocalObject
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~MUF_Scheduler (void);
+  ~MUF_Scheduler ();
 
 
   virtual MUF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
@@ -137,13 +137,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
index e266b41624e..19fc90711e1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
@@ -5,12 +5,12 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
 
-Task_Stats::Task_Stats (void)
+Task_Stats::Task_Stats ()
   : base_time_(0),
     end_time_ (0),
     max_samples_ (0),
@@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->thr_run_time_;
   delete[] this->thr_count_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
index 841c120565f..cf8651bb6de 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
@@ -25,7 +25,7 @@
 class Kokyu_DSRT_Schedulers_Export Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -40,10 +40,10 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats
 {
  public:
   /// Constructor
-  Task_Stats (void);
+  Task_Stats ();
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Init
   int init (size_t max_samples);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 136e71cbc06..fec3e6ec1a5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -283,7 +283,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   const char * name = 0;
   /*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 857c842cd0d..60dce97a3fe 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(120);
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index b018b6d3ff6..3fa1ac61ad8 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
index 7615f7ca6f1..04048f621ae 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
@@ -34,7 +34,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index bbbe337f20f..c58eead7349 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -277,7 +277,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   const char * name = 0;
   /*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 810c7326f99..b09e5a3c5d9 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(120);
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index a40ae883ebf..f5b08106a04 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
index 7615f7ca6f1..04048f621ae 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
@@ -34,7 +34,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index dac14afb350..c550dcc65f4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -347,7 +347,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   const char * name = 0;
   /*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 4e2feec4fd5..e94e379de45 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(120);
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index a40ae883ebf..f5b08106a04 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
index 7615f7ca6f1..04048f621ae 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
@@ -34,7 +34,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 208572497ab..0b75abf3404 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -16,7 +16,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-Identity_Client::Identity_Client (void)
+Identity_Client::Identity_Client ()
   : group_factory_ior_ (0),
     number_of_invocations_ (5),
     use_random_ (0)
@@ -90,7 +90,7 @@ Identity_Client::init (int argc,
 }
 
 int
-Identity_Client::run (void)
+Identity_Client::run ()
 {
   ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized\n"));
 
@@ -176,7 +176,7 @@ Identity_Client::run (void)
   return 0;
 }
 
-Identity_Client::~Identity_Client (void)
+Identity_Client::~Identity_Client ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h
index dda809513f5..5610af49043 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.h
+++ b/TAO/examples/Load_Balancing/Identity_Client.h
@@ -41,16 +41,16 @@ class Identity_Client
 {
 public:
   /// Default constructor.
-  Identity_Client (void);
+  Identity_Client ();
 
   /// Destructor.
-  ~Identity_Client (void);
+  ~Identity_Client ();
 
   /// Initializes <orb_manager_>, and parses commandline arguments.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// See TITLE.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index e6def9c5295..0e0056a4bc5 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -13,7 +13,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Identity_Server::Identity_Server (void)
+Identity_Server::Identity_Server ()
   : group_factory_ior_ (0),
     random_objects_ (5),
     rr_objects_ (5)
@@ -164,7 +164,7 @@ Identity_Server::create_objects (size_t number_of_objects,
 }
 
 int
-Identity_Server::run (void)
+Identity_Server::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Identity_Server: Initialized\n"));
@@ -176,7 +176,7 @@ Identity_Server::run (void)
   return result;
 }
 
-Identity_Server::~Identity_Server (void)
+Identity_Server::~Identity_Server ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h
index e9fac45c6af..a065ca77cc2 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.h
+++ b/TAO/examples/Load_Balancing/Identity_Server.h
@@ -35,17 +35,17 @@ class Identity_Server
 {
 public:
   /// Default constructor.
-  Identity_Server (void);
+  Identity_Server ();
 
   /// Destructor.
-  ~Identity_Server (void);
+  ~Identity_Server ();
 
   /// Performs all the initializations necessary before going into the
   /// ORB event loop.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp
index 9c9806b40ca..5f2f897ed70 100644
--- a/TAO/examples/Load_Balancing/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing/Identity_i.cpp
@@ -16,7 +16,7 @@ Identity_i::Identity_i (const char *name)
 {
 }
 
-Identity_i::~Identity_i (void)
+Identity_i::~Identity_i ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h
index 145808d82b0..53d7bbf57c3 100644
--- a/TAO/examples/Load_Balancing/Identity_i.h
+++ b/TAO/examples/Load_Balancing/Identity_i.h
@@ -24,7 +24,7 @@ public:
   Identity_i (const char *name);
 
   /// Destructor.
-  ~Identity_i (void);
+  ~Identity_i ();
 
   /// Returns the name of this object.
   virtual void get_name (CORBA::String_out name);
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
index 841f74e9149..66c1861d936 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -11,11 +11,11 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_time.h"
 
-Object_Group_Factory_i::Object_Group_Factory_i (void)
+Object_Group_Factory_i::Object_Group_Factory_i ()
 {
 }
 
-Object_Group_Factory_i::~Object_Group_Factory_i (void)
+Object_Group_Factory_i::~Object_Group_Factory_i ()
 {
 }
 
@@ -157,13 +157,13 @@ Object_Group_Factory_i::list_groups (int random)
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (void)
+Object_Group_Factory_i::round_robin_groups ()
 {
   return list_groups (0);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (void)
+Object_Group_Factory_i::random_groups ()
 {
   return list_groups (1);
 }
@@ -175,7 +175,7 @@ Object_Group_i::Object_Group_i (const char * id,
 {
 }
 
-Object_Group_i::~Object_Group_i (void)
+Object_Group_i::~Object_Group_i ()
 {
   // Need to delete all the items from the member_id_list, to avoid
   // memory leaks.
@@ -188,7 +188,7 @@ Object_Group_i::~Object_Group_i (void)
 }
 
 char *
-Object_Group_i::id (void)
+Object_Group_i::id ()
 {
   return CORBA::string_dup (id_.c_str ());
 }
@@ -264,7 +264,7 @@ Object_Group_i::resolve_with_id (const char * id)
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (void)
+Object_Group_i::members ()
 {
   Load_Balancer::Member_ID_List * list;
 
@@ -291,7 +291,7 @@ Object_Group_i::members (void)
 }
 
 void
-Object_Group_i::destroy (void)
+Object_Group_i::destroy ()
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
@@ -315,12 +315,12 @@ Random_Object_Group::Random_Object_Group (const char *id,
   ACE_OS::srand (static_cast<u_int> (ACE_OS::time ()));
 }
 
-Random_Object_Group::~Random_Object_Group (void)
+Random_Object_Group::~Random_Object_Group ()
 {
 }
 
 void
-Random_Object_Group::destroy (void)
+Random_Object_Group::destroy ()
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
@@ -330,7 +330,7 @@ Random_Object_Group::destroy (void)
 }
 
 CORBA::Object_ptr
-Random_Object_Group::resolve (void)
+Random_Object_Group::resolve ()
 {
   CORBA::Object_var obj;
 
@@ -361,12 +361,12 @@ RR_Object_Group::RR_Object_Group (const char *id,
 {
 }
 
-RR_Object_Group::~RR_Object_Group (void)
+RR_Object_Group::~RR_Object_Group ()
 {
 }
 
 void
-RR_Object_Group::destroy (void)
+RR_Object_Group::destroy ()
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
@@ -376,7 +376,7 @@ RR_Object_Group::destroy (void)
 }
 
 CORBA::Object_ptr
-RR_Object_Group::resolve (void)
+RR_Object_Group::resolve ()
 {
   CORBA::Object_var obj;
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index 43308af99c8..0cbd5aad84d 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -40,10 +40,10 @@ class  Object_Group_Factory_i :
   //
 public:
   /// Constructor.
-  Object_Group_Factory_i (void);
+  Object_Group_Factory_i ();
 
   /// Destructor.
-  ~Object_Group_Factory_i (void);
+  ~Object_Group_Factory_i ();
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
@@ -78,7 +78,7 @@ public:
    * a sequence of <Group_ID>s of all existing round robin
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * round_robin_groups (void);
+  Load_Balancer::Group_List * round_robin_groups ();
 
   /**
    * Lists all the random <Object_Group>s which were created
@@ -86,7 +86,7 @@ public:
    * a sequence of <Group_ID>s of all existing random
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * random_groups (void);
+  Load_Balancer::Group_List * random_groups ();
 
   // = Implementation detail methods.
 
@@ -152,12 +152,12 @@ public:
                   Object_Group_Factory_i * my_factory);
 
   /// Destructor.
-  ~Object_Group_i (void);
+  ~Object_Group_i ();
 
   // = Load_Balancer::Object_Group idl methods.
 
   /// Get group's id.
-  char * id (void);
+  char * id ();
 
   /**
    * Adds a new <member> to the <Object_Group>.  Note that each
@@ -190,7 +190,7 @@ public:
   CORBA::Object_ptr resolve_with_id (const char * id);
 
   /// Return a sequence of <Member_ID>s of all of its members.
-  Load_Balancer::Member_ID_List * members (void);
+  Load_Balancer::Member_ID_List * members ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -198,7 +198,7 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 
 protected:
   /// Typedefs for ease of use.
@@ -248,11 +248,11 @@ public:
                        Object_Group_Factory_i *my_factory);
 
   /// Destructor.
-  ~Random_Object_Group (void);
+  ~Random_Object_Group ();
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "random" load balancing policy.
-  CORBA::Object_ptr resolve (void);
+  CORBA::Object_ptr resolve ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -260,7 +260,7 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 };
 
 /**
@@ -277,7 +277,7 @@ public:
                    Object_Group_Factory_i *my_factory);
 
   /// Destructor.
-  ~RR_Object_Group (void);
+  ~RR_Object_Group ();
 
   /**
    * We need to override the implementation of <unbind> from
@@ -288,7 +288,7 @@ public:
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "round robin" load balancing policy.
-  CORBA::Object_ptr resolve (void);
+  CORBA::Object_ptr resolve ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -296,7 +296,7 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 
 private:
   /// Index into the Object_Group_i::member_id_list_: keeps track of
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index 68363132cfc..f6968916ddf 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -13,7 +13,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Load_Balancing_Service::Load_Balancing_Service (void)
+Load_Balancing_Service::Load_Balancing_Service ()
   : ior_output_file_ (0)
 {
 }
@@ -106,7 +106,7 @@ Load_Balancing_Service::init (int argc,
 
 
 int
-Load_Balancing_Service::run (void)
+Load_Balancing_Service::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Load_Balancer: Initialized\n"));
@@ -118,7 +118,7 @@ Load_Balancing_Service::run (void)
   return result;
 }
 
-Load_Balancing_Service::~Load_Balancing_Service (void)
+Load_Balancing_Service::~Load_Balancing_Service ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
index 7e6b2098d7d..10064e4eb3f 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
@@ -31,17 +31,17 @@ class Load_Balancing_Service
 {
 public:
   /// Default constructor.
-  Load_Balancing_Service (void);
+  Load_Balancing_Service ();
 
   /// Destructor.
-  ~Load_Balancing_Service (void);
+  ~Load_Balancing_Service ();
 
   /// Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   /// arguments, creates a servant ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index ae098dcb145..76b84686191 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -15,7 +15,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
 
-Identity_Client::Identity_Client (void)
+Identity_Client::Identity_Client ()
   : group_factory_ior_ (0),
     number_of_invocations_ (5),
     use_random_ (0),
@@ -92,7 +92,7 @@ Identity_Client::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-Identity_Client::run (void)
+Identity_Client::run ()
 {
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
@@ -212,7 +212,7 @@ Identity_Client::run (void)
   return 0;
 }
 
-Identity_Client::~Identity_Client (void)
+Identity_Client::~Identity_Client ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
index 3f5ffac3dbc..98dffd43a45 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
@@ -41,16 +41,16 @@ class Identity_Client
 {
 public:
   /// Default constructor.
-  Identity_Client (void);
+  Identity_Client ();
 
   /// Destructor.
-  ~Identity_Client (void);
+  ~Identity_Client ();
 
   /// Initializes <orb_manager_>, and parses commandline arguments.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// See TITLE.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 5d5b72afde6..ace0fe75317 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -4,7 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Identity_Server::Identity_Server (void)
+Identity_Server::Identity_Server ()
   : group_factory_ior_ (0),
     random_objects_ (5),
     rr_objects_ (5)
@@ -99,7 +99,7 @@ Identity_Server::init (int argc,
 }
 
 int
-Identity_Server::register_groups (void)
+Identity_Server::register_groups ()
 {
   // Contact the <Object_Group_Factory> to create 2
   // <Object_Group>s, one random and one rr.
@@ -218,7 +218,7 @@ Identity_Server::create_objects (size_t number_of_objects,
 }
 
 int
- Identity_Server::run (void)
+ Identity_Server::run ()
 {
   int result;
 
@@ -227,7 +227,7 @@ int
   return result;
 }
 
-Identity_Server::~Identity_Server (void)
+Identity_Server::~Identity_Server ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index 58a488e4ef3..1ee2731d507 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
@@ -35,10 +35,10 @@ class Identity_Server
 {
 public:
   /// Default constructor.
-  Identity_Server (void);
+  Identity_Server ();
 
   /// Destructor.
-  ~Identity_Server (void);
+  ~Identity_Server ();
 
   /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -47,11 +47,11 @@ public:
   /// ORB event loop.
   int init (int argc, ACE_TCHAR *argv[]);
 
-  int register_groups (void);
+  int register_groups ();
 
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /**
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
index 10be44939a2..c1e8c37dd2e 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
@@ -18,7 +18,7 @@ Identity_i::Identity_i (const char *name,
 {
 }
 
-Identity_i::~Identity_i (void)
+Identity_i::~Identity_i ()
 {
 }
 
@@ -29,7 +29,7 @@ Identity_i::get_name (CORBA::String_out name)
 }
 
 PortableServer::POA_ptr
-Identity_i::_default_POA (void)
+Identity_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h
index 522a0ed0296..d9b538bd63a 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h
@@ -25,14 +25,14 @@ public:
               PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~Identity_i (void);
+  ~Identity_i ();
 
   /// Returns the name of this object.
   virtual void get_name (CORBA::String_out name);
 
   /// Method for the POA that will return the persistent POA_ptr stored
   /// in here..
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// Stores the name of this object.
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 4c50b22b832..787623fdf51 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -32,13 +32,13 @@ Object_Group_Factory_i::Object_Group_Factory_i (CORBA::ORB_ptr orb,
                       &options));
 }
 
-Object_Group_Factory_i::~Object_Group_Factory_i (void)
+Object_Group_Factory_i::~Object_Group_Factory_i ()
 {
   delete this->mem_pool_;
 }
 
 PortableServer::POA_ptr
-Object_Group_Factory_i::_default_POA (void)
+Object_Group_Factory_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -438,13 +438,13 @@ Object_Group_Factory_i::list_groups (int random)
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (void)
+Object_Group_Factory_i::round_robin_groups ()
 {
   return list_groups (0);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (void)
+Object_Group_Factory_i::random_groups ()
 {
   return list_groups (1);
 }
@@ -500,7 +500,7 @@ Object_Group_Factory_i::update_flags (int random)
 }
 
 void
-Object_Group_Factory_i::update_objects (void)
+Object_Group_Factory_i::update_objects ()
 {
   // Create an appropriate servant.
   Object_Group_i * group_servant = 0;
@@ -563,7 +563,7 @@ Object_Group_i::Object_Group_i (const char * id,
 }
 
 
-Object_Group_i::~Object_Group_i (void)
+Object_Group_i::~Object_Group_i ()
 {
   // Need to delete all the items from the member_id_list, to avoid
   // memory leaks.
@@ -579,14 +579,14 @@ Object_Group_i::~Object_Group_i (void)
 
 
 PortableServer::POA_ptr
-Object_Group_i::_default_POA (void)
+Object_Group_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 
 char *
-Object_Group_i::id (void)
+Object_Group_i::id ()
 {
   return CORBA::string_dup (id_.c_str ());
 }
@@ -768,7 +768,7 @@ Object_Group_i::resolve_with_id (const char * id)
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (void)
+Object_Group_i::members ()
 {
   Load_Balancer::Member_ID_List * list = 0;
 
@@ -799,7 +799,7 @@ Object_Group_i::members (void)
 }
 
 void
-Object_Group_i::destroy (void)
+Object_Group_i::destroy ()
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
@@ -812,7 +812,7 @@ Object_Group_i::destroy (void)
 }
 
 void
-Object_Group_i::read_from_memory (void)
+Object_Group_i::read_from_memory ()
 {
     // Sanity check needs to be done in all the places
   ACE_CString id = this->id ();
@@ -867,7 +867,7 @@ Random_Object_Group::Random_Object_Group (const char *id,
 }
 
 char *
-Random_Object_Group::resolve (void)
+Random_Object_Group::resolve ()
 {
   this->read_from_memory ();
 
@@ -902,7 +902,7 @@ RR_Object_Group::RR_Object_Group (const char *id,
 }
 
 char *
-RR_Object_Group::resolve (void)
+RR_Object_Group::resolve ()
 {
   char *objref = 0;
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 9ed1a3fc2f7..d9cfd46c15d 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -53,12 +53,12 @@ public:
                           PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~Object_Group_Factory_i (void);
+  ~Object_Group_Factory_i ();
 
 
   /// Method for the POA that will return the persistent POA_ptr stored
   /// in here..
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
@@ -98,7 +98,7 @@ public:
    * a sequence of <Group_ID>s of all existing round robin
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * round_robin_groups (void);
+  Load_Balancer::Group_List * round_robin_groups ();
 
   /**
    * Lists all the random <Object_Group>s which were created
@@ -106,7 +106,7 @@ public:
    * a sequence of <Group_ID>s of all existing random
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * random_groups (void);
+  Load_Balancer::Group_List * random_groups ();
 
 private:
   /// Our ORB
@@ -138,7 +138,7 @@ private:
 
   /// This rolls back the status of the objects in the POA if the
   /// service had failed..
-  void update_objects (void);
+  void update_objects ();
 
   /// Map containing all random <Object_Group>s created by this factory.
   HASH_MAP *random_groups_;
@@ -185,16 +185,16 @@ public:
                   PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~Object_Group_i (void);
+  ~Object_Group_i ();
 
   // Persistent POA
   // Method for the POA
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   // = Load_Balancer::Object_Group idl methods.
 
   /// Get group's id.
-  char * id (void);
+  char * id ();
 
   /**
    * Adds a new <member> to the <Object_Group>.  Note that each
@@ -227,7 +227,7 @@ public:
   char * resolve_with_id (const char * id);
 
   /// Return a sequence of <Member_ID>s of all of its members.
-  Load_Balancer::Member_ID_List * members (void);
+  Load_Balancer::Member_ID_List * members ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -235,12 +235,12 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 
 protected:
   /// This will replenish all the pointers that could have been lost
   /// because of failure
-  void read_from_memory (void);
+  void read_from_memory ();
 
   /// Our POA
   PortableServer::POA_var poa_;
@@ -285,7 +285,7 @@ public:
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "random" load balancing policy.
-  char * resolve (void);
+  char * resolve ();
 };
 
 /**
@@ -310,7 +310,7 @@ public:
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "round robin" load balancing policy.
-  char * resolve (void);
+  char * resolve ();
 
 private:
   /// Index into the Object_Group_i::member_id_list_: keeps track of
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index 78028eecc73..f758ba10873 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -13,7 +13,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Load_Balancing_Service::Load_Balancing_Service (void)
+Load_Balancing_Service::Load_Balancing_Service ()
   : ior_output_file_ (0)
 {
 }
@@ -136,7 +136,7 @@ Load_Balancing_Service::init (int argc, ACE_TCHAR* argv[])
 
 
 int
-Load_Balancing_Service::run (void)
+Load_Balancing_Service::run ()
 {
   int result;
 
@@ -145,7 +145,7 @@ Load_Balancing_Service::run (void)
   return result;
 }
 
-Load_Balancing_Service::~Load_Balancing_Service (void)
+Load_Balancing_Service::~Load_Balancing_Service ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index 510d8483d50..b5c84935631 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
@@ -31,17 +31,17 @@ class Load_Balancing_Service
 {
 public:
   /// Default constructor.
-  Load_Balancing_Service (void);
+  Load_Balancing_Service ();
 
   /// Destructor.
-  ~Load_Balancing_Service (void);
+  ~Load_Balancing_Service ();
 
   /// Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   /// arguments, creates a servant ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 765a792642e..c5157ae2c99 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -6,11 +6,11 @@
 #include "ace/Log_Record.h"
 #include "ace/os_include/os_netdb.h"
 
-Logger_Factory_i::Logger_Factory_i (void)
+Logger_Factory_i::Logger_Factory_i ()
 {
 }
 
-Logger_Factory_i::~Logger_Factory_i (void)
+Logger_Factory_i::~Logger_Factory_i ()
 {
 }
 
@@ -68,7 +68,7 @@ Logger_i::Logger_i (const char *name)
   // Do nothing
 }
 
-Logger_i::~Logger_i (void)
+Logger_i::~Logger_i ()
 {
   ACE_OS::free (this->name_);
 }
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index 2b94f5ab540..3bb8414a11e 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -31,7 +31,7 @@ public:
   Logger_i (const char* name);
 
   /// destructor
-  virtual ~Logger_i (void);
+  virtual ~Logger_i ();
 
   /// Writes the <log_rec> to the standard output.
   virtual void log (const Logger::Log_Record &log_rec);
@@ -82,10 +82,10 @@ class Logger_Factory_i : public virtual POA_Logger_Factory
 {
 public:
   /// Constructor.
-  Logger_Factory_i (void);
+  Logger_Factory_i ();
 
   /// Destructor.
-  ~Logger_Factory_i (void);
+  ~Logger_Factory_i ();
 
   /**
    * This function returns a logger with name <name>. If <name> is
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 01068f6bfab..537c81cde11 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -1,14 +1,14 @@
 #include "Logging_Service_i.h"
 #include "tao/debug.h"
 
-Logger_Server::Logger_Server (void)
+Logger_Server::Logger_Server ()
   :service_name_ (ACE_TEXT("LoggingService"))
 {
   // Do nothing
 }
 
 int
-Logger_Server::parse_args (void)
+Logger_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:"));
   int c;
@@ -112,7 +112,7 @@ Logger_Server::init_naming_service ()
 }
 
 int
-Logger_Server::run (void)
+Logger_Server::run ()
 {
   int ret = this->orb_manager_.run ();
   if (ret == -1)
@@ -122,7 +122,7 @@ Logger_Server::run (void)
   return 0;
 }
 
-Logger_Server::~Logger_Server (void)
+Logger_Server::~Logger_Server ()
 {
   // Do nothing
 }
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index 72aec50c78e..f5b07aab74f 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -43,17 +43,17 @@ class Logger_Server
 {
 public:
   /// Constructor.
-  Logger_Server (void);
+  Logger_Server ();
 
   /// Destructor.
-  ~Logger_Server (void);
+  ~Logger_Server ();
 
   /// Initialize the Logger_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// This function creates and returns a logger with the given <name>.
   /// Currently, <name> is unused.
@@ -61,11 +61,11 @@ public:
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Initialises the name server and registers logger_factory with the
   /// name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index 86ce2bd23a2..60597175a72 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -10,13 +10,13 @@
 #include "ace/OS_NS_sys_time.h"
 
   // Constructor
-  Logger_Client::Logger_Client (void)
+  Logger_Client::Logger_Client ()
 {
   // Do nothing
 }
 
 // Destructor
-Logger_Client::~Logger_Client (void)
+Logger_Client::~Logger_Client ()
 {
   // Do nothing
 }
@@ -70,7 +70,7 @@ Logger_Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Logger_Client::init_naming_service (void)
+Logger_Client::init_naming_service ()
 {
   // Initialize the naming services
   if (my_name_client_.init (orb_.in ()) != 0)
@@ -124,7 +124,7 @@ Logger_Client::init_naming_service (void)
 }
 
 int
-Logger_Client::init_loggers (void)
+Logger_Client::init_loggers ()
 {
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
@@ -174,7 +174,7 @@ Logger_Client::init_loggers (void)
 // Execute client example code.
 
 int
-Logger_Client::run (void)
+Logger_Client::run ()
 {
   try
     {
@@ -261,7 +261,7 @@ Logger_Client::run (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Logger_Client::parse_args (void)
+Logger_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d"));
   int c;
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index 4ea1d598921..e151e38c9b4 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/examples/Logging/Logging_Test_i.h
@@ -41,20 +41,20 @@ class Logger_Client
 {
 public:
   /// Constructor.
-  Logger_Client (void);
+  Logger_Client ();
 
   /// Destructor.
-  ~Logger_Client (void);
+  ~Logger_Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Prepares the <Log_Record> for logging.
   void init_record (Logger::Log_Record &newrec,
@@ -62,10 +62,10 @@ private:
                     const char *msg);
 
   /// Initialises the name server and resolves the logger_factory
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Instantiates the 2 logger member variables
-  int init_loggers (void);
+  int init_loggers ();
 
   /// Shows contents of the record (for debugging purposes).
   void show_record (Logger::Log_Record &newrec);
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 45b412010c2..f760acfdf4c 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -13,21 +13,21 @@
 // Constructor.
 
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
     : ior_output_file_ (0)
 {
 }
 
 // Destructor.
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:"));
   int c = 0;
@@ -124,7 +124,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
     // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -136,7 +136,7 @@ Server<Servant>::run (void)
 }
 
 template <class Servant> int
-Server<Servant>::register_name (void)
+Server<Servant>::register_name ()
 {
   return -1;
 }
@@ -144,7 +144,7 @@ Server<Servant>::register_name (void)
 // Constructor.
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
+Client<InterfaceObj, Var>::Client ()
   : ior_ (0)
 {
   //no-op
@@ -183,7 +183,7 @@ Client<InterfaceObj, Var>::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
+Client<InterfaceObj, Var>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:nk:x"));
   int c = 0;
@@ -216,7 +216,7 @@ Client<InterfaceObj, Var>::parse_args (void)
 }
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
+Client<InterfaceObj, Var>::~Client ()
 {
   ACE_OS::free (this->ior_);
 }
@@ -271,7 +271,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (void)
+Client<InterfaceObj, Var>::obtain_initial_references ()
 {
   return 0;
 }
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 9185c1f0f6f..30b9d2fe8ee 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -35,10 +35,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -48,10 +48,10 @@ public:
 
   /// After calling <init>, this method will register the server with
   /// the TAO Naming Service using the servant_name passed to <init>.
-  int register_name (void);
+  int register_name ();
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 protected:
   /// Servant class
@@ -61,7 +61,7 @@ protected:
   const char *name;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
@@ -94,10 +94,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
@@ -112,14 +112,14 @@ public:
   void shutdown (int);
 
   /// Initialize naming service
-  int obtain_initial_references (void);
+  int obtain_initial_references ();
 
 protected:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
 //  TAO_Naming_Client namingClient;
   // helper class for getting access to Naming Service.
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index f16ddf658fd..54ee02013ee 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -88,13 +88,13 @@ Checkpoint_Client_i::run (const char *name,
 }
 
 // Constructor.
-Checkpoint_Client_i::Checkpoint_Client_i (void)
+Checkpoint_Client_i::Checkpoint_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Checkpoint_Client_i::~Checkpoint_Client_i (void)
+Checkpoint_Client_i::~Checkpoint_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h
index 31663db5ee6..0be2eeffcfa 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.h
+++ b/TAO/examples/OBV/Typed_Events/Client_i.h
@@ -33,10 +33,10 @@ class Checkpoint_Client_i
 {
 public:
   /// Constructor
-  Checkpoint_Client_i (void);
+  Checkpoint_Client_i ();
 
   /// Destructor
-  virtual  ~Checkpoint_Client_i (void);
+  virtual  ~Checkpoint_Client_i ();
 
   /// Execute the methods
   virtual int run (const char *,int, ACE_TCHAR** );
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 7ce46031ad8..a52f9f7530a 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -17,7 +17,7 @@ Event_impl::~Event_impl ()
 }
 
 ::CORBA::ValueBase *
-Event_impl::_copy_value (void)
+Event_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -25,7 +25,7 @@ Event_impl::_copy_value (void)
 }
 
 void
-Event_impl::do_print (void)
+Event_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG, "(time %d origin %d)  ",
              (CORBA::ULong) this->time_(),
@@ -38,7 +38,7 @@ Event_factory::~Event_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (void)
+Event_factory::create_for_unmarshal ()
 {
   return new Event_impl;
 }
@@ -60,7 +60,7 @@ Temperature_impl::~Temperature_impl ()
 }
 
 ::CORBA::ValueBase *
-Temperature_impl::_copy_value (void)
+Temperature_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -68,7 +68,7 @@ Temperature_impl::_copy_value (void)
 }
 
 void
-Temperature_impl::do_print (void)
+Temperature_impl::do_print ()
 {
   // The timestamp
   Event_impl::do_print ();
@@ -81,7 +81,7 @@ Temperature_factory::~Temperature_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Temperature)
-Temperature_factory::create_for_unmarshal (void)
+Temperature_factory::create_for_unmarshal ()
 {
   return new Temperature_impl;
 }
@@ -103,7 +103,7 @@ Position_impl::~Position_impl ()
 }
 
 ::CORBA::ValueBase *
-Position_impl::_copy_value (void)
+Position_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -111,7 +111,7 @@ Position_impl::_copy_value (void)
 }
 
 void
-Position_impl::do_print (void)
+Position_impl::do_print ()
 {
   // The timestamp
   Event_impl::do_print ();
@@ -126,7 +126,7 @@ Position_impl::do_print (void)
              x, y, z));
 }
 
-CORBA::Float Position_impl::x (void)
+CORBA::Float Position_impl::x ()
 {
   return this->xyz()[0];
 }
@@ -136,7 +136,7 @@ void Position_impl::x (CORBA::Float x)
   this->xyz()[0] = x;
 }
 
-CORBA::Float Position_impl::y (void)
+CORBA::Float Position_impl::y ()
 {
   return this->xyz()[1];
 }
@@ -146,7 +146,7 @@ void Position_impl::y (CORBA::Float y)
   this->xyz()[1] = y;
 }
 
-CORBA::Float Position_impl::z (void)
+CORBA::Float Position_impl::z ()
 {
   return this->xyz()[2];
 }
@@ -161,7 +161,7 @@ Position_factory::~Position_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Position)
-Position_factory::create_for_unmarshal (void)
+Position_factory::create_for_unmarshal ()
 {
   return new Position_impl;
 }
@@ -183,7 +183,7 @@ Log_Msg_impl::~Log_Msg_impl ()
 }
 
 ::CORBA::ValueBase *
-Log_Msg_impl::_copy_value (void)
+Log_Msg_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -191,7 +191,7 @@ Log_Msg_impl::_copy_value (void)
 }
 
 void
-Log_Msg_impl::do_print (void)
+Log_Msg_impl::do_print ()
 {
   // The timestamp
   Event_impl::do_print ();
@@ -211,7 +211,7 @@ Log_Msg_factory::~Log_Msg_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)
-Log_Msg_factory::create_for_unmarshal (void)
+Log_Msg_factory::create_for_unmarshal ()
 {
   return new Log_Msg_impl;
 }
@@ -240,7 +240,7 @@ Event_List_Link_impl::~Event_List_Link_impl ()
 }
 
 ::CORBA::ValueBase *
-Event_List_Link_impl::_copy_value (void)
+Event_List_Link_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -248,13 +248,13 @@ Event_List_Link_impl::_copy_value (void)
 }
 
 Event*
-Event_List_Link_impl::get_event (void)
+Event_List_Link_impl::get_event ()
 {
   return this->my_event ();
 }
 
 Event_List_Link*
-Event_List_Link_impl::get_next_link (void)
+Event_List_Link_impl::get_next_link ()
 {
   return this->next ();
 }
@@ -270,26 +270,26 @@ Event_List_Link_factory::~Event_List_Link_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)
-Event_List_Link_factory::create_for_unmarshal (void)
+Event_List_Link_factory::create_for_unmarshal ()
 {
   return new Event_List_Link_impl;
 }
 
 // Event_List implementation  ===================================
 
-Event_List_impl::Event_List_impl (void)
+Event_List_impl::Event_List_impl ()
 {
   this->first_link (0);
   this->last_link_cache_ = 0;
 }
 
-Event_List_impl::~Event_List_impl (void)
+Event_List_impl::~Event_List_impl ()
 {
   // Destructor does nothing explicit, because the _var types do care.
 }
 
 ::CORBA::ValueBase *
-Event_List_impl::_copy_value (void)
+Event_List_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -337,12 +337,12 @@ Event_List_impl::store_event (Event* e)
     }
 }
 
-Event_List_factory::~Event_List_factory (void)
+Event_List_factory::~Event_List_factory ()
 {
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event_List)
-Event_List_factory::create_for_unmarshal (void)
+Event_List_factory::create_for_unmarshal ()
 {
   return new Event_List_impl;
 }
@@ -352,12 +352,12 @@ Event_List_Iterator::Event_List_Iterator (Event_List *list)
   this->init (list);
 }
 
-Event_List_Iterator::Event_List_Iterator (void)
+Event_List_Iterator::Event_List_Iterator ()
 {
   // current_ is a _var and set itself to null.
 }
 
-Event_List_Iterator::~Event_List_Iterator (void)
+Event_List_Iterator::~Event_List_Iterator ()
 {
   // nothing
 }
@@ -428,7 +428,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl ()
 }
 
 ::CORBA::ValueBase *
-Temperature_Criterion_impl::_copy_value (void)
+Temperature_Criterion_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -452,7 +452,7 @@ Temperature_Criterion_impl::is_critical (Event* e)
 }
 
 void
-Temperature_Criterion_impl::do_print (void)
+Temperature_Criterion_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
              this->origin_id_ () ));
@@ -464,7 +464,7 @@ Temperature_Criterion_factory::~Temperature_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion)
-Temperature_Criterion_factory::create_for_unmarshal (void)
+Temperature_Criterion_factory::create_for_unmarshal ()
 {
   return new Temperature_Criterion_impl;
 }
@@ -487,7 +487,7 @@ Position_Criterion_impl::~Position_Criterion_impl ()
 }
 
 ::CORBA::ValueBase *
-Position_Criterion_impl::_copy_value (void)
+Position_Criterion_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -529,7 +529,7 @@ Position_Criterion_factory::~Position_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)
-Position_Criterion_factory::create_for_unmarshal (void)
+Position_Criterion_factory::create_for_unmarshal ()
 {
   return new Position_Criterion_impl;
 }
@@ -543,7 +543,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
 }
 
 ::CORBA::ValueBase *
-Log_Msg_Criterion_impl::_copy_value (void)
+Log_Msg_Criterion_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -564,7 +564,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e)
 }
 
 void
-Log_Msg_Criterion_impl::do_print (void)
+Log_Msg_Criterion_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG,
              "All log messages with urgency greater zero are registered.\n" ));
@@ -575,7 +575,7 @@ Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)
-Log_Msg_Criterion_factory::create_for_unmarshal (void)
+Log_Msg_Criterion_factory::create_for_unmarshal ()
 {
   return new Log_Msg_Criterion_impl;
 }
@@ -596,7 +596,7 @@ Criterion_List_impl::~Criterion_List_impl ()
 }
 
 ::CORBA::ValueBase *
-Criterion_List_impl::_copy_value (void)
+Criterion_List_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index 93657769e99..3f9b7213a56 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -48,9 +48,9 @@ class Event_impl : public virtual OBV_Event,
  public:
   Event_impl ();
   virtual ~Event_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual void do_print (void);
+  virtual void do_print ();
   // Implementation of the do_print () operation the valuetype should have.
   // All operations in valuetypes are virtual.
 
@@ -85,7 +85,7 @@ protected:
   virtual ~Event_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal ();
 };
 #endif /* is not defined */
 
@@ -119,9 +119,9 @@ public:
   // But it is more simple to do so here.
 
   virtual ~Temperature_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual void do_print (void);
+  virtual void do_print ();
   // Overrides Event_impl::do_print (). Note that a new declaration
   // in IDL in a derived class is not allowed.
 };
@@ -137,7 +137,7 @@ protected:
   virtual ~Temperature_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal ();
 };
 
 // Position implementation classes =====================================
@@ -149,17 +149,17 @@ public:
   Position_impl ();
   Position_impl (Point &p);
   virtual ~Position_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual CORBA::Float x (void);
+  virtual CORBA::Float x ();
   virtual void x (CORBA::Float);
-  virtual CORBA::Float y (void);
+  virtual CORBA::Float y ();
   virtual void y (CORBA::Float);
-  virtual CORBA::Float z (void);
+  virtual CORBA::Float z ();
   virtual void z (CORBA::Float);
   //These are the attributes
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Position_factory : public CORBA::ValueFactoryBase
@@ -173,7 +173,7 @@ protected:
   virtual ~Position_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal ();
 };
 
 // Log_Msg implementation classes =====================================
@@ -185,9 +185,9 @@ public:
   Log_Msg_impl ();
   Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
   virtual ~Log_Msg_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Log_Msg_factory : public CORBA::ValueFactoryBase
@@ -201,7 +201,7 @@ protected:
   virtual ~Log_Msg_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal ();
 };
 
 // Event_List_Link implementation classes =====================================
@@ -220,12 +220,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link,
   Event_List_Link_impl ();
   Event_List_Link_impl (Event *e);
   virtual ~Event_List_Link_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  Event *get_event (void);
+  Event *get_event ();
 
  private:
-  Event_List_Link *get_next_link (void);
+  Event_List_Link *get_next_link ();
 
   void attach_next_link (Event_List_Link * chain);
   // Attach a chain at the end.
@@ -239,7 +239,7 @@ protected:
   virtual ~Event_List_Link_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal ();
 };
 
 // The event list itself.   ----------------------------------
@@ -252,11 +252,11 @@ class Event_List_impl : public virtual OBV_Event_List,
  public:
   Event_List_impl ();
   virtual ~Event_List_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   void store_event (Event* e);
 
-  Event_List_Link *get_first_link(void);
+  Event_List_Link *get_first_link();
   // The iterator needs it.
 
  private:
@@ -280,13 +280,13 @@ protected:
   virtual ~Event_List_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal ();
 };
 
 class Event_List_Iterator
 {
  public:
-  Event_List_Iterator (void);
+  Event_List_Iterator ();
   Event_List_Iterator (Event_List *list);
   // Construct it to point to the first list link.
 
@@ -328,11 +328,11 @@ public:
   Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp);
 
   virtual ~Temperature_Criterion_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Temperature_Criterion_factory : public CORBA::ValueFactoryBase
@@ -341,7 +341,7 @@ class Temperature_Criterion_factory : public CORBA::ValueFactoryBase
 
 private:
   virtual ~Temperature_Criterion_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal ();
 };
 
 class Position_Criterion_impl :
@@ -355,11 +355,11 @@ public:
                            Position *lb,
                            Position *tr);
   virtual ~Position_Criterion_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Position_Criterion_factory : public CORBA::ValueFactoryBase
@@ -370,7 +370,7 @@ protected:
   virtual ~Position_Criterion_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal ();
 };
 
 class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion,
@@ -380,11 +380,11 @@ class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion,
 public:
   Log_Msg_Criterion_impl ();
   virtual ~Log_Msg_Criterion_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase
@@ -395,7 +395,7 @@ protected:
   virtual ~Log_Msg_Criterion_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal ();
 };
 
 class Criterion_List_impl : public virtual OBV_Criterion_List,
@@ -404,7 +404,7 @@ class Criterion_List_impl : public virtual OBV_Criterion_List,
  public:
   Criterion_List_impl ();
   virtual ~Criterion_List_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   void store_criterion (Criterion *c);
   CORBA::Boolean is_critical (Event *e);
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index e317239e1d2..b9bf7e3de68 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -128,7 +128,7 @@ Checkpoint_i::put_event (Event *event)
 
 
 Event_List *
-Checkpoint_i::get_critical_events (void)
+Checkpoint_i::get_critical_events ()
 {
   // The skeleton should not steal our list by decrementing
   // the reference counter.
@@ -144,7 +144,7 @@ Checkpoint_i::get_critical_events (void)
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (void)
+Checkpoint_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nThe Checkpoint server is shutting down\n"));
@@ -156,12 +156,12 @@ Checkpoint_i::shutdown (void)
 
 // Constructor.
 
-Checkpoint_i::Checkpoint_i (void)
+Checkpoint_i::Checkpoint_i ()
 {
 }
 
 // Destructor.
 
-Checkpoint_i::~Checkpoint_i (void)
+Checkpoint_i::~Checkpoint_i ()
 {
 }
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
index 01ee4d8fdb3..f433bc1e191 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -21,10 +21,10 @@ class Checkpoint_i : public POA_Checkpoint
 {
 public:
   /// Constructor.
-  Checkpoint_i (void);
+  Checkpoint_i ();
 
   /// Destructor.
-  ~Checkpoint_i (void);
+  ~Checkpoint_i ();
 
   virtual void put_event (
         Event * e
@@ -34,7 +34,7 @@ public:
   );
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index 9c674fe0ea6..f1f82f59e9b 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -5,7 +5,7 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Grid_Client_i::Grid_Client_i (void)
+Grid_Client_i::Grid_Client_i ()
   : height_ (0),
     width_ (0),
     setx_ (0),
@@ -17,7 +17,7 @@ Grid_Client_i::Grid_Client_i (void)
 }
 
 //Destructor.
-Grid_Client_i::~Grid_Client_i (void)
+Grid_Client_i::~Grid_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.h b/TAO/examples/Persistent_Grid/Grid_Client_i.h
index 615a4a50fc6..3a44409b072 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.h
@@ -29,10 +29,10 @@ class Grid_Client_i
 {
 public:
   /// Constructor
-  Grid_Client_i (void);
+  Grid_Client_i ();
 
   /// Destructor
-  virtual ~Grid_Client_i (void);
+  virtual ~Grid_Client_i ();
 
   /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 91ed608427f..8be57e51736 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -3,7 +3,7 @@
 
 // Default constructor.
 
-Grid_i::Grid_i (void)
+Grid_i::Grid_i ()
   : width_ (0),
     height_ (0),
     array_ (0)
@@ -58,7 +58,7 @@ Grid_i::Grid_i (CORBA::Short x,
 
 // Default destructor.
 
-Grid_i::~Grid_i (void)
+Grid_i::~Grid_i ()
 {
 }
 
@@ -96,13 +96,13 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (void)
+Grid_i::width ()
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (void)
+Grid_i::height ()
 {
   return this->height_;
 }
@@ -142,7 +142,7 @@ Grid_i::set_pool (pool_t *pool)
 }
 // Constructor
 
-Grid_Factory_i::Grid_Factory_i (void)
+Grid_Factory_i::Grid_Factory_i ()
   : orb_ (0),
     pool_name_ (0),
     pool_t_ (0)
@@ -151,7 +151,7 @@ Grid_Factory_i::Grid_Factory_i (void)
 
 // Destructor
 
-Grid_Factory_i::~Grid_Factory_i (void)
+Grid_Factory_i::~Grid_Factory_i ()
 {
   delete this->pool_t_;
 }
@@ -207,7 +207,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (void)
+Grid_Factory_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%P|%t) %s\n",
@@ -218,7 +218,7 @@ Grid_Factory_i::shutdown (void)
 }
 
 void
-Grid_Factory_i::cleanup (void)
+Grid_Factory_i::cleanup ()
 {
   const char *name = "Array";
 
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index 31a1dc8dec3..dcaa6d3aac5 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -30,17 +30,17 @@ class Grid_Factory_i : public POA_Grid_Factory
 {
 public:
   /// Constructor.
-  Grid_Factory_i (void);
+  Grid_Factory_i ();
 
   /// Destructor.
-  ~Grid_Factory_i (void);
+  ~Grid_Factory_i ();
 
   /// This function creates and returns a <Grid>.
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Do a clean up of the memory map
   virtual void cleanup ( );
@@ -76,19 +76,19 @@ class Grid_i: public POA_Grid
 {
 public:
   /// Constructor
-  Grid_i (void);
+  Grid_i ();
 
   /// Constructor.
   Grid_i (CORBA::Short, CORBA::Short, pool_t *);
 
   /// Destructor
-  ~Grid_i (void);
+  ~Grid_i ();
 
   /// Returns the width of the grid
-  virtual CORBA::Short width (void);
+  virtual CORBA::Short width ();
 
   /// Returns the height of the grid
-  virtual CORBA::Short height (void);
+  virtual CORBA::Short height ();
 
   /// Sets the width of the grid.
   virtual void width (CORBA::Short);
@@ -106,7 +106,7 @@ public:
                            CORBA::Short);
 
   /// Destroy the grid.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Set a pointer to the pool
   void set_pool (pool_t *);
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client.h b/TAO/examples/Persistent_Grid/Persistent_Client.h
index 32d3c55f5c9..e8c62731969 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client.h
+++ b/TAO/examples/Persistent_Grid/Persistent_Client.h
@@ -29,10 +29,10 @@ class Persistent_Client_i
 {
 public:
   /// Constructor
-  Persistent_Client_i (void);
+  Persistent_Client_i ();
 
   /// Destructor
-  virtual ~Persistent_Client_i (void);
+  virtual ~Persistent_Client_i ();
 
   /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index 6073083f88f..dd4a4e14d90 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -5,7 +5,7 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Persistent_Client_i::Persistent_Client_i (void)
+Persistent_Client_i::Persistent_Client_i ()
   : height_ (0),
     width_ (0)
 {
@@ -13,7 +13,7 @@ Persistent_Client_i::Persistent_Client_i (void)
 }
 
 //Destructor.
-Persistent_Client_i::~Persistent_Client_i (void)
+Persistent_Client_i::~Persistent_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index 3984299e49b..90bae9293f5 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -10,7 +10,7 @@
 // Constructor.
 
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
   : ior_output_file_ (0),
     mem_pool_name_ (0)
 {
@@ -19,14 +19,14 @@ Server<Servant>::Server (void)
 // Destructor.
 
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:m:"));
   int c = 0;
@@ -130,7 +130,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant> int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
     // Run the main event loop for the ORB.
   int ret = this->orb_manager_.run ();
@@ -150,7 +150,7 @@ Server<Servant>::run (void)
 
 // Constructor.
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
+Client<InterfaceObj, Var>::Client ()
   : ior_ (0)
 {
   //no-op
@@ -189,7 +189,7 @@ Client<InterfaceObj, Var>::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
+Client<InterfaceObj, Var>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:k:x"));
   int c = 0;
@@ -222,7 +222,7 @@ Client<InterfaceObj, Var>::parse_args (void)
 }
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
+Client<InterfaceObj, Var>::~Client ()
 {
   ACE_OS::free (this->ior_);
 }
@@ -273,7 +273,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::shutdown (void)
+Client<InterfaceObj, Var>::shutdown ()
 {
   // Returns the shutdwon flag
   return shutdown_;
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index 24367cc0d0d..d9272e1fe0c 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -33,10 +33,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -44,12 +44,12 @@ public:
             int argc,
             ACE_TCHAR *argv[]);
 
-  // int register_name (void);
+  // int register_name ();
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
  protected:
   /// Servant class
@@ -59,7 +59,7 @@ public:
   const char *name;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
@@ -95,10 +95,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
@@ -113,14 +113,14 @@ public:
   void shutdown (int);
 
   /// Initialize naming service
-  int obtain_initial_references (void);
+  int obtain_initial_references ();
 
 protected:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index b0f4c261305..ce2b60542e8 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -20,7 +20,7 @@ UDP_PerformanceClient::UDP_PerformanceClient (CORBA::ORB_ptr orb,
 }
 
 //Destructor.
-UDP_PerformanceClient::~UDP_PerformanceClient (void)
+UDP_PerformanceClient::~UDP_PerformanceClient ()
 {
   //no-op
 }
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
index 5a13402ce67..ea87bd4f6d0 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
@@ -37,7 +37,7 @@ public:
                          ACE_UINT32 burst_messages);
 
   /// Destructor
-  virtual ~UDP_PerformanceClient (void);
+  virtual ~UDP_PerformanceClient ();
 
 private:
   // Runs in a separate thread.
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index 47d93a2863d..5f932e4d5e9 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -2,14 +2,14 @@
 
 
 // Constructor
-UDP_i::UDP_i (void)
+UDP_i::UDP_i ()
   : messages_count_ (0)
   , wrong_messages_count_ (0)
 {
 }
 
 // Destructor
-UDP_i::~UDP_i (void)
+UDP_i::~UDP_i ()
 {
 }
 
@@ -104,7 +104,7 @@ UDP_i::reset (const char * client_name)
 // Shutdown.
 
 void
-UDP_i::shutdown (void)
+UDP_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
index cfb27be63d7..12eab1d599d 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
@@ -27,10 +27,10 @@ class UDP_i: public POA_UDP
 {
 public:
   /// Constructor
-  UDP_i (void);
+  UDP_i ();
 
   /// Destructor
-  ~UDP_i (void);
+  ~UDP_i ();
 
   virtual void setResponseHandler (UDP_ptr udpHandler);
 
@@ -40,7 +40,7 @@ public:
   virtual void reset (const char * client_name);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index cf4cc23bf95..17fac18d59f 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -145,7 +145,7 @@ Client::Client (Simple_Server_ptr server,
 
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index a9c9d47744e..3bea2eb8282 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -30,7 +30,7 @@ Simple_Server_i::get_number (CORBA::Long)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Simple_Server_i::shutdown\n"));
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
index 37796d06ecc..ea18f61e54f 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
@@ -33,7 +33,7 @@ public:
 
   CORBA::Long get_number (CORBA::Long num);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index e6c22dccfd2..dd925c6cedc 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -13,13 +13,13 @@
 
 #include "Factory_Finder.h"
 
-Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void)
+Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server ()
 :   debug_level_ (1)
 {
   // Nothing
 }
 
-Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
+Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server ()
 {
   try
     {
@@ -146,7 +146,7 @@ Quoter_Factory_Finder_Server::init (int argc,
 }
 
 int
-Quoter_Factory_Finder_Server::run (void)
+Quoter_Factory_Finder_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -161,7 +161,7 @@ Quoter_Factory_Finder_Server::run (void)
 // Function get_options.
 
 u_int
-Quoter_Factory_Finder_Server::parse_args (void)
+Quoter_Factory_Finder_Server::parse_args ()
 {
   ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("?d:"));
   int opt;
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 1ca45ac5e93..5dcb8c46ad0 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -31,19 +31,19 @@ class Quoter_Factory_Finder_Server
 {
 public:
   /// Default constructor
-  Quoter_Factory_Finder_Server (void);
+  Quoter_Factory_Finder_Server ();
 
   /// Destructor
-  ~Quoter_Factory_Finder_Server (void);
+  ~Quoter_Factory_Finder_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
   /// parse the passed parameters
-  u_int parse_args (void);
+  u_int parse_args ();
 
 private:
   /// instance of the ORB Manager
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 461ccaccd91..c67a55c1bff 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -26,7 +26,7 @@ Quoter_Factory_Finder_i::Quoter_Factory_Finder_i (int debug_level)
 }
 
 // Destructor.
-Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
+Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i ()
 {
   // Nothing
 }
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index aa6409d0e7f..32bfe203aeb 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -25,7 +25,7 @@ class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder
 {
 public:
   Quoter_Factory_Finder_i (int debug_level = 1);
-  ~Quoter_Factory_Finder_i (void);
+  ~Quoter_Factory_Finder_i ();
 
   /**
    * Returns a sequence of Factories if factories matching the
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index c4a09c2923d..a008cc8d16a 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -14,13 +14,13 @@
 
 #include "orbsvcs/LifeCycleServiceC.h"
 
-Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
+Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server ()
 : use_LifeCycle_Service_ (0),
   debug_level_ (1)
 {
 }
 
-Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
+Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server ()
 {
   try
     {
@@ -195,7 +195,7 @@ Quoter_Generic_Factory_Server::init (int argc,
 }
 
 int
-Quoter_Generic_Factory_Server::run (void)
+Quoter_Generic_Factory_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -209,7 +209,7 @@ Quoter_Generic_Factory_Server::run (void)
 // Function get_options.
 
 u_int
-Quoter_Generic_Factory_Server::parse_args (void)
+Quoter_Generic_Factory_Server::parse_args ()
 {
   ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("l?d:"));
   int opt;
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 8f4f86191ac..71c994a0c1a 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -31,20 +31,20 @@ class Quoter_Generic_Factory_Server
 {
 public:
   /// Default constructor
-  Quoter_Generic_Factory_Server (void);
+  Quoter_Generic_Factory_Server ();
 
   /// Destructor
-  ~Quoter_Generic_Factory_Server (void);
+  ~Quoter_Generic_Factory_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Parse the passed parameters.
-  u_int parse_args (void);
+  u_int parse_args ();
 
 private:
   /// instance of the ORB Manager
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index 66a60ebb862..57165cbde26 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -25,7 +25,7 @@ Quoter_Generic_Factory_i::Quoter_Generic_Factory_i (int debug_level)
 }
 
 // Destructor.
-Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
+Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i ()
 {
 }
 
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index cb6d51e9179..7515831d311 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -26,7 +26,7 @@ class Quoter_Generic_Factory_i : public POA_Stock::Quoter_Generic_Factory
 {
 public:
   Quoter_Generic_Factory_i (int debug_level = 1);
-  ~Quoter_Generic_Factory_i (void);
+  ~Quoter_Generic_Factory_i ();
 
   /// Returns true if the Generic Factory is able to forward a request
   /// for creating an object described by the <factory_key>.
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 7c25746e4a4..c789ac4b870 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -27,7 +27,7 @@ Quoter_Factory_i::Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr)
 
 // Destructor
 
-Quoter_Factory_i::~Quoter_Factory_i (void)
+Quoter_Factory_i::~Quoter_Factory_i ()
 {
   for (size_t i = 0; i < this->quoter_num_; i++)
     delete this->my_quoters_[i];
@@ -37,7 +37,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 
 // Initialize everything in the factory
 
-int Quoter_Factory_i::init (void)
+int Quoter_Factory_i::init ()
 {
   ACE_NEW_RETURN (this->my_quoters_,
                   Quoter_i *[this->quoter_num_],
@@ -104,7 +104,7 @@ Quoter_i::Quoter_i (const char *name,
 
 // Destructor
 
-Quoter_i::~Quoter_i (void)
+Quoter_i::~Quoter_i ()
 {
   // Nothing
 }
@@ -248,7 +248,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (void)
+Quoter_i::remove ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n"));
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index 476ce8b769e..2539a4261f3 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -38,7 +38,7 @@ public:
             PortableServer::POA_ptr poa_ptr = 0);
 
   /// Destructor
-  ~Quoter_i (void);
+  ~Quoter_i ();
 
   /// Returns the current quote for the stock <stock_name>
   virtual CORBA::Long get_quote (const char *stock_name);
@@ -54,7 +54,7 @@ public:
                      const CosLifeCycle::Criteria &the_criteria);
 
   /// Removes the object.
-  virtual void remove (void);
+  virtual void remove ();
 
 private:
   /// This flag defines if a Generic Factory is used (0 by default) or
@@ -84,10 +84,10 @@ public:
   Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr);
 
   /// Destructor.
-  ~Quoter_Factory_i (void);
+  ~Quoter_Factory_i ();
 
   /// Initialize everything in the factory
-  int init (void);
+  int init ();
 
   /// Return the quoter by the id <name>.
   virtual Stock::Quoter_ptr create_quoter (const char *name);
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index a65a944c5e1..e5eb55e1407 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -11,7 +11,7 @@ Quoter_Task::Quoter_Task (int argc, ACE_TCHAR **argv)
 }
 
 int
-Quoter_Task::svc (void)
+Quoter_Task::svc ()
 {
   if (this->quoter_client.init (this->argc_, this->argv_) == -1)
     return 1;
@@ -20,7 +20,7 @@ Quoter_Task::svc (void)
 }
 
 // Constructor.
-Quoter_Client::Quoter_Client (void)
+Quoter_Client::Quoter_Client ()
   : quoter_factory_key_ (0),
     quoter_key_ (ACE_OS::strdup ("key0")),
     shutdown_ (0),
@@ -34,7 +34,7 @@ Quoter_Client::Quoter_Client (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Quoter_Client::parse_args (void)
+Quoter_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("n:d:lx"));
   int opt;
@@ -78,7 +78,7 @@ Quoter_Client::parse_args (void)
 }
 
 int
-Quoter_Client::run (void)
+Quoter_Client::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -135,7 +135,7 @@ Quoter_Client::run (void)
   return 0;
 }
 
-Quoter_Client::~Quoter_Client (void)
+Quoter_Client::~Quoter_Client ()
 {
   // Free resources
   // Close the ior files
@@ -146,7 +146,7 @@ Quoter_Client::~Quoter_Client (void)
 }
 
 int
-Quoter_Client::init_naming_service (void)
+Quoter_Client::init_naming_service ()
 {
   const char *exception_message = "Null Message";
 
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index 35721ddd9f1..298fb1075f0 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -37,11 +37,11 @@ class Quoter_Client
 {
 public:
   // = Constructor and destructor.
-  Quoter_Client (void);
-  ~Quoter_Client (void);
+  Quoter_Client ();
+  ~Quoter_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
@@ -51,10 +51,10 @@ private:
   CORBA::ORB_var orb_;
 
   /// Function to initialize the naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index 6907e551726..476d2911c17 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -12,7 +12,7 @@
 #include "server.h"
 #include "tao/ORB_Core.h"
 
-Quoter_Server::Quoter_Server (void)
+Quoter_Server::Quoter_Server ()
   : num_of_objs_ (1),
     quoter_Factory_i_ptr_ (0),
     debug_level_ (1)
@@ -20,7 +20,7 @@ Quoter_Server::Quoter_Server (void)
 }
 
 int
-Quoter_Server::parse_args (void)
+Quoter_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d:n:"));
   int c;
@@ -141,7 +141,7 @@ Quoter_Server::init (int argc,
 // and Quoter_factory object.
 
 int
-Quoter_Server::init_naming_service (void)
+Quoter_Server::init_naming_service ()
 {
   const char *exception_message = "Null Message";
   try
@@ -192,7 +192,7 @@ Quoter_Server::init_naming_service (void)
 }
 
 int
-Quoter_Server::run (void)
+Quoter_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -203,7 +203,7 @@ Quoter_Server::run (void)
   return 0;
 }
 
-Quoter_Server::~Quoter_Server (void)
+Quoter_Server::~Quoter_Server ()
 {
   try
     {
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index cefb4aca3a4..2658f5c0e29 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -42,24 +42,24 @@ class Quoter_Server
 {
 public:
   /// Default constructor
-  Quoter_Server (void);
+  Quoter_Server ();
 
   /// Destructor
-  ~Quoter_Server (void);
+  ~Quoter_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Initializes the name server and registers cubit factory with the
   /// name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Number of quoter objects we export.
   int num_of_objs_;
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index ba7dab08712..f20c5e9d531 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -26,7 +26,7 @@ extern "C" void handler (int)
 
 //***************************************************************//
 
-Activity::Activity (void)
+Activity::Activity ()
   :builder_ (0),
    barrier_ (0),
    active_task_count_ (0),
@@ -35,7 +35,7 @@ Activity::Activity (void)
   state_lock_ = new ACE_Lock_Adapter <TAO_SYNCH_MUTEX>;
 }
 
-Activity::~Activity (void)
+Activity::~Activity ()
 {
   delete state_lock_;
   delete barrier_;
@@ -48,13 +48,13 @@ Activity::builder (Builder* builder)
 }
 
 CORBA::ORB_ptr
-Activity::orb (void)
+Activity::orb ()
 {
   return orb_.in ();
 }
 
 RTCORBA::Current_ptr
-Activity::current (void)
+Activity::current ()
 {
   return current_.in ();
 }
@@ -101,7 +101,7 @@ Activity::init (int& argc, ACE_TCHAR *argv [])
 }
 
 int
-Activity::resolve_naming_service (void)
+Activity::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -119,7 +119,7 @@ Activity::resolve_naming_service (void)
 }
 
 void
-Activity::activate_poa_list (void)
+Activity::activate_poa_list ()
 {
   POA_LIST list;
   int count = builder_->poa_list (list);
@@ -131,7 +131,7 @@ Activity::activate_poa_list (void)
 }
 
 void
-Activity::activate_job_list (void)
+Activity::activate_job_list ()
 {
   JOB_LIST list;
   int count = builder_->job_list (list);
@@ -178,7 +178,7 @@ Activity::activate_job_list (void)
 }
 
 void
-Activity::activate_schedule (void)
+Activity::activate_schedule ()
 {
   TASK_LIST list;
   int count = builder_->task_list (list);
@@ -269,7 +269,7 @@ Activity::job_ended (Job_i* /*ended_job*/)
 }
 
 void
-Activity::check_ifexit (void)
+Activity::check_ifexit ()
 {
   // All tasks have finished and all jobs have been shutdown.
   if (active_task_count_ == 0 && active_job_count_ == 0)
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index 8f8ffa04ee2..34582c21a32 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -52,11 +52,11 @@ public:
   void run (int argc, ACE_TCHAR *argv[]);
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// = Accessors
-  CORBA::ORB_ptr orb (void);
-  RTCORBA::Current_ptr current (void);
+  CORBA::ORB_ptr orb ();
+  RTCORBA::Current_ptr current ();
   void builder (Builder* builder);
 
   /// Returns priority if server declared model else -1
@@ -71,16 +71,16 @@ public:
 protected:
   /// = Activation methods.
   /// Activate the POA's
-  void activate_poa_list (void);
+  void activate_poa_list ();
 
   /// Activate the task list.
-  void activate_schedule (void);
+  void activate_schedule ();
 
   /// Activate the Job's
-  void activate_job_list (void);
+  void activate_job_list ();
 
   /// Check if we should process exit
-  void check_ifexit (void);
+  void check_ifexit ();
 
   /// Create a file whose name is specified in the -Started_Flag <file_name> argument at startup.
   /// This file flags that the Activity has finished its bootstrapping step.
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index 820c9b284f1..d86fabcb697 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -6,7 +6,7 @@
 #include "Thread_Task.h"
 #include "Activity.h"
 
-Builder::Builder(void)
+Builder::Builder()
   :poa_count_ (0),
    poa_list_ (0),
    task_count_ (0),
@@ -17,7 +17,7 @@ Builder::Builder(void)
   ACTIVITY::instance()->builder (this);
 }
 
-Builder::~Builder(void)
+Builder::~Builder()
 {
 }
 
@@ -128,7 +128,7 @@ Builder::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Builder::fini (void)
+Builder::fini ()
 {
   // It's only a hack for proper cleanup of this badly designed test.
   static bool already_cleaned = false;
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index 7f0ac5e8ec4..cbee3186a06 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -9,13 +9,13 @@ Job_i::Job_i ()
 }
 
 const ACE_CString&
-Job_i::name (void)
+Job_i::name ()
 {
   return job_name_;
 }
 
 const ACE_CString&
-Job_i::poa (void)
+Job_i::poa ()
 {
   return POA_name_;
 }
@@ -51,7 +51,7 @@ Job_i::work (CORBA::ULong work)
 }
 
 void
-Job_i::shutdown (void)
+Job_i::shutdown ()
 {
   ACTIVITY::instance()->job_ended (this);
 }
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 7eda03d5f40..f1e532d5711 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -24,19 +24,19 @@ class Job_i : public POA_Job
 {
  public:
   /// Constructor
-  Job_i (void);
+  Job_i ();
 
   /// Init the state of this object.
   int init (ACE_Arg_Shifter& arg_shifter);
 
   /// = Accessors
-  const ACE_CString& name (void);
-  const ACE_CString& poa (void);
+  const ACE_CString& name ();
+  const ACE_CString& poa ();
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
  protected:
   /// The name of this Job
   ACE_CString job_name_;
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index b999f5f3283..581993d6c77 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -2,7 +2,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-POA_Holder::POA_Holder (void)
+POA_Holder::POA_Holder ()
   : priority_model_ (RTCORBA::CLIENT_PROPAGATED),
     server_priority_ (0)
 {
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index 2e8440ba572..6e46602824b 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -25,7 +25,7 @@ class POA_Holder
 {
  public:
   /// Constructor
-  POA_Holder (void);
+  POA_Holder ();
 
   /// The arg_shifter options are read in the following manner: -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
   int init (ACE_Arg_Shifter& arg_shifter);
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 4bef00b9e64..e03a478974b 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -5,7 +5,7 @@
 
 #include "Task_Stats.h"
 
-Periodic_Task::Periodic_Task (void)
+Periodic_Task::Periodic_Task ()
   :barrier_ (0),
    task_priority_ (0),
    period_ (0),
@@ -86,7 +86,7 @@ Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
 }
 
 const char*
-Periodic_Task::job (void)
+Periodic_Task::job ()
 {
   return name_.c_str ();
 }
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index 1c2e9785e81..05939aaa5b2 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -32,7 +32,7 @@ class Task_Stats;
 class Periodic_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
-  Periodic_Task (void);
+  Periodic_Task ();
   ~Periodic_Task ();
 
   /// Init the state of this object.
@@ -46,7 +46,7 @@ class Periodic_Task : public ACE_Task <ACE_SYNCH>
 
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
-  const char* job (void);
+  const char* job ();
 
   /// Sets the Job to exec.
   void job (Job_ptr job);
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
index 9998b2bf3b7..f91efd34b7a 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -5,7 +5,7 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
@@ -26,14 +26,14 @@ Task_Stats::Task_Stats (size_t max_samples)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->time_inv_;
   delete[] this->time_exec_;
 }
 
 int
-Task_Stats::init (void)
+Task_Stats::init ()
 {
   ACE_NEW_RETURN (this->time_inv_, ACE_UINT64[this->max_samples_], -1);
   ACE_NEW_RETURN (this->time_exec_, ACE_UINT64[this->max_samples_], -1);
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h
index 235a40dc7c9..0fa872dd9e8 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.h
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h
@@ -25,7 +25,7 @@
 class Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -43,10 +43,10 @@ class Task_Stats
   Task_Stats (size_t max_samples);
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Init
-  int init (void);
+  int init ();
 
   /// Set the base time value.
   void base_time (ACE_hrtime_t time);
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
index a9afbc7e28a..d94ab040f49 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
@@ -9,7 +9,7 @@
 #include "Task_Stats.h"
 #include "ace/Barrier.h"
 
-Thread_Task::Thread_Task (void)
+Thread_Task::Thread_Task ()
 {
 }
 
@@ -53,7 +53,7 @@ Thread_Task::activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *prio
 }
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   // if debugging, dump the priority that we're actually at.
   if (TAO_debug_level > 0)
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h
index a0d97d97da7..27b5b9727b9 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h
@@ -28,7 +28,7 @@ class Thread_Task : public Periodic_Task
 {
  public:
   /// Constructor
-  Thread_Task (void);
+  Thread_Task ();
 
   /// Activate thread(s).
   virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping);
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index fb1818c3f98..0d01b0bbf5b 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -168,7 +168,7 @@ DT_Creator::init (int argc, ACE_TCHAR *argv [])
 }
 
 void
-DT_Creator::register_synch_obj (void)
+DT_Creator::register_synch_obj ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -232,7 +232,7 @@ DT_Creator::register_synch_obj (void)
 
 
 int
-DT_Creator::activate_root_poa (void)
+DT_Creator::activate_root_poa ()
 {
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RootPOA");
@@ -249,7 +249,7 @@ DT_Creator::activate_root_poa (void)
 }
 
 void
-DT_Creator::activate_poa_list (void)
+DT_Creator::activate_poa_list ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -275,7 +275,7 @@ DT_Creator::activate_poa_list (void)
 }
 
 void
-DT_Creator::activate_job_list (void)
+DT_Creator::activate_job_list ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -329,7 +329,7 @@ DT_Creator::activate_job_list (void)
 }
 
 void
-DT_Creator::activate_schedule (void)
+DT_Creator::activate_schedule ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -393,7 +393,7 @@ DT_Creator::activate_schedule (void)
 }
 
 int
-DT_Creator::resolve_naming_service (void)
+DT_Creator::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -488,7 +488,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current)
 }
 
 void
-DT_Creator::dt_ended (void)
+DT_Creator::dt_ended ()
 {
   {
     ACE_GUARD (ACE_Lock, ace_mon, *state_lock_);
@@ -503,7 +503,7 @@ DT_Creator::dt_ended (void)
 }
 
 void
-DT_Creator::job_ended (void)
+DT_Creator::job_ended ()
 {
   {
     ACE_GUARD (ACE_Lock, ace_mon, *state_lock_);
@@ -519,7 +519,7 @@ DT_Creator::job_ended (void)
 }
 
 void
-DT_Creator::check_ifexit (void)
+DT_Creator::check_ifexit ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -577,12 +577,12 @@ DT_Creator::check_ifexit (void)
 }
 
 int
-DT_Creator::dt_count (void)
+DT_Creator::dt_count ()
 {
   return dt_count_;
 }
 
-DT_Creator::DT_Creator (void)
+DT_Creator::DT_Creator ()
  : dt_list_ (0),
    poa_list_ (0),
    job_list_ (0),
@@ -602,7 +602,7 @@ DT_Creator::DT_Creator (void)
 {
 }
 
-DT_Creator::~DT_Creator (void)
+DT_Creator::~DT_Creator ()
 {
   for (int i = 0; i < log_index; ++i)
     ACE_OS::free (log[i]);
@@ -630,7 +630,7 @@ DT_Creator::log_msg (char* msg)
 }
 
 CORBA::ORB_ptr
-DT_Creator::orb (void)
+DT_Creator::orb ()
 {
   return this->orb_.in ();
 }
@@ -642,7 +642,7 @@ DT_Creator::orb (CORBA::ORB_ptr orb)
 }
 
 ACE_Time_Value*
-DT_Creator::base_time (void)
+DT_Creator::base_time ()
 {
   return this->base_time_;
 }
@@ -655,7 +655,7 @@ DT_Creator::base_time (ACE_Time_Value* base_time)
 
 
 Synch_i*
-DT_Creator::synch (void)
+DT_Creator::synch ()
 {
   return this->synch_.in ();
 }
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index 8132c8549b0..020b8108712 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -24,9 +24,9 @@ typedef Job_i **JOB_LIST;
 class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
 {
  public:
-  DT_Creator (void);
+  DT_Creator ();
 
-  virtual ~DT_Creator (void);
+  virtual ~DT_Creator ();
 
   int init (int argc, ACE_TCHAR *argv []);
 
@@ -34,9 +34,9 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
 
   virtual void create_distributable_threads (RTScheduling::Current_ptr  current);
 
-  void activate_poa_list (void);
-  void activate_job_list (void);
-  void activate_schedule (void);
+  void activate_poa_list ();
+  void activate_job_list ();
+  void activate_schedule ();
 
   virtual void yield (time_t suspend_time,
                       Thread_Task* task) = 0;
@@ -54,32 +54,32 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
   //  virtual Task* task (void) = 0;
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
-  int dt_count (void);
+  int dt_count ();
 
-  void dt_ended (void);
-  void job_ended (void);
+  void dt_ended ();
+  void job_ended ();
 
-  void check_ifexit (void);
+  void check_ifexit ();
 
   void log_msg (char* msg);
 
   void orb (CORBA::ORB_ptr);
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
-  ACE_Time_Value* base_time (void);
+  ACE_Time_Value* base_time ();
   void base_time (ACE_Time_Value*);
 
-  ACE_hrtime_t base_hr_time (void);
+  ACE_hrtime_t base_hr_time ();
 
   virtual int total_load (void) = 0;
 
-  Synch_i* synch (void);
+  Synch_i* synch ();
 
-  void register_synch_obj (void);
+  void register_synch_obj ();
 
-  int activate_root_poa (void);
+  int activate_root_poa ();
 
  protected:
   DT_LIST dt_list_;
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
index 3a92fd23bc3..a5f47892108 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
@@ -2,7 +2,7 @@
 #include "test.h"
 #include "FP_Task.h"
 
-FP_DT_Creator::FP_DT_Creator (void)
+FP_DT_Creator::FP_DT_Creator ()
 {
   DT_TEST::instance ()->dt_creator (this);
 }
@@ -45,13 +45,13 @@ FP_DT_Creator::yield (time_t suspend_time,
 }
 
 int
-FP_DT_Creator::total_load (void)
+FP_DT_Creator::total_load ()
 {
   return BUFSIZ;
 }
 
 void
-FP_DT_Creator::wait (void)
+FP_DT_Creator::wait ()
 {
 }
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
index 2c0f6620005..4d9f0dfccce 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
@@ -7,11 +7,11 @@
 class FP_DT_Creator: public DT_Creator
 {
 public:
-  FP_DT_Creator (void);
+  FP_DT_Creator ();
 
   virtual CORBA::Policy_ptr sched_param (int importance);
 
-  //virtual Task* task (void);
+  //virtual Task* task ();
   virtual Thread_Task* create_thr_task (int importance,
                                         time_t start_time,
                                         int load,
@@ -22,8 +22,8 @@ public:
   virtual void yield (time_t suspend_time,
                       Thread_Task* task);
 
-  virtual void wait (void);
-  virtual int total_load (void);
+  virtual void wait ();
+  virtual int total_load ();
 };
 
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index 3873dcaa59a..3cd0d02ed68 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -6,7 +6,7 @@
 std::atomic<long> server_guid_counter;
 
 RTCORBA::Priority
-Segment_Sched_Param_Policy::value (void)
+Segment_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -18,7 +18,7 @@ Segment_Sched_Param_Policy::value (RTCORBA::Priority value)
 }
 
 CORBA::Policy_ptr
-Segment_Sched_Param_Policy::copy (void)
+Segment_Sched_Param_Policy::copy ()
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
@@ -31,13 +31,13 @@ Segment_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-Segment_Sched_Param_Policy::policy_type (void)
+Segment_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-Segment_Sched_Param_Policy::destroy (void)
+Segment_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -57,7 +57,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb)
     }
 }
 
-Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
+Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler ()
 {
 }
 
@@ -239,7 +239,7 @@ Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::scheduling_policies (void)
+Fixed_Priority_Scheduler::scheduling_policies ()
 {
   return 0;
 }
@@ -250,13 +250,13 @@ Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::poa_policies (void)
+Fixed_Priority_Scheduler::poa_policies ()
 {
   return 0;
 }
 
 char *
-Fixed_Priority_Scheduler::scheduling_discipline_name (void)
+Fixed_Priority_Scheduler::scheduling_discipline_name ()
 {
   return 0;
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
index c1c2a22dd00..0c648b8758b 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
@@ -10,15 +10,15 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
        public ::CORBA::LocalObject
 {
  public:
-  virtual RTCORBA::Priority value (void);
+  virtual RTCORBA::Priority value ();
 
   virtual void value (RTCORBA::Priority value);
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  void destroy (void);
+  void destroy ();
 
  private:
   RTCORBA::Priority value_;
@@ -31,7 +31,7 @@ public ::CORBA::LocalObject
  public:
   Fixed_Priority_Scheduler (CORBA::ORB_ptr orb);
 
-  ~Fixed_Priority_Scheduler (void);
+  ~Fixed_Priority_Scheduler ();
 
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (RTCORBA::Priority segment_priority);
@@ -82,13 +82,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr
     create_resource_manager (const char * name,
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
index 51b1787ddd9..812c8e5be23 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
@@ -61,7 +61,7 @@ FP_Task::activate_task (RTScheduling::Current_ptr current,
 }
 
 void
-FP_Task::pre_activate (void)
+FP_Task::pre_activate ()
 {
   CORBA::Object_var object =
     DT_TEST::instance ()->orb ()->resolve_initial_references ("PriorityMappingManager");
@@ -89,7 +89,7 @@ FP_Task::pre_activate (void)
 }
 
 int
-FP_Task::perform_task (void)
+FP_Task::perform_task ()
 {
   static CORBA::ULong prime_number = 9619;
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
index 5f1d2780c76..0a84c498a9c 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
@@ -19,9 +19,9 @@ public:
                              long flags,
                              ACE_Time_Value* base_time);
 
-  virtual int perform_task (void);
+  virtual int perform_task ();
 
-  virtual void pre_activate (void);
+  virtual void pre_activate ();
 };
 
 #endif /*FP_TASK_H*/
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index 3de953d95fc..942ade718a1 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -23,7 +23,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
@@ -46,13 +46,13 @@ private:
   ACE_Sig_Handler shutdown_;
 };
 
-DT_Test::DT_Test (void)
+DT_Test::DT_Test ()
 {
   base_t = ACE_OS::gethrtime ();
 }
 
 void
-DT_Test::check_supported_priorities (void)
+DT_Test::check_supported_priorities ()
 {
   // Check that we have sufficient priority range to run this
   // test, i.e., more than 1 priority level.
@@ -200,19 +200,19 @@ DT_Test::dt_creator (FP_DT_Creator* dt_creator)
 }
 
 FP_DT_Creator*
-DT_Test::dt_creator (void)
+DT_Test::dt_creator ()
 {
   return this->dt_creator_;
 }
 
 Fixed_Priority_Scheduler*
-DT_Test::scheduler (void)
+DT_Test::scheduler ()
 {
   return this->scheduler_.in ();
 }
 
 int
-DT_Test::activate_task (void)
+DT_Test::activate_task ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test Activate Task\n"));
@@ -238,7 +238,7 @@ DT_Test::activate_task (void)
 }
 
 int
-DT_Test::svc (void)
+DT_Test::svc ()
 {
   try
     {
@@ -261,7 +261,7 @@ DT_Test::svc (void)
 }
 
 CORBA::ORB_ptr
-DT_Test::orb (void)
+DT_Test::orb ()
 {
   return this->orb_.in ();
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
index 3d87db7a750..9391080ff6b 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
@@ -15,22 +15,22 @@ class Task_Stats;
 class DT_Test :public ACE_Task <ACE_SYNCH>
 {
  public:
-  DT_Test (void);
+  DT_Test ();
 
-  void check_supported_priorities (void);
+  void check_supported_priorities ();
 
   int init (int argc, ACE_TCHAR *argv []);
 
   void run (int argc, ACE_TCHAR *argv []);
 
   void dt_creator (FP_DT_Creator* dt_creator);
-  FP_DT_Creator* dt_creator (void);
+  FP_DT_Creator* dt_creator ();
 
-  Fixed_Priority_Scheduler* scheduler (void);
+  Fixed_Priority_Scheduler* scheduler ();
 
-  int activate_task (void);
+  int activate_task ();
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   ACE_hrtime_t base_t;
 
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index ce90a908d1b..f4723e88252 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -18,19 +18,19 @@ Job_i::Job_i (DT_Creator* dt_creator)
   task_stats_->init (100);
 }
 
-Job_i::~Job_i (void)
+Job_i::~Job_i ()
 {
   delete task_stats_;
 }
 
 const ACE_CString&
-Job_i::name (void)
+Job_i::name ()
 {
   return job_name_;
 }
 
 const ACE_CString&
-Job_i::poa (void)
+Job_i::poa ()
 {
   return POA_name_;
 }
@@ -128,19 +128,19 @@ Job_i::post_work (int /*guid*/,
 }
 
 int
-Job_i::guid (void)
+Job_i::guid ()
 {
   return this->guid_;
 }
 
 void
-Job_i::shutdown (void)
+Job_i::shutdown ()
 {
   dt_creator_->job_ended ();
 }
 
 void
-Job_i::dump_stats (void)
+Job_i::dump_stats ()
 {
   ACE_TCHAR fname [BUFSIZ];
   ACE_OS::sprintf (fname,
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 68976b7d96b..3981b40a076 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -31,14 +31,14 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
   /// Constructor
   Job_i (DT_Creator* dt_creator);
 
-  ~Job_i (void);
+  ~Job_i ();
 
   /// Init the state of this object.
   int init (ACE_Arg_Shifter& arg_shifter);
 
   /// = Accessors
-  const ACE_CString& name (void);
-  const ACE_CString& poa (void);
+  const ACE_CString& name ();
+  const ACE_CString& poa ();
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work,
@@ -47,11 +47,11 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
   virtual void post_work (int guid,
         int importance);
 
-  void dump_stats (void);
+  void dump_stats ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  int guid (void);
+  int guid ();
 
  protected:
   /// The name of this Job
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
index 9c51a32ba92..52754b1de27 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
@@ -2,7 +2,7 @@
 #include "test.h"
 #include "MIF_Task.h"
 
-MIF_DT_Creator::MIF_DT_Creator (void)
+MIF_DT_Creator::MIF_DT_Creator ()
 {
   DT_TEST::instance ()->dt_creator (this);
 }
@@ -68,13 +68,13 @@ MIF_DT_Creator::yield (time_t suspend_time,
 }
 
 int
-MIF_DT_Creator::total_load (void)
+MIF_DT_Creator::total_load ()
 {
   return 1000;
 }
 
 void
-MIF_DT_Creator::wait (void)
+MIF_DT_Creator::wait ()
 {
   while (active_dt_count_ > 0 || active_job_count_ > 0)
     {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
index f677b094f9e..5e2039eec7a 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
@@ -7,11 +7,11 @@
 class MIF_DT_Creator: public DT_Creator
 {
 public:
-  MIF_DT_Creator (void);
+  MIF_DT_Creator ();
 
   virtual CORBA::Policy_ptr sched_param (int importance);
 
-  //virtual Task* task (void);
+  //virtual Task* task ();
   virtual Thread_Task* create_thr_task (int importance,
                                         time_t start_time,
                                         int load,
@@ -22,8 +22,8 @@ public:
   virtual void yield (time_t suspend_time,
                       Thread_Task* task);
 
-  virtual void wait (void);
-  virtual int total_load (void);
+  virtual void wait ();
+  virtual int total_load ();
 };
 
 ACE_STATIC_SVC_DECLARE (MIF_DT_Creator)
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index 10af4fdab2f..406ec0cccad 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -14,7 +14,7 @@ DT::DT (TAO_SYNCH_MUTEX &lock,
 }
 
 void
-DT::suspend (void)
+DT::suspend ()
 {
   eligible_ = 0;
   while (!eligible_)
@@ -22,14 +22,14 @@ DT::suspend (void)
 }
 
 void
-DT::resume (void)
+DT::resume ()
 {
   eligible_ = 1;
   this->dt_cond_.signal ();
 }
 
 CORBA::Short
-Segment_Sched_Param_Policy::importance (void)
+Segment_Sched_Param_Policy::importance ()
 {
   return this->importance_;
 }
@@ -41,7 +41,7 @@ Segment_Sched_Param_Policy::importance (CORBA::Short importance)
 }
 
 CORBA::Policy_ptr
-Segment_Sched_Param_Policy::copy (void)
+Segment_Sched_Param_Policy::copy ()
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
@@ -54,13 +54,13 @@ Segment_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-Segment_Sched_Param_Policy::policy_type (void)
+Segment_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-Segment_Sched_Param_Policy::destroy (void)
+Segment_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -88,7 +88,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb)
     }
 }
 
-MIF_Scheduler::~MIF_Scheduler (void)
+MIF_Scheduler::~MIF_Scheduler ()
 {
   while (free_que_.message_count () > 0)
     {
@@ -101,7 +101,7 @@ MIF_Scheduler::~MIF_Scheduler (void)
 }
 
 void
-MIF_Scheduler::incr_thr_count (void)
+MIF_Scheduler::incr_thr_count ()
 {
   lock_.acquire ();
   wait_++;
@@ -109,7 +109,7 @@ MIF_Scheduler::incr_thr_count (void)
 }
 
 void
-MIF_Scheduler::wait (void)
+MIF_Scheduler::wait ()
 {
   lock_.acquire ();
   while (wait_ > 0)
@@ -123,7 +123,7 @@ MIF_Scheduler::wait (void)
 }
 
 void
-MIF_Scheduler::resume_main (void)
+MIF_Scheduler::resume_main ()
 {
   wait_--;
   wait_cond_.signal ();
@@ -669,7 +669,7 @@ MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (void)
+MIF_Scheduler::scheduling_policies ()
 {
   return 0;
 }
@@ -680,13 +680,13 @@ MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::poa_policies (void)
+MIF_Scheduler::poa_policies ()
 {
         return 0;
 }
 
 char *
-MIF_Scheduler::scheduling_discipline_name (void)
+MIF_Scheduler::scheduling_discipline_name ()
 {
         return 0;
 }
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index 0883dc31a73..faff34ee9e2 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -19,8 +19,8 @@ class DT : public ACE_Message_Block
   DT (TAO_SYNCH_MUTEX &lock,
       int guid);
 
-  void suspend (void);
-  void resume (void);
+  void suspend ();
+  void resume ();
 
  private:
   TAO_SYNCH_CONDITION dt_cond_;
@@ -33,15 +33,15 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy,
        public ::CORBA::LocalObject
 {
  public:
-  virtual CORBA::Short importance (void);
+  virtual CORBA::Short importance ();
 
   virtual void importance (CORBA::Short importance);
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  void destroy (void);
+  void destroy ();
 
  private:
   CORBA::Short importance_;
@@ -56,17 +56,17 @@ public ::CORBA::LocalObject
  public:
   MIF_Scheduler (CORBA::ORB_ptr orb);
 
-  ~MIF_Scheduler (void);
+  ~MIF_Scheduler ();
 
 
   virtual MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (CORBA::Short segment_priority);
 
-  void wait (void);
+  void wait ();
 
-  void resume_main (void);
+  void resume_main ();
 
-  void incr_thr_count (void);
+  void incr_thr_count ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                const char * name,
@@ -114,13 +114,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index b56821f79a3..7e2fbd38dbf 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -25,19 +25,19 @@ MIF_Task::MIF_Task (int importance,
   task_stats_->init (iter_);
 }
 
-MIF_Task::~MIF_Task (void)
+MIF_Task::~MIF_Task ()
 {
   delete task_stats_;
 }
 
 void
-MIF_Task::pre_activate (void)
+MIF_Task::pre_activate ()
 {
   DT_TEST::instance ()->scheduler ()->incr_thr_count ();
 }
 
 void
-MIF_Task::post_activate (void)
+MIF_Task::post_activate ()
 {
   DT_TEST::instance ()->scheduler ()->wait ();
 }
@@ -79,7 +79,7 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
 }
 
 int
-MIF_Task::perform_task (void)
+MIF_Task::perform_task ()
 {
   try
     {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
index 5acb8995953..f1183757f37 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
@@ -14,18 +14,18 @@ class MIF_Task : public Thread_Task
             char *job_name,
             DT_Creator *dt_creator);
 
-  ~MIF_Task (void);
+  ~MIF_Task ();
 
   virtual int activate_task (RTScheduling::Current_ptr current,
                              CORBA::Policy_ptr sched_param,
                              long flags,
                              ACE_Time_Value* base_time);
 
-  virtual int perform_task (void);
+  virtual int perform_task ();
 
  private:
-  void pre_activate (void);
-  void post_activate (void);
+  void pre_activate ();
+  void post_activate ();
 };
 
 #endif /*MIF_TASK_H*/
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index 7bba63a6bb9..1fd1c748dc3 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -24,7 +24,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
@@ -47,7 +47,7 @@ private:
   ACE_Sig_Handler shutdown_;
 };
 
-DT_Test::DT_Test (void)
+DT_Test::DT_Test ()
 {
 }
 
@@ -118,13 +118,13 @@ DT_Test::dt_creator (MIF_DT_Creator* dt_creator)
 
 
 MIF_Scheduler*
-DT_Test::scheduler (void)
+DT_Test::scheduler ()
 {
   return this->scheduler_.in ();
 }
 /*
 int
-DT_Test::activate_task (void)
+DT_Test::activate_task ()
 {
 long flags;
   flags = THR_NEW_LWP | THR_JOINABLE;
@@ -144,7 +144,7 @@ long flags;
 }
 
 int
-DT_Test::svc (void)
+DT_Test::svc ()
 {
   try
     {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
index 41f2bc737e7..e009c734a6b 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
@@ -14,7 +14,7 @@ class Task_Stats;
 class DT_Test //:public ACE_Task <ACE_SYNCH>
 {
  public:
-  DT_Test (void);
+  DT_Test ();
 
   int init (int argc, ACE_TCHAR *argv []);
 
@@ -22,9 +22,9 @@ class DT_Test //:public ACE_Task <ACE_SYNCH>
 
   void dt_creator (MIF_DT_Creator* dt_creator);
 
-  MIF_Scheduler* scheduler (void);
+  MIF_Scheduler* scheduler ();
 
-  int activate_task (void);
+  int activate_task ();
 
 
 /*   protected: */
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index 7178f23d0cb..7ece096155e 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -5,7 +5,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Log_Msg.h"
 
-POA_Holder::POA_Holder (void)
+POA_Holder::POA_Holder ()
   :priority_model_ (RTCORBA::CLIENT_PROPAGATED),
    server_priority_ (0),
    thread_pool_ (0)
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index 94f45bf0872..22fb36645b8 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -28,7 +28,7 @@ class RTSCHEDTESTLIB_Export POA_Holder
 {
 public:
   /// Constructor
-  POA_Holder (void);
+  POA_Holder ();
 
   /// The arg_shifter options are read in the following manner:
   ///-POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 3a6bc37c1eb..a072dbc2b4e 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -12,7 +12,7 @@ Starter::Starter (CORBA::ORB_ptr orb)
 }
 
 void
-Starter::init (void)
+Starter::init ()
 {
   this->resolve_synch_objs ();
 
@@ -20,7 +20,7 @@ Starter::init (void)
 }
 
 void
-Starter::fire (void)
+Starter::fire ()
 {
   ACE_Time_Value base_time = ACE_OS::gettimeofday ();
   for (Synchs::iterator iterator = this->synchs_.begin ();
@@ -32,7 +32,7 @@ Starter::fire (void)
 }
 
 void
-Starter::resolve_synch_objs (void)
+Starter::resolve_synch_objs ()
 {
   CosNaming::Name name (1);
   name.length (1);
diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index c15851b81ae..664dadde5f9 100644
--- a/TAO/examples/RTScheduling/Starter.h
+++ b/TAO/examples/RTScheduling/Starter.h
@@ -14,16 +14,16 @@ class Starter
  public:
   Starter (CORBA::ORB_ptr orb);
 
-  void init (void);
+  void init ();
 
-  void fire (void);
+  void fire ();
 
   typedef ACE_Hash_Map_Manager <ACE_CString,
                                 Synch_var,
                                 ACE_Null_Mutex> Synchs;
 
  private:
-  void resolve_synch_objs (void);
+  void resolve_synch_objs ();
 
   void add_to_synchs (CosNaming::BindingList &binding_list);
 
diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp
index 8e89b0fc637..466cf7cf3f2 100644
--- a/TAO/examples/RTScheduling/Synch_i.cpp
+++ b/TAO/examples/RTScheduling/Synch_i.cpp
@@ -1,6 +1,6 @@
 #include "Synch_i.h"
 
-Synch_i::Synch_i (void)
+Synch_i::Synch_i ()
 {
   this->synched_ = 0;
 }
@@ -15,13 +15,13 @@ Synch_i::go (CORBA::Long base_time)
 }
 
 int
-Synch_i::synched (void)
+Synch_i::synched ()
 {
   return this->synched_;
 }
 
 ACE_Time_Value*
-Synch_i::base_time (void)
+Synch_i::base_time ()
 {
   return &this->base_time_;
 }
diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h
index 72256b7424a..5ccfa567b98 100644
--- a/TAO/examples/RTScheduling/Synch_i.h
+++ b/TAO/examples/RTScheduling/Synch_i.h
@@ -6,12 +6,12 @@
 class SYNCH_Export Synch_i : public POA_Synch
 {
  public:
-  Synch_i (void);
+  Synch_i ();
   virtual void go (CORBA::Long base_time);
 
-  int synched (void);
+  int synched ();
 
-  ACE_Time_Value* base_time (void);
+  ACE_Time_Value* base_time ();
 
  private:
   int synched_;
diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp
index 053ffaf63a2..9813c860e90 100644
--- a/TAO/examples/RTScheduling/Task_Stats.cpp
+++ b/TAO/examples/RTScheduling/Task_Stats.cpp
@@ -5,12 +5,12 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
 
-Task_Stats::Task_Stats (void)
+Task_Stats::Task_Stats ()
   : base_time_(0),
     end_time_ (0),
     max_samples_ (0),
@@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->thr_run_time_;
   delete[] this->thr_count_;
diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h
index 5a556e030c4..a99faeeeaa8 100644
--- a/TAO/examples/RTScheduling/Task_Stats.h
+++ b/TAO/examples/RTScheduling/Task_Stats.h
@@ -27,7 +27,7 @@
 class RTSCHEDTESTLIB_Export Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -42,10 +42,10 @@ class RTSCHEDTESTLIB_Export Task_Stats
 {
  public:
   /// Constructor
-  Task_Stats (void);
+  Task_Stats ();
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Init
   int init (size_t max_samples);
diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp
index 4c8ceb2ad23..d14bfe3b2e8 100644
--- a/TAO/examples/RTScheduling/Thread_Task.cpp
+++ b/TAO/examples/RTScheduling/Thread_Task.cpp
@@ -7,7 +7,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Atomic_Op.h"
 
-Thread_Task::Thread_Task (void)
+Thread_Task::Thread_Task ()
  : start_time_ (0),
    load_ (0),
    iter_ (0),
@@ -22,7 +22,7 @@ Thread_Task::Thread_Task (void)
 }
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   try
     {
@@ -72,26 +72,26 @@ Thread_Task::svc (void)
 }
 
 int
-Thread_Task::importance (void)
+Thread_Task::importance ()
 {
   return this->importance_;
 }
 
 time_t
-Thread_Task::start_time (void)
+Thread_Task::start_time ()
 {
   return this->start_time_;
 }
 
 int
-Thread_Task::perform_task (void)
+Thread_Task::perform_task ()
 {
   return 0;
 }
 
 
 const char*
-Thread_Task::job (void)
+Thread_Task::job ()
 {
   return job_name_.in ();
 }
@@ -103,13 +103,13 @@ Thread_Task::job (Job_ptr job)
 }
 
 int
-Thread_Task::dist (void)
+Thread_Task::dist ()
 {
   return this->dist_;
 }
 
 void
-Thread_Task::dump_stats (void)
+Thread_Task::dump_stats ()
 {
   ACE_TCHAR fname [BUFSIZ];
   ACE_OS::sprintf (fname,
diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h
index feeeea0d9c8..cab325d8eff 100644
--- a/TAO/examples/RTScheduling/Thread_Task.h
+++ b/TAO/examples/RTScheduling/Thread_Task.h
@@ -13,29 +13,29 @@ class DT_Creator;
 class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
-  Thread_Task (void);
+  Thread_Task ();
 
   virtual int activate_task (RTScheduling::Current_ptr current,
                              CORBA::Policy_ptr sched_param,
                              long flags,
                              ACE_Time_Value* base_time) = 0;
 
-  virtual int perform_task (void);
+  virtual int perform_task ();
 
-  int importance (void);
+  int importance ();
 
-  time_t start_time (void);
+  time_t start_time ();
 
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
-  const char* job (void);
+  const char* job ();
 
   /// Sets the Job to exec.
   void job (Job_ptr job);
 
-  int dist (void);
+  int dist ();
 
-  void dump_stats (void);
+  void dump_stats ();
 
  protected:
   /// task svc
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 9843d76d6c4..3958418597a 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -11,7 +11,7 @@
 
 // Constructor.
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
   : servant_ (0)
   , ior_output_file_ (0)
   , naming_ (0)
@@ -26,7 +26,7 @@ Server<Servant>::Server (void)
 
 // Parse the command-line arguments and set options.
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_,
                         ACE_TEXT ("do:ni:"), 1, 0,
@@ -186,7 +186,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
   // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -283,7 +283,7 @@ Client<ServerInterface>::read_ior (ACE_TCHAR *filename)
 
 // Parses the command line arguments and returns an error status.
 template <class ServerInterface> int
-Client<ServerInterface>::parse_args (void)
+Client<ServerInterface>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_,
                         ACE_TEXT ("df:nk:x"), 1, 0,
@@ -434,7 +434,7 @@ Client<ServerInterface>::obtain_initial_references (const char *name)
 }
 
 template <class ServerInterface> int
-Client<ServerInterface>::do_shutdown (void)
+Client<ServerInterface>::do_shutdown ()
 {
   // Returns the shutdwon flag
   return this->do_shutdown_;
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index a501bdcb429..51319b172f1 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -114,7 +114,7 @@ public:
   ServerInterface *operator-> () { return server_.in (); }
 
   /// Returns the shutdown flag.
-  int do_shutdown (void);
+  int do_shutdown ();
 
   /// Fills in the shutdwon flag.
   void do_shutdown (int);
@@ -122,7 +122,7 @@ public:
   /// Initialize naming service
   int obtain_initial_references (const char *name);
 
-  CORBA::ORB_ptr orb (void)
+  CORBA::ORB_ptr orb ()
     {
       return CORBA::ORB::_duplicate (this->orb_.in ());
     }
@@ -132,7 +132,7 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 35010cece90..6dcb1c83216 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -10,7 +10,7 @@ AccountManager_i::AccountManager_i (void) :
 }
 
 // Destructor
-AccountManager_i::~AccountManager_i (void)
+AccountManager_i::~AccountManager_i ()
 {
 }
 
@@ -114,7 +114,7 @@ AccountManager_i::close (Bank::Account_ptr account)
 }
 
 void
-AccountManager_i::shutdown (void)
+AccountManager_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n[SERVER] Process/Thread Id : (%P/%t) AccountManager_i is shutting down\n")));
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index b18f8c00829..a948759e161 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -45,10 +45,10 @@ class AccountManager_i : public POA_Bank::AccountManager
 {
 public:
   /// Constructor.
-  AccountManager_i (void);
+  AccountManager_i ();
 
   /// Destructor.
-  virtual ~AccountManager_i (void);
+  virtual ~AccountManager_i ();
 
   /// Return the Account interface with the given name from the server.
   /// Put the initial balance specified in the new account.
@@ -59,7 +59,7 @@ public:
   virtual void close (Bank::Account_ptr);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index e301f7fab97..5b2fb3a7954 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -1,7 +1,7 @@
 #include "Account_i.h"
 
 // Constructor
-Account_i::Account_i (void)
+Account_i::Account_i ()
 {
 }
 
@@ -13,7 +13,7 @@ Account_i::Account_i (const char *name,
 }
 
 // Destructor
-Account_i::~Account_i (void)
+Account_i::~Account_i ()
 {
 }
 
@@ -26,7 +26,7 @@ Account_i::orb (CORBA::ORB_ptr o)
 
 // Return the current balance on the server.
 CORBA::Float
-Account_i::balance (void)
+Account_i::balance ()
 {
   return balance_;
 }
@@ -47,7 +47,7 @@ Account_i::withdraw (CORBA::Float withdrawl)
 }
 
 char *
-Account_i::name (void)
+Account_i::name ()
 {
   return CORBA::string_dup (this->name_.in ());
 }
diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h
index bbdfa6775ac..9e20a47f7b2 100644
--- a/TAO/examples/Simple/bank/Account_i.h
+++ b/TAO/examples/Simple/bank/Account_i.h
@@ -29,19 +29,19 @@ class Account_i : public POA_Bank::Account
 {
 public:
   /// Constructor.
-  Account_i (void);
+  Account_i ();
 
   /// Constructor.
   Account_i (const char *, CORBA::Float);
 
   /// Destructor.
-  virtual ~Account_i (void);
+  virtual ~Account_i ();
 
   /// Get the current balance in the account.
-  virtual CORBA::Float balance (void);
+  virtual CORBA::Float balance ();
 
   /// Get the name of the <Account> holder.
-  virtual char *name (void);
+  virtual char *name ();
 
   /// Set the name of the <Account> holder.
   virtual void name (const char *name);
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
index b8a5a874fc4..6192e1b171b 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp
@@ -6,13 +6,13 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Bank_Client_i::Bank_Client_i (void)
+Bank_Client_i::Bank_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Bank_Client_i::~Bank_Client_i (void)
+Bank_Client_i::~Bank_Client_i ()
 {
   //no-op
 }
@@ -42,7 +42,7 @@ Bank_Client_i::run (const char *name,
 }
 
 int
-Bank_Client_i::check_accounts (void)
+Bank_Client_i::check_accounts ()
 {
   try
     {
@@ -69,7 +69,7 @@ Bank_Client_i::check_accounts (void)
 // This method tests whether an account with a
 // a same name can be opened
 void
-Bank_Client_i::test_for_same_name (void)
+Bank_Client_i::test_for_same_name ()
 {
   const char *name = "Name";
   CORBA::Float initial_bal = 0.00;
@@ -87,7 +87,7 @@ Bank_Client_i::test_for_same_name (void)
 
 // This method tests whether an account with different names can be opened
 void
-Bank_Client_i::test_for_different_name (void)
+Bank_Client_i::test_for_different_name ()
 {
   const char *name1 = "Name1";
   const char *name2 = "Name2";
@@ -108,7 +108,7 @@ Bank_Client_i::test_for_different_name (void)
 
 // This method tests the Overdraft exception.
 void
-Bank_Client_i::test_for_overdraft (void)
+Bank_Client_i::test_for_overdraft ()
 {
   CORBA::Float initial_bal = 100.0;
   const char *name = "Name";
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h
index 944707d5e36..7d040afd661 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.h
+++ b/TAO/examples/Simple/bank/Bank_Client_i.h
@@ -29,29 +29,29 @@ class Bank_Client_i
 {
 public:
   /// Constructor
-  Bank_Client_i (void);
+  Bank_Client_i ();
 
   /// Destructor
-  ~Bank_Client_i (void);
+  ~Bank_Client_i ();
 
   /// Execute the methods.
   int run (const char *, int, ACE_TCHAR *[]);
 
 private:
   /// Method that calls all the test functions
-  int check_accounts (void);
+  int check_accounts ();
 
   /// Tests if accounts opened with different names return a different account
   /// reference.
-  void test_for_different_name (void);
+  void test_for_different_name ();
 
   /// Tests if accounts opened with the same name return the same
   /// object reference.
-  void test_for_same_name (void);
+  void test_for_same_name ();
 
   /// Tests for the Overdraft Exception when the client tries to
   /// withdraw more money than the current balance.
-  void test_for_overdraft (void);
+  void test_for_overdraft ();
 
   /// Instantiate the client object.
   Client<Bank::AccountManager> client_;
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index f5773f4e00a..714bebc94c0 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -118,7 +118,7 @@ Client_i::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client_i::run (void)
+Client_i::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n============= Simple Chat =================\n")
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index c9c8d33be78..beb17fffb9d 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -40,13 +40,13 @@ class Client_i : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Client_i (void);
+  Client_i ();
 
   /// Initialize the client communication with the server.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Start the ORB object.
-  int run (void);
+  int run ();
 
   /// Handle the user input.
   virtual int handle_input (ACE_HANDLE);
diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp
index cfebe82f8eb..23aec18bea5 100644
--- a/TAO/examples/Simple/chat/Receiver_i.cpp
+++ b/TAO/examples/Simple/chat/Receiver_i.cpp
@@ -12,12 +12,12 @@
 
 #include "Receiver_i.h"
 
-Receiver_i::Receiver_i (void)
+Receiver_i::Receiver_i ()
   : orb_ (0)
 {
 }
 
-Receiver_i::~Receiver_i (void)
+Receiver_i::~Receiver_i ()
 {
 }
 
@@ -30,7 +30,7 @@ Receiver_i::message (const char *msg)
 }
 
 void
-Receiver_i::shutdown (void)
+Receiver_i::shutdown ()
 {
   // Instruct the ORB to shutdown.
   this->orb_->shutdown ();
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index 1f9fa39a46a..8a552707ea8 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -27,10 +27,10 @@ class Receiver_i : public POA_Receiver
 {
 public:
   /// Constructor.
-  Receiver_i (void);
+  Receiver_i ();
 
   /// Destructor.
-  virtual ~Receiver_i (void);
+  virtual ~Receiver_i ();
 
   /// Receives a message string.
   virtual void message (const char *msg);
@@ -40,7 +40,7 @@ public:
    * implementation should shutdown the chat client in response to
    * this.
    */
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index c62fb1f7bb7..6628b345992 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -24,7 +24,7 @@ Server_i::Server_i ()
   this->broadcaster_i_ = tmp;
 }
 
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
   // NO Op.
 }
@@ -82,7 +82,7 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Running chat server...\n")));
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index e61ba6b9092..b0b0a020a87 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -28,17 +28,17 @@ class Server_i
 {
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Destructor.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialize the server.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the command line arguments.
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index 136d74f224b..c32847e6c1c 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -66,7 +66,7 @@ Echo_i::echo_string (const char *mesg)
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (void)
+Echo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe echo server is shutting down\n")));
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 3fc17f6347c..b93825f1e0e 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -42,7 +42,7 @@ public:
   virtual char *echo_string (const char *mesg);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index c3405df96d7..d9f89666569 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -7,7 +7,7 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Grid_Client_i::Grid_Client_i (void)
+Grid_Client_i::Grid_Client_i ()
   : height_ (0),
     width_ (0),
     setx_ (0),
@@ -19,7 +19,7 @@ Grid_Client_i::Grid_Client_i (void)
 }
 
 //Destructor.
-Grid_Client_i::~Grid_Client_i (void)
+Grid_Client_i::~Grid_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.h b/TAO/examples/Simple/grid/Grid_Client_i.h
index f95daa5c4c6..766f70ea17d 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.h
+++ b/TAO/examples/Simple/grid/Grid_Client_i.h
@@ -29,10 +29,10 @@ class Grid_Client_i
 {
 public:
   /// Constructor
-  Grid_Client_i (void);
+  Grid_Client_i ();
 
   /// Destructor
-  ~Grid_Client_i (void);
+  ~Grid_Client_i ();
 
   /// Execute the methods.
   int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 52419e2f08b..3fa4a1fcd6c 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -10,7 +10,7 @@ Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b)
 }
 
 // Default constructor.
-Grid_i::Grid_i (void)
+Grid_i::Grid_i ()
   : width_ (0),
     height_ (0),
     array_ (0)
@@ -28,7 +28,7 @@ Grid_i::Grid_i (CORBA::Short x,
 }
 
 // Default destructor.
-Grid_i::~Grid_i (void)
+Grid_i::~Grid_i ()
 {
 }
 
@@ -71,13 +71,13 @@ Grid_i::get (CORBA::Short x,
 
 // Access methods.
 CORBA::Short
-Grid_i::width (void)
+Grid_i::width ()
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (void)
+Grid_i::height ()
 {
   return this->height_;
 }
@@ -118,7 +118,7 @@ Grid_i::height (CORBA::Short y)
 
 // Destroy the grid
 void
-Grid_i::destroy (void)
+Grid_i::destroy ()
 {
   // Delete the array.
   ACE_Auto_Array_Ptr<CORBA::Long> tmp (this->array_.release ());
@@ -150,7 +150,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (void)
+Grid_Factory_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Grid Factory is shutting down\n")));
@@ -160,12 +160,12 @@ Grid_Factory_i::shutdown (void)
 }
 
 // Constructor
-Grid_Factory_i::Grid_Factory_i (void)
+Grid_Factory_i::Grid_Factory_i ()
 {
 }
 
 // Destructor
-Grid_Factory_i::~Grid_Factory_i (void)
+Grid_Factory_i::~Grid_Factory_i ()
 {
 }
 
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index 8b44630bf84..6d85fddce5d 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -27,20 +27,20 @@ class Grid_i: public POA_Grid
 {
 public:
   /// Constructor
-  Grid_i (void);
+  Grid_i ();
 
   /// Constructor.
   Grid_i (CORBA::Short,
           CORBA::Short);
 
   /// Destructor
-  virtual ~Grid_i (void);
+  virtual ~Grid_i ();
 
   /// Returns the width of the grid
-  virtual CORBA::Short width (void);
+  virtual CORBA::Short width ();
 
   /// Returns the height of the grid
-  virtual CORBA::Short height (void);
+  virtual CORBA::Short height ();
 
   /// Sets the width of the grid.
   virtual void width (CORBA::Short);
@@ -58,7 +58,7 @@ public:
                            CORBA::Short);
 
   /// Destroy the grid.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   /// Allocates array
@@ -87,17 +87,17 @@ class Grid_Factory_i : public POA_Grid_Factory
 {
 public:
   /// Constructor.
-  Grid_Factory_i (void);
+  Grid_Factory_i ();
 
   /// Destructor.
-  virtual ~Grid_Factory_i (void);
+  virtual ~Grid_Factory_i ();
 
   /// This function creates and returns a <Grid>.
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index 935af26ce7c..d1f3f806107 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -17,7 +17,7 @@
 
 
 ACE_Reactor *
-My_Resource_Factory::get_reactor (void)
+My_Resource_Factory::get_reactor ()
 {
 #if defined (ACE_HAS_THREADS)
   // Use whatever the default is if we've got threads.
@@ -31,7 +31,7 @@ My_Resource_Factory::get_reactor (void)
 ACE_FACTORY_DEFINE (Alt_Resource_Factory, My_Resource_Factory)
 
 int
-DLL_ORB::svc (void)
+DLL_ORB::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\tRunning ORB event loop (%t)\n\n")));
@@ -111,7 +111,7 @@ DLL_ORB::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-DLL_ORB::fini (void)
+DLL_ORB::fini ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\tFinalizing the service (%t)\n\n")));
@@ -119,7 +119,7 @@ DLL_ORB::fini (void)
   // return 0;
 }
 
-Time_Date_Servant::Time_Date_Servant (void)
+Time_Date_Servant::Time_Date_Servant ()
   : servant_ (0)
   , ior_output_file_ (0)
   , orb_ ("")
diff --git a/TAO/examples/Simple/time-date/Time_Date.h b/TAO/examples/Simple/time-date/Time_Date.h
index fb63add9109..1e109e22091 100644
--- a/TAO/examples/Simple/time-date/Time_Date.h
+++ b/TAO/examples/Simple/time-date/Time_Date.h
@@ -21,7 +21,7 @@ class Alt_Resource_Factory_Export My_Resource_Factory
 {
 public:
   /// Return the @c ACE_Reactor that will be utilized by the ORB.
-  virtual ACE_Reactor *get_reactor (void);
+  virtual ACE_Reactor *get_reactor ();
 };
 
 ACE_FACTORY_DECLARE (Alt_Resource_Factory, My_Resource_Factory)
@@ -66,7 +66,7 @@ class ACE_Svc_Export Time_Date_Servant : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  Time_Date_Servant (void);
+  Time_Date_Servant ();
 
   /// Initialize the @c Time_Date servant.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
index 346a83df81f..8197bff6401 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
@@ -5,12 +5,12 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Time_Date_Client_i::Time_Date_Client_i (void)
+Time_Date_Client_i::Time_Date_Client_i ()
 {
 }
 
 //Destructor.
-Time_Date_Client_i::~Time_Date_Client_i (void)
+Time_Date_Client_i::~Time_Date_Client_i ()
 {
 }
 
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.h b/TAO/examples/Simple/time-date/Time_Date_Client_i.h
index 9a5df732376..65b745ae5db 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.h
@@ -29,10 +29,10 @@ class Time_Date_Client_i
 {
 public:
   /// Constructor
-  Time_Date_Client_i (void);
+  Time_Date_Client_i ();
 
   /// Destructor
-  virtual ~Time_Date_Client_i (void);
+  virtual ~Time_Date_Client_i ();
 
   /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index 05d0a085854..d19532eb481 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -21,7 +21,7 @@ Time_Date_i::str_date (CORBA::String_out time_date)
 
 // Shutdown.
 void
-Time_Date_i::shutdown (void)
+Time_Date_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Time_Date_i is shutting down\n")));
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h
index 9fccb9e978d..1b6f7347fed 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_i.h
@@ -32,7 +32,7 @@ public:
   virtual void str_date (CORBA::String_out time_date);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// ORB pointer.
   void orb (CORBA::ORB_ptr orb_ptr);
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index 43c46e20502..2ffb6c48a35 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -4,13 +4,13 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Time_Client_i::Time_Client_i (void)
+Time_Client_i::Time_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Time_Client_i::~Time_Client_i (void)
+Time_Client_i::~Time_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/Simple/time/Time_Client_i.h b/TAO/examples/Simple/time/Time_Client_i.h
index a1d995efd7c..4f5540a0964 100644
--- a/TAO/examples/Simple/time/Time_Client_i.h
+++ b/TAO/examples/Simple/time/Time_Client_i.h
@@ -29,10 +29,10 @@ class Time_Client_i
 {
 public:
   /// Constructor
-  Time_Client_i (void);
+  Time_Client_i ();
 
   /// Destructor
-  ~Time_Client_i (void);
+  ~Time_Client_i ();
 
   /// Execute the methods
   int run (const char *, int, ACE_TCHAR**);
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index 65dd56da074..da2012edaef 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -2,12 +2,12 @@
 #include "ace/OS_NS_time.h"
 
 // Constructor
-Time_i::Time_i (void)
+Time_i::Time_i ()
 {
 }
 
 // Destructor
-Time_i::~Time_i (void)
+Time_i::~Time_i ()
 {
 }
 
@@ -20,14 +20,14 @@ Time_i::orb (CORBA::ORB_ptr o)
 
 // Return the current date/time on the server.
 CORBA::Long
-Time_i::current_time (void)
+Time_i::current_time ()
 {
   return CORBA::Long (ACE_OS::time (0));
 }
 
 // Shutdown.
 void
-Time_i::shutdown (void)
+Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Time_i is shutting down\n")));
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index a3c9556d137..9a990e976be 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -29,16 +29,16 @@ class Time_i: public POA_Time
 {
 public:
   /// Constructor
-  Time_i (void);
+  Time_i ();
 
   /// Destructor
-  virtual ~Time_i (void);
+  virtual ~Time_i ();
 
   /// Return the current time/date on the server
-  virtual CORBA::Long current_time (void);
+  virtual CORBA::Long current_time ();
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index d5e299cc3c2..9514648ec52 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -59,7 +59,7 @@ DOVE_Supplier::~DOVE_Supplier ()
 // Initialize the ORB and the connection to the Name Service
 
 int
-DOVE_Supplier::init (void)
+DOVE_Supplier::init ()
 {
   try
   {
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index f5411123a3d..8fb279a321d 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -34,10 +34,10 @@ public:
   DOVE_Supplier ();
 
   /// Destructor.
-  ~DOVE_Supplier (void);
+  ~DOVE_Supplier ();
 
   /// Initialize the ORB and the connection to the Name Service
-  int init (void);
+  int init ();
 
   /// Connect to the event service.
   int connect (const char * MIB_name = 0,
@@ -69,7 +69,7 @@ private:
     friend class DOVE_Supplier;
 
   public:
-    virtual void disconnect_push_supplier (void)
+    virtual void disconnect_push_supplier ()
     {
     }
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index cbad17be5ad..5eaee1f34e9 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -265,7 +265,7 @@ DualEC_Supplier::init ()
 // Private class that implements a termination servant.
 
 void
-DualEC_Supplier::Terminator::shutdown (void)
+DualEC_Supplier::Terminator::shutdown ()
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
 }
@@ -430,7 +430,7 @@ DualEC_Supplier::run_weap_thread (void *arg)
 // them with the Naming Service.
 
 int
-DualEC_Supplier::create_schedulers (void)
+DualEC_Supplier::create_schedulers ()
 {
   // @@TBD - look at a command line modified setting,
   // create either a runtime or a config scheduler for
@@ -558,7 +558,7 @@ DualEC_Supplier::create_schedulers (void)
 // them with the Naming Service.
 
 int
-DualEC_Supplier::create_event_channels (void)
+DualEC_Supplier::create_event_channels ()
 {
   try
     {
@@ -604,7 +604,7 @@ DualEC_Supplier::create_event_channels (void)
 }
 
 void
-DualEC_Supplier::compute_schedules (void)
+DualEC_Supplier::compute_schedules ()
 {
   try
     {
@@ -653,7 +653,7 @@ DualEC_Supplier::compute_schedules (void)
 }
 
 void
-DualEC_Supplier::start_generating_events (void)
+DualEC_Supplier::start_generating_events ()
 {
   try
     {
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index 4f36119ca62..cc5dc5f289f 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -52,19 +52,19 @@ class DualEC_Supplier
 public:
   DualEC_Supplier (int argc, ACE_TCHAR** argv);
 
-  ~DualEC_Supplier (void);
+  ~DualEC_Supplier ();
 
   /// Initialize: set up, resolve ORB services,
   /// connect the DOVE_Suppliers.
-  int init (void);
+  int init ();
 
   /// Compute schedule priorities, possibly dump
   /// data into runtime scheduler header files.
-  void compute_schedules (void);
+  void compute_schedules ();
 
   /// here is really something going on,
   /// here we deliver the messages
-  void start_generating_events (void);
+  void start_generating_events ();
 
   /// Load the scheduling information into memory
   void load_schedule_data ();
@@ -78,7 +78,7 @@ private:
  */
   class Terminator : public POA_NavWeapTerminator
   {
-    void shutdown (void);
+    void shutdown ();
   };
 
   /// Run the orb event loop.
@@ -92,11 +92,11 @@ private:
 
   /// Create two scheduling service instances, registers
   /// them with the Naming Service.
-  int create_schedulers (void);
+  int create_schedulers ();
 
   /// Create two event service instances, registers
   /// them with the Naming Service.
-  int create_event_channels (void);
+  int create_event_channels ();
 
   /// Get command line options.
   unsigned int get_options (int argc, ACE_TCHAR *argv []);
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 76ca7f5475d..a4559e8963c 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -44,7 +44,7 @@ static int received = 0;
 
 // ************************************************************
 
-Demo_Consumer::Demo_Consumer (void)
+Demo_Consumer::Demo_Consumer ()
 {
 }
 
@@ -123,7 +123,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 void
-Demo_Consumer::disconnect_push_consumer (void)
+Demo_Consumer::disconnect_push_consumer ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Consumer received disconnect from channel.\n"));
@@ -193,7 +193,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Demo_Consumer::shutdown (void)
+Demo_Consumer::shutdown ()
 {
   try
     {
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
index 5536e2fe442..377344095a7 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
@@ -32,7 +32,7 @@
 class Demo_Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
-  Demo_Consumer (void);
+  Demo_Consumer ();
 
   /**
    * Uses the name server to obtain a reference to the <supplier_name>
@@ -45,7 +45,7 @@ public:
                      const char *my_name);
 
   /// The channel is disconnecting.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = (not protected to allow short-circuiting) protected:
   /**
@@ -57,7 +57,7 @@ public:
 
 protected:
   /// Disconnect from the Event Service.
-  void shutdown (void);
+  void shutdown ();
 
   // = Event channel adminstration references.
   RtecEventChannelAdmin::EventChannel_var channel_admin_;
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 8acdacb1272..984e5904e7b 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -56,7 +56,7 @@ Event_Supplier::init ()
 }
 
 void
-Event_Supplier::start_generating_events (void)
+Event_Supplier::start_generating_events ()
 {
   unsigned long total_sent = 0;
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
index f2f6b9ecf85..a15bc247c4a 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
@@ -44,14 +44,14 @@ class Event_Supplier
 public:
   Event_Supplier (int argc, ACE_TCHAR** argv);
 
-  ~Event_Supplier (void);
+  ~Event_Supplier ();
 
   /// connect the DOVE_Supplier
-  int init (void);
+  int init ();
 
   /// here is really something going on,
   /// here we deliver the messages
-  void start_generating_events (void);
+  void start_generating_events ();
 
   /// Load the scheduling information into memory
   void load_schedule_data (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data);
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 59cb0a0f392..9cda0d5e84f 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -69,7 +69,7 @@ Logging_Supplier::init ()
 }
 
 void
-Logging_Supplier::start_generating_events (void)
+Logging_Supplier::start_generating_events ()
 {
   unsigned long total_sent = 0;
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
index f959bdbc9a0..dc73fa496dc 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
@@ -45,14 +45,14 @@ class Logging_Supplier
 public:
   Logging_Supplier (int argc, ACE_TCHAR** argv);
 
-  ~Logging_Supplier (void);
+  ~Logging_Supplier ();
 
   /// connect the DOVE_Supplier
-  int init (void);
+  int init ();
 
   /// here is really something going on,
   /// here we deliver the messages
-  void start_generating_events (void);
+  void start_generating_events ();
 
   /// Load the scheduling information into memory
   void load_schedule_data (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data);
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
index eb0f51c36d8..3a96702b496 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -17,16 +17,16 @@
 #include "ace/Read_Buffer.h"
 
 // Constructor
-IOR_corbaloc_Client_i::IOR_corbaloc_Client_i (void)
+IOR_corbaloc_Client_i::IOR_corbaloc_Client_i ()
 {
 }
 
-IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void)
+IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i ()
 {
 }
 
 int
-IOR_corbaloc_Client_i::run (void)
+IOR_corbaloc_Client_i::run ()
 {
   try
     {
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
index 7fe58cc2df9..4cd6e443d85 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
@@ -30,11 +30,11 @@ class IOR_corbaloc_Client_i
 {
  public:
   // = Constructor and destructor.
-  IOR_corbaloc_Client_i (void);
-  ~IOR_corbaloc_Client_i (void);
+  IOR_corbaloc_Client_i ();
+  ~IOR_corbaloc_Client_i ();
 
   /// Execute the client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with the server.
   int init (int& argc, ACE_TCHAR *argv[]);
diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp
index d9e7c972a22..b61f0355899 100644
--- a/TAO/examples/ior_corbaloc/status_i.cpp
+++ b/TAO/examples/ior_corbaloc/status_i.cpp
@@ -7,7 +7,7 @@ corbaloc_Status_i::corbaloc_Status_i ()
 }
 
 CORBA::Boolean
-corbaloc_Status_i::print_status (void)
+corbaloc_Status_i::print_status ()
 {
   // If the server received the request from the client, return true
   // == 0;
diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h
index 59438b1b708..dbbd61f1d74 100644
--- a/TAO/examples/ior_corbaloc/status_i.h
+++ b/TAO/examples/ior_corbaloc/status_i.h
@@ -9,7 +9,7 @@ class corbaloc_Status_i : public POA_corbaloc::Status
 public:
   corbaloc_Status_i ();
 
-  CORBA::Boolean print_status (void);
+  CORBA::Boolean print_status ();
 
   void set_name (const char *name) { server_name_ = name; }
 
diff --git a/TAO/examples/mfc/w32_test_impl.cpp b/TAO/examples/mfc/w32_test_impl.cpp
index eecacc3dbc4..d6b722b20c2 100644
--- a/TAO/examples/mfc/w32_test_impl.cpp
+++ b/TAO/examples/mfc/w32_test_impl.cpp
@@ -2,11 +2,11 @@
 
 #include "w32_test_impl.h"
 
-W32_Test_Impl::~W32_Test_Impl (void)
+W32_Test_Impl::~W32_Test_Impl ()
 {
 }
 
-W32_Test_Impl::W32_Test_Impl (void)
+W32_Test_Impl::W32_Test_Impl ()
 {
   blabla = 1;
 }
diff --git a/TAO/examples/mfc/w32_test_impl.h b/TAO/examples/mfc/w32_test_impl.h
index 1022be5cf40..386c775b173 100644
--- a/TAO/examples/mfc/w32_test_impl.h
+++ b/TAO/examples/mfc/w32_test_impl.h
@@ -6,9 +6,9 @@
 class W32_Test_Impl : public POA_W32_Test_Interface
 {
 public:
-  ~W32_Test_Impl (void);
+  ~W32_Test_Impl ();
 
-  W32_Test_Impl (void);
+  W32_Test_Impl ();
 
   char *getresponse (CORBA::Long respnr);
 
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
index b0c7a59fe9c..9d2c8faa312 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
@@ -32,12 +32,12 @@
 #include "ace/Log_Msg.h"
 
 // Implementation skeleton constructor
-ATC_Test_i::ATC_Test_i (void)
+ATC_Test_i::ATC_Test_i ()
 {
 }
 
 // Implementation skeleton destructor
-ATC_Test_i::~ATC_Test_i (void)
+ATC_Test_i::~ATC_Test_i ()
 {
 }
 
@@ -166,7 +166,7 @@ ATC_Test_i::do_value (const ::CORBA::Any & a)
 }
 
 void
-ATC_Test_i::shutdown (void)
+ATC_Test_i::shutdown ()
 {
   int argc = 0;
   ACE_TCHAR **argv = 0;
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
index 7618e410182..33eac69ba61 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
@@ -38,15 +38,15 @@
 class  ATC_Test_i : public virtual POA_Demo::ATC_Test
 {
 public:
-  ATC_Test_i (void);
+  ATC_Test_i ();
 
-  virtual ~ATC_Test_i (void);
+  virtual ~ATC_Test_i ();
 
   virtual char * do_union (const ::CORBA::Any & a);
   virtual char * do_struct (const ::CORBA::Any & a);
   virtual char * do_value (const ::CORBA::Any & a);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
index 1eee8431332..89dfd4b0c93 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
@@ -2,7 +2,7 @@
 #include "NestedValueImpl.h"
 
 CORBA::ValueBase*
-Demo_NestedValueFactory::create_for_unmarshal (void)
+Demo_NestedValueFactory::create_for_unmarshal ()
 {
   return new Demo_NestedValueImpl ();
 }
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
index 0ae211131d8..260dc8111c4 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
@@ -1,15 +1,15 @@
 #include "NestedValueImpl.h"
 
-Demo_NestedValueImpl::Demo_NestedValueImpl (void)
+Demo_NestedValueImpl::Demo_NestedValueImpl ()
 {
 }
 
-Demo_NestedValueImpl::~Demo_NestedValueImpl (void)
+Demo_NestedValueImpl::~Demo_NestedValueImpl ()
 {
 }
 
 CORBA::ValueBase*
-Demo_NestedValueImpl::_copy_value (void)
+Demo_NestedValueImpl::_copy_value ()
 {
   Demo_NestedValueImpl *nestedValueImpl = new Demo_NestedValueImpl();
   nestedValueImpl->foo1 (foo1 ());
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
index d84a54fdedf..8932fb90144 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
@@ -8,9 +8,9 @@ class Demo_NestedValueImpl : public virtual OBV_Demo::NestedValue,
                              public virtual CORBA::DefaultValueRefCountBase
 {
 public:
-  Demo_NestedValueImpl (void);
-  ~Demo_NestedValueImpl (void);
-  virtual CORBA::ValueBase* _copy_value (void);
+  Demo_NestedValueImpl ();
+  ~Demo_NestedValueImpl ();
+  virtual CORBA::ValueBase* _copy_value ();
 };
 
 #endif
diff --git a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
index d2f36f04d3f..219ebf257eb 100644
--- a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
@@ -13,7 +13,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
index 019e4210026..2235d3beb57 100644
--- a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
@@ -10,16 +10,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
index d65ed78aa37..cc83c5b7e3b 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
index dd22dcc19d3..2d12efbd1f0 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
index 9554057647d..e3d1af0b6df 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
@@ -26,7 +26,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
index 6b5c5afe283..d23af7e6cba 100644
--- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
@@ -14,18 +14,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
index e7b490fa096..d3fb25ea8be 100644
--- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
index 6e620abfe29..ac639a0e1c9 100644
--- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
@@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "12345678";
 
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
index 2755fd363b3..1659c5f6071 100644
--- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
@@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
index 28251a8109b..ab75e516797 100644
--- a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
@@ -12,7 +12,7 @@ CDR_Out_Arg_i::get_out (CORBA::Long_out arg)
 }
 
 void
-CDR_Out_Arg_i::shutdown (void)
+CDR_Out_Arg_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.h b/TAO/interop-tests/CdrOutArg/tao/test_i.h
index 6a2721a9f6e..90dfd48bda9 100644
--- a/TAO/interop-tests/CdrOutArg/tao/test_i.h
+++ b/TAO/interop-tests/CdrOutArg/tao/test_i.h
@@ -26,7 +26,7 @@ public:
 
   void get_out (CORBA::Long_out arg);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pseudo-reference (for shutdown).
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index 59a5b5b8ab1..6a9597d01ed 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -10,12 +10,12 @@ interop_WChar_Passer_i::interop_WChar_Passer_i (CORBA::ORB_ptr o,
 }
 
 // Implementation skeleton destructor
-interop_WChar_Passer_i::~interop_WChar_Passer_i (void)
+interop_WChar_Passer_i::~interop_WChar_Passer_i ()
 {
 }
 
 char *
-interop_WChar_Passer_i::orb_name (void)
+interop_WChar_Passer_i::orb_name ()
 {
   return CORBA::string_dup ("TAO");
 }
@@ -211,7 +211,7 @@ interop_WChar_Passer_i::exception_test ( CORBA::Short key)
 }
 
 void
-interop_WChar_Passer_i::shutdown (void)
+interop_WChar_Passer_i::shutdown ()
 {
   this->orb_->shutdown(0);
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index 3350932888b..83bd1198afe 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -37,9 +37,9 @@ public:
   interop_WChar_Passer_i (CORBA::ORB_ptr o, int verbose);
 
   //Destructor
-  virtual ~interop_WChar_Passer_i (void);
+  virtual ~interop_WChar_Passer_i ();
 
-  virtual char * orb_name (void);
+  virtual char * orb_name ();
 
   virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
                                           CORBA::Short key);
@@ -82,7 +82,7 @@ public:
 
 virtual void exception_test (CORBA::Short key);
 
-virtual void shutdown (void);
+virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index 70e52c70f6c..c823ba14583 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -23,7 +23,7 @@
 
 // Default Constructor.
 
-Concurrency_Service::Concurrency_Service (void)
+Concurrency_Service::Concurrency_Service ()
   : use_naming_service_ (1),
     ior_file_name_ (0),
     pid_file_name_ (0)
@@ -147,7 +147,7 @@ Concurrency_Service::init (int argc,
 }
 
 int
-Concurrency_Service::init_naming_service (void)
+Concurrency_Service::init_naming_service ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n"));
   CORBA::ORB_var orb;
@@ -180,7 +180,7 @@ Concurrency_Service::init_naming_service (void)
 // Run the ORB event loop.
 
 int
-Concurrency_Service::run (void)
+Concurrency_Service::run ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "Concurrency_Service::run (...)\n"));
@@ -195,7 +195,7 @@ Concurrency_Service::run (void)
 
 // Destructor.
 
-Concurrency_Service::~Concurrency_Service (void)
+Concurrency_Service::~Concurrency_Service ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "Concurrency_Service::~Concurrency_Service (void)\n"));
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index a80045d75fa..c630331101b 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -39,21 +39,21 @@ class Concurrency_Service : public TAO_ORB_Manager
 {
 public:
   /// Default Constructor.
-  Concurrency_Service (void);
+  Concurrency_Service ();
 
   /// Constructor taking the command-line arguments.
   Concurrency_Service (int argc,
                        ACE_TCHAR **argv);
 
   /// Destructor.
-  ~Concurrency_Service (void);
+  ~Concurrency_Service ();
 
   /// Initialize the Concurrency Service with the arguments.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the Concurrency_Service.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
@@ -65,7 +65,7 @@ private:
    * the individual lock sets with the naming service. At present the
    * clients must keep track of the reference and pass 'by hand'
    */
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Flag to tell wheter the naming service will be used.
   int use_naming_service_;
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
index d6e04baa4f1..625480e6fec 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
@@ -20,7 +20,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb,
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
index d437c61d1fd..614219cd901 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
@@ -28,7 +28,7 @@ public:
                int event_limit);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual void send_message (const char * user_name,
                              const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
index cad9543fb1c..5a2521f4bf2 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
index 51a17c26b09..a59513010b0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
index 5e857eefb2b..9cd0461819f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
@@ -11,13 +11,13 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
   std::cout << "Hello";
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
index 51a17c26b09..a59513010b0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
index e2cd0fc8925..63ad758730f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
index ed58ae335d9..787ab998278 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
@@ -11,12 +11,12 @@
 
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
index e2cd0fc8925..63ad758730f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
index 4e0eb4783bf..3776f962281 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
index f5ae4c1b664..a5a1587e151 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
index 5b85d67ecd4..3245e521a62 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
index d457dc3f4b1..60153e1b1a5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
@@ -66,7 +66,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
index b02d68f1b92..4ef01eb8480 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
@@ -101,7 +101,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
index 28e15e9d4f9..cb3d1512f6b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
@@ -15,7 +15,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
  CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
index 87fc10aa190..34156bd41a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
@@ -74,7 +74,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
     connect_structured_push_supplier (supplier.in());
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
index e488e183bcf..ce9aa7c930b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
@@ -9,7 +9,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
index a8a88595673..6e4bc4d8073 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
@@ -106,7 +106,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
   s_proxy_consumer_->offer_change(added, removed);
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
index 9ccdbcc3740..69a75da32e9 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
@@ -8,7 +8,7 @@ class  Messenger_i : public POA_Messenger
 {
 public:
   Messenger_i (CORBA::ORB_ptr orb);
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
  CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
index 5c46a1cf215..7de7ea60031 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
@@ -88,7 +88,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
index e488e183bcf..ce9aa7c930b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
@@ -9,7 +9,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
index d269451a068..569cd0b9f57 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
@@ -105,7 +105,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
index 83115d8465c..21d197d81a2 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
@@ -10,7 +10,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
index 5a001740634..4410caa5332 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
@@ -112,7 +112,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
index 28e15e9d4f9..cb3d1512f6b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
@@ -15,7 +15,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
  CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
index 26400a9741a..55532bfbfa0 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_unistd.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
  : slot_ (0),
    current_ (PortableInterceptor::Current::_nil())
 {
@@ -65,7 +65,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 }
 
 void
-ClientInitializer::set_slot_data (void)
+ClientInitializer::set_slot_data ()
 {
   // Set the recursion flag
   CORBA::Any flag;
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
index 4870f1877c3..c3d497c1008 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
@@ -11,10 +11,10 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
-  void set_slot_data (void);
+  void set_slot_data ();
 
  private:
    PortableInterceptor::SlotId slot_;
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
index 86ba4505116..6fc2e054d63 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
@@ -19,7 +19,7 @@ ClientInterceptor (Messenger_var theMessenger,
   this->slot = theSlot;
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
index 4cbb4f32191..49f716877e6 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
@@ -12,12 +12,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
index a75058af397..ed581d27abf 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
index 5fae85e4a42..80041289ce9 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
@@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] =
   {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0};
 const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"};
 
-ServerInterceptor::ServerInterceptor (void)
+ServerInterceptor::ServerInterceptor ()
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
index a8da1affe95..3e8e46e14a9 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
@@ -8,7 +8,7 @@ class ServerInterceptor
 : public PortableInterceptor::ServerRequestInterceptor
 {
  public:
-  ServerInterceptor (void);
+  ServerInterceptor ();
 
   ~ServerInterceptor ();
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
index 037e494f62d..4c71c9969b0 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
@@ -13,7 +13,7 @@ Messenger_i::Messenger_i (
   {
   }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
index febd241327e..947ce475082 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
@@ -21,7 +21,7 @@ public:
       SSLIOP::Current_ptr ssliop_current
     );
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
    virtual CORBA::Boolean send_message (
      const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
index 062708bd920..8f2c72c4817 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
@@ -3,12 +3,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
index 1c47ddf998f..dced78f9cd4 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
@@ -14,10 +14,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
index cd9f4219370..fe9a9e53fc3 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
@@ -19,12 +19,12 @@
 #include "MessengerI.h"
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
index ed4ef394a2f..586ce510a09 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
index 1c47ddf998f..dced78f9cd4 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
@@ -14,10 +14,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
index c47878eb0fc..da4b376c2c2 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
@@ -21,7 +21,7 @@ public:
     kind(k);
   }
 
-  virtual ::CORBA::ValueBase *_copy_value (void)
+  virtual ::CORBA::ValueBase *_copy_value ()
   {
     ::CORBA::ValueBase *ret_val = 0;
     ACE_NEW_THROW_EX (
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 29726be0784..78814972504 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -42,7 +42,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
 // ****************************************************************
 
-Event_Service::Event_Service (void)
+Event_Service::Event_Service ()
   : sched_impl_ (0),
     ec_impl_ (0),
     scheduler_type_ (ES_SCHED_NONE),
@@ -51,7 +51,7 @@ Event_Service::Event_Service (void)
 {
 }
 
-Event_Service::~Event_Service (void)
+Event_Service::~Event_Service ()
 {
   delete this->ec_impl_;
   this->ec_impl_ = 0;
@@ -402,19 +402,19 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv [])
 
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-Event_Service::for_consumers (void)
+Event_Service::for_consumers ()
 {
   return this->ec_impl_->for_consumers ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-Event_Service::for_suppliers (void)
+Event_Service::for_suppliers ()
 {
   return this->ec_impl_->for_suppliers ();
 }
 
 void
-Event_Service::destroy (void)
+Event_Service::destroy ()
 {
   this->ec_impl_->destroy ();
   this->orb_->shutdown ();
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index bd7dbc3a5dc..06a95d327bb 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -31,18 +31,18 @@
 class Event_Service : public POA_RtecEventChannelAdmin::EventChannel
 {
 public:
-  Event_Service (void);
-  virtual ~Event_Service (void);
+  Event_Service ();
+  virtual ~Event_Service ();
 
   /// Run the event service.
   int run (int argc, ACE_TCHAR* argv[]);
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void);
-  virtual void destroy (void);
+    for_suppliers ();
+  virtual void destroy ();
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer);
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle);
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
index 43bf42d75f5..6958151e8dc 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
@@ -9,7 +9,7 @@
 #include "ace/Task.h"
 
 // Default Constructor.
-TAO_FT_Naming_Service::TAO_FT_Naming_Service (void)
+TAO_FT_Naming_Service::TAO_FT_Naming_Service ()
   : time_ (0),
     num_threads_ (1)
 {
@@ -123,7 +123,7 @@ public:
       time_(t)
   {}
 
-  int svc (void)
+  int svc ()
   {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -147,7 +147,7 @@ private:
 };
 
 int
-TAO_FT_Naming_Service::run (void)
+TAO_FT_Naming_Service::run ()
 {
   ORB_Runner runner (this->orb_.in(), time_);
   if (this->num_threads_ == 1)
@@ -169,7 +169,7 @@ TAO_FT_Naming_Service::run (void)
 }
 
 void
-TAO_FT_Naming_Service::shutdown (void)
+TAO_FT_Naming_Service::shutdown ()
 {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -178,7 +178,7 @@ TAO_FT_Naming_Service::shutdown (void)
 }
 
 int
-TAO_FT_Naming_Service::fini (void)
+TAO_FT_Naming_Service::fini ()
 {
   this->my_naming_server_.fini();
 
@@ -199,6 +199,6 @@ TAO_FT_Naming_Service::fini (void)
 }
 
 // Destructor.
-TAO_FT_Naming_Service::~TAO_FT_Naming_Service (void)
+TAO_FT_Naming_Service::~TAO_FT_Naming_Service ()
 {
 }
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
index a9828df3d37..d8feffc6453 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
@@ -29,7 +29,7 @@ class TAO_FT_Naming_Service
 {
 public:
   /// Default Constructor.
-  TAO_FT_Naming_Service (void);
+  TAO_FT_Naming_Service ();
 
   /// Constructor taking the command-line arguments.
   TAO_FT_Naming_Service (int argc, ACE_TCHAR* argv[]);
@@ -41,13 +41,13 @@ public:
   virtual int fini ();
 
   /// Run the TAO_Naming_Service.
-  virtual int run (void);
+  virtual int run ();
 
   /// Shut down the TAO_Naming_Service; you must still call fini().
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Destructor.
-  virtual ~TAO_FT_Naming_Service (void);
+  virtual ~TAO_FT_Naming_Service ();
 
 protected:
   /// Parse the command line arguments to find
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 2f7b9c0cfd5..baa75633fb6 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -113,7 +113,7 @@ int TAO::FT_FaultConsumer::init (
 * - Disconnect from FT::FaultNotifier.
 * - Deactivate from the POA.
 */
-int TAO::FT_FaultConsumer::fini (void)
+int TAO::FT_FaultConsumer::fini ()
 {
   if (TAO_debug_level > 1)
   {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 882c0144437..cf86895b424 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -74,7 +74,7 @@ namespace TAO
     * - Disconnect from FT::FaultNotifier.
     * - Deactivate from the POA.
     */
-    int fini (void);
+    int fini ();
 
     /**
     * Accessor for a duplicate of this consumer's object reference.
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 30baef0cd46..4893362ece5 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::FT_Property_Validator::FT_Property_Validator (void)
+TAO::FT_Property_Validator::FT_Property_Validator ()
   : replication_style_ (1),
     membership_style_ (1),
     consistency_style_ (1),
@@ -32,7 +32,7 @@ TAO::FT_Property_Validator::FT_Property_Validator (void)
 }
 
 
-TAO::FT_Property_Validator::~FT_Property_Validator (void)
+TAO::FT_Property_Validator::~FT_Property_Validator ()
 {
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index 1cbc87839bc..44fa0384d58 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -36,10 +36,10 @@ namespace TAO
   {
   public:
     /// Constructor.
-    FT_Property_Validator (void);
+    FT_Property_Validator ();
 
     /// Destructor.
-    virtual ~FT_Property_Validator (void);
+    virtual ~FT_Property_Validator ();
 
     /// Validate the given properties.  Throw an exception when the
     /// first invalid property is encountered.  The remaining properties
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index d6ae2013e48..c9f53833ab4 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -81,7 +81,7 @@ TAO::FT_ReplicationManager::FT_ReplicationManager ()
   // init must be called before using this object.
 }
 
-TAO::FT_ReplicationManager::~FT_ReplicationManager (void)
+TAO::FT_ReplicationManager::~FT_ReplicationManager ()
 {
   // cleanup happens in fini
 }
@@ -324,7 +324,7 @@ int TAO::FT_ReplicationManager::idle (int & result)
 
 
 //public
-int TAO::FT_ReplicationManager::fini (void)
+int TAO::FT_ReplicationManager::fini ()
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 1f4b4fdbff4..6d7d99d8d2e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -113,7 +113,7 @@ namespace TAO
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Idle-time activity.
@@ -342,7 +342,7 @@ namespace TAO
     /**
      * Write this factory's IOR to a file
      */
-    int write_ior (void);
+    int write_ior ();
 
     /// Registers the Fault Notifier with the Replication Manager.
     void register_fault_notifier_i (
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index b3139b404ba..4ba0ec642ae 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -90,7 +90,7 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i ()
 ////////////////////////////////////////////
 // FT_FaultDetectorFactory_i private methods
 
-void TAO::FT_FaultDetectorFactory_i::shutdown_i(void)
+void TAO::FT_FaultDetectorFactory_i::shutdown_i()
 {
   // assume mutex is locked
   for (size_t nDetector = 0; nDetector < this->detectors_.size(); ++nDetector)
@@ -103,7 +103,7 @@ void TAO::FT_FaultDetectorFactory_i::shutdown_i(void)
   }
 }
 
-int TAO::FT_FaultDetectorFactory_i::write_ior(void)
+int TAO::FT_FaultDetectorFactory_i::write_ior()
 {
   int result = -1;
   FILE* out = ACE_OS::fopen (this->ior_output_file_, "w");
@@ -346,7 +346,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb)
   return result;
 }
 
-int TAO::FT_FaultDetectorFactory_i::fini (void)
+int TAO::FT_FaultDetectorFactory_i::fini ()
 {
   if (this->ior_output_file_ != 0)
   {
@@ -465,7 +465,7 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::change_properties);
 }
 
-void TAO::FT_FaultDetectorFactory_i::shutdown (void)
+void TAO::FT_FaultDetectorFactory_i::shutdown ()
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::shutdown);
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->internals_);
@@ -654,7 +654,7 @@ void TAO::FT_FaultDetectorFactory_i::delete_object (
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::delete_object);
 }
 
-CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void)
+CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive ()
 {
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive)
     1;
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index 6a91d96a957..9f2dc08d010 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -120,7 +120,7 @@ namespace TAO
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Idle-time activity.
@@ -154,7 +154,7 @@ namespace TAO
     virtual void change_properties (
         const PortableGroup::Properties & property_set);
 
-    virtual void shutdown (void);
+    virtual void shutdown ();
 
     /////////////////////////////////////////
     // CORBA interface GenericFactory methods
@@ -169,7 +169,7 @@ namespace TAO
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
 
-    virtual CORBA::Boolean is_alive (void);
+    virtual CORBA::Boolean is_alive ();
 
     /////////////////////////
     // Implementation methods
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index 1052ea3760e..23698aaecda 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -193,13 +193,13 @@ const char * TAO::FT_FaultNotifier_i::identity () const
   return this->identity_.c_str();
 }
 
-PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA (void)
+PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA ()
 {
   return this->poa_.in();
 }
 
 
-void TAO::FT_FaultNotifier_i::_remove_ref (void)
+void TAO::FT_FaultNotifier_i::_remove_ref ()
 {
   notify_channel_->destroy();
 
@@ -209,7 +209,7 @@ void TAO::FT_FaultNotifier_i::_remove_ref (void)
   this->gone_ = 1;
 }
 
-int TAO::FT_FaultNotifier_i::fini (void)
+int TAO::FT_FaultNotifier_i::fini ()
 {
   if (this->ior_output_file_ != 0)
   {
@@ -683,7 +683,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
   METHOD_RETURN(TAO::FT_FaultNotifier_i::disconnect_consumer);
 }
 
-CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (void)
+CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive ()
 {
   METHOD_RETURN(TAO::FT_FaultNotifier_i::is_alive) 1;
 }
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index fa82d98e021..1f3634355fb 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -69,7 +69,7 @@ namespace TAO
      * Prepare to exit
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Identify this fault notifier.
@@ -110,13 +110,13 @@ namespace TAO
 
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
-    virtual CORBA::Boolean is_alive (void);
+    virtual CORBA::Boolean is_alive ();
 
     /////////////////////////////////////////
     // Override CORBA servant virtual methods
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
 
-    virtual void _remove_ref (void);
+    virtual void _remove_ref ();
 
     /////////////////////////
     // Implementation methods
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index d51d3ad101b..cfc41f9e387 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -9,11 +9,11 @@
 #include "tao/ORB_Core.h"
 #include "ace/Auto_Ptr.h"
 
-IFR_Service::IFR_Service (void)
+IFR_Service::IFR_Service ()
 {
 }
 
-IFR_Service::~IFR_Service (void)
+IFR_Service::~IFR_Service ()
 {
 }
 
@@ -45,7 +45,7 @@ IFR_Service::init (int argc,
 }
 
 int
-IFR_Service::run (void)
+IFR_Service::run ()
 {
   this->orb_->run (0);
 
@@ -53,7 +53,7 @@ IFR_Service::run (void)
 }
 
 int
-IFR_Service::fini (void)
+IFR_Service::fini ()
 {
   try
     {
@@ -68,7 +68,7 @@ IFR_Service::fini (void)
 }
 
 void
-IFR_Service::shutdown (void)
+IFR_Service::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index e3d7ebee02a..8a1eb7337b2 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -29,23 +29,23 @@ class IFR_Service
 {
 public:
   /// Default constructor.
-  IFR_Service (void);
+  IFR_Service ();
 
   /// Destructor
-  ~IFR_Service (void);
+  ~IFR_Service ();
 
   /// Initialize the IFR service.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Shut down the IFR Service.
-  int fini (void);
+  int fini ();
 
   /// Run the IFR service.
-  int run (void);
+  int run ();
 
   /// Shutdown the Service.
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   /// Reference to our ORB.
diff --git a/TAO/orbsvcs/IFR_Service/be_extern.h b/TAO/orbsvcs/IFR_Service/be_extern.h
index c28a7c0c15e..52e35843295 100644
--- a/TAO/orbsvcs/IFR_Service/be_extern.h
+++ b/TAO/orbsvcs/IFR_Service/be_extern.h
@@ -76,9 +76,9 @@ extern TAO_IFR_BE_Export BE_GlobalData *be_global;
 
 extern TAO_IFR_BE_Export int BE_init (int &, ACE_TCHAR*[]);
 extern TAO_IFR_BE_Export void BE_post_init (char *[], long);
-extern TAO_IFR_BE_Export void BE_version (void);
-extern TAO_IFR_BE_Export void BE_produce (void);
-extern TAO_IFR_BE_Export void BE_cleanup (void);
-extern TAO_IFR_BE_Export void BE_abort (void);
+extern TAO_IFR_BE_Export void BE_version ();
+extern TAO_IFR_BE_Export void BE_produce ();
+extern TAO_IFR_BE_Export void BE_cleanup ();
+extern TAO_IFR_BE_Export void BE_abort ();
 
 #endif /* TAO_IFR_BE_EXTERN_H */
diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp
index 4e90faf42b0..89a0ed5262c 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_global.cpp
@@ -18,7 +18,7 @@
 
 TAO_IFR_BE_Export BE_GlobalData *be_global = 0;
 
-BE_GlobalData::BE_GlobalData (void)
+BE_GlobalData::BE_GlobalData ()
   : removing_ (false),
     filename_ (0),
     enable_locking_ (false),
@@ -30,7 +30,7 @@ BE_GlobalData::BE_GlobalData (void)
   idl_global->preserve_cpp_keywords (true);
 }
 
-BE_GlobalData::~BE_GlobalData (void)
+BE_GlobalData::~BE_GlobalData ()
 {
 }
 
@@ -71,13 +71,13 @@ BE_GlobalData::repository (CORBA::Repository_ptr repo)
 }
 
 ACE_Unbounded_Stack<CORBA::Container_ptr> &
-BE_GlobalData::ifr_scopes (void)
+BE_GlobalData::ifr_scopes ()
 {
   return this->ifr_scopes_;
 }
 
 void
-BE_GlobalData::destroy (void)
+BE_GlobalData::destroy ()
 {
 }
 
@@ -142,7 +142,7 @@ BE_GlobalData::orb_args (const ACE_CString& args)
 }
 
 ACE_CString
-BE_GlobalData::spawn_options (void)
+BE_GlobalData::spawn_options ()
 {
   return this->orb_args_ + idl_global->idl_flags ();
 }
diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h
index 7ad1bb1abf7..21d5e0885bc 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.h
+++ b/TAO/orbsvcs/IFR_Service/be_global.h
@@ -38,10 +38,10 @@ public:
   //    Storage of global data specific to the compiler back end
   //
   /// Constructor.
-  BE_GlobalData (void);
+  BE_GlobalData ();
 
   /// Destructor.
-  virtual ~BE_GlobalData (void);
+  virtual ~BE_GlobalData ();
 
   // Data accessors.
 
@@ -54,10 +54,10 @@ public:
   CORBA::Repository_ptr repository () const;
   void repository (CORBA::Repository_ptr repo);
 
-  ACE_Unbounded_Stack<CORBA::Container_ptr> &ifr_scopes (void);
+  ACE_Unbounded_Stack<CORBA::Container_ptr> &ifr_scopes ();
 
   /// Cleanup function.
-  void destroy (void);
+  void destroy ();
 
   const char *filename () const;
   void filename (char *fname);
@@ -76,7 +76,7 @@ public:
 
   /// Command line passed to ACE_Process::spawn. Different
   /// implementations in IDL and IFR backends.
-  ACE_CString spawn_options (void);
+  ACE_CString spawn_options ();
 
   /// Parse an argument that might affect the backend.
   void parse_args (long &i, char **av);
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 94916420226..6a8bea44587 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -86,7 +86,7 @@ BE_ifr_orb_init (int &ac, ACE_TCHAR *av[])
 }
 
 TAO_IFR_BE_Export void
-BE_version (void)
+BE_version ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "%s %s\n",
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 515b22f7c04..2e307463a62 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -77,14 +77,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Clean up before exit, whether successful or not.
 TAO_IFR_BE_Export void
-BE_cleanup (void)
+BE_cleanup ()
 {
   idl_global->destroy ();
 }
 
 // Abort this run of the BE.
 TAO_IFR_BE_Export void
-BE_abort (void)
+BE_abort ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
               ACE_TEXT ("Fatal Error - Aborting\n")));
@@ -94,7 +94,7 @@ BE_abort (void)
 }
 
 int
-BE_ifr_repo_init (void)
+BE_ifr_repo_init ()
 {
   try
   {
@@ -138,7 +138,7 @@ BE_ifr_repo_init (void)
 
 // Do the work of this BE. This is the starting point for code generation.
 TAO_IFR_BE_Export void
-BE_produce (void)
+BE_produce ()
 {
   try
     {
diff --git a/TAO/orbsvcs/IFR_Service/be_util.cpp b/TAO/orbsvcs/IFR_Service/be_util.cpp
index 0459215ea0b..15e4f2b0a85 100644
--- a/TAO/orbsvcs/IFR_Service/be_util.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_util.cpp
@@ -24,12 +24,12 @@ be_util::prep_be_arg (char *)
 }
 
 void
-be_util::arg_post_proc (void)
+be_util::arg_post_proc ()
 {
 }
 
 void
-be_util::usage (void)
+be_util::usage ()
 {
   ORBSVCS_DEBUG ((
       LM_DEBUG,
@@ -44,7 +44,7 @@ be_util::usage (void)
 }
 
 AST_Generator *
-be_util::generator_init (void)
+be_util::generator_init ()
 {
   AST_Generator *gen = 0;
   ACE_NEW_RETURN (gen,
diff --git a/TAO/orbsvcs/IFR_Service/be_util.h b/TAO/orbsvcs/IFR_Service/be_util.h
index 6e41caf36e6..01640c194cb 100644
--- a/TAO/orbsvcs/IFR_Service/be_util.h
+++ b/TAO/orbsvcs/IFR_Service/be_util.h
@@ -26,15 +26,15 @@ public:
 
   /// Checks made after parsing args.
   static TAO_IFR_BE_Export void
-  arg_post_proc (void);
+  arg_post_proc ();
 
   /// Display usage of BE-specific options.
   static TAO_IFR_BE_Export void
-  usage (void);
+  usage ();
 
   /// Create an AST node generator.
   static TAO_IFR_BE_Export AST_Generator *
-  generator_init (void);
+  generator_init ();
 };
 
 #endif // if !defined
diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
index c8332057f1e..07953dded01 100644
--- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
@@ -73,7 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024;
 
 void
-DRV_init (void)
+DRV_init ()
 {
   // Initialize FE global data object.
   ACE_NEW (idl_global,
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 057e05a5013..826c5536758 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -61,7 +61,7 @@ ifr_adding_visitor::ifr_adding_visitor (
 {
 }
 
-ifr_adding_visitor::~ifr_adding_visitor (void)
+ifr_adding_visitor::~ifr_adding_visitor ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 773f97a4b9d..61cc748ff5d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -38,7 +38,7 @@ public:
                       CORBA::Boolean in_reopened = 0,
                       bool allow_duplicate_typedefs = false);
 
-  virtual ~ifr_adding_visitor (void);
+  virtual ~ifr_adding_visitor ();
 
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_predefined_type (AST_PredefinedType *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 2a622afb5af..10ce5c043da 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -20,7 +20,7 @@ ifr_adding_visitor_exception::ifr_adding_visitor_exception (
 {
 }
 
-ifr_adding_visitor_exception::~ifr_adding_visitor_exception (void)
+ifr_adding_visitor_exception::~ifr_adding_visitor_exception ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
index a70cfb44783..abea0065cf1 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
@@ -36,7 +36,7 @@ public:
                                 CORBA::Boolean in_reopened_);
 
   /// Destructor.
-  virtual ~ifr_adding_visitor_exception (void);
+  virtual ~ifr_adding_visitor_exception ();
 
   /// Visit a struct.
   virtual int visit_scope (UTL_Scope *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index 368763cd70b..9411447ca73 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -18,7 +18,7 @@ ifr_adding_visitor_operation::ifr_adding_visitor_operation (AST_Decl *scope)
 {
 }
 
-ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void)
+ifr_adding_visitor_operation::~ifr_adding_visitor_operation ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
index 2975da818cd..f0984d11e0a 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
@@ -35,7 +35,7 @@ public:
   ifr_adding_visitor_operation (AST_Decl *scope);
 
   /// Destructor.
-  virtual ~ifr_adding_visitor_operation (void);
+  virtual ~ifr_adding_visitor_operation ();
 
   /// Visit an operation.
   virtual int visit_operation (AST_Operation *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 234142c65cf..8b2bcddb295 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -14,7 +14,7 @@ ifr_adding_visitor_structure::ifr_adding_visitor_structure (AST_Decl *scope)
 {
 }
 
-ifr_adding_visitor_structure::~ifr_adding_visitor_structure (void)
+ifr_adding_visitor_structure::~ifr_adding_visitor_structure ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
index 10609bf9939..0803c307aac 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
@@ -33,7 +33,7 @@ class ifr_adding_visitor_structure : public ifr_adding_visitor
 public:
   ifr_adding_visitor_structure (AST_Decl *scope);
 
-  virtual ~ifr_adding_visitor_structure (void);
+  virtual ~ifr_adding_visitor_structure ();
 
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_structure (AST_Structure *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 4f7015b2fa6..2c8e0d5e89c 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -18,7 +18,7 @@ ifr_adding_visitor_union::ifr_adding_visitor_union (AST_Decl *scope)
 {
 }
 
-ifr_adding_visitor_union::~ifr_adding_visitor_union (void)
+ifr_adding_visitor_union::~ifr_adding_visitor_union ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
index 747fb2e7628..0029f754649 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
@@ -33,7 +33,7 @@ class ifr_adding_visitor_union : public ifr_adding_visitor
 public:
   ifr_adding_visitor_union (AST_Decl *scope);
 
-  virtual ~ifr_adding_visitor_union (void);
+  virtual ~ifr_adding_visitor_union ();
 
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_structure (AST_Structure *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 8c9c04bb1e8..dcb44de6140 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -4,11 +4,11 @@
 #include "utl_scope.h"
 #include "ast_root.h"
 
-ifr_removing_visitor::ifr_removing_visitor (void)
+ifr_removing_visitor::ifr_removing_visitor ()
 {
 }
 
-ifr_removing_visitor::~ifr_removing_visitor (void)
+ifr_removing_visitor::~ifr_removing_visitor ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h
index 9499a726cc9..9f830bdddf2 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h
@@ -32,10 +32,10 @@ class ifr_removing_visitor : public ifr_visitor
 {
 public:
   /// Constructor.
-  ifr_removing_visitor (void);
+  ifr_removing_visitor ();
 
   /// Destructor.
-  virtual ~ifr_removing_visitor (void);
+  virtual ~ifr_removing_visitor ();
 
   /// Visit the scope.
   virtual int visit_scope (UTL_Scope *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index f7a0750d2cc..b440b045419 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -8,7 +8,7 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
 
-ifr_visitor::ifr_visitor (void)
+ifr_visitor::ifr_visitor ()
   : lock_ (0)
 {
   // Create the appropriate lock.
@@ -24,7 +24,7 @@ ifr_visitor::ifr_visitor (void)
     }
 }
 
-ifr_visitor::~ifr_visitor (void)
+ifr_visitor::~ifr_visitor ()
 {
   delete this->lock_;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
index 99b48ca2a99..9c43d0348a7 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
@@ -34,7 +34,7 @@
 class ifr_visitor : public ast_visitor
 {
 public:
-  virtual ~ifr_visitor (void);
+  virtual ~ifr_visitor ();
 
   virtual int visit_decl (AST_Decl *d);
   virtual int visit_scope (UTL_Scope *node);
@@ -93,7 +93,7 @@ public:
 
 protected:
   // Not abstract but we want to force subclassing anyway.
-  ifr_visitor (void);
+  ifr_visitor ();
 
 private:
   /// Lock.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
index 4633fa0dfcf..d2c30c71aaa 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
@@ -1,6 +1,6 @@
 #include "Activator_Info.h"
 
-Activator_Info::Activator_Info (void)
+Activator_Info::Activator_Info ()
   : name ("")
   , token (0)
   , ior ("")
@@ -27,7 +27,7 @@ Activator_Info::Activator_Info (const ACE_CString& aname,
 }
 
 void
-Activator_Info::clear (void)
+Activator_Info::clear ()
 {
   this->name = "";
   this->token = 0;
@@ -36,7 +36,7 @@ Activator_Info::clear (void)
 }
 
 void
-Activator_Info::reset_runtime (void)
+Activator_Info::reset_runtime ()
 {
   this->ior = "";
   this->activator = ImplementationRepository::Activator::_nil ();
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
index 704e489a354..1bf3a3c14db 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
@@ -15,7 +15,7 @@
 */
 struct Activator_Info
 {
-  Activator_Info (void);
+  Activator_Info ();
   Activator_Info (const Activator_Info& other);
 
   Activator_Info (const ACE_CString& aname,
@@ -24,10 +24,10 @@ struct Activator_Info
     ImplementationRepository::Activator_ptr act =
     ImplementationRepository::Activator::_nil ());
 
-  void clear (void);
+  void clear ();
 
   /// Reset the connection portion
-  void reset_runtime(void);
+  void reset_runtime();
 
   ACE_CString name;
   CORBA::Long token;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 2023bcad320..f23b234e7e2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -19,7 +19,7 @@ public:
   }
 };
 
-ImR_Activator_Loader::ImR_Activator_Loader (void)
+ImR_Activator_Loader::ImR_Activator_Loader ()
 {
 }
 
@@ -56,7 +56,7 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ImR_Activator_Loader::fini (void)
+ImR_Activator_Loader::fini ()
 {
   ACE_ASSERT (this->runner_.get() != 0);
   try
@@ -82,7 +82,7 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
 }
 
 int
-ImR_Activator_Loader::run (void)
+ImR_Activator_Loader::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index 8441aa9113d..deb6a53607a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -18,7 +18,7 @@ class ImR_Activator_ORB_Runner;
 class Activator_Export ImR_Activator_Loader : public TAO_Object_Loader
 {
 public:
-  ImR_Activator_Loader(void);
+  ImR_Activator_Loader();
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -29,7 +29,7 @@ public:
                                            ACE_TCHAR *argv[]);
 
  // Unlike other service objects, we have our own orb.
- int run(void);
+ int run();
 
 private:
   ImR_Activator_i service_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 0c8a041bd6b..f52131335bc 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -61,7 +61,7 @@ Activator_NT_Service::handle_exception (ACE_HANDLE)
  * we update the report_status after init.
  */
 int
-Activator_NT_Service::svc (void)
+Activator_NT_Service::svc ()
 {
   ImR_Activator_i server;
   Activator_Options opts;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 1a3ee36d37a..2f469b6e3da 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -223,7 +223,7 @@ Activator_Options::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Activator_Options::init_from_registry (void)
+Activator_Options::init_from_registry ()
 {
   this->load_registry_options();
   return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index a2daa136fa6..92a7caac5ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -12,7 +12,7 @@
 #include "orbsvcs/Log_Macros.h"
 #include "tao/PortableServer/Servant_Base.h"
 
-ImR_Adapter::ImR_Adapter (void)
+ImR_Adapter::ImR_Adapter ()
   : default_servant_ (0)
 {
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 65e8aa1e9b4..bcb9e1ea344 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -31,7 +31,7 @@ AsyncAccessManager::AsyncAccessManager (UpdateableServerInfo &info,
   this->prev_pid_ = info_->pid;
 }
 
-AsyncAccessManager::~AsyncAccessManager (void)
+AsyncAccessManager::~AsyncAccessManager ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -40,7 +40,7 @@ AsyncAccessManager::~AsyncAccessManager (void)
 }
 
 void
-AsyncAccessManager::started_running (void)
+AsyncAccessManager::started_running ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -86,7 +86,7 @@ AsyncAccessManager::report (const char* operation) const
 }
 
 void
-AsyncAccessManager::update_prev_pid (void)
+AsyncAccessManager::update_prev_pid ()
 {
   this->prev_pid_ = this->info_->pid;
 }
@@ -310,7 +310,7 @@ AsyncAccessManager::notify_waiter (ImR_ResponseHandler *rh)
 }
 
 void
-AsyncAccessManager::notify_waiters (void)
+AsyncAccessManager::notify_waiters ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -443,7 +443,7 @@ AsyncAccessManager::activator_replied_start_running (bool success, int pid)
 }
 
 void
-AsyncAccessManager::shutdown_initiated (void)
+AsyncAccessManager::shutdown_initiated ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -460,7 +460,7 @@ AsyncAccessManager::shutdown_initiated (void)
 }
 
 void
-AsyncAccessManager::server_is_shutting_down (void)
+AsyncAccessManager::server_is_shutting_down ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -589,7 +589,7 @@ AsyncAccessManager::notify_child_death (int pid)
 }
 
 void
-AsyncAccessManager::listener_disconnected (void)
+AsyncAccessManager::listener_disconnected ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -705,7 +705,7 @@ AsyncAccessManager::ping_replied (LiveStatus server)
 }
 
 bool
-AsyncAccessManager::send_start_request (void)
+AsyncAccessManager::send_start_request ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -803,7 +803,7 @@ AsyncAccessManager::send_start_request (void)
 }
 
 AsyncAccessManager *
-AsyncAccessManager::_add_ref (void)
+AsyncAccessManager::_add_ref ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
   ++this->refcount_;
@@ -812,7 +812,7 @@ AsyncAccessManager::_add_ref (void)
 }
 
 void
-AsyncAccessManager::_remove_ref (void)
+AsyncAccessManager::_remove_ref ()
 {
   int count = 0;
   {
@@ -835,12 +835,12 @@ ActivatorReceiver::ActivatorReceiver (AsyncAccessManager *aam,
 {
 }
 
-ActivatorReceiver::~ActivatorReceiver (void)
+ActivatorReceiver::~ActivatorReceiver ()
 {
 }
 
 void
-ActivatorReceiver::start_server (void)
+ActivatorReceiver::start_server ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -898,7 +898,7 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder)
 }
 
 void
-ActivatorReceiver::shutdown (void)
+ActivatorReceiver::shutdown ()
 {
 }
 
@@ -946,7 +946,7 @@ AccessLiveListener::AccessLiveListener (const char *server,
 {
 }
 
-AccessLiveListener::~AccessLiveListener (void)
+AccessLiveListener::~AccessLiveListener ()
 {
   if (!this->aam_.is_nil())
   {
@@ -955,7 +955,7 @@ AccessLiveListener::~AccessLiveListener (void)
 }
 
 bool
-AccessLiveListener::start (void)
+AccessLiveListener::start ()
 {
   bool const started = this->per_client_ ?
     this->pinger_.add_per_client_listener (this, srv_ref_.in()) :
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
index dc2d5716bf6..b9e0828d000 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
@@ -54,9 +54,9 @@ class Locator_Export AsyncAccessManager
   AsyncAccessManager (UpdateableServerInfo &info,
                       ImR_Locator_i &locator);
 
-  ~AsyncAccessManager (void);
+  ~AsyncAccessManager ();
 
-  void started_running (void);
+  void started_running ();
 
   bool is_terminating () const;
   bool is_running () const;
@@ -70,26 +70,26 @@ class Locator_Export AsyncAccessManager
   void activator_replied_start_running (bool success, int pid);
   void server_is_running (const char *partial_ior,
                           ImplementationRepository::ServerObject_ptr ref);
-  void server_is_shutting_down (void);
-  void shutdown_initiated (void);
+  void server_is_shutting_down ();
+  void shutdown_initiated ();
   bool notify_child_death (int pid);
   void ping_replied (LiveStatus server);
-  void listener_disconnected (void);
+  void listener_disconnected ();
 
-  AsyncAccessManager *_add_ref (void);
-  void _remove_ref (void);
+  AsyncAccessManager *_add_ref ();
+  void _remove_ref ();
   static const char *status_name (ImplementationRepository::AAM_Status s);
   static bool is_final (ImplementationRepository::AAM_Status s);
-  void update_prev_pid (void);
+  void update_prev_pid ();
 
  private:
   void report (const char* operation) const;
   void final_state (bool active = true);
   void notify_waiter (ImR_ResponseHandler *rh);
-  void notify_waiters (void);
+  void notify_waiters ();
   void status (ImplementationRepository::AAM_Status s);
   void update_status (ImplementationRepository::AAM_Status s);
-  bool send_start_request (void);
+  bool send_start_request ();
 
   UpdateableServerInfo info_;
   bool manual_start_;
@@ -125,12 +125,12 @@ class ActivatorReceiver :
 public:
   ActivatorReceiver (AsyncAccessManager *aam,
                      PortableServer::POA_ptr poa);
-  virtual ~ActivatorReceiver (void);
+  virtual ~ActivatorReceiver ();
 
-  void start_server (void);
+  void start_server ();
   void start_server_excep (Messaging::ExceptionHolder * excep_holder);
 
-  void shutdown (void);
+  void shutdown ();
   void shutdown_excep (Messaging::ExceptionHolder * excep_holder);
 
   void kill_server (CORBA::Boolean);
@@ -155,8 +155,8 @@ class AccessLiveListener : public LiveListener
                       AsyncAccessManager *aam,
                       LiveCheck &pinger);
 
-  virtual ~AccessLiveListener (void);
-  bool start (void);
+  virtual ~AccessLiveListener ();
+  bool start ();
 
   bool status_changed (LiveStatus status);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
index 0934f68f194..3c6db946c54 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
@@ -25,7 +25,7 @@ AsyncListManager::AsyncListManager (const Locator_Repository *repo,
 {
 }
 
-AsyncListManager::~AsyncListManager (void)
+AsyncListManager::~AsyncListManager ()
 {
   if (ImR_Locator_i::debug() > 4)
     {
@@ -36,13 +36,13 @@ AsyncListManager::~AsyncListManager (void)
 }
 
 PortableServer::POA_ptr
-AsyncListManager::poa (void)
+AsyncListManager::poa ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in());
 }
 
 void
-AsyncListManager::init_list (void)
+AsyncListManager::init_list ()
 {
   CORBA::ULong const len =
     static_cast<CORBA::ULong> (this->repo_->servers ().current_size ());
@@ -146,7 +146,7 @@ AsyncListManager::make_iterator (ImplementationRepository::ServerInformationIter
 }
 
 void
-AsyncListManager::final_state (void)
+AsyncListManager::final_state ()
 {
   if (ImR_Locator_i::debug() > 4)
     {
@@ -313,14 +313,14 @@ AsyncListManager::ping_replied (CORBA::ULong index, LiveStatus status, int pid)
 }
 
 AsyncListManager *
-AsyncListManager::_add_ref (void)
+AsyncListManager::_add_ref ()
 {
   ++this->refcount_;
   return this;
 }
 
 void
-AsyncListManager::_remove_ref (void)
+AsyncListManager::_remove_ref ()
 {
   int const count = --this->refcount_;
 
@@ -348,12 +348,12 @@ ListLiveListener::ListLiveListener (const char *server,
 {
 }
 
-ListLiveListener::~ListLiveListener (void)
+ListLiveListener::~ListLiveListener ()
 {
 }
 
 bool
-ListLiveListener::start (void)
+ListLiveListener::start ()
 {
   bool const rtn = this->pinger_.add_poll_listener (this);
   this->started_ = true;
@@ -361,13 +361,13 @@ ListLiveListener::start (void)
 }
 
 LiveStatus
-ListLiveListener::status (void)
+ListLiveListener::status ()
 {
   return this->status_;
 }
 
 void
-ListLiveListener::cancel (void)
+ListLiveListener::cancel ()
 {
   this->pinger_.remove_listener (this);
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
index 6fe0271458d..4879ac15547 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
@@ -43,9 +43,9 @@ class AsyncListManager
                     PortableServer::POA_ptr poa,
                     LiveCheck *pinger);
 
-  ~AsyncListManager (void);
+  ~AsyncListManager ();
 
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
   void list (ImplementationRepository::AMH_AdministrationResponseHandler_ptr _tao_rh,
              CORBA::ULong count);
 
@@ -55,15 +55,15 @@ class AsyncListManager
   bool evaluate_status (CORBA::ULong index, LiveStatus status, int pid);
   void ping_replied (CORBA::ULong index, LiveStatus status, int pid);
 
-  AsyncListManager *_add_ref (void);
-  void _remove_ref (void);
+  AsyncListManager *_add_ref ();
+  void _remove_ref ();
 
  private:
-  void init_list (void);
+  void init_list ();
   void list_i (CORBA::ULong start, CORBA::ULong count);
   bool make_iterator (ImplementationRepository::ServerInformationIterator_out si,
                       CORBA::ULong start);
-  void final_state (void);
+  void final_state ();
 
   const Locator_Repository *repo_;
   PortableServer::POA_var poa_;
@@ -90,10 +90,10 @@ class ListLiveListener : public LiveListener
                     AsyncListManager *owner,
                     LiveCheck &pinger);
 
-  virtual ~ListLiveListener (void);
-  bool start (void);
-  void cancel (void);
-  LiveStatus status (void);
+  virtual ~ListLiveListener ();
+  bool start ();
+  void cancel ();
+  LiveStatus status ();
   bool status_changed (LiveStatus status);
 
  private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 60976e69dc6..06fb6740309 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -32,7 +32,7 @@ ImR_DSI_Forwarder::ImR_DSI_Forwarder (ImR_Locator_i& imr_impl)
 {
 }
 
-ImR_DSI_Forwarder::~ImR_DSI_Forwarder (void)
+ImR_DSI_Forwarder::~ImR_DSI_Forwarder ()
 {
 }
 
@@ -171,7 +171,7 @@ ImR_DSI_ResponseHandler::ImR_DSI_ResponseHandler (const char *key,
 {
 }
 
-ImR_DSI_ResponseHandler::~ImR_DSI_ResponseHandler (void)
+ImR_DSI_ResponseHandler::~ImR_DSI_ResponseHandler ()
 {
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index 23e81669c28..44fd1feb694 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -55,7 +55,7 @@ public:
                         CORBA::ORB_ptr orb,
                         TAO_AMH_DSI_Response_Handler_ptr resp);
 
-  virtual ~ImR_DSI_ResponseHandler (void);
+  virtual ~ImR_DSI_ResponseHandler ();
 
   void send_ior (const char *pior);
   void send_exception (CORBA::Exception *ex);
@@ -85,7 +85,7 @@ class Locator_Export ImR_DSI_Forwarder : public virtual TAO_DynamicImplementatio
 {
 public:
   ImR_DSI_Forwarder (ImR_Locator_i& imr_impl);
-  virtual ~ImR_DSI_Forwarder (void);
+  virtual ~ImR_DSI_Forwarder ();
 
   virtual void _dispatch (TAO_ServerRequest& request,
                           TAO::Portable_Server::Servant_Upcall *context);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 43c20f68948..679908d3e35 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -84,7 +84,7 @@ ACE_NT_SERVICE_DEFINE (service, Activator_NT_Service, IMR_ACTIVATOR_SERVICE_NAME
 #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
-run_service (void)
+run_service ()
 {
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index ab2e06d5c0f..18e34e05ea4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -71,7 +71,7 @@ Watchdog::stop()
 }
 #endif /* ACE_WIN32 */
 
-ImR_Activator_i::ImR_Activator_i (void)
+ImR_Activator_i::ImR_Activator_i ()
   : registration_token_(0)
   , debug_(0)
   , notify_imr_ (false)
@@ -279,7 +279,7 @@ ImR_Activator_i::init (Activator_Options& opts)
 }
 
 int
-ImR_Activator_i::fini (void)
+ImR_Activator_i::fini ()
 {
   try
     {
@@ -335,20 +335,20 @@ ImR_Activator_i::fini (void)
 }
 
 int
-ImR_Activator_i::run (void)
+ImR_Activator_i::run ()
 {
   this->orb_->run ();
   return 0;
 }
 
 void
-ImR_Activator_i::shutdown (void)
+ImR_Activator_i::shutdown ()
 {
   this->shutdown (false);
 }
 
 bool
-ImR_Activator_i::in_upcall (void)
+ImR_Activator_i::in_upcall ()
 {
   try
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 86d8c7b604c..f3ecb416bd7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -85,7 +85,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac
 public:
   friend class Active_Pid_Setter;
 
-  ImR_Activator_i (void);
+  ImR_Activator_i ();
 
   void start_server (const char* name,
                      const char* cmdline,
@@ -96,18 +96,18 @@ public:
 
   CORBA::Boolean still_alive (CORBA::Long pid);
 
-  void shutdown(void);
+  void shutdown();
 
   /// Initialize the Server state - parsing arguments and waiting.
   int init (Activator_Options& opts);
 
   /// Cleans up any state created by init*.
-  int fini (void);
+  int fini ();
 
   int handle_timeout (const ACE_Time_Value &, const void *tok);
 
   /// Runs the orb.
-  int run (void);
+  int run ();
 
   /// Shutdown the orb.
   void shutdown (bool signaled);
@@ -124,7 +124,7 @@ private:
 
   bool still_running_i (const char *name, pid_t& pid);
 
-  bool in_upcall (void);
+  bool in_upcall ();
 
 private:
   typedef ACE_Unbounded_Set<ACE_CString> UniqueServerList;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 770eba43712..fdcda8a7ddd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -82,7 +82,7 @@ ACE_NT_SERVICE_DEFINE (service, Locator_NT_Service, IMR_LOCATOR_SERVICE_NAME);
 #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
-run_service (void)
+run_service ()
 {
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 60621b1f137..2e435ddae6f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -52,7 +52,7 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) {
 
 int ImR_Locator_i::debug_ = 0;
 
-ImR_Locator_i::ImR_Locator_i (void)
+ImR_Locator_i::ImR_Locator_i ()
   : dsi_forwarder_ (*this)
   , ins_locator_ (0)
   , aam_active_ ()
@@ -69,7 +69,7 @@ ImR_Locator_i::ImR_Locator_i (void)
   ins_locator_ = locator;
 }
 
-ImR_Locator_i::~ImR_Locator_i (void)
+ImR_Locator_i::~ImR_Locator_i ()
 {
 }
 
@@ -237,7 +237,7 @@ ImR_Locator_i::init (Options& opts)
 }
 
 int
-ImR_Locator_i::run (void)
+ImR_Locator_i::run ()
 {
   if (debug_ > 0)
     {
@@ -359,7 +359,7 @@ ImR_Locator_i::opts () const
 }
 
 int
-ImR_Locator_i::fini (void)
+ImR_Locator_i::fini ()
 {
   try
     {
@@ -1539,7 +1539,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
 }
 
 void
-ImR_Locator_i::auto_start_servers (void)
+ImR_Locator_i::auto_start_servers ()
 {
   if (this->repository_->servers ().current_size () == 0)
     return;
@@ -1657,13 +1657,13 @@ ImR_Locator_i::debug ()
 }
 
 LiveCheck&
-ImR_Locator_i::pinger (void)
+ImR_Locator_i::pinger ()
 {
   return this->pinger_;
 }
 
 PortableServer::POA_ptr
-ImR_Locator_i::root_poa (void)
+ImR_Locator_i::root_poa ()
 {
   return PortableServer::POA::_duplicate (this->root_poa_.in());
 }
@@ -1769,7 +1769,7 @@ SyncListener::~SyncListener ()
 }
 
 bool
-SyncListener::is_alive (void)
+SyncListener::is_alive ()
 {
   this->callback_ = true;
   while (!this->got_it_)
@@ -1807,7 +1807,7 @@ ImR_SyncResponseHandler::ImR_SyncResponseHandler (const char *objkey, CORBA::ORB
 {
 }
 
-ImR_SyncResponseHandler::~ImR_SyncResponseHandler (void)
+ImR_SyncResponseHandler::~ImR_SyncResponseHandler ()
 {
 }
 
@@ -1826,7 +1826,7 @@ ImR_SyncResponseHandler::send_exception (CORBA::Exception *ex)
 }
 
 char *
-ImR_SyncResponseHandler::wait_for_result (void)
+ImR_SyncResponseHandler::wait_for_result ()
 {
   while (this->result_.in() == 0 && this->excep_ == 0)
     {
@@ -1858,7 +1858,7 @@ ImR_Loc_ResponseHandler::ImR_Loc_ResponseHandler
 {
 }
 
-ImR_Loc_ResponseHandler::~ImR_Loc_ResponseHandler (void)
+ImR_Loc_ResponseHandler::~ImR_Loc_ResponseHandler ()
 {
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index abc250a2aa1..da3bc7db940 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -38,7 +38,7 @@ class Locator_Export ImR_Locator_i :
 public:
   ImR_Locator_i();
 
-  ~ImR_Locator_i (void);
+  ~ImR_Locator_i ();
 
   /// Initialize the service, creating its own orb, poa, etc.
   int init (Options& opts);
@@ -47,13 +47,13 @@ public:
   int init_with_orb (CORBA::ORB_ptr orb); //, Options& opts);
 
   /// Cleans up any state created by init*.
-  int fini (void);
+  int fini ();
 
   /// Run using the orb reference created during init()
-  int run (void);
+  int run ();
 
   /// Called by the signal handler to notify of shutdown request
-  void signal_shutdown (void);
+  void signal_shutdown ();
 
   /// Shutdown the orb.
   void shutdown (bool wait_for_completion);
@@ -61,7 +61,7 @@ public:
   /// Access the options
   const Options *opts () const;
 
-  static int debug (void);
+  static int debug ();
   // Note : See the IDL for descriptions of the operations.
 
   // Activator->Locator
@@ -160,8 +160,8 @@ public:
 
   // interfaces to aid with collaboration
 
-  LiveCheck &pinger (void);
-  PortableServer::POA_ptr root_poa (void);
+  LiveCheck &pinger ();
+  PortableServer::POA_ptr root_poa ();
   Activator_Info_Ptr get_activator (const ACE_CString& name);
 
   void remove_server_i (const Server_Info_Ptr &si);
@@ -192,7 +192,7 @@ private:
 
   void connect_activator (Activator_Info& info);
 
-  void auto_start_servers (void);
+  void auto_start_servers ();
 
   void connect_server (UpdateableServerInfo& info);
 
@@ -258,7 +258,7 @@ class SyncListener : public LiveListener
 
   virtual ~SyncListener ();
 
-  bool is_alive (void);
+  bool is_alive ();
 
   bool status_changed (LiveStatus status);
 
@@ -281,12 +281,12 @@ class ImR_SyncResponseHandler : public ImR_ResponseHandler
 {
 public:
   ImR_SyncResponseHandler (const char *key, CORBA::ORB_ptr orb);
-  virtual ~ImR_SyncResponseHandler (void);
+  virtual ~ImR_SyncResponseHandler ();
 
   virtual void send_ior (const char *pior);
   virtual void send_exception (CORBA::Exception *ex);
 
-  char *wait_for_result (void);
+  char *wait_for_result ();
 
 private:
   CORBA::String_var result_;
@@ -320,7 +320,7 @@ public:
                            ImplementationRepository::AMH_AdministrationResponseHandler_ptr rh);
   ImR_Loc_ResponseHandler (Loc_Operation_Id opid,
                            ImplementationRepository::AMH_AdministrationExtResponseHandler_ptr rh);
-  virtual ~ImR_Loc_ResponseHandler (void);
+  virtual ~ImR_Loc_ResponseHandler ();
 
   virtual void send_ior (const char *pior);
   virtual void send_exception (CORBA::Exception *ex);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
index cd1ca302346..ef3bc15ab6e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
@@ -12,7 +12,7 @@ ImR_ResponseHandler::ImR_ResponseHandler ()
 {
 }
 
-ImR_ResponseHandler::~ImR_ResponseHandler (void)
+ImR_ResponseHandler::~ImR_ResponseHandler ()
 {
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h
index bc8ea58d0a8..0e327f880f0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h
@@ -26,8 +26,8 @@
 class ImR_ResponseHandler
 {
 public:
-  ImR_ResponseHandler (void);
-  virtual ~ImR_ResponseHandler (void);
+  ImR_ResponseHandler ();
+  virtual ~ImR_ResponseHandler ();
 
   // Dummy implementations used for internal operations
   virtual void send_ior (const char *pior);
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 5bfa60ae725..22be5392ce1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -16,7 +16,7 @@ LiveListener::LiveListener (const char *server)
 {
 }
 
-LiveListener::~LiveListener (void)
+LiveListener::~LiveListener ()
 {
 }
 
@@ -27,7 +27,7 @@ LiveListener::server () const
 }
 
 LiveListener *
-LiveListener::_add_ref (void)
+LiveListener::_add_ref ()
 {
   int const refcount = ++this->refcount_;
   if (ImR_Locator_i::debug () > 5)
@@ -40,7 +40,7 @@ LiveListener::_add_ref (void)
 }
 
 void
-LiveListener::_remove_ref (void)
+LiveListener::_remove_ref ()
 {
   int const count = --this->refcount_;
   if (ImR_Locator_i::debug () > 5)
@@ -102,7 +102,7 @@ LiveEntry::reping_available () const
 }
 
 int
-LiveEntry::next_reping (void)
+LiveEntry::next_reping ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, -1);
   return this->reping_available() ? LiveEntry::reping_msec_[this->repings_++] : -1;
@@ -146,7 +146,7 @@ LiveEntry::LiveEntry (LiveCheck *owner,
     }
 }
 
-LiveEntry::~LiveEntry (void)
+LiveEntry::~LiveEntry ()
 {
   if (this->callback_.in () != 0)
     {
@@ -159,7 +159,7 @@ LiveEntry::~LiveEntry (void)
 }
 
 void
-LiveEntry::release_callback (void)
+LiveEntry::release_callback ()
 {
   this->callback_ = 0;
 }
@@ -195,7 +195,7 @@ LiveEntry::remove_listener (LiveListener *ll)
 }
 
 void
-LiveEntry::reset_status (void)
+LiveEntry::reset_status ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
   if ( this->liveliness_ == LS_ALIVE ||
@@ -238,7 +238,7 @@ LiveEntry::status () const
 }
 
 void
-LiveEntry::update_listeners (void)
+LiveEntry::update_listeners ()
 {
   Listen_Set remove;
   for (Listen_Set::ITERATOR i(this->listeners_);
@@ -494,12 +494,12 @@ PingReceiver::PingReceiver (LiveEntry *entry, PortableServer::POA_ptr poa)
 {
 }
 
-PingReceiver::~PingReceiver (void)
+PingReceiver::~PingReceiver ()
 {
 }
 
 void
-PingReceiver::cancel (void)
+PingReceiver::cancel ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -531,7 +531,7 @@ PingReceiver::cancel (void)
 }
 
 void
-PingReceiver::ping (void)
+PingReceiver::ping ()
 {
   if (this->entry_ != 0)
     {
@@ -632,7 +632,7 @@ LC_TimeoutGuard::LC_TimeoutGuard (LiveCheck *owner, LC_token_type token)
   owner_->enter_handle_timeout ();
 }
 
-LC_TimeoutGuard::~LC_TimeoutGuard (void)
+LC_TimeoutGuard::~LC_TimeoutGuard ()
 {
   owner_->exit_handle_timeout ();
 
@@ -702,7 +702,7 @@ LiveCheck::LiveCheck ()
 {
 }
 
-LiveCheck::~LiveCheck (void)
+LiveCheck::~LiveCheck ()
 {
   for (LiveEntryMap::iterator em (this->entry_map_); !em.done(); em++)
     {
@@ -719,19 +719,19 @@ LiveCheck::~LiveCheck (void)
 }
 
 void
-LiveCheck::enter_handle_timeout (void)
+LiveCheck::enter_handle_timeout ()
 {
   ++this->handle_timeout_busy_;
 }
 
 void
-LiveCheck::exit_handle_timeout (void)
+LiveCheck::exit_handle_timeout ()
 {
   --this->handle_timeout_busy_;
 }
 
 bool
-LiveCheck::in_handle_timeout (void)
+LiveCheck::in_handle_timeout ()
 {
   return this->handle_timeout_busy_ != 0;
 }
@@ -749,7 +749,7 @@ LiveCheck::init (CORBA::ORB_ptr orb,
 }
 
 void
-LiveCheck::shutdown (void)
+LiveCheck::shutdown ()
 {
   this->running_ = false;
   this->reactor()->cancel_timer (this);
@@ -968,7 +968,7 @@ LiveCheck::remove_server (const char *server, int pid)
 }
 
 void
-LiveCheck::remove_deferred_servers (void)
+LiveCheck::remove_deferred_servers ()
 {
   if (!this->removed_entries_.is_empty ())
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
index 610b942a4ed..a61ec955363 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
@@ -76,7 +76,7 @@ class Locator_Export LiveListener
   /// look up a listener entry in the LiveCheck map.
   LiveListener (const char *server);
 
-  virtual ~LiveListener (void);
+  virtual ~LiveListener ();
 
   /// called by the asynch ping receiver when a reply or an exception
   /// is received. Returns true if finished listening
@@ -85,8 +85,8 @@ class Locator_Export LiveListener
   /// Accessor for the server name. Used by the LiveCheck to associate a listener
   const char *server () const;
 
-  LiveListener *_add_ref (void);
-  void _remove_ref (void);
+  LiveListener *_add_ref ();
+  void _remove_ref ();
 
  protected:
   ACE_CString server_;
@@ -116,25 +116,25 @@ class Locator_Export LiveEntry
              bool may_ping,
              ImplementationRepository::ServerObject_ptr ref,
              int pid);
-  ~LiveEntry (void);
+  ~LiveEntry ();
 
-  void release_callback (void);
+  void release_callback ();
   void add_listener (LiveListener *ll);
   void remove_listener (LiveListener *ll);
   LiveStatus status () const;
   void status (LiveStatus l);
-  void reset_status (void);
+  void reset_status ();
 
   /// the current state value as text
   static const char *status_name (LiveStatus s);
 
-  void update_listeners (void);
+  void update_listeners ();
   bool validate_ping (bool &want_reping, ACE_Time_Value &next);
   void do_ping (PortableServer::POA_ptr poa);
   const ACE_Time_Value &next_check () const;
   static void set_reping_limit (int max);
   bool reping_available () const;
-  int next_reping (void);
+  int next_reping ();
   void max_retry_msec (int max);
   const char *server_name () const;
   void set_pid (int pid);
@@ -176,14 +176,14 @@ class Locator_Export PingReceiver :
 {
  public:
   PingReceiver (LiveEntry * entry, PortableServer::POA_ptr poa);
-  virtual ~PingReceiver (void);
+  virtual ~PingReceiver ();
 
   /// Called by the entry if it is no longer interested in the result of
   /// a ping.
-  void cancel (void);
+  void cancel ();
 
   /// Called when an anticipated ping reply is received
-  void ping (void);
+  void ping ();
 
   /// Called when an anticipated ping raises an exception
   void ping_excep (Messaging::ExceptionHolder * excep_holder);
@@ -222,7 +222,7 @@ class Locator_Export LC_TimeoutGuard
 
   /// Releases the flag. If the LiveCheck received any requests for an immediate
   /// or deferred ping during this time, schedule it now.
-  ~LC_TimeoutGuard (void);
+  ~LC_TimeoutGuard ();
 
   /// Returns true if the in handle timeout in the owner was already set.
   bool blocked () const;
@@ -250,11 +250,11 @@ class Locator_Export LiveCheck : public ACE_Event_Handler
   friend class LC_TimeoutGuard;
 
   LiveCheck ();
-  ~LiveCheck (void);
+  ~LiveCheck ();
 
   void init (CORBA::ORB_ptr orb,
              const ACE_Time_Value &interval);
-  void shutdown (void);
+  void shutdown ();
   int handle_timeout (const ACE_Time_Value &current_time,
                       const void *act = 0);
   bool has_server (const char *server);
@@ -275,10 +275,10 @@ class Locator_Export LiveCheck : public ACE_Event_Handler
   const ACE_Time_Value &ping_interval () const;
 
  private:
-  void enter_handle_timeout (void);
-  void exit_handle_timeout (void);
-  bool in_handle_timeout (void);
-  void remove_deferred_servers (void);
+  void enter_handle_timeout ();
+  void exit_handle_timeout ();
+  bool in_handle_timeout ();
+  void remove_deferred_servers ();
 
   typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                   LiveEntry *,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index 4328605dad5..4a5f2e10eb0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -50,7 +50,7 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ImR_Locator_Loader::fini (void)
+ImR_Locator_Loader::fini ()
 {
   ACE_ASSERT(this->runner_.get () != 0);
   try
@@ -76,7 +76,7 @@ ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
 }
 
 int
-ImR_Locator_Loader::run(void)
+ImR_Locator_Loader::run()
 {
   try
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index 8bcd258b37f..76f39081061 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -28,7 +28,7 @@ public:
                                            ACE_TCHAR *argv[]);
 
  // Unlike other service objects, we have our own orb.
- int run(void);
+ int run();
 
 private:
   ImR_Locator_i service_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 26e98badd8e..53ea42e2495 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -57,7 +57,7 @@ Locator_NT_Service::handle_exception (ACE_HANDLE)
  * We do almost the same thing as we do in run_standalone ()
  */
 int
-Locator_NT_Service::svc (void)
+Locator_NT_Service::svc ()
 {
   ImR_Locator_i server;
   Options opts;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index ae17ac4ad0a..282c8f2324a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -359,7 +359,7 @@ Options::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Options::init_from_registry (void)
+Options::init_from_registry ()
 {
   this->load_registry_options ();
   return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 3c244cfdc9e..29b7d010aaf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -26,7 +26,7 @@ Locator_Repository::~Locator_Repository ()
 }
 
 void
-Locator_Repository::shutdown (void)
+Locator_Repository::shutdown ()
 {
   // default impl - no op
 }
@@ -127,7 +127,7 @@ Locator_Repository::report_ior (PortableServer::POA_ptr )
 }
 
 int
-Locator_Repository::recover_ior (void)
+Locator_Repository::recover_ior ()
 {
   if (this->registered_)
     {
@@ -644,7 +644,7 @@ Locator_Repository::remove_activator (const ACE_CString& name)
 }
 
 Locator_Repository::SIMap&
-Locator_Repository::servers (void)
+Locator_Repository::servers ()
 {
   return server_infos_;
 }
@@ -656,7 +656,7 @@ Locator_Repository::servers () const
 }
 
 Locator_Repository::AIMap&
-Locator_Repository::activators (void)
+Locator_Repository::activators ()
 {
   return activator_infos_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
index 45dd43ffbff..f32a1f7d1ac 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -59,7 +59,7 @@ public:
 
   virtual ~Locator_Repository();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   int unregister_if_address_reused (const ACE_CString& fqname,
                                     const char* partial_ior,
@@ -113,10 +113,10 @@ public:
   int remove_activator (const ACE_CString& name);
 
   /// Returns the internal hash map containing the server information.
-  SIMap& servers(void);
+  SIMap& servers();
   const SIMap& servers() const;
   /// Returns the internal hash map containing the activator information.
-  AIMap& activators(void);
+  AIMap& activators();
   const AIMap& activators() const;
 
   /// Indicate the persistence mode for the repository
@@ -143,7 +143,7 @@ protected:
   /// perform sync of repo with backing store
   /// defaults to no-op, only shared backing stores
   /// need to sync
-  virtual int sync_load (void);
+  virtual int sync_load ();
 
   /// perform server persistent update
   virtual int persistent_update (const Server_Info_Ptr& info, bool add) = 0;
@@ -155,7 +155,7 @@ protected:
   virtual int persistent_remove (const ACE_CString& name, bool activator) = 0;
 
   /// recover the ImR Locator's IOR from the persisted file
-  virtual int recover_ior (void);
+  virtual int recover_ior ();
 
   int setup_multicast (ACE_Reactor* reactor, const char* imr_ior);
   void teardown_multicast ();
diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp
index cb0a2e31c20..e14f60fd7f4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp
@@ -83,7 +83,7 @@ Replicator::~Replicator()
 }
 
 void
-Replicator::init_orb (void)
+Replicator::init_orb ()
 {
   int argc = 6;
   ACE_TCHAR *argv[8];
@@ -119,19 +119,19 @@ Replicator::init_orb (void)
 }
 
 char *
-Replicator::ior (void)
+Replicator::ior ()
 {
   return this->orb_->object_to_string (this->me_.in ());
 }
 
 bool
-Replicator::peer_available (void)
+Replicator::peer_available ()
 {
   return !CORBA::is_nil (this->peer_.in ());
 }
 
 void
-Replicator::stop (void)
+Replicator::stop ()
 {
   if (this->reactor_ == 0)
     {
@@ -141,7 +141,7 @@ Replicator::stop (void)
 }
 
 int
-Replicator::svc (void)
+Replicator::svc ()
 {
   if (this->reactor_ == 0)
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.h b/TAO/orbsvcs/ImplRepo_Service/Replicator.h
index b08775cb800..905dec77683 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Replicator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.h
@@ -77,22 +77,22 @@ public:
 
   Replicator (Shared_Backing_Store &repo, const Options& opts);
 
-  virtual ~Replicator(void);
+  virtual ~Replicator();
 
   virtual int svc ();
   virtual int handle_exception (ACE_HANDLE );
 
-  void stop (void);
+  void stop ();
   void send_access_state (const char *name, ImplementationRepository::AAM_Status state);
   void send_entity (ImplementationRepository::UpdateInfo &info);
 
-  void init_orb (void);
+  void init_orb ();
 
   bool init_peer (const ACE_CString &filename );
   int send_registration (char *&ior );
 
-  bool peer_available (void);
-  char * ior (void);
+  bool peer_available ();
+  char * ior ();
 
 private:
   Replica_var me_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 254fbf91d31..08713c61c5d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -1,6 +1,6 @@
 #include "Server_Info.h"
 
-Server_Info::Server_Info (void)
+Server_Info::Server_Info ()
 {
   this->clear ();
 }
@@ -99,7 +99,7 @@ Server_Info::Server_Info (const ACE_CString& serverId,
 }
 
 Server_Info *
-Server_Info::active_info (void)
+Server_Info::active_info ()
 {
   return this->alt_info_.null() ? this : this->alt_info_.get();
 }
@@ -152,7 +152,7 @@ Server_Info::is_running () const
 }
 
 bool
-Server_Info::start_allowed (void)
+Server_Info::start_allowed ()
 {
   Server_Info *active = this->active_info ();
   bool allowed = active->start_count_ < active->start_limit_;
@@ -277,7 +277,7 @@ Server_Info::createImRServerInfo () const
 }
 
 void
-Server_Info::clear (void)
+Server_Info::clear ()
 {
   server_id = "";
   poa_name = "";
@@ -301,7 +301,7 @@ Server_Info::clear (void)
 }
 
 void
-Server_Info::reset_runtime (void)
+Server_Info::reset_runtime ()
 {
   this->partial_ior = "";
   Server_Info *startup = this->active_info ();
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
index 069b8764293..5132dfa1447 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
@@ -28,7 +28,7 @@ typedef ACE_Strong_Bound_Ptr<Server_Info, ACE_Null_Mutex> Server_Info_Ptr;
 */
 struct Server_Info
 {
-  Server_Info (void);
+  Server_Info ();
   Server_Info (const Server_Info & other);
 
   Server_Info (const ACE_CString& fqname,
@@ -49,13 +49,13 @@ struct Server_Info
 
   Server_Info & operator= (const Server_Info& other);
 
-  void clear (void);
+  void clear ();
 
   /// Convert to the corba type
   void setImRInfo (ImplementationRepository::ServerInformation* info) const;
   ImplementationRepository::ServerInformation* createImRServerInfo() const;
 
-  void reset_runtime (void);
+  void reset_runtime ();
 
   bool is_server (const char *name) const;
   bool has_peer (const char *name) const;
@@ -63,7 +63,7 @@ struct Server_Info
   ImplementationRepository::ActivationMode mode () const;
 
   bool is_running () const;
-  bool start_allowed (void);
+  bool start_allowed ();
   void started (bool success);
 
   // transform the supplied limit to always be at least 1
@@ -74,7 +74,7 @@ struct Server_Info
                     const char *sior,
                     ImplementationRepository::ServerObject_ptr svrobj);
 
-  Server_Info *active_info (void);
+  Server_Info *active_info ();
   const Server_Info *active_info () const;
 
   const char * ping_id () const;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index 5084fa7e53a..29b71f9529a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -23,7 +23,7 @@ namespace {
   class Lockable_File
   {
   public:
-    Lockable_File (void)
+    Lockable_File ()
       : file_lock_ (),
         file_ (0),
         flags_ (0),
@@ -46,12 +46,12 @@ namespace {
       init_fl(file, flags, unlink_in_destructor);
     }
 
-    ~Lockable_File (void)
+    ~Lockable_File ()
     {
       release ();
     }
 
-    void release (void)
+    void release ()
     {
       if (this->file_ != 0)
         {
@@ -61,7 +61,7 @@ namespace {
       this->locked_ = false;
     }
 
-    FILE* get_file (void)
+    FILE* get_file ()
     {
       lock ();
 
@@ -103,7 +103,7 @@ namespace {
 #endif
     }
 
-    void close_file (void)
+    void close_file ()
     {
       if (this->file_ == 0)
         return;
@@ -120,7 +120,7 @@ namespace {
 #endif
     }
 
-    void lock (void)
+    void lock ()
     {
 #if !defined (ACE_WIN32)
       if (this->locked_)
@@ -248,7 +248,7 @@ Shared_Backing_Store::~Shared_Backing_Store()
 }
 
 void
-Shared_Backing_Store::shutdown (void)
+Shared_Backing_Store::shutdown ()
 {
   this->replicator_.stop ();
   this->replicator_.wait ();
@@ -536,7 +536,7 @@ Shared_Backing_Store::repo_mode() const
 }
 
 int
-Shared_Backing_Store::connect_replicas (void)
+Shared_Backing_Store::connect_replicas ()
 {
   ACE_CString replica_ior_file = this->replica_ior_filename (true);
   bool was_running = this->replicator_.init_peer (replica_ior_file);
@@ -1027,7 +1027,7 @@ Shared_Backing_Store::Update_Handler::handle_exception (ACE_HANDLE)
 }
 
 void
-Shared_Backing_Store::process_updates (void)
+Shared_Backing_Store::process_updates ()
 {
   //  ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->sync_lock_);
   this->notified_ = false;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
index f29305cfdab..4b75bac1916 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
@@ -67,7 +67,7 @@ public:
 
   virtual ~Shared_Backing_Store();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// indicate the persistence mode for the repository
   virtual const ACE_TCHAR* repo_mode() const;
@@ -109,7 +109,7 @@ public:
   void gen_ior (char*& ft_imr_ior);
   void updates_available (const ImplementationRepository::UpdateInfoSeq& info,
                           bool missed);
-  void process_updates (void);
+  void process_updates ();
 
 protected:
   /// perform shared backing store specific initialization
@@ -136,7 +136,7 @@ protected:
   /// this ImR Locator's IOR
   char* locator_service_ior(const char* peer_ior) const;
 
-  int connect_replicas (void);
+  int connect_replicas ();
 
 private:
   /// map management helper functions
diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
index daf9eb94551..11c23c8db80 100644
--- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
+++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
@@ -44,10 +44,10 @@ public:
   UpdateableServerInfo(UpdateableServerInfo& other );
 
   /// Destructor (updates repo if needed)
-  ~UpdateableServerInfo(void);
+  ~UpdateableServerInfo();
 
   /// Explicitly update repo if needed
-  void update_repo(void);
+  void update_repo();
 
   /// Update remote access state
   void notify_remote_access (ImplementationRepository::AAM_Status state);
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
index 8a327299054..a7da1bb2082 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
@@ -44,7 +44,7 @@ public:
                      CORBA::ORB_ptr orb,
                      bool suppress_erase = false);
 
-  virtual ~XML_Backing_Store (void);
+  virtual ~XML_Backing_Store ();
 
   /// indicate the XML filename as the persistence mode for the repository
   virtual const ACE_TCHAR* repo_mode () const;
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index c3019685522..2a55ef99a9a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -12,7 +12,7 @@
 #include "ace/os_include/os_netdb.h"
 #include "ace/OS_NS_unistd.h"
 
-TAO_IMR_i::TAO_IMR_i (void)
+TAO_IMR_i::TAO_IMR_i ()
   : argc_ (0),
     argv_ (0),
     orb_ (),
@@ -22,7 +22,7 @@ TAO_IMR_i::TAO_IMR_i (void)
   // Nothing
 }
 
-TAO_IMR_i::~TAO_IMR_i (void)
+TAO_IMR_i::~TAO_IMR_i ()
 {
 }
 
@@ -92,7 +92,7 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv)
 // Go through and figure out which operation we should do.
 
 int
-TAO_IMR_i::parse_args (void)
+TAO_IMR_i::parse_args ()
 {
   // Make sure one command was given
   if (this->argc_ < 2)
@@ -121,7 +121,7 @@ TAO_IMR_i::parse_args (void)
 // Print out information about all operations.
 
 void
-TAO_IMR_i::print_usage (void)
+TAO_IMR_i::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n"
     "  where [options] are ORB options\n"
@@ -263,7 +263,7 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
   ORBSVCS_DEBUG ((LM_DEBUG, "\n"));
 }
 
-TAO_IMR_Op_List::TAO_IMR_Op_List (void)
+TAO_IMR_Op_List::TAO_IMR_Op_List ()
 : verbose_server_information_ (0)
 , list_only_active_servers_ (0)
 , how_many_ (0)
@@ -287,7 +287,7 @@ TAO_IMR_Op_Register::TAO_IMR_Op_Register (bool is_add)
 }
 
 void
-TAO_IMR_Op_Activate::print_usage (void)
+TAO_IMR_Op_Activate::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
                   "Starts a server using its registered Activator.\n\n"
@@ -334,7 +334,7 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Autostart::print_usage (void)
+TAO_IMR_Op_Autostart::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n"
     "  where [options] are ORB options\n"
@@ -366,7 +366,7 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_IOR::print_usage (void)
+TAO_IMR_Op_IOR::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n"
     "the InterOperable Naming Service.  Please see the documentation for\n"
@@ -423,7 +423,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Kill::print_usage (void)
+TAO_IMR_Op_Kill::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
                   "Sends a signal to the designated process\n\n"
@@ -478,7 +478,7 @@ TAO_IMR_Op_Kill::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Link::print_usage (void)
+TAO_IMR_Op_Link::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Links multiple POAs to a single executable\n"
     "\n"
@@ -548,7 +548,7 @@ TAO_IMR_Op_Link::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_List::print_usage (void)
+TAO_IMR_Op_List::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n"
     "\n"
@@ -608,7 +608,7 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Remove::print_usage (void)
+TAO_IMR_Op_Remove::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Removes a server entry\n"
     "\n"
@@ -662,7 +662,7 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Shutdown::print_usage (void)
+TAO_IMR_Op_Shutdown::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
                   "Shuts down a server\n\n"
@@ -714,7 +714,7 @@ TAO_IMR_Op_ShutdownRepo::TAO_IMR_Op_ShutdownRepo()
 }
 
 void
-TAO_IMR_Op_ShutdownRepo::print_usage (void)
+TAO_IMR_Op_ShutdownRepo::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Shuts down the ImR\n"
     "\n"
@@ -775,7 +775,7 @@ TAO_IMR_Op_Register::addenv (ACE_TCHAR *opt)
 }
 
 void
-TAO_IMR_Op_Register::print_usage (void)
+TAO_IMR_Op_Register::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
     "Adds/Updates a server entry\n\n"
@@ -876,7 +876,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv)
 
 
 int
-TAO_IMR_Op_Activate::run (void)
+TAO_IMR_Op_Activate::run ()
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
   try
@@ -927,7 +927,7 @@ TAO_IMR_Op_Activate::run (void)
 }
 
 int
-TAO_IMR_Op_Autostart::run (void)
+TAO_IMR_Op_Autostart::run ()
 {
   ACE_ASSERT(! CORBA::is_nil (imr_));
 
@@ -967,7 +967,7 @@ TAO_IMR_Op_Autostart::run (void)
 }
 
 int
-TAO_IMR_Op_IOR::run (void)
+TAO_IMR_Op_IOR::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1055,7 +1055,7 @@ TAO_IMR_Op_IOR::run (void)
 }
 
 int
-TAO_IMR_Op_Kill::run (void)
+TAO_IMR_Op_Kill::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1104,7 +1104,7 @@ TAO_IMR_Op_Kill::run (void)
 }
 
 int
-TAO_IMR_Op_Link::run (void)
+TAO_IMR_Op_Link::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1148,7 +1148,7 @@ TAO_IMR_Op_Link::run (void)
 
 
 int
-TAO_IMR_Op_List::run (void)
+TAO_IMR_Op_List::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1220,7 +1220,7 @@ TAO_IMR_Op_List::run (void)
 }
 
 int
-TAO_IMR_Op_Remove::run (void)
+TAO_IMR_Op_Remove::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1274,7 +1274,7 @@ TAO_IMR_Op_Remove::run (void)
 }
 
 int
-TAO_IMR_Op_Shutdown::run (void)
+TAO_IMR_Op_Shutdown::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1318,7 +1318,7 @@ TAO_IMR_Op_Shutdown::run (void)
 }
 
 int
-TAO_IMR_Op_ShutdownRepo::run (void)
+TAO_IMR_Op_ShutdownRepo::run ()
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
 
@@ -1343,7 +1343,7 @@ TAO_IMR_Op_ShutdownRepo::run (void)
 }
 
 int
-TAO_IMR_Op_Register::run (void)
+TAO_IMR_Op_Register::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
index 1c291c84d7f..e2a5ed189c9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
@@ -31,21 +31,21 @@ class TAO_IMR_i
 {
 public:
   // = Constructor and destructor.
-  TAO_IMR_i (void);
-  ~TAO_IMR_i (void);
+  TAO_IMR_i ();
+  ~TAO_IMR_i ();
 
   /// Execute client code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
 
 private:
   /// Print out information about all operations.
-  void print_usage (void);
+  void print_usage ();
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
@@ -89,7 +89,7 @@ public:
   static TAO_IMR_Op *make_op (const ACE_TCHAR *op_name);
 
   /// Destructor.
-  virtual ~TAO_IMR_Op (void);
+  virtual ~TAO_IMR_Op ();
 
   /// Parse arguments.
   virtual int parse (int argc, ACE_TCHAR **argv) = 0;
@@ -125,11 +125,11 @@ class TAO_IMR_Op_Activate : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
@@ -147,11 +147,11 @@ class TAO_IMR_Op_Autostart : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 };
 
 
@@ -167,11 +167,11 @@ class TAO_IMR_Op_IOR : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
@@ -192,11 +192,11 @@ class TAO_IMR_Op_Kill : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
   int signum_;
@@ -214,11 +214,11 @@ class TAO_IMR_Op_Link : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
 
@@ -237,14 +237,14 @@ protected:
 class TAO_IMR_Op_List : public TAO_IMR_Op
 {
 public:
-  TAO_IMR_Op_List (void);
+  TAO_IMR_Op_List ();
 
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
@@ -278,11 +278,11 @@ class TAO_IMR_Op_Remove : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
   bool force_;
@@ -301,11 +301,11 @@ class TAO_IMR_Op_Shutdown : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
 };
@@ -318,10 +318,10 @@ class TAO_IMR_Op_ShutdownRepo : public TAO_IMR_Op
 public:
   TAO_IMR_Op_ShutdownRepo();
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
-  void print_usage (void);
+  void print_usage ();
 
   bool activators_;
 };
@@ -340,7 +340,7 @@ public:
   TAO_IMR_Op_Register(bool is_add);
 
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Enables pre-registration checks
@@ -350,7 +350,7 @@ protected:
   void addenv (ACE_TCHAR *opt);
 
   /// Prints a message about the usage.
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index c395b67f8a8..65c02ac3e62 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -24,7 +24,7 @@ Criteria_Evaluator::~Criteria_Evaluator ()
 }
 
 const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
-Criteria_Evaluator::getInitialization (void)
+Criteria_Evaluator::getInitialization ()
 {
   const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0;
 
@@ -41,7 +41,7 @@ Criteria_Evaluator::getInitialization (void)
 }
 
 char *
-Criteria_Evaluator::getFilter (void)
+Criteria_Evaluator::getFilter ()
 {
   const char* string;
   CORBA::Any value;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index 63c3d225195..0a58031a210 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -22,18 +22,18 @@ class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator
 {
 public:
   Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
-  ~Criteria_Evaluator (void);
+  ~Criteria_Evaluator ();
 
-  const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (void);
+  const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization ();
 
-  char * getFilter (void);
+  char * getFilter ();
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (void)
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation ()
     {
       return 0;
     }
 
-  char * getPreferences (void)
+  char * getPreferences ()
     {
       return 0;
     }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index afa7e326bea..0bd674008d4 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -16,12 +16,12 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
 
-Life_Cycle_Service_Server::Life_Cycle_Service_Server (void)
+Life_Cycle_Service_Server::Life_Cycle_Service_Server ()
 :   debug_level_ (1)
 {
 }
 
-Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
+Life_Cycle_Service_Server::~Life_Cycle_Service_Server ()
 {
   try
     {
@@ -126,7 +126,7 @@ Life_Cycle_Service_Server::init (int argc,
 
 
 int
-Life_Cycle_Service_Server::run (void)
+Life_Cycle_Service_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ORBSVCS_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index ad41e40c92f..8255eb62173 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -31,17 +31,17 @@ class Life_Cycle_Service_Server
 {
 public:
   /// Default constructor
-  Life_Cycle_Service_Server (void);
+  Life_Cycle_Service_Server ();
 
   /// Destructor
-  ~Life_Cycle_Service_Server (void);
+  ~Life_Cycle_Service_Server ();
 
   /// Initialize the Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Parse the passed parameters.
   u_int parse_args (int argc,
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 358ca85d90c..68746b24775 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -25,7 +25,7 @@ Life_Cycle_Service_i::Life_Cycle_Service_i (int debug_level)
 }
 
 // Destructor.
-Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
+Life_Cycle_Service_i::~Life_Cycle_Service_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 17cdc9b4c9b..5ed3bbd2edf 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -26,7 +26,7 @@ class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service
 {
 public:
   Life_Cycle_Service_i (int debug_level = 1);
-  ~Life_Cycle_Service_i (void);
+  ~Life_Cycle_Service_i ();
 
   /// Returns true if the Generic Factory is able to forward a request
   /// for creating an object described by the <factory_key>.
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index be03640c14d..16b2419b728 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -19,7 +19,7 @@ TAO_LB_Signal_Handler::TAO_LB_Signal_Handler (CORBA::ORB_ptr orb,
 }
 
 int
-TAO_LB_Signal_Handler::svc (void)
+TAO_LB_Signal_Handler::svc ()
 {
   // This method is only invoked when performing synchronous signal
   // handling.
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index d8094afeb0c..ef83acee478 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-Basic_Logging_Service::Basic_Logging_Service (void)
+Basic_Logging_Service::Basic_Logging_Service ()
   : service_name_ ("BasicLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -16,7 +16,7 @@ Basic_Logging_Service::Basic_Logging_Service (void)
   // No-Op.
 }
 
-Basic_Logging_Service::~Basic_Logging_Service (void)
+Basic_Logging_Service::~Basic_Logging_Service ()
 {
   // No-Op.
 }
@@ -159,7 +159,7 @@ Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Basic_Logging_Service::resolve_naming_service (void)
+Basic_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -173,7 +173,7 @@ Basic_Logging_Service::resolve_naming_service (void)
 }
 
 int
-Basic_Logging_Service::run (void)
+Basic_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -190,7 +190,7 @@ Basic_Logging_Service::run (void)
 }
 
 int
-Basic_Logging_Service::svc (void)
+Basic_Logging_Service::svc ()
 {
   try
     {
@@ -205,7 +205,7 @@ Basic_Logging_Service::svc (void)
 }
 
 void
-Basic_Logging_Service::shutdown (void)
+Basic_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index baa266ec49f..554ba9e1e97 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -29,21 +29,21 @@ class Basic_Logging_Service
   //   Implementation of the Telecom Log Service
 
 public:
-  Basic_Logging_Service (void);
+  Basic_Logging_Service ();
   // Constructor.
 
-  virtual ~Basic_Logging_Service (void);
+  virtual ~Basic_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (void);
+  int run ();
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -54,7 +54,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR *argv []);
   // Parses the command line arguments.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 3a12a0d0a5d..e0bbec59fdf 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-Event_Logging_Service::Event_Logging_Service (void)
+Event_Logging_Service::Event_Logging_Service ()
   : service_name_ ("EventLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -17,7 +17,7 @@ Event_Logging_Service::Event_Logging_Service (void)
   // No-Op.
 }
 
-Event_Logging_Service::~Event_Logging_Service (void)
+Event_Logging_Service::~Event_Logging_Service ()
 {
   // No-Op.
 }
@@ -163,7 +163,7 @@ Event_Logging_Service::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Event_Logging_Service::resolve_naming_service (void)
+Event_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -177,7 +177,7 @@ Event_Logging_Service::resolve_naming_service (void)
 }
 
 int
-Event_Logging_Service::run (void)
+Event_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -194,7 +194,7 @@ Event_Logging_Service::run (void)
 }
 
 int
-Event_Logging_Service::svc (void)
+Event_Logging_Service::svc ()
 {
   try
     {
@@ -209,7 +209,7 @@ Event_Logging_Service::svc (void)
 }
 
 void
-Event_Logging_Service::shutdown (void)
+Event_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index 59b245511bb..6d669a5e97d 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -30,21 +30,21 @@ class Event_Logging_Service
   //   Implementation of the Telecom Log Service
 
 public:
-  Event_Logging_Service (void);
+  Event_Logging_Service ();
   // Constructor.
 
-  virtual ~Event_Logging_Service (void);
+  virtual ~Event_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (void);
+  int run ();
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -55,7 +55,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR *argv []);
   // Parses the command line arguments.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 09df44ccbbf..f8e8e963fe5 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-Notify_Logging_Service::Notify_Logging_Service (void)
+Notify_Logging_Service::Notify_Logging_Service ()
   : service_name_ (NOTIFY_KEY),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -17,7 +17,7 @@ Notify_Logging_Service::Notify_Logging_Service (void)
   // No-Op.
 }
 
-Notify_Logging_Service::~Notify_Logging_Service (void)
+Notify_Logging_Service::~Notify_Logging_Service ()
 {
   // No-Op.
 }
@@ -185,7 +185,7 @@ Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Notify_Logging_Service::resolve_naming_service (void)
+Notify_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -199,7 +199,7 @@ Notify_Logging_Service::resolve_naming_service (void)
 }
 
 int
-Notify_Logging_Service::run (void)
+Notify_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -216,7 +216,7 @@ Notify_Logging_Service::run (void)
 }
 
 int
-Notify_Logging_Service::svc (void)
+Notify_Logging_Service::svc ()
 {
   try
     {
@@ -231,7 +231,7 @@ Notify_Logging_Service::svc (void)
 }
 
 void
-Notify_Logging_Service::shutdown (void)
+Notify_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index ae5dfaecfee..edcf537a82b 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -34,21 +34,21 @@ class Notify_Logging_Service
   //   Implementation of the Telecom Log Service
 
  public:
-  Notify_Logging_Service (void);
+  Notify_Logging_Service ();
   // Constructor.
 
-  virtual ~Notify_Logging_Service (void);
+  virtual ~Notify_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (void);
+  int run ();
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Service.
   // Returns 0 on success, -1 on error.
 
@@ -59,7 +59,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index c2c6b65e1de..29afb015fdd 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-RTEvent_Logging_Service::RTEvent_Logging_Service (void)
+RTEvent_Logging_Service::RTEvent_Logging_Service ()
   : service_name_ ("RTEventLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -15,7 +15,7 @@ RTEvent_Logging_Service::RTEvent_Logging_Service (void)
   // No-Op.
 }
 
-RTEvent_Logging_Service::~RTEvent_Logging_Service (void)
+RTEvent_Logging_Service::~RTEvent_Logging_Service ()
 {
   // No-Op.
 }
@@ -169,7 +169,7 @@ RTEvent_Logging_Service::init (int argc, ACE_TCHAR* argv[])
 }
 
 void
-RTEvent_Logging_Service::resolve_naming_service (void)
+RTEvent_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -183,7 +183,7 @@ RTEvent_Logging_Service::resolve_naming_service (void)
 }
 
 int
-RTEvent_Logging_Service::run (void)
+RTEvent_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -200,7 +200,7 @@ RTEvent_Logging_Service::run (void)
 }
 
 int
-RTEvent_Logging_Service::svc (void)
+RTEvent_Logging_Service::svc ()
 {
   try
     {
@@ -215,7 +215,7 @@ RTEvent_Logging_Service::svc (void)
 }
 
 void
-RTEvent_Logging_Service::shutdown (void)
+RTEvent_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index daefddca2c0..c8f37af5973 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -28,20 +28,20 @@ class RTEvent_Logging_Service
   //   Implementation of the Telecom Log Service
 
 public:
-  RTEvent_Logging_Service (void);
+  RTEvent_Logging_Service ();
   // Constructor.
 
-  virtual ~RTEvent_Logging_Service (void);
+  virtual ~RTEvent_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR* argv[]);
   // Initializes the Telecom Log Service.
 
-  int run (void);
+  int run ();
     // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -52,7 +52,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR* argv[]);
   // parse the command line args
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index fe908ddb630..7cf4bbb1583 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -43,15 +43,15 @@ ACE_TMAIN(int, ACE_TCHAR *[])
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
 
   int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc,
                    ACE_TCHAR *argv[]);
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
 
 private:
   ACE_TCHAR progname[128];
@@ -70,7 +70,7 @@ private:
 
 typedef ACE_Singleton<Options, ACE_Mutex> OPTIONS;
 
-Options::Options (void)
+Options::Options ()
   : opt_setargs (0),
     opt_args (0),
     opt_install (0),
@@ -86,13 +86,13 @@ Options::Options (void)
   ACE::init ();
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   ACE::fini ();
 }
 
 void
-Options::print_usage_and_die (void)
+Options::print_usage_and_die ()
 {
   ORBSVCS_DEBUG ((LM_INFO,
               ACE_TEXT("Usage: %s")
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 74ad8a93515..1a5e27cd68d 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -26,7 +26,7 @@ AutoFinalizer::~AutoFinalizer ()
 }
 
 
-TAO_NT_Naming_Service::TAO_NT_Naming_Service (void)
+TAO_NT_Naming_Service::TAO_NT_Naming_Service ()
   : argc_ (0),
     argc_save_ (0),
     argv_ (0),
@@ -34,7 +34,7 @@ TAO_NT_Naming_Service::TAO_NT_Naming_Service (void)
 {
 }
 
-TAO_NT_Naming_Service::~TAO_NT_Naming_Service (void)
+TAO_NT_Naming_Service::~TAO_NT_Naming_Service ()
 {
   if (argv_save_)
     {
@@ -242,7 +242,7 @@ TAO_NT_Naming_Service::init (int argc,
 }
 
 int
-TAO_NT_Naming_Service::svc (void)
+TAO_NT_Naming_Service::svc ()
 {
   TAO_Naming_Service naming_service;
 
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 2cf49e00aba..c90b1ccc4ac 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -33,8 +33,8 @@ class TAO_NT_Naming_Service : public ACE_NT_Service
 public:
   typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX;
 
-  TAO_NT_Naming_Service (void);
-  virtual ~TAO_NT_Naming_Service (void);
+  TAO_NT_Naming_Service ();
+  virtual ~TAO_NT_Naming_Service ();
 
   /// We override <handle_control> because it handles stop requests
   /// privately.
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 64942450df1..bbda4aa95c8 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -8,7 +8,7 @@
 #include "ace/Task.h"
 
 // Default Constructor.
-TAO_Naming_Service::TAO_Naming_Service (void)
+TAO_Naming_Service::TAO_Naming_Service ()
   : time_ (0),
     num_threads_ (1)
 {
@@ -122,7 +122,7 @@ public:
       time_(t)
   {}
 
-  int svc (void)
+  int svc ()
   {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -146,7 +146,7 @@ private:
 };
 
 int
-TAO_Naming_Service::run (void)
+TAO_Naming_Service::run ()
 {
   ORB_Runner runner (this->orb_.in(), time_);
   if (this->num_threads_ == 1)
@@ -168,7 +168,7 @@ TAO_Naming_Service::run (void)
 }
 
 void
-TAO_Naming_Service::shutdown (void)
+TAO_Naming_Service::shutdown ()
 {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -177,7 +177,7 @@ TAO_Naming_Service::shutdown (void)
 }
 
 int
-TAO_Naming_Service::fini (void)
+TAO_Naming_Service::fini ()
 {
   this->my_naming_server_.fini();
 
@@ -198,6 +198,6 @@ TAO_Naming_Service::fini (void)
 }
 
 // Destructor.
-TAO_Naming_Service::~TAO_Naming_Service (void)
+TAO_Naming_Service::~TAO_Naming_Service ()
 {
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index 6d11543466d..858145e7a6f 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -33,7 +33,7 @@ class TAO_Naming_Service
 {
 public:
   /// Default Constructor.
-  TAO_Naming_Service (void);
+  TAO_Naming_Service ();
 
   /// Constructor taking the command-line arguments.
   TAO_Naming_Service (int argc, ACE_TCHAR* argv[]);
@@ -45,13 +45,13 @@ public:
   virtual int fini ();
 
   /// Run the TAO_Naming_Service.
-  virtual int run (void);
+  virtual int run ();
 
   /// Shut down the TAO_Naming_Service; you must still call fini().
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Destructor.
-  virtual ~TAO_Naming_Service (void);
+  virtual ~TAO_Naming_Service ();
 
 protected:
   /// Parse the command line arguments to find
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 54391be46d0..3dafb41d56a 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -49,14 +49,14 @@ ACE_TMAIN(int, ACE_TCHAR *[])
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
 
   int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc, ACE_TCHAR *argv[]);
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
 
 private:
   ACE_TCHAR progname[128];
@@ -75,7 +75,7 @@ private:
 
 typedef ACE_Singleton<Options, ACE_Mutex> OPTIONS;
 
-Options::Options (void)
+Options::Options ()
   : opt_setargs (0),
     opt_args (0),
     opt_install (0),
@@ -91,13 +91,13 @@ Options::Options (void)
   ACE::init ();
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   ACE::fini ();
 }
 
 void
-Options::print_usage_and_die (void)
+Options::print_usage_and_die ()
 {
   ORBSVCS_DEBUG ((LM_INFO,
               ACE_TEXT ("Usage: %s")
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index cde1f49c6c3..3e1b4adbd72 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -14,7 +14,7 @@
 #define TAO_NOTIFY_SERVICE_OPTS_NAME ACE_TEXT ("TaoNotifyServiceOptions")
 #define TAO_SERVICE_PARAM_COUNT ACE_TEXT ("TaoServiceParameterCount")
 
-TAO_NT_Notify_Service::TAO_NT_Notify_Service (void)
+TAO_NT_Notify_Service::TAO_NT_Notify_Service ()
   : argc_ (0),
     argc_save_ (0),
     argv_ (0),
@@ -22,7 +22,7 @@ TAO_NT_Notify_Service::TAO_NT_Notify_Service (void)
 {
 }
 
-TAO_NT_Notify_Service::~TAO_NT_Notify_Service (void)
+TAO_NT_Notify_Service::~TAO_NT_Notify_Service ()
 {
   if (argv_save_)
     {
@@ -238,7 +238,7 @@ TAO_NT_Notify_Service::init (int argc,
 }
 
 int
-TAO_NT_Notify_Service::svc (void)
+TAO_NT_Notify_Service::svc ()
 {
   TAO_Notify_Service_Driver notify_service;
 
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index 1548b5606ec..f99ef755182 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -34,8 +34,8 @@ class TAO_NT_Notify_Service : public ACE_NT_Service
 public:
   typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX;
 
-  TAO_NT_Notify_Service (void);
-  virtual ~TAO_NT_Notify_Service (void);
+  TAO_NT_Notify_Service ();
+  virtual ~TAO_NT_Notify_Service ();
 
   /// We override <handle_control> because it handles stop requests
   /// privately.
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index f46860dbcec..03fb45de211 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -31,7 +31,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Logging_Strategy.h"
 
-TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
+TAO_Notify_Service_Driver::TAO_Notify_Service_Driver ()
 : notify_service_ (0)
 , bootstrap_ (false)
 , use_name_svc_ (true)
@@ -47,7 +47,7 @@ TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
 {
 }
 
-TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void)
+TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver ()
 {
 }
 
@@ -335,7 +335,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Notify_Service_Driver::resolve_naming_service (void)
+TAO_Notify_Service_Driver::resolve_naming_service ()
 {
   try
     {
@@ -366,7 +366,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (void)
 }
 
 int
-TAO_Notify_Service_Driver::run (void)
+TAO_Notify_Service_Driver::run ()
 {
   if (TAO_debug_level > 0 )
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -388,7 +388,7 @@ TAO_Notify_Service_Driver::run (void)
 }
 
 int
-TAO_Notify_Service_Driver::fini (void)
+TAO_Notify_Service_Driver::fini ()
 {
   /// Release all the _vars as the ORB about to go away.
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -689,7 +689,7 @@ LoggingWorker::start ()
 }
 
 int
-LoggingWorker::svc (void)
+LoggingWorker::svc ()
 {
   if (TAO_debug_level > 0)
     {
@@ -719,7 +719,7 @@ LoggingWorker::end ()
     }
 }
 
-Worker::Worker (void)
+Worker::Worker ()
 {
 }
 
@@ -730,7 +730,7 @@ Worker::orb (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
 #if 0
   // ACE_Thread::getprio() fails on systems that do not support thread
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 486fdbd1e3f..bcc90d11e45 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -57,7 +57,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   /// ctor
-  Worker (void);
+  Worker ();
 
   void orb (CORBA::ORB_ptr orb);
 
@@ -82,10 +82,10 @@ friend class LoggingWorker;
 
 public:
   /// Constructor.
-  TAO_Notify_Service_Driver (void);
+  TAO_Notify_Service_Driver ();
 
   /// Destructor.
-  virtual ~TAO_Notify_Service_Driver (void);
+  virtual ~TAO_Notify_Service_Driver ();
 
   /// Initializes the Service.
   /// Returns 0 on success, -1 on error.
@@ -93,7 +93,7 @@ public:
 
   /// run the Service.
   /// Returns 0 on success, -1 on error.
-  int run (void);
+  int run ();
 
   /// Shutdown the Service.
   /// Returns 0 on success, -1 on error.
@@ -112,7 +112,7 @@ protected:
   TAO_Notify_Service* notify_service_;
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv []);
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 90e27bb45ef..b268cab6d8d 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
-TAO_Scheduling_Service::TAO_Scheduling_Service (void)
+TAO_Scheduling_Service::TAO_Scheduling_Service ()
   : scheduler_impl_ (0),
     service_name_ ("ScheduleService"),
     scheduler_type_ (CONFIG)
@@ -25,7 +25,7 @@ TAO_Scheduling_Service::TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[])
   this->init (argc, argv);
 }
 
-TAO_Scheduling_Service::~TAO_Scheduling_Service (void)
+TAO_Scheduling_Service::~TAO_Scheduling_Service ()
 {
 }
 
@@ -143,7 +143,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 // Runs the TAO_Scheduling_Service.
 
 int
-TAO_Scheduling_Service::run (void)
+TAO_Scheduling_Service::run ()
 {
   // Run the ORB manager.
   return this->orb_manager_.run ();
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index 69c5f56df75..0b19983505f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -37,7 +37,7 @@ class TAO_Scheduling_Service
 {
 public:
   /// Default Constructor.
-  TAO_Scheduling_Service (void);
+  TAO_Scheduling_Service ();
 
   /// Constructor taking the command-line arguments.
   TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[]);
@@ -46,10 +46,10 @@ public:
   int init (int argc, ACE_TCHAR* argv[]);
 
   /// Run the TAO_Scheduling_Service.
-  int run (void);
+  int run ();
 
   /// Destructor.
-  ~TAO_Scheduling_Service (void);
+  ~TAO_Scheduling_Service ();
 
 private:
   typedef ACE_Config_Scheduler CONFIG_SCHED_TYPE;
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index ef188c1982c..48ed6b7a58c 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -11,7 +11,7 @@
 #include "ace/os_include/os_netdb.h"
 
 // Constructor.
-Clerk_i::Clerk_i (void)
+Clerk_i::Clerk_i ()
   : ior_output_file_ (0),
     timer_value_ (3),
     timer_value_usecs_ (0),
@@ -21,7 +21,7 @@ Clerk_i::Clerk_i (void)
 }
 
 // Destructor.
-Clerk_i::~Clerk_i (void)
+Clerk_i::~Clerk_i ()
 {
 }
 
@@ -161,7 +161,7 @@ Clerk_i::parse_args (int argc,
 // The iterator returned from this is used to get the next n IORs.
 
 int
-Clerk_i::get_first_IOR (void)
+Clerk_i::get_first_IOR ()
 {
   try
     {
@@ -290,7 +290,7 @@ Clerk_i::init_naming_service ()
 // Create an instance of the clerk with appropriate parameters.
 
 int
-Clerk_i::create_clerk (void)
+Clerk_i::create_clerk ()
 {
   try
     {
@@ -340,7 +340,7 @@ Clerk_i::create_clerk (void)
 // Clerk:<hostname>.
 
 int
-Clerk_i::register_clerk (void)
+Clerk_i::register_clerk ()
 {
   try
     {
@@ -465,7 +465,7 @@ Clerk_i::init (int argc,
 }
 
 int
-Clerk_i::run (void)
+Clerk_i::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 5712627db78..24bab371fbf 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -37,10 +37,10 @@ public:
   };
 
   /// Constructor.
-  Clerk_i (void);
+  Clerk_i ();
 
   /// Destructor.
-  ~Clerk_i (void);
+  ~Clerk_i ();
 
   /// Set of available Time servers.
   typedef ACE_Array_Base<CosTime::TimeService_var> IORS;
@@ -50,7 +50,7 @@ public:
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 private:
   /// Insert a server in the internal data structure (servers_).
@@ -76,18 +76,18 @@ private:
   int init_naming_service ();
 
   /// Create an instance of the clerk to use.
-  int create_clerk (void);
+  int create_clerk ();
 
   /// Bind the clerk in the appropriate context in the Naming Service.
-  int register_clerk (void);
+  int register_clerk ();
 
   /// Initialise the Interface Repository and register the clerk
   /// implementation with it.
-  int init_IR (void);
+  int init_IR ();
 
   /// Get the reference to the server naming context and the first
   /// server IOR.
-  int get_first_IOR (void);
+  int get_first_IOR ();
 
   /// Iterate over the given server context to get the rest of the
   /// server IORs.
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 90133414c07..c93028b2db6 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -9,13 +9,13 @@
 #include "ace/os_include/os_netdb.h"
 
 // Constructor.
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : ior_output_file_ (0)
 {
 }
 
 // Destructor.
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
 }
 
@@ -72,7 +72,7 @@ Server_i::init_naming_service ()
 // Print the IOR of the registered server on the console and in a file.
 
 int
-Server_i::create_server (void)
+Server_i::create_server ()
 {
   try
     {
@@ -133,7 +133,7 @@ Server_i::create_server (void)
 // 'Server:<hostname>'.
 
 int
-Server_i::register_server (void)
+Server_i::register_server ()
 {
   try
     {
@@ -242,7 +242,7 @@ Server_i::init (int argc,
 // Run the event loop for ORB.
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   int retval = this->orb_manager_.run ();
 
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 1ceb27508ca..5a967d63148 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -31,26 +31,26 @@ class Server_i
 {
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Destructor.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialize the Server state.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Initialises the name client.
   int init_naming_service ();
 
   /// Create the time server object.
-  int create_server (void);
+  int create_server ();
 
   /// Register the time server object with the Naming Service.
-  int register_server (void);
+  int register_server ();
 
   /// Parse the commandline arguments.
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 8d725db9608..0cbcf2c4d0f 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -13,26 +13,26 @@ class FactoryClient
 
 public:
   // Initialization and termination methods
-  FactoryClient (void);
+  FactoryClient ();
   // constructor.
 
-  virtual ~FactoryClient (void);
+  virtual ~FactoryClient ();
   // destructor.
 
   void init_ORB (int argc, ACE_TCHAR *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Try to get hold of a running naming service.
 
-  void resolve_factory (void);
+  void resolve_factory ();
   // Try to resolve the factory from the Naming service.
 
   CosEventChannelFactory::ChannelFactory_ptr
-  create_factory (void);
+  create_factory ();
   // Create a local Factory and also set the <factory_>.
 
-  virtual void run_test (void);
+  virtual void run_test ();
   // Runs a couple of tests to check if the factory behaves correctly.
 
 protected:
@@ -67,14 +67,14 @@ protected:
   // flag to indicate if the naming service should be used.
 };
 
-FactoryClient::FactoryClient (void)
+FactoryClient::FactoryClient ()
   :factory_name_ ("CosEC_Factory"),
    use_naming_service (0)
 {
   // No-Op.
 }
 
-FactoryClient::~FactoryClient (void)
+FactoryClient::~FactoryClient ()
 {
   // No-Op.
 }
@@ -86,7 +86,7 @@ FactoryClient::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-FactoryClient::resolve_naming_service (void)
+FactoryClient::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -102,7 +102,7 @@ FactoryClient::resolve_naming_service (void)
 }
 
 void
-FactoryClient::resolve_factory (void)
+FactoryClient::resolve_factory ()
 {
   ACE_ASSERT (this->use_naming_service == 1);
 
@@ -118,7 +118,7 @@ FactoryClient::resolve_factory (void)
 }
 
 CosEventChannelFactory::ChannelFactory_ptr
-FactoryClient::create_factory (void)
+FactoryClient::create_factory ()
 {
   throw CORBA::UNKNOWN ();
 }
@@ -223,7 +223,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel)
  */
 
 void
-FactoryClient::run_test (void)
+FactoryClient::run_test ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->factory_.in ()));
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index 74021f65fb5..e5793987ef2 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -131,7 +131,7 @@ FactoryDriver::start (int argc, ACE_TCHAR *argv [])
 }
 
 int
-FactoryDriver::stop (void)
+FactoryDriver::stop ()
 {
   orb_->shutdown ();
   return 0;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index 7c9e7e02414..9a189b121f7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Get_Opt.h"
 
-RtEC_Based_CosEC::RtEC_Based_CosEC (void)
+RtEC_Based_CosEC::RtEC_Based_CosEC ()
   : service_name (ACE_TEXT("CosEventService")),
     rt_service_name (ACE_TEXT("EventService")),
     remote_rtec_ (0)
@@ -10,7 +10,7 @@ RtEC_Based_CosEC::RtEC_Based_CosEC (void)
   // No-Op.
 }
 
-RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
+RtEC_Based_CosEC::~RtEC_Based_CosEC ()
 {
   // No-Op.
 }
@@ -132,7 +132,7 @@ RtEC_Based_CosEC::startup (int argc, ACE_TCHAR *argv[])
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-RtEC_Based_CosEC::create_rtec (void)
+RtEC_Based_CosEC::create_rtec ()
 {
   // see if the user wants a local RtEC..
   if (this->remote_rtec_ == 0)
@@ -142,7 +142,7 @@ RtEC_Based_CosEC::create_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::activate_rtec (void)
+RtEC_Based_CosEC::activate_rtec ()
 {
   // see if the user wants to use a local RtEC..
   if (this->remote_rtec_ == 0)
@@ -162,7 +162,7 @@ RtEC_Based_CosEC::activate_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::deactivate_rtec (void)
+RtEC_Based_CosEC::deactivate_rtec ()
 {
   // Check if the local rtec is to be deactivated.
   if (this->remote_rtec_ == 0)
@@ -172,7 +172,7 @@ RtEC_Based_CosEC::deactivate_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::locate_rtec (void)
+RtEC_Based_CosEC::locate_rtec ()
 {
   CosNaming::Name ref_name (1);
   ref_name.length (1);
@@ -187,7 +187,7 @@ RtEC_Based_CosEC::locate_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::resolve_naming_service (void)
+RtEC_Based_CosEC::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -201,7 +201,7 @@ RtEC_Based_CosEC::resolve_naming_service (void)
 }
 
 int
-RtEC_Based_CosEC::run (void)
+RtEC_Based_CosEC::run ()
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the CosEventService\n", __FILE__));
   try
@@ -217,7 +217,7 @@ RtEC_Based_CosEC::run (void)
 }
 
 void
-RtEC_Based_CosEC::shutdown (void)
+RtEC_Based_CosEC::shutdown ()
 {
   // Deactivate.
   this->deactivate ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index b0317154a24..874bf090220 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -32,10 +32,10 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
 {
  public:
   /// Constructor.
-  RtEC_Based_CosEC (void);
+  RtEC_Based_CosEC ();
 
   /// Destructor.
-  virtual ~RtEC_Based_CosEC (void);
+  virtual ~RtEC_Based_CosEC ();
 
   /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv []);
@@ -46,32 +46,32 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
 
   /// run the COS Event Service.
   /// Returns 0 on success, -1 on error.
-  int run (void);
+  int run ();
 
   /// Shutdown the COS Event Service.
   /// Returns 0 on success, -1 on error.
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   // = Methods from CosEC_ServantBase
   /// Create a local rtec.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (void);
+  create_rtec ();
 
   /// Activates the rtec.
-  virtual void activate_rtec (void);
+  virtual void activate_rtec ();
 
   /// Deactivates the rtec.
-  virtual void deactivate_rtec (void);
+  virtual void deactivate_rtec ();
 
   /// initialize the ORB.
   void init_ORB (int& argc, ACE_TCHAR *argv []);
 
   /// Resolve the naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Locate a rtec.
-  void locate_rtec (void);
+  void locate_rtec ();
 
   // = Data members
   /// The name we use to register with the Naming Service.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index 49a0415e491..fa54c53ca57 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -1,7 +1,7 @@
 #include "ConsumerAdmin_i.h"
 #include <memory>
 
-TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i (void)
+TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i ()
   : qos_ (),
     rtec_consumeradmin_ (RtecEventChannelAdmin::ConsumerAdmin::_nil ())
 {
@@ -18,7 +18,7 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier ()
 {
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -45,7 +45,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void)
+TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier ()
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullSupplier::_nil ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index f84f4654d4f..623b6fb2567 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -31,7 +31,7 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ConsumerAdmin_i :
   //   RtecEventChannelAdmin::ConsumerAdmin.
 public:
   /// Constructor.
-  TAO_CosEC_ConsumerAdmin_i (void);
+  TAO_CosEC_ConsumerAdmin_i ();
 
   /// Destructor.
   ~TAO_CosEC_ConsumerAdmin_i () = default;
@@ -41,11 +41,11 @@ public:
 
   /// Returns a new ProxyPushSupplier_ptr.
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(void);
+    obtain_push_supplier();
 
   /// Returns a new ProxyPullSupplier_ptr.
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(void);
+    obtain_pull_supplier();
 
 private:
   /// The ConsumerQOS specified by the user of this class.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 71fbff1ea65..b95e8c9fcce 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -6,7 +6,7 @@
 #include "ace/Auto_Ptr.h"
 #include <memory>
 
-CosEC_ServantBase::CosEC_ServantBase (void)
+CosEC_ServantBase::CosEC_ServantBase ()
   :poa_ (PortableServer::POA::_nil ()),
    rtec_servant_ (0),
    cosec_servant_ (0),
@@ -44,7 +44,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
 }
 
 int
-CosEC_ServantBase::activate (void)
+CosEC_ServantBase::activate ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
@@ -102,7 +102,7 @@ CosEC_ServantBase::activate (const char* servant_id)
 }
 
 void
-CosEC_ServantBase::activate_rtec (void)
+CosEC_ServantBase::activate_rtec ()
 {
   // Activate the Rtec
   PortableServer::ObjectId_var oid =
@@ -118,7 +118,7 @@ CosEC_ServantBase::activate_rtec (void)
 }
 
 int
-CosEC_ServantBase::activate_cosec (void)
+CosEC_ServantBase::activate_cosec ()
 {
  // Initialize the CosEC servant.
   RtecBase::handle_t supp_handle = 0;
@@ -160,7 +160,7 @@ CosEC_ServantBase::activate_cosec (void)
 }
 
 void
-CosEC_ServantBase::deactivate (void)
+CosEC_ServantBase::deactivate ()
 {
   // Deactivate all those we control...
   this->deactivate_rtec ();
@@ -176,7 +176,7 @@ CosEC_ServantBase::deactivate (void)
 }
 
 void
-CosEC_ServantBase::deactivate_rtec (void)
+CosEC_ServantBase::deactivate_rtec ()
 {
   // Deactivate the rtec.
   PortableServer::ObjectId_var oid =
@@ -187,7 +187,7 @@ CosEC_ServantBase::deactivate_rtec (void)
 }
 
 void
-CosEC_ServantBase::deactivate_cosec (void)
+CosEC_ServantBase::deactivate_cosec ()
 {
   // Deactivate the cosec.
   PortableServer::ObjectId_var oid =
@@ -198,19 +198,19 @@ CosEC_ServantBase::deactivate_cosec (void)
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-CosEC_ServantBase::for_consumers (void)
+CosEC_ServantBase::for_consumers ()
 {
   return this->cosec_->for_consumers ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-CosEC_ServantBase::for_suppliers (void)
+CosEC_ServantBase::for_suppliers ()
 {
   return this->cosec_->for_suppliers ();
 }
 
 void
-CosEC_ServantBase::destroy (void)
+CosEC_ServantBase::destroy ()
 {
   // Deactivate all the contained servants and ourselves.
   // The poa will "destroy" the ref counted servants.
@@ -219,7 +219,7 @@ CosEC_ServantBase::destroy (void)
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEC_ServantBase::create_rtec (void)
+CosEC_ServantBase::create_rtec ()
 {
   // Create the RtEC servant.
   TAO_EC_Event_Channel_Attributes attr (this->poa_.in (),
@@ -233,7 +233,7 @@ CosEC_ServantBase::create_rtec (void)
 }
 
 TAO_CosEC_EventChannel_i*
-CosEC_ServantBase::create_cosec (void)
+CosEC_ServantBase::create_cosec ()
 {
   // Create the CosEC servant.
   TAO_CosEC_EventChannel_i* _cosec_servant;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index f3e359d7934..0faed4b7f51 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -34,7 +34,7 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
   //   Clients can derive from this class and create servants.
  public:
   /// Constructor.
-  CosEC_ServantBase (void);
+  CosEC_ServantBase ();
 
   /// Destructor.
   virtual ~CosEC_ServantBase () = default;
@@ -52,45 +52,45 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
                      ACE_TCHAR *source_type_pairs);
 
   /// Activates the CosEC with <thispoa_> and friends with the <poa_>
-  int activate (void);
+  int activate ();
 
   /// If the servant_id is not nil then it is used to supply the object id
   /// for <this> servant.
   int activate (const char* servant_id);
 
   /// Deactivates the CosEC and friends with the POA.
-  void deactivate (void);
+  void deactivate ();
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
   /// Destroys this Event Channel object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
  protected:
   // = RtEC creation, activation and deactivation methods.
   /// Create a local rtec.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (void);
+  create_rtec ();
 
   /// Activates the rtec.
-  virtual void activate_rtec (void);
+  virtual void activate_rtec ();
 
   /// Deactivates the rtec.
-  virtual void deactivate_rtec (void);
+  virtual void deactivate_rtec ();
 
   // = CosEC creation, activation and deactivation methods.
   /// Create a local cosec.
   TAO_CosEC_EventChannel_i*
-  create_cosec (void);
+  create_cosec ();
 
   /// Activates the cosec.
-  int activate_cosec (void);
+  int activate_cosec ();
 
   /// Deactivates the cosec.
-  void deactivate_cosec (void);
+  void deactivate_cosec ();
 
   /// Initialize the SupplierQOS Factory.
   void init_SupplierQOS (RtecBase::handle_t supp_handle,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index 126eed592a0..a9bd639f1c1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -1,7 +1,7 @@
 #include "EventChannel_i.h"
 #include <memory>
 
-TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i (void)
+TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i ()
   : consumer_admin_ (0),
     supplier_admin_ (0),
     consumeradmin_ (CosEventChannelAdmin::ConsumerAdmin::_nil ()),
@@ -78,7 +78,7 @@ TAO_CosEC_EventChannel_i::for_suppliers ()
 }
 
 void
-TAO_CosEC_EventChannel_i::destroy (void)
+TAO_CosEC_EventChannel_i::destroy ()
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
@@ -93,7 +93,7 @@ TAO_CosEC_EventChannel_i::destroy (void)
 }
 
 void
-TAO_CosEC_EventChannel_i::shutdown (void)
+TAO_CosEC_EventChannel_i::shutdown ()
 {
   this->destroy ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index 683f878d464..f6924763a89 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -49,17 +49,17 @@ public:
 
   /// The for_consumers method will return the same ConsumerAdmin_ptr
   /// everytime its called.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
   /// The for_suppliers method will return the same SupplierAdmin_ptr
   /// everytime its called.
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
   /// Destroys this Event Channel object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// destroys this Event Channel object and <delete>s this object.
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// ConsumerAdmin servant object.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index 0adcb289b62..5c70464417d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -53,7 +53,7 @@ TAO_CosEC_PushSupplierWrapper::TAO_CosEC_PushSupplierWrapper
 }
 
 void
-TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void)
+TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier ()
 {
   this->supplier_->disconnect_push_supplier ();
 
@@ -78,7 +78,7 @@ TAO_CosEC_ProxyPushConsumer_i::TAO_CosEC_ProxyPushConsumer_i (const RtecEventCha
 {
 }
 
-TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
+TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i ()
 {
 }
 
@@ -119,7 +119,7 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data)
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void)
+TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer ()
 {
   this->proxypushconsumer_->disconnect_push_consumer ();
 
@@ -161,7 +161,7 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
 }
 
 int
-TAO_CosEC_ProxyPushConsumer_i::connected (void)
+TAO_CosEC_ProxyPushConsumer_i::connected ()
 {
   return this->wrapper_ == 0 ? 0 : 1;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index 73b04c479e5..17149cf23ed 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -44,13 +44,13 @@ public:
                                  RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer);
 
   /// Destructor.
-  ~TAO_CosEC_ProxyPushConsumer_i (void);
+  ~TAO_CosEC_ProxyPushConsumer_i ();
 
   /// Suppliers call this method to pass data to connected consumers.
   virtual void push (const CORBA::Any &data);
 
   /// Disconnects the supplier from the event communication.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Connects a push supplier.
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier);
@@ -58,7 +58,7 @@ public:
 private:
   /// Returns 0 if a push_supplier is already connected to this
   /// ProxyPushConsumer, otherwise it returns a 1.
-  int connected (void);
+  int connected ();
 
   /// The SupplierQOS specified by the user of this class.
   const RtecEventChannelAdmin::SupplierQOS &qos_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 7528c70dfe3..2ec39fed7a6 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -68,7 +68,7 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set)
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer ()
 {
   // Deactivate the supplier proxy.
   this->consumer_->disconnect_push_consumer ();
@@ -95,7 +95,7 @@ TAO_CosEC_ProxyPushSupplier_i::TAO_CosEC_ProxyPushSupplier_i
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier ()
 {
   this->pps_->disconnect_push_supplier ();
 
@@ -142,7 +142,7 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer
 }
 
 int
-TAO_CosEC_ProxyPushSupplier_i::connected (void)
+TAO_CosEC_ProxyPushSupplier_i::connected ()
 {
   return this->wrapper_ == 0 ? 0 : 1;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index 245f4f3c449..1f711ec2a26 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -40,7 +40,7 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i () = default;
 
   /// Ends the event communication and disposes this object.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Connects the <push_consumer> to the Event Channel.
   virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer);
@@ -48,7 +48,7 @@ public:
 private:
   /// Returns 0 if a push_consumer is already connected to this
   /// ProxyPushSupplier, otherwise it returns a 1.
-  int connected (void);
+  int connected ();
 
   /// The ConsumerQOS specified by the user of this class.
   const RtecEventChannelAdmin::ConsumerQOS &qos_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index 9de4ca109e6..54b80aa496f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -1,7 +1,7 @@
 #include "SupplierAdmin_i.h"
 #include <memory>
 
-TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i (void)
+TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i ()
   : qos_ (),
     rtec_supplieradmin_ (RtecEventChannelAdmin::SupplierAdmin::_nil ())
 {
@@ -18,7 +18,7 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer ()
 {
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -46,7 +46,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void)
+TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer ()
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullConsumer::_nil ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index d3c7c3c763a..79bffa8634e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -44,7 +44,7 @@ public:
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ();
 
   /// Returns a new ProxyPullConsumer_ptr.
-  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer(void);
+  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer();
 
 private:
   /// The SupplierQOS specified by the user of this class.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index 959aa21e667..0a45c2d7aa4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -29,12 +29,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Basic::Basic (void)
+Basic::Basic ()
 {
   // No-Op.
 }
 
-Basic::~Basic (void)
+Basic::~Basic ()
 {
   // No-Op.
 }
@@ -69,7 +69,7 @@ Basic::init_ORB  (int argc, ACE_TCHAR *argv [])
 }
 
 void
-Basic::init_CosEC (void)
+Basic::init_CosEC ()
 {
   CosEC_ServantBase *ec = 0;
 
@@ -97,7 +97,7 @@ Basic::init_CosEC (void)
 }
 
 void
-Basic::run (void)
+Basic::run ()
 {
   // Create an Any type to pass to the Cos EC.
   CORBA::Any any;
@@ -124,7 +124,7 @@ Basic::run (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->supplier_.close ();
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
index 996a8b8c513..dea78bf07da 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -29,10 +29,10 @@ class Basic
 {
 public:
   /// Constructor.
-  Basic (void);
+  Basic ();
 
   /// Destructor.
-  ~Basic (void);
+  ~Basic ();
 
   /// Starts up an ORB and the CosEC.
   /// Returns 0 on success, -1 on error.
@@ -40,10 +40,10 @@ public:
 
   /// Connects a consumer and a supplier to the CosEC and sends 1 event
   /// across.
-  void run (void);
+  void run ();
 
   /// Closes down the CosEC.
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// initializes the ORB.
@@ -52,7 +52,7 @@ private:
 
   /// initializes the COS EC.
   /// Returns 0 on success, -1 on error.
-  void init_CosEC (void);
+  void init_CosEC ();
 
   /// The ORB that we use.
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 435888329b5..1b296892916 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -13,7 +13,7 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
 }
 
 void
-Consumer::close (void)
+Consumer::close ()
 {
   this->disconnect ();
 
@@ -22,7 +22,7 @@ Consumer::close (void)
 }
 
 void
-Consumer::connect (void)
+Consumer::connect ()
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -37,7 +37,7 @@ Consumer::connect (void)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -59,7 +59,7 @@ Consumer::push (const CORBA::Any &)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index e26d81af275..f859e513cc5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -35,20 +35,20 @@ public:
              CORBA::ORB_ptr orb);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
   /// Connect the Consumer to the EventChannel.
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the supplier, but do not forget about it or close
   /// it.
-  void disconnect (void);
+  void disconnect ();
 
   /// push the event to the consumer.
   virtual void push (const CORBA::Any &data);
 
   /// disconnect the consumer from the EC.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// The orb that we as using.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 0a5b0f9bb35..404425e3277 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -10,7 +10,7 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 }
 
 void
-Supplier::close (void)
+Supplier::close ()
 {
   this->disconnect ();
 
@@ -19,7 +19,7 @@ Supplier::close (void)
 }
 
 void
-Supplier::connect (void)
+Supplier::connect ()
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
@@ -33,7 +33,7 @@ Supplier::connect (void)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
@@ -52,7 +52,7 @@ Supplier::send_event (const CORBA::Any & data)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 0a99793afa0..1bbd4b93308 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -34,18 +34,18 @@ public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the EC, but do not forget about it or close it.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   void send_event (const CORBA::Any &data);
 
   /// The POA_CosEventComm::PushSupplier method.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   /// We talk to the EC using this proxy.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index c0f1633dd9e..85d56eba259 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -50,7 +50,7 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 }
 
 void
-Consumer::close (void)
+Consumer::close ()
 {
   this->disconnect ();
 
@@ -59,7 +59,7 @@ Consumer::close (void)
 }
 
 void
-Consumer::connect (void)
+Consumer::connect ()
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -74,7 +74,7 @@ Consumer::connect (void)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -113,7 +113,7 @@ Consumer::push (const CORBA::Any &)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // Deactivate this object.
 
@@ -127,7 +127,7 @@ Consumer::disconnect_push_consumer (void)
 }
 
 int
-Consumer::init_Consumer (void)
+Consumer::init_Consumer ()
 {
   try
    {
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index ce68de17b99..69fa5a4e84a 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -36,26 +36,26 @@ public:
   Consumer ();
 
   /// Initialize the Consumer.
-  int init_Consumer (void);
+  int init_Consumer ();
 
   /// This method connects the consumer to the EC.
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
   /// Connect the Consumer to the EventChannel.
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the supplier, but do not forget about it or close
   /// it.
-  void disconnect (void);
+  void disconnect ();
 
   /// push the event to the consumer.
   virtual void push (const CORBA::Any &data);
 
   /// disconnect the consumer from the EC.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = CosEC_Multiple methods.
   /// Parse the command line options.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index bf465408a0e..979b3b52344 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -1,6 +1,6 @@
 #include "Multiple.h"
 
-Multiple::Multiple (void)
+Multiple::Multiple ()
   : cos_ec_ (CosEventChannelAdmin::EventChannel::_nil ()),
     service_name_ (ACE_TEXT ("CosEventService")),
     orb_ (CORBA::ORB::_nil ())
@@ -9,7 +9,7 @@ Multiple::Multiple (void)
 }
 
 
-Multiple::~Multiple (void)
+Multiple::~Multiple ()
 {
   // No-Op.
 }
@@ -67,7 +67,7 @@ Multiple::init_ORB  (int argc, ACE_TCHAR *argv [])
 }
 
 int
-Multiple::init_CosEC (void)
+Multiple::init_CosEC ()
 {
   try
     {
@@ -102,7 +102,7 @@ Multiple::init_CosEC (void)
 }
 
 int
-Multiple::runORB (void)
+Multiple::runORB ()
 {
   try
     {
@@ -117,7 +117,7 @@ Multiple::runORB (void)
 }
 
 void
-Multiple::shutdown (void)
+Multiple::shutdown ()
 {
   if (!this->orb_->_nil ())
     this->orb_->shutdown ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
index 233c0abd0e1..5f3f24a25b3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
@@ -30,20 +30,20 @@ class Multiple
   //   via the Cos Event Service.
  public:
   /// Constructor.
-  Multiple (void);
+  Multiple ();
 
   /// Destructor.
-  virtual ~Multiple (void);
+  virtual ~Multiple ();
 
   /// Calls parse_args, Starts up an ORB, gets hold of the Event Service.
   /// Returns 0 on success, -1 on error.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Calls the ORB's <run> method.
-  int runORB (void);
+  int runORB ();
 
   /// Closes down the ORB and exits.
-  void shutdown (void);
+  void shutdown ();
 
  protected:
   /// Parse the command line arguments.
@@ -62,7 +62,7 @@ class Multiple
 
   /// initializes the COS EC.
   /// Returns 0 on success, -1 on error.
-  int init_CosEC (void);
+  int init_CosEC ();
 
   /// The ORB that we use.
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 66dd5961a01..934564a51f1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -49,7 +49,7 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 }
 
 void
-Supplier::close (void)
+Supplier::close ()
 {
   this->disconnect ();
 
@@ -58,7 +58,7 @@ Supplier::close (void)
 }
 
 void
-Supplier::connect (void)
+Supplier::connect ()
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
@@ -72,7 +72,7 @@ Supplier::connect (void)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
@@ -91,7 +91,7 @@ Supplier::send_event (const CORBA::Any & data)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
   // Deactivate this object.
 
@@ -105,7 +105,7 @@ Supplier::disconnect_push_supplier (void)
 }
 
 void
-Supplier::run (void)
+Supplier::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index f737bd6ce0f..d20e5dc00cb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -38,21 +38,21 @@ public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the EC, but do not forget about it or close it.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   void send_event (const CORBA::Any &data);
 
   /// The POA_CosEventComm::PushSupplier method.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Sends the events to the EC.
-  void run (void);
+  void run ();
 
   // = Multiple methods.
   /// Parses the command line arguments.
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index 42242a6b8db..a3b3097121a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -122,7 +122,7 @@ Consumer::push (const CORBA::Any &)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 68d6eef38d8..687e07bd847 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -28,7 +28,7 @@ class Consumer : public POA_CosEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -37,7 +37,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const CORBA::Any &event);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index b23bcc5216e..72f499c2398 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -121,7 +121,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 897ef6acbd7..fc32ef54529 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -28,7 +28,7 @@ class Supplier : public POA_CosEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -36,7 +36,7 @@ public:
   // = The CosEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
 };
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
index d9c931e8164..15775983533 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
@@ -8,7 +8,7 @@ Country_i::Country_i (CORBA::ORB_ptr orb) :
 }
 
 // Implementation skeleton destructor
-Country_i::~Country_i (void)
+Country_i::~Country_i ()
 {
 }
 
@@ -22,7 +22,7 @@ void Country_i::update_population (const char * country,
 }
 
 CORBA::Object_ptr
-Country_i::get_typed_consumer (void)
+Country_i::get_typed_consumer ()
 
 {
   //Add your implementation here
@@ -42,7 +42,7 @@ Country_i::push (const CORBA::Any & /* data */)
 }
 
 void
-Country_i::disconnect_push_consumer (void)
+Country_i::disconnect_push_consumer ()
 
 {
   //Add your implementation here
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
index 8a06018ff12..a52b2201d63 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
@@ -16,16 +16,16 @@ public:
   Country_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Country_i (void);
+  virtual ~Country_i ();
 
   virtual void update_population (const char * country,
                                   CORBA::Long population);
 
-  virtual CORBA::Object_ptr get_typed_consumer (void);
+  virtual CORBA::Object_ptr get_typed_consumer ();
 
   virtual void push (const CORBA::Any & data);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 0681024f2f9..94cfb90c9ad 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -465,7 +465,7 @@ namespace
 
 
 char*
-ReplicaController::name (void)
+ReplicaController::name ()
 {
   return CORBA::string_dup ("ReplicaController");
 }
@@ -483,7 +483,7 @@ ReplicaController::send_other (
 }
 
 void
-ReplicaController::destroy (void)
+ReplicaController::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
index 5e200d12f7b..93e4428250e 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
@@ -8,7 +8,7 @@ Manager_i::Manager_i (long retryCount)
 {
 }
 
-Manager_i::~Manager_i (void)
+Manager_i::~Manager_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
index ca1e362a95c..934de961ae0 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
@@ -14,7 +14,7 @@ class  Manager_i
 public:
   Manager_i (long retryCount);
 
-  virtual ~Manager_i (void);
+  virtual ~Manager_i ();
 
   virtual CORBA::Long registerServer ();
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
index d57009c00f7..2beba55339b 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
@@ -10,7 +10,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, long instance)
 {
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
index e81bf681048..ebeaf377152 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
@@ -14,7 +14,7 @@ class  Messenger_i
 public:
   Messenger_i (CORBA::ORB_ptr orb, long instance);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual
   CORBA::Long send_message (
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index 8cf2c96d7fe..6fcabe26717 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -59,7 +59,7 @@ public:
   }
 };
 
-DynServer_Loader::DynServer_Loader(void)
+DynServer_Loader::DynServer_Loader()
 {
 }
 
@@ -116,7 +116,7 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-DynServer_Loader::fini (void)
+DynServer_Loader::fini ()
 {
   ACE_ASSERT(runner_.get() != 0);
   try {
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
index 031f401980d..6591ba81d09 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
@@ -15,7 +15,7 @@ class DynServer_Export DynServer
 {
   int n_;
 public:
-  DynServer(void);
+  DynServer();
   virtual ~DynServer();
   virtual CORBA::Long get();
 };
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index c270870f635..735ce7ef005 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -20,7 +20,7 @@ public:
   }
   virtual ~test_i (void) {
   }
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ACE_DEBUG((LM_DEBUG, "dynserver: get() %d\n", ++n_));
     return n_;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index 69cbb3cfe31..5d82cab4250 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -6,7 +6,7 @@
 #include "orbsvcs/CosLoadBalancingC.h"
 #include "tao/ORB_Constants.h"
 
-ORBInitializer::ORBInitializer (void)
+ORBInitializer::ORBInitializer ()
   : load_alert_ (),
     interceptor_ (0)
 {
@@ -52,7 +52,7 @@ ORBInitializer::post_init (
 
 
 TAO_LB_LoadAlert &
-ORBInitializer::load_alert (void)
+ORBInitializer::load_alert ()
 {
   return this->load_alert_;
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 041ddf9fbd8..e004a72cedb 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -21,12 +21,12 @@ RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor)
   this->location_[0].kind = CORBA::string_dup ("UUID");
 }
 
-RPS_Monitor::~RPS_Monitor (void)
+RPS_Monitor::~RPS_Monitor ()
 {
 }
 
 CosLoadBalancing::Location *
-RPS_Monitor::the_location (void)
+RPS_Monitor::the_location ()
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -41,7 +41,7 @@ RPS_Monitor::the_location (void)
 }
 
 CosLoadBalancing::LoadList *
-RPS_Monitor::loads (void)
+RPS_Monitor::loads ()
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
index e24f5c1f2f3..a51f978e878 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
@@ -65,7 +65,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~RPS_Monitor (void);
+  ~RPS_Monitor ();
 
 private:
   /// The name of the location at which this LoadMonitor resides.
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index 2af202455c5..05012b1fb74 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -1,22 +1,22 @@
 #include "ServerRequestInterceptor.h"
 
-ServerRequestInterceptor::ServerRequestInterceptor (void)
+ServerRequestInterceptor::ServerRequestInterceptor ()
   : request_count_ (0)
 {
 }
 
-ServerRequestInterceptor::~ServerRequestInterceptor (void)
+ServerRequestInterceptor::~ServerRequestInterceptor ()
 {
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
@@ -52,7 +52,7 @@ ServerRequestInterceptor::send_other (
 }
 
 CORBA::Long
-ServerRequestInterceptor::request_count (void)
+ServerRequestInterceptor::request_count ()
 {
   const CORBA::Long r = this->request_count_.value ();
   this->request_count_ = 0;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 94e2e8b6403..70e212dfda8 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -48,7 +48,7 @@ class ServerRequestInterceptor
 {
 public:
   /// Constructor.
-  ServerRequestInterceptor (void);
+  ServerRequestInterceptor ();
 
   /**
    * @name Methods Required by the ServerRequestInterceptor
@@ -58,9 +58,9 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -78,7 +78,7 @@ public:
       PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
-  CORBA::Long request_count (void);
+  CORBA::Long request_count ();
 
 protected:
   /// Destructor.
@@ -86,7 +86,7 @@ protected:
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  ~ServerRequestInterceptor (void);
+  ~ServerRequestInterceptor ();
 
 private:
   /// The number of requests that have arrived on the server.
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index d5b9fcb84b9..b224ca9342a 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -23,7 +23,7 @@ StockFactory::get_stock (const char *symbol)
 }
 
 void
-StockFactory::shutdown (void)
+StockFactory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 17f030929c9..7cdf0431a68 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -13,7 +13,7 @@ public:
 
   Test::Stock_ptr get_stock (const char *symbol);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index f0550d67bb8..6c2c98331c1 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -9,7 +9,7 @@
 #define QUERY_LANG "TCL"
 
 
-TLS_Client::TLS_Client (void)
+TLS_Client::TLS_Client ()
 {
   // No-Op.
 }
@@ -35,7 +35,7 @@ TLS_Client::init_ORB (int argc,
 }
 
 void
-TLS_Client::resolve_naming_service (void)
+TLS_Client::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -49,7 +49,7 @@ TLS_Client::resolve_naming_service (void)
 }
 
 void
-TLS_Client::resolve_TLS_Basic_factory (void)
+TLS_Client::resolve_TLS_Basic_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -63,7 +63,7 @@ TLS_Client::resolve_TLS_Basic_factory (void)
 }
 
 void
-TLS_Client::run_tests (void)
+TLS_Client::run_tests ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->basic_log_factory_.in ()));
 
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index dea614b2c50..054366ebebc 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -23,23 +23,23 @@ class TLS_Client
   // = DESCRIPTION
   //   This client demonstates how to use the log service.
  public:
-  TLS_Client (void);
+  TLS_Client ();
   ~TLS_Client ();
 
   void init (int argc, ACE_TCHAR *argv []);
   // Init the Client.
 
-  void run_tests (void);
+  void run_tests ();
   // Run the tests..
 
  protected:
   void init_ORB (int argc, ACE_TCHAR *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Try to get hold of a running naming service.
 
-  void resolve_TLS_Basic_factory (void);
+  void resolve_TLS_Basic_factory ();
   // Try to resolve the TLS factory from the Naming service.
 
   // = Data Members
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index 9bce68a2b19..5e639f2bec2 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -15,7 +15,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -98,7 +98,7 @@ Consumer::push (const CORBA::Any &)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index e23c33959b3..1453e5331c9 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -31,7 +31,7 @@ class Consumer : public POA_CosEventComm::PushConsumer
   //   This class is a consumer of log generated events.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -41,7 +41,7 @@ public:
 
   virtual void push (const CORBA::Any &event);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index 13d885b60db..7b09a500702 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -175,7 +175,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index 6b2d7a484d3..e1639955cd7 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -30,7 +30,7 @@ class Supplier : public POA_CosEventComm::PushSupplier
   //   This class is a supplier of events.
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -38,7 +38,7 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 72636dce089..d3353b80412 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any &event)
 
 void
 Consumer::disconnect_push_consumer
-   (void)
+   ()
 {
   this->proxy_supplier_->
     disconnect_push_supplier();
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 805a9900f3e..36e09083f14 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -34,7 +34,7 @@ class Consumer
   //   This class is a consumer of log generated events.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 5d5dfad91bd..15ab44f8224 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -22,7 +22,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -229,7 +229,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 
-Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  (void)
+Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  ()
 {
 }
 
@@ -258,7 +258,7 @@ Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (void)
+Filter_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -284,7 +284,7 @@ Filter_StructuredPushSupplier::send_event
 
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
-   (void)
+   ()
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index 3324eced5e2..438ee6784ad 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -34,7 +34,7 @@ class Supplier
   //   This class is a supplier of events.
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   ~Supplier ();
@@ -71,14 +71,14 @@ class Filter_StructuredPushSupplier
   //   Supplier for the filter example.
   //
  public:
-  Filter_StructuredPushSupplier (void);
+  Filter_StructuredPushSupplier ();
   // Constructor.
 
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the supplier.
 
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index 19e3a04b718..f1384c7fd4e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -16,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -137,7 +137,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index 6ebec884016..a49c0dae275 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -32,7 +32,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer
   //   It simply registers for one event type.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -41,7 +41,7 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 653890485d1..8800ef9a19e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -21,7 +21,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -220,7 +220,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 20de42fc970..4b48fd774a2 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -31,7 +31,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier
   //   It simply publishes one event type.
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -39,7 +39,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index a61c03e454f..315227f0860 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -173,7 +173,7 @@ private:
 
 
   virtual void
-  disconnect_structured_push_consumer (void)
+  disconnect_structured_push_consumer ()
   {
     // We don't care.
   }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index 7055c096e6f..93d46418516 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -238,7 +238,7 @@ push_structured_event (StructuredEvent const& e)
 
 
 void
-Gate::disconnect_structured_push_consumer (void)
+Gate::disconnect_structured_push_consumer ()
 {
   // We don't care.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index 8444f2f6a12..049662855bd 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -58,7 +58,7 @@ private:
 
 
   virtual void
-  disconnect_structured_push_consumer (void);
+  disconnect_structured_push_consumer ();
 
 private:
   ACE_thread_t thread_;
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index ea341893d7b..4150d641a7c 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -13,7 +13,7 @@
 
 ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0;
 
-FilterClient::FilterClient (void)
+FilterClient::FilterClient ()
   :done_ (0)
 {
   g_result_count = 0;
@@ -47,7 +47,7 @@ FilterClient::init (int argc, ACE_TCHAR *argv [])
 }
 
 void
-FilterClient::run (void)
+FilterClient::run ()
 {
   send_events ();
 
@@ -60,7 +60,7 @@ FilterClient::run (void)
 }
 
 void
-FilterClient::done (void)
+FilterClient::done ()
 {
   this->done_ = 1;
 }
@@ -89,7 +89,7 @@ FilterClient::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-FilterClient::resolve_naming_service (void)
+FilterClient::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -103,7 +103,7 @@ FilterClient::resolve_naming_service (void)
 }
 
 void
-FilterClient::resolve_Notify_factory (void)
+FilterClient::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -117,7 +117,7 @@ FilterClient::resolve_Notify_factory (void)
 }
 
 void
-FilterClient::create_EC (void)
+FilterClient::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -129,7 +129,7 @@ FilterClient::create_EC (void)
 }
 
 void
-FilterClient::create_supplieradmin (void)
+FilterClient::create_supplieradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
@@ -161,7 +161,7 @@ FilterClient::create_supplieradmin (void)
 }
 
 void
-FilterClient:: create_consumeradmin (void)
+FilterClient:: create_consumeradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
@@ -196,7 +196,7 @@ FilterClient:: create_consumeradmin (void)
 }
 
 void
-FilterClient::create_consumers (void)
+FilterClient::create_consumers ()
 {
   // startup the first consumer.
   ACE_NEW_THROW_EX (consumer_1,
@@ -214,7 +214,7 @@ FilterClient::create_consumers (void)
 }
 
 void
-FilterClient::create_suppliers (void)
+FilterClient::create_suppliers ()
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
@@ -232,7 +232,7 @@ FilterClient::create_suppliers (void)
 }
 
 void
-FilterClient::send_events (void)
+FilterClient::send_events ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -294,7 +294,7 @@ Filter_StructuredPushConsumer::Filter_StructuredPushConsumer (FilterClient* filt
 {
 }
 
-Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
+Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer ()
 {
 }
 
@@ -321,7 +321,7 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr
 }
 
 void
-Filter_StructuredPushConsumer::disconnect (void)
+Filter_StructuredPushConsumer::disconnect ()
 {
   this->proxy_supplier_->
     disconnect_structured_push_supplier();
@@ -360,7 +360,7 @@ Filter_StructuredPushConsumer::push_structured_event
 
 void
 Filter_StructuredPushConsumer::disconnect_structured_push_consumer
-   (void)
+   ()
 {
   // No-Op.
 }
@@ -398,7 +398,7 @@ Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (void)
+Filter_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -428,7 +428,7 @@ Filter_StructuredPushSupplier::send_event
 
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
-   (void)
+   ()
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index c1b6f85e28c..09e4f29ec9f 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -33,7 +33,7 @@ class FilterClient
 {
  public:
   /// Constructor
-  FilterClient (void);
+  FilterClient ();
 
   /// Destructor
   ~FilterClient ();
@@ -42,38 +42,38 @@ class FilterClient
   void init (int argc, ACE_TCHAR *argv []);
 
   /// Run the demo.
-  void run (void);
+  void run ();
 
   /// Consumer calls done, We're done.
-  void done (void);
+  void done ();
 
  protected:
   /// Initializes the ORB.
   void init_ORB (int argc, ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   /// Create an EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// Create the Supplier Admin.
-  void create_supplieradmin(void);
+  void create_supplieradmin();
 
   /// Create the Consumer Admin.
-  void create_consumeradmin (void);
+  void create_consumeradmin ();
 
   /// Create and initialize the consumers.
-  void create_consumers (void);
+  void create_consumers ();
 
   /// create and initialize the suppliers.
-  void create_suppliers (void);
+  void create_suppliers ();
 
   /// send the events.
-  void send_events (void);
+  void send_events ();
 
   // = Data Members
   /// Reference to the root poa.
@@ -142,7 +142,7 @@ class Filter_StructuredPushConsumer
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the supplier.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
 protected:
   // = Data members
@@ -161,7 +161,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~Filter_StructuredPushConsumer (void);
+  virtual ~Filter_StructuredPushConsumer ();
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -195,7 +195,7 @@ class Filter_StructuredPushSupplier
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 275d6fa001b..bd3d67a94b7 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -5,7 +5,7 @@ TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& or
 {
 }
 
-TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer (void)
+TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer ()
 {
 }
 
@@ -20,19 +20,19 @@ TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelA
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer::_default_POA (void)
+TAO_Notify_Lanes_Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_Lanes_Consumer::run (void)
+TAO_Notify_Lanes_Consumer::run ()
 {
   // Nothing to do.
 }
 
 void
-TAO_Notify_Lanes_Consumer::connect (void)
+TAO_Notify_Lanes_Consumer::connect ()
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
@@ -63,7 +63,7 @@ TAO_Notify_Lanes_Consumer::connect (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer::disconnect (void)
+TAO_Notify_Lanes_Consumer::disconnect ()
 {
   this->proxy_supplier_->disconnect_structured_push_supplier();
 }
@@ -120,7 +120,7 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
 }
 
 void
-TAO_Notify_Lanes_Consumer::deactivate (void)
+TAO_Notify_Lanes_Consumer::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -130,7 +130,7 @@ TAO_Notify_Lanes_Consumer::deactivate (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void)
+TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index 6945eb99a24..df77a378564 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -33,7 +33,7 @@ public:
   void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type);
 
   /// Run
-  void run (void);
+  void run ();
 
 protected:
   // = Data members
@@ -58,20 +58,20 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~TAO_Notify_Lanes_Consumer (void);
+  virtual ~TAO_Notify_Lanes_Consumer ();
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Connect the Consumer to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   // = NotifyPublish method
   virtual void offer_change (
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 786c1029bc9..e2139f642c0 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -52,7 +52,7 @@ TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_Lanes_Consumer_Client::initialize (void)
+TAO_Notify_Lanes_Consumer_Client::initialize ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n"
               , this->lane_priority_, this->event_type_.c_str ()));
@@ -98,7 +98,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
+TAO_Notify_Lanes_Consumer_Client::create_rt_poa ()
 {
   PortableServer::POA_var rt_poa;
 
@@ -160,13 +160,13 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer_Client::run (void)
+TAO_Notify_Lanes_Consumer_Client::run ()
 {
   this->consumer_->run ();
 }
 
 int
-TAO_Notify_Lanes_Consumer_Client::svc (void)
+TAO_Notify_Lanes_Consumer_Client::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
index 8ca203d982c..2d22ab6f102 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
@@ -34,10 +34,10 @@ public:
   ~TAO_Notify_Lanes_Consumer_Client ();
 
   /// Init
-  void initialize (void);
+  void initialize ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -47,7 +47,7 @@ public:
 
 protected:
   /// Create an RT POA with a single lane at the specified RT Priority.
-  PortableServer::POA_ptr create_rt_poa (void);
+  PortableServer::POA_ptr create_rt_poa ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 7bbd202e3d3..84e33b4c6aa 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -1,7 +1,7 @@
 #include "ORB_Objects.h"
 
 
-TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
+TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects ()
 {
 }
 
@@ -35,7 +35,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (void)
+TAO_Notify_ORB_Objects::notify_factory ()
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf;
 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index c40609915fa..132f3bd1c23 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -24,7 +24,7 @@ class TAO_Notify_ORB_Objects
 {
 public:
   /// Constructor
-  TAO_Notify_ORB_Objects (void);
+  TAO_Notify_ORB_Objects ();
 
   /// Destructor
   ~TAO_Notify_ORB_Objects ();
@@ -33,7 +33,7 @@ public:
   void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory ();
 
   ///= Public Data
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index 5e1cb1fb3f2..0806cfadc71 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -11,7 +11,7 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 }
 
 int
-TAO_Notify_ORB_Run_Task::svc (void)
+TAO_Notify_ORB_Run_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 8bab425bc0f..c5f549bc370 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -27,7 +27,7 @@ TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin
 }
 
 void
-TAO_Notify_Lanes_Supplier::run (void)
+TAO_Notify_Lanes_Supplier::run ()
 {
   // The Priority at which we send the first event to the first consumer.
   RTCORBA::Priority priority = 1;
@@ -92,7 +92,7 @@ TAO_Notify_Lanes_Supplier::run (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier::connect (void)
+TAO_Notify_Lanes_Supplier::connect ()
 {
   // Activate the supplier object.
   CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
@@ -115,7 +115,7 @@ TAO_Notify_Lanes_Supplier::connect (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier::disconnect (void)
+TAO_Notify_Lanes_Supplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -123,7 +123,7 @@ TAO_Notify_Lanes_Supplier::disconnect (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier::deactivate (void)
+TAO_Notify_Lanes_Supplier::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -155,7 +155,7 @@ TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& e
 }
 
 void
-TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void)
+TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index 1f4dceb6a0b..bf0746c0b80 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -32,20 +32,20 @@ public:
   void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count);
 
   /// Run
-  void run (void);
+  void run ();
 
 protected:
   // = Protected Methods
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
@@ -59,7 +59,7 @@ protected:
         const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
   /// = Data members
 
   /// ORB Objects.
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 12f60304909..c823ef82e81 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -58,7 +58,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::initialize (void)
+TAO_Notify_Lanes_Supplier_Client::initialize ()
 {
   PortableServer::POAManager_var poa_manager =
     this->orb_objects_.root_poa_->the_POAManager ();
@@ -83,7 +83,7 @@ TAO_Notify_Lanes_Supplier_Client::initialize (void)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_Lanes_Supplier_Client::create_ec (void)
+TAO_Notify_Lanes_Supplier_Client::create_ec ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -144,7 +144,7 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::run (void)
+TAO_Notify_Lanes_Supplier_Client::run ()
 {
   /// First, signal that the supplier is ready.
   this->write_ior ();
@@ -153,7 +153,7 @@ TAO_Notify_Lanes_Supplier_Client::run (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::write_ior (void)
+TAO_Notify_Lanes_Supplier_Client::write_ior ()
 {
   CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
 
@@ -173,7 +173,7 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (void)
 }
 
 int
-TAO_Notify_Lanes_Supplier_Client::svc (void)
+TAO_Notify_Lanes_Supplier_Client::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
index c10aa42d931..229ce52a686 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
@@ -31,10 +31,10 @@ public:
   ~TAO_Notify_Lanes_Supplier_Client ();
 
   /// Init
-  void initialize (void);
+  void initialize ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -44,10 +44,10 @@ public:
 
 protected:
   /// Create an EC
-  CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
+  CosNotifyChannelAdmin::EventChannel_ptr create_ec ();
 
   /// Write ior to file.
-  void write_ior (void);
+  void write_ior ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 93cd4e1f219..1d749a9ada6 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -16,7 +16,7 @@
 
 ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; // we wait for 4 events.
 
-Subscribe::Subscribe (void)
+Subscribe::Subscribe ()
   : done_ (0)
 {
   // No-Op.
@@ -42,7 +42,7 @@ Subscribe::init (int argc, ACE_TCHAR *argv [])
 }
 
 void
-Subscribe::run (void)
+Subscribe::run ()
 {
   this->send_events ();
 
@@ -55,7 +55,7 @@ Subscribe::run (void)
 }
 
 void
-Subscribe::done (void)
+Subscribe::done ()
 {
   this->done_ = 1;
 }
@@ -84,7 +84,7 @@ Subscribe::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-Subscribe::resolve_naming_service (void)
+Subscribe::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -98,7 +98,7 @@ Subscribe::resolve_naming_service (void)
 }
 
 void
-Subscribe::resolve_Notify_factory (void)
+Subscribe::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -112,7 +112,7 @@ Subscribe::resolve_Notify_factory (void)
 }
 
 void
-Subscribe::create_EC (void)
+Subscribe::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -124,7 +124,7 @@ Subscribe::create_EC (void)
 }
 
 void
-Subscribe::create_supplieradmin (void)
+Subscribe::create_supplieradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -135,7 +135,7 @@ Subscribe::create_supplieradmin (void)
 }
 
 void
-Subscribe:: create_consumeradmin (void)
+Subscribe:: create_consumeradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -146,7 +146,7 @@ Subscribe:: create_consumeradmin (void)
 }
 
 void
-Subscribe::create_consumers (void)
+Subscribe::create_consumers ()
 {
   consumer_1_ = new Subscribe_StructuredPushConsumer (this);
   consumer_1_->connect (this->consumer_admin_.in ());
@@ -156,7 +156,7 @@ Subscribe::create_consumers (void)
 }
 
 void
-Subscribe::create_suppliers (void)
+Subscribe::create_suppliers ()
 {
   supplier_1_ = new Subscribe_StructuredPushSupplier ();
   supplier_1_->connect (this->supplier_admin_.in ());
@@ -166,7 +166,7 @@ Subscribe::create_suppliers (void)
 }
 
 void
-Subscribe::send_events (void)
+Subscribe::send_events ()
 {
   // Setup the CA to receive event_type : "domain_A", "Type_a"
   CosNotification::EventTypeSeq added(1);
@@ -288,7 +288,7 @@ Subscribe_StructuredPushConsumer::connect
 }
 
 void
-Subscribe_StructuredPushConsumer::disconnect (void)
+Subscribe_StructuredPushConsumer::disconnect ()
 {
   this->proxy_supplier_->
     disconnect_structured_push_supplier();
@@ -333,20 +333,20 @@ Subscribe_StructuredPushConsumer::push_structured_event
 
 void
 Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
-   (void)
+   ()
 {
   // No-Op.
 }
 
 CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr
-Subscribe_StructuredPushConsumer::get_proxy_supplier (void)
+Subscribe_StructuredPushConsumer::get_proxy_supplier ()
 {
   return proxy_supplier_.in ();
 }
 
 /*****************************************************************/
 
-Subscribe_StructuredPushSupplier::Subscribe_StructuredPushSupplier (void)
+Subscribe_StructuredPushSupplier::Subscribe_StructuredPushSupplier ()
 {
 }
 
@@ -376,7 +376,7 @@ Subscribe_StructuredPushSupplier::connect
 }
 
 void
-Subscribe_StructuredPushSupplier::disconnect (void)
+Subscribe_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -402,7 +402,7 @@ Subscribe_StructuredPushSupplier::send_event
 
 void
 Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
-   (void)
+   ()
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index e6294322038..fd6466c78ca 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -30,45 +30,45 @@ class Subscribe_StructuredPushSupplier;
 class Subscribe
 {
 public:
-  Subscribe (void);
+  Subscribe ();
   ~Subscribe ();
 
   /// Init the Client.
   void init (int argc, ACE_TCHAR *argv []);
 
   /// Run the demo.
-  void run (void);
+  void run ();
 
   /// Called when all events we are waiting for have occurred.
-  void done (void);
+  void done ();
 
  protected:
   /// Initializes the ORB.
   void init_ORB (int argc, ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   /// Create an EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// Create the Supplier Admin.
-  void create_supplieradmin(void);
+  void create_supplieradmin();
 
   /// Create the Consumer Admin.
-  void create_consumeradmin (void);
+  void create_consumeradmin ();
 
   /// Create and initialize the consumers.
-  void create_consumers (void);
+  void create_consumers ();
 
   /// create and initialize the suppliers.
-  void create_suppliers (void);
+  void create_suppliers ();
 
   /// send the events.
-  void send_events (void);
+  void send_events ();
 
   // = Data Members
   /// Reference to the root poa.
@@ -130,10 +130,10 @@ public:
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the supplier.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
   /// Accessor for the Proxy that we're connected to.
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
+  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier ();
 
   // public data member for evaluating the results of subscription.
   CosNotification::EventTypeSeq expected_subscription_;
@@ -150,7 +150,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~Subscribe_StructuredPushConsumer (void);
+  virtual ~Subscribe_StructuredPushConsumer ();
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -177,14 +177,14 @@ class Subscribe_StructuredPushSupplier
   //
 public:
   /// Constructor.
-  Subscribe_StructuredPushSupplier (void);
+  Subscribe_StructuredPushSupplier ();
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 93d29935e5e..ab02d46ca9f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -18,7 +18,7 @@ TAO_Notify_ThreadPool_Consumer::TAO_Notify_ThreadPool_Consumer (TAO_Notify_ORB_O
 {
 }
 
-TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer (void)
+TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer ()
 {
 }
 
@@ -38,19 +38,19 @@ TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyCha
 }
 
 PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer::_default_POA (void)
+TAO_Notify_ThreadPool_Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::run (void)
+TAO_Notify_ThreadPool_Consumer::run ()
 {
   // Nothing to do.
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::connect (void)
+TAO_Notify_ThreadPool_Consumer::connect ()
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
@@ -111,7 +111,7 @@ TAO_Notify_ThreadPool_Consumer::connect (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::disconnect (void)
+TAO_Notify_ThreadPool_Consumer::disconnect ()
 {
   this->proxy_supplier_->disconnect_structured_push_supplier();
 }
@@ -158,7 +158,7 @@ TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::St
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::dump_throughput (void)
+TAO_Notify_ThreadPool_Consumer::dump_throughput ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
@@ -171,7 +171,7 @@ TAO_Notify_ThreadPool_Consumer::dump_throughput (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::deactivate (void)
+TAO_Notify_ThreadPool_Consumer::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -181,7 +181,7 @@ TAO_Notify_ThreadPool_Consumer::deactivate (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void)
+TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index 131c4b81deb..673e4faf480 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -34,28 +34,28 @@ public:
   void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay);
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Print the consumer throughput
-  void dump_throughput (void);
+  void dump_throughput ();
 
 protected:
   // = Methods
   /// Destructor
-  virtual ~TAO_Notify_ThreadPool_Consumer (void);
+  virtual ~TAO_Notify_ThreadPool_Consumer ();
 
   /// Connect the Consumer to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   // = NotifyPublish method
   virtual void offer_change (
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index a61cbed6fe5..850a331191b 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -60,7 +60,7 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::_init (void)
+TAO_Notify_ThreadPool_Consumer_Client::_init ()
 {
   PortableServer::POAManager_var poa_manager =
     this->orb_objects_.root_poa_->the_POAManager ();
@@ -103,7 +103,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (void)
 }
 
 PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
+TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa ()
 {
   PortableServer::POA_var rt_poa;
 
@@ -158,19 +158,19 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::run (void)
+TAO_Notify_ThreadPool_Consumer_Client::run ()
 {
   this->consumer_->run ();
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::dump_stats (void)
+TAO_Notify_ThreadPool_Consumer_Client::dump_stats ()
 {
   this->consumer_->dump_throughput ();
 }
 
 int
-TAO_Notify_ThreadPool_Consumer_Client::svc (void)
+TAO_Notify_ThreadPool_Consumer_Client::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
index 492ca513a76..f5dc2ff31db 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
@@ -32,10 +32,10 @@ public:
   ~TAO_Notify_ThreadPool_Consumer_Client ();
 
   /// Init
-  void _init (void);
+  void _init ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -44,11 +44,11 @@ public:
   virtual int svc ();
 
   /// Dump stats.
-  void dump_stats (void);
+  void dump_stats ();
 
 protected:
   /// Create an RT POA with a single threadpool.
-  PortableServer::POA_ptr create_rt_poa (void);
+  PortableServer::POA_ptr create_rt_poa ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index 7bbd202e3d3..84e33b4c6aa 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -1,7 +1,7 @@
 #include "ORB_Objects.h"
 
 
-TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
+TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects ()
 {
 }
 
@@ -35,7 +35,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (void)
+TAO_Notify_ORB_Objects::notify_factory ()
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf;
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
index 4c501ec1f3f..ca94c2e8937 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
@@ -23,7 +23,7 @@ class TAO_Notify_ORB_Objects
 {
 public:
   /// Constructor
-  TAO_Notify_ORB_Objects (void);
+  TAO_Notify_ORB_Objects ();
 
   /// Destructor
   ~TAO_Notify_ORB_Objects ();
@@ -32,7 +32,7 @@ public:
   void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory ();
 
   ///= Public Data
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index 5e1cb1fb3f2..0806cfadc71 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -11,7 +11,7 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 }
 
 int
-TAO_Notify_ORB_Run_Task::svc (void)
+TAO_Notify_ORB_Run_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index 416239c0e0e..ec24428c2df 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -32,7 +32,7 @@ TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var&
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::run (void)
+TAO_Notify_ThreadPool_Supplier::run ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
@@ -68,7 +68,7 @@ TAO_Notify_ThreadPool_Supplier::run (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::connect (void)
+TAO_Notify_ThreadPool_Supplier::connect ()
 {
   // Activate the supplier object.
   CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
@@ -116,7 +116,7 @@ TAO_Notify_ThreadPool_Supplier::connect (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::disconnect (void)
+TAO_Notify_ThreadPool_Supplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -124,7 +124,7 @@ TAO_Notify_ThreadPool_Supplier::disconnect (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::deactivate (void)
+TAO_Notify_ThreadPool_Supplier::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -165,7 +165,7 @@ TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEve
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void)
+TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index 06bb8d8502c..5b263d76ae1 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -34,20 +34,20 @@ public:
              int proxy_consumer_thread_count);
 
   /// Run
-  void run (void);
+  void run ();
 
 protected:
   // = Protected Methods
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
@@ -61,7 +61,7 @@ protected:
         const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
   /// = Data members
 
   /// ORB Objects.
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 6afd9723a61..2bccc8f164c 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -76,7 +76,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::_init (void)
+TAO_Notify_ThreadPool_Supplier_Client::_init ()
 {
   PortableServer::POAManager_var poa_manager =
     this->orb_objects_.root_poa_->the_POAManager ();
@@ -101,7 +101,7 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (void)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
+TAO_Notify_ThreadPool_Supplier_Client::create_ec ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -141,7 +141,7 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::run (void)
+TAO_Notify_ThreadPool_Supplier_Client::run ()
 {
   /// First, signal that the supplier is ready.
   this->write_ior ();
@@ -150,7 +150,7 @@ TAO_Notify_ThreadPool_Supplier_Client::run (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
+TAO_Notify_ThreadPool_Supplier_Client::write_ior ()
 {
   CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
 
@@ -170,7 +170,7 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
 }
 
 int
-TAO_Notify_ThreadPool_Supplier_Client::svc (void)
+TAO_Notify_ThreadPool_Supplier_Client::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
index a8124b09e5c..d94d8462b3f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
@@ -30,10 +30,10 @@ public:
   ~TAO_Notify_ThreadPool_Supplier_Client ();
 
   /// Init
-  void _init (void);
+  void _init ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -43,10 +43,10 @@ public:
 
 protected:
   /// Create an EC
-  CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
+  CosNotifyChannelAdmin::EventChannel_ptr create_ec ();
 
   /// Write ior to file.
-  void write_ior (void);
+  void write_ior ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index d313390481f..69ddc038a5d 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -11,7 +11,7 @@ Gateway_ObjRef_Factory (
 }
 
 ::CORBA::ValueBase *
-Gateway_ObjRef_Factory::_copy_value (void)
+Gateway_ObjRef_Factory::_copy_value ()
 {
   Gateway_ObjRef_Factory *ret_val= 0;
   ACE_NEW_THROW_EX (
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
index 27ba0514a18..8f62819a96a 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
@@ -18,7 +18,7 @@ public:
     Gateway::Object_Factory_ptr gateway_object_factory,
     PortableInterceptor::ObjectReferenceFactory *old_factory);
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   virtual CORBA::Object_ptr make_object (
       const char *repository_id,
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 49a2906ce81..b4c59369154 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -7,20 +7,20 @@ Server_IORInterceptor (Gateway::Object_Factory_ptr factory)
 {
 }
 
-Server_IORInterceptor::~Server_IORInterceptor (void)
+Server_IORInterceptor::~Server_IORInterceptor ()
 {
   CORBA::release (this->gateway_object_factory_);
 }
 
 
 char *
-Server_IORInterceptor::name (void)
+Server_IORInterceptor::name ()
 {
   return CORBA::string_dup ("Server_IORInterceptor");
 }
 
 void
-Server_IORInterceptor::destroy (void)
+Server_IORInterceptor::destroy ()
 {
   CORBA::release (this->gateway_object_factory_);
   this->gateway_object_factory_ = Gateway::Object_Factory::_nil ();
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 32748ae6eee..d36f2c0a3ed 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -33,10 +33,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -56,7 +56,7 @@ public:
   //@}
 
 protected:
-  ~Server_IORInterceptor (void);
+  ~Server_IORInterceptor ();
 
 private:
   Gateway::Object_Factory_ptr gateway_object_factory_;
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 305d0d1fdf6..810c5adae15 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -21,7 +21,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -142,7 +142,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index afa68222030..b64b43bee56 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -27,7 +27,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -36,7 +36,7 @@ public:
 
   // The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index 46beee50311..e4dfe0a4bd2 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC::EC (void)
+EC::EC ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
index b9f326327bc..5648f124f3a 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
@@ -25,7 +25,7 @@ class EC
 {
 public:
   /// Constructor
-  EC (void);
+  EC ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 1e5908baf66..c36aafa4ee1 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -20,7 +20,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Gateway::Gateway (void)
+Gateway::Gateway ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
index 8e203359789..52944979ec5 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
@@ -24,7 +24,7 @@ class Gateway
 {
 public:
   /// Constructor
-  Gateway (void);
+  Gateway ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index 71007b6620f..bda7a4bfbdf 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -22,7 +22,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -137,7 +137,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index b20a42d89b0..0b71d3a186d 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -26,7 +26,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -34,7 +34,7 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 8ba0a0c792a..a126ffcde82 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -1,7 +1,7 @@
 #include "Consumer.h"
 
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
 {
 }
 
@@ -20,7 +20,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index eca442d1128..f11eb11cf76 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -34,13 +34,13 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 };
 
 #endif /* CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index a62d2de04dd..451f7ccfe93 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -12,7 +12,7 @@ Supplier::Supplier (RtecEventComm::EventSourceID id,
 }
 
 void
-Supplier::timeout_occurred (void)
+Supplier::timeout_occurred ()
 {
   RtecEventComm::EventSet event (1);
   if (id_ == 1)
@@ -34,7 +34,7 @@ Supplier::timeout_occurred (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
@@ -58,7 +58,7 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Timeout_Consumer::disconnect_push_consumer (void)
+Timeout_Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 521175465fb..1a34a69e981 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -41,9 +41,9 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
-  void timeout_occurred (void);
+  void timeout_occurred ();
 
 private:
   RtecEventComm::EventSourceID id_;
@@ -69,7 +69,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   Supplier *supplier_impl_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 0fca147dffc..241296a0526 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -36,7 +36,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   try
     {
@@ -79,7 +79,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index a48d9c507ce..8e9bdcfa1b8 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -30,19 +30,19 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Connect to the Event Channel
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 819a6caf61a..bfd1976c7bb 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -30,7 +30,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   // Disconnect from the EC
   try
@@ -49,7 +49,7 @@ Supplier::disconnect (void)
 }
 
 void
-Supplier::perform_push (void)
+Supplier::perform_push ()
 {
   try
     {
@@ -69,7 +69,7 @@ Supplier::perform_push (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 242d7385234..795a05aab74 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -31,21 +31,21 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event
-  void perform_push (void);
+  void perform_push ();
 
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 4554ad6baff..b342a399e8e 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -1,6 +1,6 @@
 #include "Consumer.h"
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
 {
 }
 
@@ -19,7 +19,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index eca442d1128..f11eb11cf76 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -34,13 +34,13 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 };
 
 #endif /* CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 3a97402ca8e..98a01e57a22 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -1,11 +1,11 @@
 #include "Supplier.h"
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index 278934efb6d..a689ef39bb7 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -34,12 +34,12 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
 };
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index 02db0dc75ae..127158fa995 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -13,7 +13,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -126,7 +126,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 71f9300fb16..dc91368f8ea 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -29,7 +29,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -38,7 +38,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 9c7b5324b23..08e8e17ce41 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -116,7 +116,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index a1e9d944303..53fc07c7145 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -29,7 +29,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -37,7 +37,7 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
 };
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 4b34d977cb2..ff983ba8c70 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -8,7 +8,7 @@ static int authorize_1 = 1;
 static int authorize_2 = 1;
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (void)
+SLevel1_Server_i::authorize_level1 ()
 {
   /// Get a reference to the SecurityCurrent object.
   CORBA::Object_var obj =
@@ -101,7 +101,7 @@ SLevel1_Server_i::authorize_level1 (void)
 
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level2 (void)
+SLevel1_Server_i::authorize_level2 ()
 {
   /// If the owner of this invocation is authorized to invoke this
   /// method, return 0 else return 1.
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
index 67a9c41c128..e43d145381c 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -20,9 +20,9 @@ class SLevel1_Server_i : public POA_SLevel1_Server
   SLevel1_Server_i ();
 
   ///
-  CORBA::Boolean authorize_level1 (void);
+  CORBA::Boolean authorize_level1 ();
 
-  CORBA::Boolean authorize_level2 (void);
+  CORBA::Boolean authorize_level2 ();
 
   static int authorized_1;
   static int authorized_2;
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 3e2822e1927..db443ce5227 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -12,7 +12,7 @@ Simple_Server_i::send_line (const char *line)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index fb2e86350c9..3391e218fca 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   void send_line (const char *line);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index ecd767ce52a..3ae3c6adc8e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -55,10 +55,10 @@ class TAO_AV_Export AV_Null_MediaCtrl
   : public virtual POA_Null_MediaCtrl
 {
 public:
-  AV_Null_MediaCtrl (void);
+  AV_Null_MediaCtrl ();
 
 protected:
-  virtual ~AV_Null_MediaCtrl (void);
+  virtual ~AV_Null_MediaCtrl ();
 };
 
 /**
@@ -72,7 +72,7 @@ class TAO_AV_Export TAO_Basic_StreamCtrl
 {
 public:
   /// Default Constructor
-  TAO_Basic_StreamCtrl (void);
+  TAO_Basic_StreamCtrl ();
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
@@ -114,7 +114,7 @@ public:
 
 protected:
   /// Destructor.
-  virtual ~TAO_Basic_StreamCtrl (void);
+  virtual ~TAO_Basic_StreamCtrl ();
 
 
   /// The Virtual Devices for this stream
@@ -151,7 +151,7 @@ class TAO_AV_Export MMDevice_Map_Hash_Key
 {
 public:
   /// default constructor.
-  MMDevice_Map_Hash_Key (void);
+  MMDevice_Map_Hash_Key ();
 
   /// constructor.
   MMDevice_Map_Hash_Key (AVStreams::MMDevice_ptr mmdevice);
@@ -160,7 +160,7 @@ public:
   MMDevice_Map_Hash_Key (const MMDevice_Map_Hash_Key&);
 
   /// destructor.
-  ~MMDevice_Map_Hash_Key (void);
+  ~MMDevice_Map_Hash_Key ();
 
   /// operator== needed by  ACE_Hash_Map_Manager.
   bool operator == (const MMDevice_Map_Hash_Key &hash_key) const;
@@ -189,10 +189,10 @@ class TAO_AV_Export TAO_StreamCtrl
 {
 public:
   /// Default Constructor
-  TAO_StreamCtrl (void);
+  TAO_StreamCtrl ();
 
   /// virtual destructor.
-  virtual ~TAO_StreamCtrl (void);
+  virtual ~TAO_StreamCtrl ();
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
@@ -239,7 +239,7 @@ public:
                              const AVStreams::flowSpec &the_spec);
 
   /// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-  virtual void unbind (void);
+  virtual void unbind ();
 
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
                                                 AVStreams::StreamEndPoint_out sep);
@@ -285,10 +285,10 @@ public:
   };
 
   /// Default constructor.
-  TAO_MCastConfigIf (void);
+  TAO_MCastConfigIf ();
 
   /// Dtor
-  ~TAO_MCastConfigIf (void);
+  ~TAO_MCastConfigIf ();
 
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
@@ -327,7 +327,7 @@ class TAO_AV_Export TAO_AV_QoS
 {
 public:
   /// constructor.
-  TAO_AV_QoS (void);
+  TAO_AV_QoS ();
 
   /// constructor taking a stream qos parameter.
   TAO_AV_QoS (AVStreams::streamQoS &stream_qos);
@@ -373,14 +373,14 @@ class TAO_AV_Export TAO_Base_StreamEndPoint
 {
   // @@Naga: Rename this class to TAO_Base_EndPoint since both stream and flowendpoints derive from it.
 public:
-  TAO_Base_StreamEndPoint (void);
-  virtual ~TAO_Base_StreamEndPoint (void);
+  TAO_Base_StreamEndPoint ();
+  virtual ~TAO_Base_StreamEndPoint ();
 
   /// called when streamendpoint is instantiated
-  virtual int handle_open (void);
+  virtual int handle_open ();
 
   /// called when streamendpoint is being destructed
-  virtual int handle_close (void);
+  virtual int handle_close ();
 
   /// Application needs to define this
   virtual int handle_stop (const AVStreams::flowSpec &the_spec);
@@ -415,10 +415,10 @@ public:
   virtual void set_control_flow_handler (const char *flowname,
                                          TAO_AV_Flow_Handler *handler);
 
-  TAO_AV_QoS &qos (void);
+  TAO_AV_QoS &qos ();
 
-  void protocol_object_set (void);
-  int is_protocol_object_set (void);
+  void protocol_object_set ();
+  int is_protocol_object_set ();
 
 protected:
   TAO_AV_QoS qos_;
@@ -444,7 +444,7 @@ class TAO_AV_Export TAO_StreamEndPoint
 {
 public:
   /// Constructor
-  TAO_StreamEndPoint (void);
+  TAO_StreamEndPoint ();
 
    /// Stop the stream. Empty the_spec means, for all the flows
   virtual void stop (const AVStreams::flowSpec &the_spec);
@@ -505,7 +505,7 @@ public:
   virtual void set_source_id (CORBA::Long source_id);
 
   /// Destructor
-  virtual ~TAO_StreamEndPoint (void);
+  virtual ~TAO_StreamEndPoint ();
 
   CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                AVStreams::flowSpec &the_spec);
@@ -569,7 +569,7 @@ class TAO_AV_Export TAO_StreamEndPoint_A :
 {
 public:
   /// Constructor
-  TAO_StreamEndPoint_A (void);
+  TAO_StreamEndPoint_A ();
 
   /// Used for ATM-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
@@ -585,7 +585,7 @@ public:
                                 const AVStreams::flowSpec &theSpec);
 
   /// Destructor
-  virtual ~TAO_StreamEndPoint_A (void);
+  virtual ~TAO_StreamEndPoint_A ();
 };
 
 // For backward compatibility.
@@ -604,14 +604,14 @@ class TAO_AV_Export TAO_StreamEndPoint_B :
   //     The "B" side of a streamendpoint
 public:
   /// Constructor
-  TAO_StreamEndPoint_B (void);
+  TAO_StreamEndPoint_B ();
 
   /// Used for internet-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                        AVStreams::flowSpec &the_spec);
 
   /// Destructor
-  virtual ~TAO_StreamEndPoint_B (void);
+  virtual ~TAO_StreamEndPoint_B ();
 };
 
 /**
@@ -625,7 +625,7 @@ class TAO_AV_Export TAO_VDev
 {
 public:
   /// Default Constructor
-  TAO_VDev (void);
+  TAO_VDev ();
 
   /// Called to tell the vdev who the streamctrl, peer vdev is
   virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
@@ -657,7 +657,7 @@ public:
 protected:
   /// Destructor for a servant should be protected or private.
   /// Use _remove_ref() to delete this servant.
-  virtual ~TAO_VDev (void);
+  virtual ~TAO_VDev ();
 
   /// hook called after set_peer is done to set the media ctrl of the peer vdev.
   virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl);
@@ -738,7 +738,7 @@ public:
   virtual void remove_fdev (const char *flow_name);
 
   /// Destructor
-  virtual ~TAO_MMDevice (void);
+  virtual ~TAO_MMDevice ();
 
 protected:
   /// Helper method to implement add_fdev()
@@ -782,16 +782,16 @@ class TAO_AV_Export TAO_FlowConnection
 {
 public:
   /// default constructor.
-  TAO_FlowConnection (void);
+  TAO_FlowConnection ();
 
   /// stop this flow.
-  virtual void stop (void);
+  virtual void stop ();
 
   /// start this flow.
-  virtual void start (void);
+  virtual void start ();
 
   /// destroy this flow.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// modify the QoS for this flow.
   virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos);
@@ -815,7 +815,7 @@ public:
                                   AVStreams::QoS & the_qos);
 
   /// disconnect this flow connection.
-  virtual CORBA::Boolean disconnect (void);
+  virtual CORBA::Boolean disconnect ();
 
   /// adds the producer to this flow connection.
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
@@ -863,7 +863,7 @@ class TAO_AV_Export TAO_FlowEndPoint :
 {
 public:
   ///default constructor.
-  TAO_FlowEndPoint (void);
+  TAO_FlowEndPoint ();
 
   TAO_FlowEndPoint (const char *flowname,
                     AVStreams::protocolSpec &protocols,
@@ -882,24 +882,24 @@ public:
                                    TAO_AV_Protocol_Object *object);
 
   /// lock the flow endpoint for a particular flow.
-  virtual CORBA::Boolean lock (void);
+  virtual CORBA::Boolean lock ();
 
   /// unlock the flow endpoint for subsequent use.
-  virtual void unlock (void);
+  virtual void unlock ();
 
 
   /// destroy this flow.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// get method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual AVStreams::StreamEndPoint_ptr related_sep(void);
+  virtual AVStreams::StreamEndPoint_ptr related_sep();
 
   /// set method for the related streamendpoint under which this
   /// flowendpoint is.
   virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep);
 
-  virtual AVStreams::FlowConnection_ptr related_flow_connection(void);
+  virtual AVStreams::FlowConnection_ptr related_flow_connection();
 
   // accessor for the related flow connection attribute.
 
@@ -907,7 +907,7 @@ public:
   virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection);
 
   /// returns the other flowendpoint to which this is connected.
-  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void);
+  virtual AVStreams::FlowEndPoint_ptr get_connected_fep ();
 
   //// use the specified flow protocol.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
@@ -1010,7 +1010,7 @@ class TAO_AV_Export TAO_FlowProducer:
 {
 public:
   /// default constructor
-  TAO_FlowProducer (void);
+  TAO_FlowProducer ();
 
   TAO_FlowProducer (const char *flowname,
                     AVStreams::protocolSpec protocols,
@@ -1026,10 +1026,10 @@ public:
   virtual char * get_rev_channel (const char * pcol_name);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (void);
+  virtual void stop ();
 
   /// start this flow, to be overridden by the application.
-  virtual void start (void);
+  virtual void start ();
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index 4fea5b533cf..d717322ee5d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -87,15 +87,15 @@ public:
   };
 
   /// Default constructor.
-  TAO_AV_Core (void);
+  TAO_AV_Core ();
 
   /// Destructor.
-  ~TAO_AV_Core (void);
+  ~TAO_AV_Core ();
 
   int init (CORBA::ORB_ptr orb,
             PortableServer::POA_ptr poa);
-  int run (void);
-  int stop_run (void);
+  int run ();
+  int stop_run ();
   int init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
                           TAO_AV_FlowSpecSet &flow_spec_set,
                           EndPoint direction,
@@ -104,33 +104,33 @@ public:
                           TAO_AV_FlowSpecSet &forward_flow_spec_set,
                           TAO_AV_FlowSpecSet &reverse_flow_spec_set,
                           EndPoint direction);
-  int init_transport_factories (void);
-  int init_flow_protocol_factories (void);
+  int init_transport_factories ();
+  int init_flow_protocol_factories ();
 
-  int load_default_transport_factories (void);
-  int load_default_flow_protocol_factories (void);
+  int load_default_transport_factories ();
+  int load_default_flow_protocol_factories ();
 
   /// = Get the acceptor registry
   TAO_AV_Acceptor *get_acceptor (const char *flowname);
   TAO_AV_Connector *get_connector (const char *flowname);
   int remove_acceptor (const char *flowname);
   int remove_connector (const char *flowname);
-  TAO_AV_Connector_Registry *connector_registry (void);
+  TAO_AV_Connector_Registry *connector_registry ();
   TAO_FlowSpec_Entry *get_flow_spec_entry (TAO_AV_FlowSpecSet &flow_spec_set,
                                            const char *flowname);
-  TAO_AV_Acceptor_Registry  *acceptor_registry  (void);
+  TAO_AV_Acceptor_Registry  *acceptor_registry  ();
 
   // = Get the protocol factories
   /// = Set/get the <ACE_Reactor>.
   TAO_AV_Flow_Protocol_Factory *get_flow_protocol_factory(const char *flow_protocol);
   TAO_AV_Transport_Factory *get_transport_factory(const char *transport_protocol);
-  TAO_AV_Flow_ProtocolFactorySet *flow_protocol_factories (void);
-  TAO_AV_TransportFactorySet *transport_factories (void);
+  TAO_AV_Flow_ProtocolFactorySet *flow_protocol_factories ();
+  TAO_AV_TransportFactorySet *transport_factories ();
   void reactor (ACE_Reactor *r);
-  ACE_Reactor *reactor (void);
-  CORBA::ORB_ptr orb (void);
+  ACE_Reactor *reactor ();
+  CORBA::ORB_ptr orb ();
   void orb (CORBA::ORB_ptr orb_);
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
   void poa (PortableServer::POA_ptr poa_);
 
   static int deactivate_servant (PortableServer::Servant servant);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 77caf7696f1..b4fa74ad221 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -39,10 +39,10 @@ class TAO_AV_Export TAO_AV_Endpoint_Strategy
 {
 public:
   /// Constructor
-  TAO_AV_Endpoint_Strategy (void);
+  TAO_AV_Endpoint_Strategy ();
 
   /// Destructor
-  virtual ~TAO_AV_Endpoint_Strategy (void);
+  virtual ~TAO_AV_Endpoint_Strategy ();
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
@@ -78,15 +78,15 @@ public:
   TAO_AV_Endpoint_Process_Strategy (ACE_Process_Options *process_options);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Process_Strategy (void);
+  virtual ~TAO_AV_Endpoint_Process_Strategy ();
 
   /// creates a new child process, and waits on a semaphore
   /// until the child process has finished creating the endpoints
-  virtual int activate (void);
+  virtual int activate ();
 
 protected:
   /// Bind to the naming service
-  virtual int bind_to_naming_service (void);
+  virtual int bind_to_naming_service ();
 
   /**
    * Get the object reference for the newly created stream
@@ -97,7 +97,7 @@ protected:
 
   /// Get the Vdev object reference for the newly created
   /// endpoint
-  virtual int get_vdev (void);
+  virtual int get_vdev ();
 
   /// Naming context
   CosNaming::NamingContext_var naming_context_;
@@ -127,7 +127,7 @@ public:
   TAO_AV_Endpoint_Process_Strategy_A (ACE_Process_Options *process_options);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Process_Strategy_A (void);
+  virtual ~TAO_AV_Endpoint_Process_Strategy_A ();
 
 protected:
   /// Creates an "A" type stream endpoint, and a vdev
@@ -135,7 +135,7 @@ protected:
                         AVStreams::VDev_ptr &vdev);
 
   /// Gets the "A" type stream endpoint from the child process
-  virtual int get_stream_endpoint (void);
+  virtual int get_stream_endpoint ();
 };
 
 // ----------------------------------------------------------------------
@@ -152,7 +152,7 @@ public:
   TAO_AV_Endpoint_Process_Strategy_B (ACE_Process_Options *process_options);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Process_Strategy_B (void);
+  virtual ~TAO_AV_Endpoint_Process_Strategy_B ();
 
 protected:
   /// Creates a "B" type stream endpoint, and a vdev
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 7167c33c74c..f1679c2ad4f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -17,14 +17,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // ----------------------------------------------------------------------
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy ()
    :  stream_endpoint_a_servant_(0), stream_endpoint_b_servant_(0), vdev_servant_(0),
       media_ctrl_servant_(0)
 {
 }
 
 template <class T_StreamEndpoint, class T_VDev, class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy ()
 {
   // Do not allow exceptions to escape from the destructor
   try
@@ -58,7 +58,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_
 // Create, activate the objects with the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate ()
 {
   try
     {
@@ -100,7 +100,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate VDev into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev ()
 {
   try
     {
@@ -131,7 +131,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate the media_controller
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl ()
 {
   try
     {
@@ -201,14 +201,14 @@ TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_m
 
 //Constructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_A (void)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_A ()
 {
 }
 
 
 // Destructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_A (void)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_A ()
 {
 }
 
@@ -242,7 +242,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
 // Put the stream_endpoint into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint ()
 {
   try
     {
@@ -269,13 +269,13 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
 
 // Constructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_B (void)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_B ()
 {
 }
 
 // Destructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_B (void)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_B ()
 {
 }
 
@@ -292,7 +292,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
 // Activate stream_endpoint
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint ()
 {
   try
     {
@@ -453,7 +453,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
 // Bind to the namingservice
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (void)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service ()
 {
   try
     {
@@ -479,7 +479,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
 // register the vdev with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (void)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev ()
 {
   try
     {
@@ -587,7 +587,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
 // register the stream_endpoint with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (void)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint ()
 {
   CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
   try
@@ -652,7 +652,7 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_mediactrl (T_M
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
+TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names ()
 {
   // Remove the names from the naming service
   try
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index f9b63701db0..2ce48375ab8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -35,16 +35,16 @@ protected:
   virtual ~TAO_AV_Endpoint_Reactive_Strategy ();
 
   /// creates and activates the streamendpoint, vdev, and mediacontrol
-  virtual int activate (void);
+  virtual int activate ();
 
   /// activates the stream_endpoint with the POA
   virtual int activate_stream_endpoint (void) = 0;
 
   /// activates the vdev with the POA
-  virtual int activate_vdev (void);
+  virtual int activate_vdev ();
 
   /// activates the media controller with the POA
-  virtual int activate_mediactrl (void);
+  virtual int activate_mediactrl ();
 
   /// Bridge method to create a vdev, a la Acceptor. Applications
   /// can override this
@@ -86,17 +86,17 @@ class TAO_AV_Endpoint_Reactive_Strategy_A
   : public TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev , T_MediaCtrl>
 {
 public:
-  TAO_AV_Endpoint_Reactive_Strategy_A (void);
+  TAO_AV_Endpoint_Reactive_Strategy_A ();
 
   /// Constructor
   int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Reactive_Strategy_A (void);
+  virtual ~TAO_AV_Endpoint_Reactive_Strategy_A ();
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// an "A" type endpoint
-  virtual int activate_stream_endpoint (void);
+  virtual int activate_stream_endpoint ();
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
@@ -168,16 +168,16 @@ protected:
   char* activate_with_poa (PortableServer::Servant servant);
 
   /// Removes the vdev and streamendpoint names from the naming service.
-  int unbind_names (void);
+  int unbind_names ();
 
   /// Binds to the naming service
-  int bind_to_naming_service (void);
+  int bind_to_naming_service ();
 
   /// Registers vdev with the naming service
-  int register_vdev (void);
+  int register_vdev ();
 
   /// Registers stream_endpoint with the naming service
-  int register_stream_endpoint (void);
+  int register_stream_endpoint ();
 
   /// Releases the semaphore on which the parent is waiting on
   int release_semaphore ();
@@ -240,10 +240,10 @@ class TAO_AV_Child_Process_A
 {
 public:
   /// Constructor.
-  TAO_AV_Child_Process_A (void);
+  TAO_AV_Child_Process_A ();
 
   /// Destructor.
-  virtual ~TAO_AV_Child_Process_A (void);
+  virtual ~TAO_AV_Child_Process_A ();
 };
 
 // ----------------------------------------------------------------------
@@ -258,10 +258,10 @@ class TAO_AV_Child_Process_B
 {
 public:
   /// Constructor.
-  TAO_AV_Child_Process_B (void);
+  TAO_AV_Child_Process_B ();
 
   /// Destructor.
-  virtual ~TAO_AV_Child_Process_B (void);
+  virtual ~TAO_AV_Child_Process_B ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
index 122d5116d24..5654b7b8a07 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const iovec Fill_ACE_QoS::iov_ = {0,0};
 
-Fill_ACE_QoS::Fill_ACE_QoS (void)
+Fill_ACE_QoS::Fill_ACE_QoS ()
 {
   ACE_NEW (this->default_traffic_,
            ACE_Flow_Spec  (ACE_QOS_NOT_SPECIFIED,
@@ -23,7 +23,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void)
 }
 
 // destructor.
-Fill_ACE_QoS::~Fill_ACE_QoS (void)
+Fill_ACE_QoS::~Fill_ACE_QoS ()
 {}
 
 int
@@ -62,7 +62,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
 }
 
 Fill_ACE_QoS::FLOW_SPEC_HASH_MAP&
-Fill_ACE_QoS::map (void)
+Fill_ACE_QoS::map ()
 {
   return this->flow_spec_map_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
index 6e4165f5b43..90e6286b790 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
@@ -40,10 +40,10 @@ public:
 
   //Initialization and termination methods.
   /// constructor.
-  Fill_ACE_QoS (void);
+  Fill_ACE_QoS ();
 
   /// destructor.
-  ~Fill_ACE_QoS (void);
+  ~Fill_ACE_QoS ();
 
   /// To be used by receivers. Fills the receiver qos and sets the
   /// sender qos to NO_TRAFFIC.
@@ -62,7 +62,7 @@ public:
                        ACE_Flow_Spec *sender_flow_spec);
 
   /// Returns the hash map of flowspecs indexed by flowspec name.
-  FLOW_SPEC_HASH_MAP& map (void);
+  FLOW_SPEC_HASH_MAP& map ();
 
 private:
   // The Service Provider is currently set to NULL for all ACE_QoS.
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index d0ff485c6f4..ea9d1237fb4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -79,7 +79,7 @@ public:
   };
 
   /// default constructor.
-  TAO_FlowSpec_Entry (void);
+  TAO_FlowSpec_Entry ();
 
   /// constructor to construct an entry from the arguments.
   TAO_FlowSpec_Entry (const char *flowname,
@@ -102,10 +102,10 @@ public:
   virtual int parse (const char* flowSpec_entry) = 0;
 
   /// virtual destructor.
-  virtual ~TAO_FlowSpec_Entry (void);
+  virtual ~TAO_FlowSpec_Entry ();
 
   /// accessor to the direction.
-  int direction (void);
+  int direction ();
 
   virtual Role role (void) = 0;
   void role (Role role);
@@ -119,9 +119,9 @@ public:
   void flow_protocol_str (const char *flow_protocol_str);
 
   /// accessor to address of the carrier protocol.
-  //ACE_Addr *fwd_address (void);
-  ACE_Addr *address (void);
-  ACE_Addr *control_address (void);
+  //ACE_Addr *fwd_address ();
+  ACE_Addr *address ();
+  ACE_Addr *control_address ();
   void address (ACE_Addr *address, bool cleanup = false);
   void control_address (ACE_Addr *address);
 
@@ -130,7 +130,7 @@ public:
   //  const char * peer_address_str () const;
 
   /// accessor to carrier protocol i.e TCP,UDP,RTP/UDP.
-  TAO_AV_Core::Protocol carrier_protocol (void);
+  TAO_AV_Core::Protocol carrier_protocol ();
 
   /// accessor to string version of carrier protocol.
   const char * carrier_protocol_str () const;
@@ -145,38 +145,38 @@ public:
   virtual const char *entry_to_string (void) = 0;
 
   int set_peer_addr (ACE_Addr *peer_addr);
-  ACE_Addr *get_peer_addr (void);
+  ACE_Addr *get_peer_addr ();
   int set_peer_control_addr (ACE_Addr *peer_control_addr);
-  ACE_Addr *get_peer_control_addr (void);
+  ACE_Addr *get_peer_control_addr ();
 
   int set_local_sec_addr (char** local_sec_addr, int size);
-  char** get_local_sec_addr (void);
-  int num_local_sec_addrs (void);
+  char** get_local_sec_addr ();
+  int num_local_sec_addrs ();
 
   int set_peer_sec_addr (char** peer_sec_addr, int size);
-  char** get_peer_sec_addr (void);
-  int num_peer_sec_addrs (void);
+  char** get_peer_sec_addr ();
+  int num_peer_sec_addrs ();
 
   int set_local_addr (ACE_Addr *local_addr);
-  ACE_Addr *get_local_addr (void);
-  char *get_local_addr_str (void);
+  ACE_Addr *get_local_addr ();
+  char *get_local_addr_str ();
   int set_local_control_addr (ACE_Addr *local_control_addr);
-  ACE_Addr *get_local_control_addr (void);
-  char *get_local_control_addr_str (void);
+  ACE_Addr *get_local_control_addr ();
+  char *get_local_control_addr_str ();
 
-  TAO_AV_Transport *transport (void);
+  TAO_AV_Transport *transport ();
   void transport (TAO_AV_Transport *transport);
-  TAO_AV_Transport *control_transport (void);
+  TAO_AV_Transport *control_transport ();
   void control_transport (TAO_AV_Transport *control_transport);
 
-  TAO_AV_Flow_Handler* handler (void);
+  TAO_AV_Flow_Handler* handler ();
   void handler (TAO_AV_Flow_Handler *handler);
-  TAO_AV_Flow_Handler* control_handler (void);
+  TAO_AV_Flow_Handler* control_handler ();
   void control_handler (TAO_AV_Flow_Handler *control_handler);
 
-  TAO_AV_Protocol_Object* protocol_object (void);
+  TAO_AV_Protocol_Object* protocol_object ();
   void protocol_object (TAO_AV_Protocol_Object *object);
-  TAO_AV_Protocol_Object* control_protocol_object (void);
+  TAO_AV_Protocol_Object* control_protocol_object ();
   void control_protocol_object (TAO_AV_Protocol_Object *object);
 
   /// sets the address for this flow.
@@ -184,7 +184,7 @@ public:
                      TAO_AV_Core::Flow_Component flow_component);
 
   /// returns true for a multicast address.
-  int is_multicast (void);
+  int is_multicast ();
 
 protected:
   /// parses the flow protocol string with tokens separated by :
@@ -194,7 +194,7 @@ protected:
   int set_direction (const char *direction_string);
 
   /// sets the protocol_ enum from the carrier_protocol_ string.
-  int set_protocol (void);
+  int set_protocol ();
 
   /// Addr information for the carrier protocol.
   ACE_Addr *address_;
@@ -268,7 +268,7 @@ public:
                  TAO_AV_PEER_ADDR = 5};
 
   /// default constructor.
-  TAO_Forward_FlowSpec_Entry (void);
+  TAO_Forward_FlowSpec_Entry ();
 
   /// constructor to construct an entry from the arguments.
   TAO_Forward_FlowSpec_Entry (const char *flowname,
@@ -285,12 +285,12 @@ public:
                               const char *flow_protocol,
                               const char *address);
 
-  virtual ~TAO_Forward_FlowSpec_Entry (void);
+  virtual ~TAO_Forward_FlowSpec_Entry ();
 
   /// converts the entry to a string.
-  virtual const char *entry_to_string (void);
+  virtual const char *entry_to_string ();
 
-  virtual Role role (void);
+  virtual Role role ();
 
   /// construct the entry from a string specified by the flowSpec grammar.
   virtual int parse (const char* flowSpec_entry);
@@ -311,7 +311,7 @@ public:
                  TAO_AV_FORMAT = 4};
 
   // default constructor.
-  TAO_Reverse_FlowSpec_Entry (void);
+  TAO_Reverse_FlowSpec_Entry ();
 
   // constructor to construct an entry from the arguments.
   TAO_Reverse_FlowSpec_Entry (const char *flowname,
@@ -329,12 +329,12 @@ public:
                               const char *flow_protocol,
                               const char *address);
 
-  virtual ~TAO_Reverse_FlowSpec_Entry (void);
+  virtual ~TAO_Reverse_FlowSpec_Entry ();
 
   /// converts the entry to a string.
-  virtual const char *entry_to_string (void);
+  virtual const char *entry_to_string ();
 
-  virtual Role role (void);
+  virtual Role role ();
 
   /// construct the entry from a string specified by the flowSpec grammar.
   virtual int parse (const char* flowSpec_entry);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index b1feb2a1270..127bbe6fccc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // default constructor
 template <class T_Producer, class T_Consumer>
-TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (void)
+TAO_FDev<T_Producer, T_Consumer>::TAO_FDev ()
 {
 }
 
@@ -35,14 +35,14 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
 }
 
 template <class T_Producer, class T_Consumer>
-TAO_FDev<T_Producer, T_Consumer>::~TAO_FDev (void)
+TAO_FDev<T_Producer, T_Consumer>::~TAO_FDev ()
 {
   //no-op
 }
 
 template <class T_Producer, class T_Consumer>
 const char *
-TAO_FDev<T_Producer, T_Consumer>::flowname (void)
+TAO_FDev<T_Producer, T_Consumer>::flowname ()
 {
   return this->flowname_.in ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h
index 900b15724a5..dbffd8ff7e9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.h
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h
@@ -31,21 +31,21 @@ class TAO_AV_UDP_MCast_Transport
   :public TAO_AV_Transport
 {
 public:
-  TAO_AV_UDP_MCast_Transport (void);
+  TAO_AV_UDP_MCast_Transport ();
 
   TAO_AV_UDP_MCast_Transport (TAO_AV_UDP_MCast_Flow_Handler *handler);
 
-  virtual ~TAO_AV_UDP_MCast_Transport (void);
+  virtual ~TAO_AV_UDP_MCast_Transport ();
 
   virtual int open (ACE_Addr *address);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
   /// Write the complete Message_Block chain to the connection.
-  virtual ACE_Addr *get_peer_addr (void);
-  virtual ACE_Addr *get_local_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
+  virtual ACE_Addr *get_local_addr ();
   virtual ssize_t send (const ACE_Message_Block *mblk,
                         ACE_Time_Value *s = 0);
 
@@ -89,8 +89,8 @@ class TAO_AV_UDP_MCast_Flow_Handler
    public virtual ACE_Event_Handler
 {
 public:
-  TAO_AV_UDP_MCast_Flow_Handler (void);
-  virtual ~TAO_AV_UDP_MCast_Flow_Handler (void);
+  TAO_AV_UDP_MCast_Flow_Handler ();
+  virtual ~TAO_AV_UDP_MCast_Flow_Handler ();
   virtual ACE_HANDLE get_handle () const;
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index b05af920247..b32d61a2539 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -118,7 +118,7 @@ TAO_AV_Callback::get_policies ()
 }
 
 // TAO_AV_Transport*
-// TAO_AV_Callback::transport (void)
+// TAO_AV_Callback::transport ()
 // {
 //   return this->transport_;
 // }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index f1b1793347a..75f26d55e1b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -53,7 +53,7 @@ class TAO_AV_Export TAO_AV_Policy
 {
 public:
   TAO_AV_Policy (CORBA::ULong type);
-  CORBA::ULong type (void);
+  CORBA::ULong type ();
 protected:
   CORBA::ULong type_;
 };
@@ -62,7 +62,7 @@ class  TAO_AV_Export TAO_AV_SSRC_Policy : public TAO_AV_Policy
 {
 public:
   TAO_AV_SSRC_Policy (CORBA::ULong ssrc = 0);
-  CORBA::ULong value (void);
+  CORBA::ULong value ();
   void value (CORBA::ULong ssrc);
 protected:
   CORBA::ULong ssrc_;
@@ -72,7 +72,7 @@ class  TAO_AV_Export TAO_AV_Payload_Type_Policy : public TAO_AV_Policy
 {
 public:
   TAO_AV_Payload_Type_Policy (int payload_type = -1);
-  int value (void);
+  int value ();
   void value (int pt);
 protected:
   int payload_type_;
@@ -81,8 +81,8 @@ protected:
 class TAO_AV_Export TAO_AV_RTCP_Sdes_Policy : public TAO_AV_Policy
 {
 public:
-  TAO_AV_RTCP_Sdes_Policy (void);
-  TAO_AV_RTCP_Sdes &value (void);
+  TAO_AV_RTCP_Sdes_Policy ();
+  TAO_AV_RTCP_Sdes &value ();
   void value (const TAO_AV_RTCP_Sdes& sdes_val);
 protected:
   TAO_AV_RTCP_Sdes sdes_;
@@ -91,8 +91,8 @@ protected:
 class TAO_AV_Export TAO_AV_SFP_Credit_Policy : public TAO_AV_Policy
 {
 public:
-  TAO_AV_SFP_Credit_Policy (void);
-  int value (void);
+  TAO_AV_SFP_Credit_Policy ();
+  int value ();
   void value (int val);
 protected:
   int value_;
@@ -113,23 +113,23 @@ class TAO_AV_Flow_Handler;
 class TAO_AV_Export TAO_AV_Callback
 {
 public:
-  TAO_AV_Callback (void);
-  virtual ~TAO_AV_Callback (void);
+  TAO_AV_Callback ();
+  virtual ~TAO_AV_Callback ();
 
   /// Called for opening the callback.
   int open (TAO_AV_Protocol_Object *object,
             TAO_AV_Flow_Handler *handler);
 
   /// Called during Streamctrl->start.
-  virtual int handle_start (void);
+  virtual int handle_start ();
 
   /// Called during Streamctrl->stop.
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
 
   /// Called during timeout for Flow Producers.
   virtual int handle_timeout (void *arg);
 
-  virtual int schedule_timer (void);
+  virtual int schedule_timer ();
 
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info = 0,
@@ -142,7 +142,7 @@ public:
                                      const ACE_Addr &address = ACE_Addr::sap_any);
 
   /// Called during Streamctrl->destroy i.e tear_down  of the stream
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
 
   /**
    * Called to get the timeout. If tv is 0 then the framework stop
@@ -153,10 +153,10 @@ public:
                             void *&arg);
 
   /// Accessor to protocol object.
-  TAO_AV_Protocol_Object *protocol_object (void);
+  TAO_AV_Protocol_Object *protocol_object ();
 
   /// get the policies for the protocol object.
-  virtual TAO_AV_PolicyList get_policies (void);
+  virtual TAO_AV_PolicyList get_policies ();
 protected:
   TAO_AV_Protocol_Object *protocol_object_;
   TAO_AV_Flow_Handler *handler_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
index e672e21cc4f..56ccfd45ef0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
@@ -27,14 +27,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_AV_Export TAO_AV_Protocol_Object
 {
 public:
-  TAO_AV_Protocol_Object (void);
+  TAO_AV_Protocol_Object ();
 
   /// constructor.
   TAO_AV_Protocol_Object (TAO_AV_Callback *callback,
                           TAO_AV_Transport *transport);
 
   /// Destructor
-  virtual ~TAO_AV_Protocol_Object (void);
+  virtual ~TAO_AV_Protocol_Object ();
 
   virtual int open (TAO_AV_Callback *callback,
                     TAO_AV_Transport *transport);
@@ -47,11 +47,11 @@ public:
 
   /// set/get policies.
   virtual int set_policies (const TAO_AV_PolicyList &policy_list);
-  virtual TAO_AV_PolicyList get_policies (void);
+  virtual TAO_AV_PolicyList get_policies ();
 
   /// start/stop the flow.
-  virtual int start (void);
-  virtual int stop (void);
+  virtual int start ();
+  virtual int stop ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -68,7 +68,7 @@ public:
   /// end the stream.
   virtual void control_object (TAO_AV_Protocol_Object *object);
   virtual int destroy (void) = 0;
-  TAO_AV_Transport *transport (void);
+  TAO_AV_Transport *transport ();
 protected:
   TAO_AV_Transport *transport_;
   TAO_AV_PolicyList policy_list_;
@@ -83,15 +83,15 @@ class TAO_AV_Export TAO_AV_Flow_Protocol_Factory : public ACE_Service_Object
 {
 public:
   /// Initialization hook.
-  TAO_AV_Flow_Protocol_Factory (void);
-  virtual ~TAO_AV_Flow_Protocol_Factory (void);
+  TAO_AV_Flow_Protocol_Factory ();
+  virtual ~TAO_AV_Flow_Protocol_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
                                                         TAO_Base_StreamEndPoint *endpoint,
                                                         TAO_AV_Flow_Handler *handler,
                                                         TAO_AV_Transport *transport);
-  virtual const char *control_flow_factory (void);
+  virtual const char *control_flow_factory ();
   int ref_count;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index eaf6739f453..cddbdbc3725 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -37,11 +37,11 @@ FillQoSParams (ACE_QoS_Params &qos_params,
   return 0;
 }
 
-TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper (void)
+TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper ()
 {
 }
 
-TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void)
+TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper ()
 {
 }
 
@@ -180,19 +180,19 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio
   return 0;
 }
 
-TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void)
+TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler ()
 {
   ACE_NEW (this->transport_,
            TAO_AV_UDP_QoS_Transport (this));
 }
 
-TAO_AV_UDP_QoS_Flow_Handler::~TAO_AV_UDP_QoS_Flow_Handler (void)
+TAO_AV_UDP_QoS_Flow_Handler::~TAO_AV_UDP_QoS_Flow_Handler ()
 {
   delete this->transport_;
 }
 
 TAO_AV_Transport *
-TAO_AV_UDP_QoS_Flow_Handler::transport (void)
+TAO_AV_UDP_QoS_Flow_Handler::transport ()
 {
   return this->transport_;
 }
@@ -551,7 +551,7 @@ TAO_AV_UDP_QoS_Flow_Handler::get_handle () const
 // TAO_AV_UDP_Transport
 //------------------------------------------------------------
 
-TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (void)
+TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport ()
   :handler_ (0)
 {
 }
@@ -562,7 +562,7 @@ TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler
 {
 }
 
-TAO_AV_UDP_QoS_Transport::~TAO_AV_UDP_QoS_Transport (void)
+TAO_AV_UDP_QoS_Transport::~TAO_AV_UDP_QoS_Transport ()
 {
 }
 
@@ -580,19 +580,19 @@ TAO_AV_UDP_QoS_Transport::open (ACE_Addr * /*address*/)
 }
 
 int
-TAO_AV_UDP_QoS_Transport::close (void)
+TAO_AV_UDP_QoS_Transport::close ()
 {
   return 0;
 }
 
 int
-TAO_AV_UDP_QoS_Transport::mtu (void)
+TAO_AV_UDP_QoS_Transport::mtu ()
 {
   return ACE_MAX_DGRAM_SIZE;
 }
 
 ACE_Addr*
-TAO_AV_UDP_QoS_Transport::get_peer_addr (void)
+TAO_AV_UDP_QoS_Transport::get_peer_addr ()
 {
   return &this->peer_addr_;
 }
@@ -772,11 +772,11 @@ TAO_AV_UDP_QoS_Transport::recv (iovec *iov,
 // TAO_AV_UDP_Acceptor
 //------------------------------------------------------------
 
-TAO_AV_UDP_QoS_Acceptor::TAO_AV_UDP_QoS_Acceptor (void)
+TAO_AV_UDP_QoS_Acceptor::TAO_AV_UDP_QoS_Acceptor ()
 {
 }
 
-TAO_AV_UDP_QoS_Acceptor::~TAO_AV_UDP_QoS_Acceptor (void)
+TAO_AV_UDP_QoS_Acceptor::~TAO_AV_UDP_QoS_Acceptor ()
 {
 }
 
@@ -1060,7 +1060,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 }
 
 int
-TAO_AV_UDP_QoS_Acceptor::close (void)
+TAO_AV_UDP_QoS_Acceptor::close ()
 {
   return 0;
 }
@@ -1068,11 +1068,11 @@ TAO_AV_UDP_QoS_Acceptor::close (void)
 //------------------------------------------------------------
 // TAO_AV_UDP_Connector
 //------------------------------------------------------------
-TAO_AV_UDP_QoS_Connector::TAO_AV_UDP_QoS_Connector (void)
+TAO_AV_UDP_QoS_Connector::TAO_AV_UDP_QoS_Connector ()
 {
 }
 
-TAO_AV_UDP_QoS_Connector::~TAO_AV_UDP_QoS_Connector (void)
+TAO_AV_UDP_QoS_Connector::~TAO_AV_UDP_QoS_Connector ()
 {
 }
 
@@ -1369,7 +1369,7 @@ TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *han
 }
 
 int
-TAO_AV_UDP_QoS_Connector::close (void)
+TAO_AV_UDP_QoS_Connector::close ()
 {
   return 0;
 }
@@ -1378,14 +1378,14 @@ TAO_AV_UDP_QoS_Connector::close (void)
 // TAO_AV_UDP_Protocol_Factory
 //------------------------------------------------------------
 
-TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void)
+TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
                 "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n"));
 }
 
-TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory (void)
+TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory ()
 {
 }
 
@@ -1402,7 +1402,7 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string)
 }
 
 TAO_AV_Acceptor*
-TAO_AV_UDP_QoS_Factory::make_acceptor (void)
+TAO_AV_UDP_QoS_Factory::make_acceptor ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -1416,7 +1416,7 @@ TAO_AV_UDP_QoS_Factory::make_acceptor (void)
 }
 
 TAO_AV_Connector*
-TAO_AV_UDP_QoS_Factory::make_connector (void)
+TAO_AV_UDP_QoS_Factory::make_connector ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -1440,14 +1440,14 @@ TAO_AV_UDP_QoS_Factory::init (int /* argc */,
 //------------------------------------------------------------
 // TAO_AV_UDP_Flow_Factory
 //------------------------------------------------------------
-TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void)
+TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
                 "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n"));
 }
 
-TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory (void)
+TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index 2b2cd75f0d0..13b2653fd4e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -30,13 +30,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory
 {
 public:
-  TAO_AV_UDP_QoS_Factory (void);
-  virtual ~TAO_AV_UDP_QoS_Factory (void);
+  TAO_AV_UDP_QoS_Factory ();
+  virtual ~TAO_AV_UDP_QoS_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   /// Initialization hook.
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_UDP_QoS_Flow_Handler;
@@ -52,19 +52,19 @@ class TAO_AV_UDP_QoS_Transport
   :public TAO_AV_Transport
 {
 public:
-  TAO_AV_UDP_QoS_Transport (void);
+  TAO_AV_UDP_QoS_Transport ();
 
   TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler *handler);
 
-  virtual  ~TAO_AV_UDP_QoS_Transport (void);
+  virtual  ~TAO_AV_UDP_QoS_Transport ();
 
   virtual int open (ACE_Addr *addr);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
-  virtual ACE_Addr *get_peer_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
 
   virtual int set_remote_address (const ACE_INET_Addr &address);
 
@@ -112,10 +112,10 @@ public:
   /**
    * Destructor
    */
-  TAO_AV_UDP_QoS_Flow_Handler (void);
-  ~TAO_AV_UDP_QoS_Flow_Handler (void);
+  TAO_AV_UDP_QoS_Flow_Handler ();
+  ~TAO_AV_UDP_QoS_Flow_Handler ();
   int open (ACE_Addr &address);
-  virtual TAO_AV_Transport *transport (void);
+  virtual TAO_AV_Transport *transport ();
   virtual int set_remote_address (ACE_Addr *address);
   virtual ACE_HANDLE get_handle () const;
   virtual int handle_input (ACE_HANDLE fd);
@@ -124,9 +124,9 @@ public:
   /// Handles a QoS event. Right now, just
   /// prints a message.
   virtual int handle_qos (ACE_HANDLE fd);
-  ACE_SOCK_Dgram_Mcast_QoS *get_socket (void);
+  ACE_SOCK_Dgram_Mcast_QoS *get_socket ();
   virtual ACE_Event_Handler* event_handler (void){ return this; }
-  virtual ACE_QoS_Session* qos_session (void);
+  virtual ACE_QoS_Session* qos_session ();
   virtual void qos_session (ACE_QoS_Session *qos_session);
 
   int translate (ACE_Flow_Spec *ace_flow_spec,
@@ -137,13 +137,13 @@ public:
   void negotiator (AVStreams::Negotiator_ptr);
 
   void endpoint (TAO_Base_StreamEndPoint *endpoint);
-  TAO_Base_StreamEndPoint* endpoint (void);
+  TAO_Base_StreamEndPoint* endpoint ();
 
   void flowspec_entry (TAO_FlowSpec_Entry *entry);
-  TAO_FlowSpec_Entry* flowspec_entry (void);
+  TAO_FlowSpec_Entry* flowspec_entry ();
 
   void av_core (TAO_AV_Core *avcore);
-  TAO_AV_Core* av_core (void);
+  TAO_AV_Core* av_core ();
 
 protected:
   TAO_AV_Core *av_core_;
@@ -159,8 +159,8 @@ class TAO_AV_UDP_QoS_Acceptor
   :public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_UDP_QoS_Acceptor (void);
-  virtual ~TAO_AV_UDP_QoS_Acceptor (void);
+  TAO_AV_UDP_QoS_Acceptor ();
+  virtual ~TAO_AV_UDP_QoS_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -177,7 +177,7 @@ public:
 
   virtual int open_i (ACE_INET_Addr *address);
 
-  virtual int close (void);
+  virtual int close ();
 
   virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler);
 
@@ -195,8 +195,8 @@ class TAO_AV_UDP_QoS_Connector
   :public TAO_AV_Connector
 {
 public:
-  TAO_AV_UDP_QoS_Connector (void);
-  ~TAO_AV_UDP_QoS_Connector (void);
+  TAO_AV_UDP_QoS_Connector ();
+  ~TAO_AV_UDP_QoS_Connector ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_AV_Flow_Protocol_Factory *factory);
@@ -206,7 +206,7 @@ public:
                        TAO_AV_Core::Flow_Component flow_comp =
                            TAO_AV_Core::TAO_AV_DATA);
   virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler);
-  virtual int close (void);
+  virtual int close ();
 
   int translate (CosPropertyService::Properties &qos_params,
                  ACE_Flow_Spec *ace_flow_spec);
@@ -226,10 +226,10 @@ protected:
 //   TAO_AV_UDP_Object (TAO_AV_Callback *callback,
 //                      TAO_AV_Transport *transport = 0);
 
-//   virtual ~TAO_AV_UDP_Object (void);
+//   virtual ~TAO_AV_UDP_Object ();
 //   // Dtor
 
-//   virtual int handle_input (void);
+//   virtual int handle_input ();
 
 //   virtual int send_frame (ACE_Message_Block *frame,
 //                           TAO_AV_frame_info *frame_info = 0);
@@ -239,7 +239,7 @@ protected:
 //                           int iovcnt,
 //                           TAO_AV_frame_info *frame_info = 0);
 
-//   virtual int destroy (void);
+//   virtual int destroy ();
 //   // end the stream.
 
 // private:
@@ -250,8 +250,8 @@ protected:
 class TAO_AV_UDP_QoS_Flow_Factory : public TAO_AV_Flow_Protocol_Factory
 {
 public:
-  TAO_AV_UDP_QoS_Flow_Factory (void);
-  virtual ~TAO_AV_UDP_QoS_Flow_Factory (void);
+  TAO_AV_UDP_QoS_Flow_Factory ();
+  virtual ~TAO_AV_UDP_QoS_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   /// Initialization hook.
   virtual int match_protocol (const char *flow_string);
@@ -267,8 +267,8 @@ public:
 class TAO_AV_UDP_QoS_Session_Helper
 {
 public:
-  TAO_AV_UDP_QoS_Session_Helper (void);
-  ~TAO_AV_UDP_QoS_Session_Helper (void);
+  TAO_AV_UDP_QoS_Session_Helper ();
+  ~TAO_AV_UDP_QoS_Session_Helper ();
 
   /// Open a QoS Session with the specified address
   ACE_QoS_Session* open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *handler,
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 24d3b48a509..4f211b6750e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -114,8 +114,8 @@ class TAO_AV_Export TAO_AV_RTCP_Flow_Factory
   :public TAO_AV_Flow_Protocol_Factory
 {
 public:
-  TAO_AV_RTCP_Flow_Factory (void);
-  virtual ~TAO_AV_RTCP_Flow_Factory (void);
+  TAO_AV_RTCP_Flow_Factory ();
+  virtual ~TAO_AV_RTCP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
@@ -134,16 +134,16 @@ class TAO_AV_Export TAO_AV_RTCP_Callback : public TAO_AV_Callback
 {
 public:
   /// RTCP callback.
-  TAO_AV_RTCP_Callback (void);
+  TAO_AV_RTCP_Callback ();
 
   /// virtual destructor.
-  virtual ~TAO_AV_RTCP_Callback (void);
+  virtual ~TAO_AV_RTCP_Callback ();
 
   /// Called during Streamctrl->start.
-  virtual int handle_start (void);
+  virtual int handle_start ();
 
   /// Called during Streamctrl->stop.
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
 
   /// Called during timeout for Flow Producers.
   virtual int handle_timeout (void *arg);
@@ -159,7 +159,7 @@ public:
 
   /// Called during Streamctrl->destroy i.e tear_down  of the stream
   /// @@coryan:Call it handle_destroy or handle_close.
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
 
   /// Called to get the timeout. If tv is 0 then the framework stop
   /// calling this.
@@ -168,7 +168,7 @@ public:
 
   int send_report(int bye);
   void schedule (int ms);
-  TAO_AV_RTP_State *state (void);
+  TAO_AV_RTP_State *state ();
   void ts_offset (ACE_UINT32 offset);
 
 protected:
@@ -199,9 +199,9 @@ public:
                       TAO_AV_Transport *transport = 0);
 
   /// Destructor
-  virtual ~TAO_AV_RTCP_Object (void);
+  virtual ~TAO_AV_RTCP_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
   virtual int handle_control_input (ACE_Message_Block *frame,
                                     const ACE_Addr &peer_address);
   virtual int handle_control_output (ACE_Message_Block *frame);
@@ -210,8 +210,8 @@ public:
   virtual int set_policies (const TAO_AV_PolicyList &policy_list);
 
   /// start/stop the flow.
-  virtual int start (void);
-  virtual int stop (void);
+  virtual int start ();
+  virtual int stop ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -226,7 +226,7 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
   void ssrc (ACE_UINT32 ssrc) {this->ssrc_ = ssrc; }
   ACE_UINT32 ssrc (void) { return this->ssrc_; }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index c19c7fe86cd..a60bc441255 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -40,13 +40,13 @@ public:
                         const ACE_Addr *peer_addr);
 
   /// Takes statistics of incoming RTP traffic and creates a receiver report block.
-  RR_Block *getRRBlock(void);
+  RR_Block *getRRBlock();
 
   /// Returns the delay since last sender report.
-  ACE_UINT32 dlsr (void);
+  ACE_UINT32 dlsr ();
 
   /// Returns the last sender report timestamp.
-  ACE_UINT32 lsr (void);
+  ACE_UINT32 lsr ();
 
   /// Updates channel information with incoming sender report.
   int updateStatistics(RTCP_SR_Packet *sr);
@@ -62,7 +62,7 @@ public:
 
 private:
   /// Don't want default constructor.
-  RTCP_Channel_In(void);
+  RTCP_Channel_In();
 
   /// Don't want copy constructor.
   RTCP_Channel_In(const RTCP_Channel_In &ch);
@@ -166,22 +166,22 @@ class RTCP_Channel_Out
 {
 public:
   /// Constructor.
-  RTCP_Channel_Out(void);
+  RTCP_Channel_Out();
 
   /// Destructor.
-  ~RTCP_Channel_Out(void);
+  ~RTCP_Channel_Out();
 
   /// Update the channel statistics each time an RTP packet is sent.
   void updateStatistics (RTP_Packet *pkt);
 
   /// Returns the timestamp of the last RTP packet sent.
-  ACE_UINT32 timestamp (void);
+  ACE_UINT32 timestamp ();
 
   /// Returns the number of packets sent.
-  ACE_UINT32 packets_sent (void);
+  ACE_UINT32 packets_sent ();
 
   /// Returns the number of octets sent.
-  ACE_UINT32 octets_sent (void);
+  ACE_UINT32 octets_sent ();
 
   /// Sets the canonical name of the source.
   void cname (const char *cname) { this->cname_ = cname; }
@@ -190,7 +190,7 @@ public:
   const char *cname (void) { return this->cname_.c_str(); }
 
   /// Returns whether or not this source is active.
-  char active (void);
+  char active ();
 
 private:
   /// Holds the canonical name for this channel.
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index 4fe56cc5b30..d96d1ae33e1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -43,7 +43,7 @@ class RTCP_Packet
 {
 public:
   /// Constructor for outgoing RTCP packets.
-  RTCP_Packet(void);
+  RTCP_Packet();
 
   /// Constructor for incoming RTCP packets.
   RTCP_Packet(char *buffer);
@@ -95,10 +95,10 @@ public:
                    int *len);
 
   /// Destructor.
-  virtual ~RTCP_BYE_Packet (void);
+  virtual ~RTCP_BYE_Packet ();
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size (void);
+  unsigned int packet_size ();
 
   /// Returns a pointer to a local list of synchronization source ids that are
   /// leaving the session.
@@ -106,10 +106,10 @@ public:
                   unsigned char &length);
 
   /// Returns the reason for leaving the session.
-  const char *reason (void);
+  const char *reason ();
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
 private:
   /// Used to create the byte representation of the RTCP packet.
@@ -180,20 +180,20 @@ public:
   RTCP_RR_Packet (ACE_UINT32 ssrc, RR_Block *blocks);
 
   /// Destructor.
-  virtual ~RTCP_RR_Packet (void);
+  virtual ~RTCP_RR_Packet ();
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size(void);
+  unsigned int packet_size();
 
   /// Returns the synchronization source id of the source sending this packet.
   ACE_INT32 ssrc (void) { return this->ssrc_; }
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
 private:
   /// Used to create the byte representation of the RTCP packet.
-  void build_packet(void);
+  void build_packet();
 
   /// The synchronization source id of the sender of this report.
   ACE_UINT32 ssrc_;
@@ -278,10 +278,10 @@ public:
   RTCP_SDES_Packet(char* buffer, int *len);
 
   /// Constructor for outgoing SDES packets.
-  RTCP_SDES_Packet(void);
+  RTCP_SDES_Packet();
 
   /// Destructor.
-  virtual ~RTCP_SDES_Packet(void);
+  virtual ~RTCP_SDES_Packet();
 
   /// This will add a standard item of type and length for the ssrc specified.
   /// When the first item for a ssrc is added, a chunk is created.  Subsequent
@@ -303,10 +303,10 @@ public:
                      const char *data);
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size(void);
+  unsigned int packet_size();
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
   /// This returns the synchronization source id for this packet.  This assumes
   /// that this source is only receiving messages from end systems (i.e. only
@@ -315,7 +315,7 @@ public:
 
 private:
   /// Used to create the byte representation of the RTCP packet.
-  void build_packet(void);
+  void build_packet();
 
   /// Add a chunk to the packet.
   void add_chunk(ACE_UINT32 ssrc);
@@ -354,10 +354,10 @@ public:
                  RR_Block *rrBlocks);
 
   /// Destructor
-  virtual ~RTCP_SR_Packet(void);
+  virtual ~RTCP_SR_Packet();
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size(void);
+  unsigned int packet_size();
 
   /// Returns the synchronization source id for the sender of this packet.
   ACE_UINT32 ssrc (void) { return this->ssrc_; }
@@ -369,11 +369,11 @@ public:
   ACE_UINT32 ntp_ts_lsw (void) { return this->ntp_ts_lsw_; }
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
 private:
   /// Used to create the byte representation of the RTCP packet.
-  void build_packet(void);
+  void build_packet();
 
   /// The synchronization source id of the sender generating this report.
   ACE_UINT32 ssrc_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index 6b629a8788a..52355672fa4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -267,50 +267,50 @@ public:
              ACE_UINT16 dataSize);
 
   /// Destructor
-  ~RTP_Packet(void);
+  ~RTP_Packet();
 
   /// Returns the size of the RTP packet in bytes.
-  ACE_UINT16 packet_size(void);
+  ACE_UINT16 packet_size();
 
   /// Returns the size of the payload in bytes.
-  ACE_UINT16 payload_size(void);
+  ACE_UINT16 payload_size();
 
   /// Populates the passed in frame_info.
   void get_frame_info (TAO_AV_frame_info *frame_info);
 
   /// Returns 1 if packet is valid and 0 if not.
-  int is_valid (void);
+  int is_valid ();
 
   /// Returns the RTP version of the packet.
-  unsigned int ver (void);
+  unsigned int ver ();
 
   /// Returns 1 if the padding bit is set, 0 if not.
-  unsigned int pad (void);
+  unsigned int pad ();
 
   /// Returns 1 if the header extension bit is set, 0 if not.
-  unsigned int ext (void);
+  unsigned int ext ();
 
   /// Returns the number of bytes in the header extension or 0 if no extension.
-  unsigned int ext_bytes (void);
+  unsigned int ext_bytes ();
 
   /// Returns the contributing source count.
   /// This should only be non-zero for mixers.
-  unsigned int cc  (void);
+  unsigned int cc  ();
 
   /// Returns 1 if the marker bit is set, 0 if not.
-  unsigned int mrk (void);
+  unsigned int mrk ();
 
   /// Returns the payload type of the packet.
-  unsigned int pt  (void);
+  unsigned int pt  ();
 
   /// Returns the sequence number of the packet.
-  ACE_UINT16   sn  (void);
+  ACE_UINT16   sn  ();
 
   /// Returns the timestamp of the packet.
-  ACE_UINT32   ts  (void);
+  ACE_UINT32   ts  ();
 
   /// Returns the synchronization source id of the packet.
-  ACE_UINT32  ssrc (void);
+  ACE_UINT32  ssrc ();
 
   /// Returns a pointer to the local contributing source list and its length.
   /// This should be empty except for mixers.
@@ -357,11 +357,11 @@ public:
   TAO_AV_RTP_Object (TAO_AV_Callback *callback,
                      TAO_AV_Transport *transport);
 
-  virtual ~TAO_AV_RTP_Object (void);
+  virtual ~TAO_AV_RTP_Object ();
 
-  virtual int start (void);
-  virtual int stop (void);
-  virtual int handle_input (void);
+  virtual int start ();
+  virtual int stop ();
+  virtual int handle_input ();
   virtual int send_frame (ACE_Message_Block *frame,
                           TAO_AV_frame_info *frame_info = 0);
 
@@ -372,7 +372,7 @@ public:
   virtual int send_frame (const char*buf,
                           size_t len);
 
-  virtual int destroy (void);
+  virtual int destroy ();
   virtual int set_policies (const TAO_AV_PolicyList &policy_list);
   virtual void control_object (TAO_AV_Protocol_Object *object);
 
@@ -398,15 +398,15 @@ class TAO_AV_Export TAO_AV_RTP_Flow_Factory : public TAO_AV_Flow_Protocol_Factor
 {
 public:
   /// Initialization hook.
-  TAO_AV_RTP_Flow_Factory (void);
-  virtual ~TAO_AV_RTP_Flow_Factory (void);
+  TAO_AV_RTP_Flow_Factory ();
+  virtual ~TAO_AV_RTP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
                                                         TAO_Base_StreamEndPoint *endpoint,
                                                         TAO_AV_Flow_Handler *handler,
                                                         TAO_AV_Transport *transport);
-  virtual const char*control_flow_factory (void);
+  virtual const char*control_flow_factory ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
index a002ac2f47b..1a7cc09f55c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // TAO_AV_SCTP_SEQ_Transport
 //------------------------------------------------------------
 
-TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport (void)
+TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport ()
   :handler_ (0)
 {
 }
@@ -24,7 +24,7 @@ TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport (TAO_AV_SCTP_SEQ_Flow_Handl
 {
 }
 
-TAO_AV_SCTP_SEQ_Transport::~TAO_AV_SCTP_SEQ_Transport (void)
+TAO_AV_SCTP_SEQ_Transport::~TAO_AV_SCTP_SEQ_Transport ()
 {
 }
 
@@ -35,19 +35,19 @@ TAO_AV_SCTP_SEQ_Transport::open (ACE_Addr * /*address*/)
 }
 
 int
-TAO_AV_SCTP_SEQ_Transport::close (void)
+TAO_AV_SCTP_SEQ_Transport::close ()
 {
   return 0;
 }
 
 int
-TAO_AV_SCTP_SEQ_Transport::mtu (void)
+TAO_AV_SCTP_SEQ_Transport::mtu ()
 {
   return 0;
 }
 
 ACE_Addr*
-TAO_AV_SCTP_SEQ_Transport::get_peer_addr (void)
+TAO_AV_SCTP_SEQ_Transport::get_peer_addr ()
 {
   return 0;
 }
@@ -221,11 +221,11 @@ TAO_AV_SCTP_SEQ_Base_Acceptor::make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&
 // TAO_AV_SCTP_SEQ_Acceptor
 //------------------------------------------------------------
 
-TAO_AV_SCTP_SEQ_Acceptor::TAO_AV_SCTP_SEQ_Acceptor (void)
+TAO_AV_SCTP_SEQ_Acceptor::TAO_AV_SCTP_SEQ_Acceptor ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Acceptor::~TAO_AV_SCTP_SEQ_Acceptor (void)
+TAO_AV_SCTP_SEQ_Acceptor::~TAO_AV_SCTP_SEQ_Acceptor ()
 {
 }
 
@@ -354,7 +354,7 @@ TAO_AV_SCTP_SEQ_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
 
 
 int
-TAO_AV_SCTP_SEQ_Acceptor::close (void)
+TAO_AV_SCTP_SEQ_Acceptor::close ()
 {
   return 0;
 }
@@ -404,11 +404,11 @@ TAO_AV_SCTP_SEQ_Base_Connector::connector_connect (TAO_AV_SCTP_SEQ_Flow_Handler
 //------------------------------------------------------------
 // TAO_AV_SCTP_SEQ_Connector
 //------------------------------------------------------------
-TAO_AV_SCTP_SEQ_Connector::TAO_AV_SCTP_SEQ_Connector (void)
+TAO_AV_SCTP_SEQ_Connector::TAO_AV_SCTP_SEQ_Connector ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Connector::~TAO_AV_SCTP_SEQ_Connector (void)
+TAO_AV_SCTP_SEQ_Connector::~TAO_AV_SCTP_SEQ_Connector ()
 {
 }
 
@@ -566,7 +566,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry,
 }
 
 int
-TAO_AV_SCTP_SEQ_Connector::close (void)
+TAO_AV_SCTP_SEQ_Connector::close ()
 {
   return 0;
 }
@@ -576,11 +576,11 @@ TAO_AV_SCTP_SEQ_Connector::close (void)
 //------------------------------------------------------------
 
 
-TAO_AV_SCTP_SEQ_Factory::TAO_AV_SCTP_SEQ_Factory (void)
+TAO_AV_SCTP_SEQ_Factory::TAO_AV_SCTP_SEQ_Factory ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Factory::~TAO_AV_SCTP_SEQ_Factory (void)
+TAO_AV_SCTP_SEQ_Factory::~TAO_AV_SCTP_SEQ_Factory ()
 {
 }
 
@@ -594,7 +594,7 @@ TAO_AV_SCTP_SEQ_Factory::match_protocol (const char *protocol_string)
 }
 
 TAO_AV_Acceptor*
-TAO_AV_SCTP_SEQ_Factory::make_acceptor (void)
+TAO_AV_SCTP_SEQ_Factory::make_acceptor ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_acceptor\n"));
@@ -606,7 +606,7 @@ TAO_AV_SCTP_SEQ_Factory::make_acceptor (void)
 }
 
 TAO_AV_Connector*
-TAO_AV_SCTP_SEQ_Factory::make_connector (void)
+TAO_AV_SCTP_SEQ_Factory::make_connector ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_connector\n"));
@@ -629,7 +629,7 @@ TAO_AV_SCTP_SEQ_Factory::init (int, ACE_TCHAR *[])
 //------------------------------------------------------------
 
 int
-TAO_AV_SCTP_SEQ_Object::handle_input (void)
+TAO_AV_SCTP_SEQ_Object::handle_input ()
 {
   int n = this->transport_->recv (this->frame_.rd_ptr (),
                                   this->frame_.size ());
@@ -675,12 +675,12 @@ TAO_AV_SCTP_SEQ_Object::TAO_AV_SCTP_SEQ_Object (TAO_AV_Callback *callback,
   this->frame_.size (BUFSIZ);
 }
 
-TAO_AV_SCTP_SEQ_Object::~TAO_AV_SCTP_SEQ_Object (void)
+TAO_AV_SCTP_SEQ_Object::~TAO_AV_SCTP_SEQ_Object ()
 {
   // No-op
 }
 int
-TAO_AV_SCTP_SEQ_Object::destroy (void)
+TAO_AV_SCTP_SEQ_Object::destroy ()
 {
   this->callback_->handle_destroy ();
   delete this;
@@ -698,13 +698,13 @@ TAO_AV_SCTP_SEQ_Flow_Handler::TAO_AV_SCTP_SEQ_Flow_Handler (TAO_AV_Callback * /*
            TAO_AV_SCTP_SEQ_Transport (this));
 }
 
-TAO_AV_SCTP_SEQ_Flow_Handler::~TAO_AV_SCTP_SEQ_Flow_Handler (void)
+TAO_AV_SCTP_SEQ_Flow_Handler::~TAO_AV_SCTP_SEQ_Flow_Handler ()
 {
   delete this->transport_;
 }
 
 TAO_AV_Transport *
-TAO_AV_SCTP_SEQ_Flow_Handler::transport (void)
+TAO_AV_SCTP_SEQ_Flow_Handler::transport ()
 {
   return this->transport_;
 }
@@ -847,11 +847,11 @@ TAO_AV_SCTP_SEQ_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
 //------------------------------------------------------------
 // TAO_AV_SCTP_SEQ_Flow_Factory
 //------------------------------------------------------------
-TAO_AV_SCTP_SEQ_Flow_Factory::TAO_AV_SCTP_SEQ_Flow_Factory (void)
+TAO_AV_SCTP_SEQ_Flow_Factory::TAO_AV_SCTP_SEQ_Flow_Factory ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Flow_Factory::~TAO_AV_SCTP_SEQ_Flow_Factory (void)
+TAO_AV_SCTP_SEQ_Flow_Factory::~TAO_AV_SCTP_SEQ_Flow_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
index 17ca39012f5..1bc5115cab1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
@@ -44,12 +44,12 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Factory : public TAO_AV_Transport_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_SCTP_SEQ_Factory (void);
-  virtual ~TAO_AV_SCTP_SEQ_Factory (void);
+  TAO_AV_SCTP_SEQ_Factory ();
+  virtual ~TAO_AV_SCTP_SEQ_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_SCTP_SEQ_Flow_Handler;
@@ -63,18 +63,18 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Transport
   :public TAO_AV_Transport
 {
 public:
-  TAO_AV_SCTP_SEQ_Transport (void);
+  TAO_AV_SCTP_SEQ_Transport ();
 
   TAO_AV_SCTP_SEQ_Transport (TAO_AV_SCTP_SEQ_Flow_Handler *handler);
 
-  virtual  ~TAO_AV_SCTP_SEQ_Transport (void);
+  virtual  ~TAO_AV_SCTP_SEQ_Transport ();
   virtual int open (ACE_Addr *addr);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
-  virtual ACE_Addr *get_peer_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (const ACE_Message_Block *mblk,
@@ -123,8 +123,8 @@ class TAO_AV_SCTP_SEQ_Flow_Handler
 {
 public:
   TAO_AV_SCTP_SEQ_Flow_Handler (TAO_AV_Callback *callback = 0);
-  virtual ~TAO_AV_SCTP_SEQ_Flow_Handler (void);
-  virtual TAO_AV_Transport *transport (void);
+  virtual ~TAO_AV_SCTP_SEQ_Flow_Handler ();
+  virtual TAO_AV_Transport *transport ();
   virtual int open (void * = 0);
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
@@ -163,8 +163,8 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Acceptor
    :public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_SCTP_SEQ_Acceptor (void);
-  virtual ~TAO_AV_SCTP_SEQ_Acceptor (void);
+  TAO_AV_SCTP_SEQ_Acceptor ();
+  virtual ~TAO_AV_SCTP_SEQ_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -179,7 +179,7 @@ public:
                             TAO_AV_Core::Flow_Component flow_comp =
                             TAO_AV_Core::TAO_AV_DATA);
 
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&handler);
 
 protected:
@@ -217,8 +217,8 @@ protected:
 class TAO_AV_SCTP_SEQ_Connector  : public TAO_AV_Connector
 {
 public:
-  TAO_AV_SCTP_SEQ_Connector (void);
-  virtual ~TAO_AV_SCTP_SEQ_Connector (void);
+  TAO_AV_SCTP_SEQ_Connector ();
+  virtual ~TAO_AV_SCTP_SEQ_Connector ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -228,7 +228,7 @@ public:
                        TAO_AV_Transport *&transport,
                        TAO_AV_Core::Flow_Component flow_comp =
                        TAO_AV_Core::TAO_AV_DATA);
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&handler);
 protected:
   TAO_AV_Core *av_core_;
@@ -249,9 +249,9 @@ public:
                      TAO_AV_Transport *transport = 0);
 
   /// Dtor
-  virtual ~TAO_AV_SCTP_SEQ_Object (void);
+  virtual ~TAO_AV_SCTP_SEQ_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -265,7 +265,7 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 private:
   /// Pre-allocated memory to receive the data...
@@ -280,8 +280,8 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Flow_Factory : public TAO_AV_Flow_Protocol_F
 {
 public:
   /// Initialization hook.
-  TAO_AV_SCTP_SEQ_Flow_Factory (void);
-  virtual ~TAO_AV_SCTP_SEQ_Flow_Factory (void);
+  TAO_AV_SCTP_SEQ_Flow_Factory ();
+  virtual ~TAO_AV_SCTP_SEQ_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h
index 1f9481a8b07..9558975fb0b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -29,12 +29,12 @@ class TAO_AV_Export TAO_AV_TCP_Factory : public TAO_AV_Transport_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_TCP_Factory (void);
-  virtual ~TAO_AV_TCP_Factory (void);
+  TAO_AV_TCP_Factory ();
+  virtual ~TAO_AV_TCP_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_TCP_Flow_Handler;
@@ -105,8 +105,8 @@ class TAO_AV_TCP_Flow_Handler
 {
 public:
   TAO_AV_TCP_Flow_Handler (TAO_AV_Callback *callback = 0);
-  virtual ~TAO_AV_TCP_Flow_Handler (void);
-  virtual TAO_AV_Transport *transport (void);
+  virtual ~TAO_AV_TCP_Flow_Handler ();
+  virtual TAO_AV_Transport *transport ();
   virtual int open (void * = 0);
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
@@ -142,8 +142,8 @@ protected:
 class TAO_AV_TCP_Acceptor : public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_TCP_Acceptor (void);
-  virtual ~TAO_AV_TCP_Acceptor (void);
+  TAO_AV_TCP_Acceptor ();
+  virtual ~TAO_AV_TCP_Acceptor ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -159,7 +159,7 @@ public:
                             TAO_AV_Core::Flow_Component flow_component =
                                 TAO_AV_Core::TAO_AV_DATA);
 
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_TCP_Flow_Handler *&handler);
 protected:
   TAO_AV_TCP_Base_Acceptor acceptor_;
@@ -195,8 +195,8 @@ protected:
 class TAO_AV_TCP_Connector : public TAO_AV_Connector
 {
 public:
-  TAO_AV_TCP_Connector (void);
-  virtual ~TAO_AV_TCP_Connector (void);
+  TAO_AV_TCP_Connector ();
+  virtual ~TAO_AV_TCP_Connector ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -206,7 +206,7 @@ public:
                        TAO_AV_Transport *&transport,
                        TAO_AV_Core::Flow_Component flow_comp =
                            TAO_AV_Core::TAO_AV_DATA);
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_TCP_Flow_Handler *&handler);
 protected:
   TAO_AV_Core *av_core_;
@@ -227,9 +227,9 @@ public:
                      TAO_AV_Transport *transport = 0);
 
   /// Dtor
-  virtual ~TAO_AV_TCP_Object (void);
+  virtual ~TAO_AV_TCP_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -243,7 +243,7 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 public:
   /// Pre-allocated memory to receive the data...
@@ -258,8 +258,8 @@ class TAO_AV_TCP_Flow_Factory : public TAO_AV_Flow_Protocol_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_TCP_Flow_Factory (void);
-  virtual ~TAO_AV_TCP_Flow_Factory (void);
+  TAO_AV_TCP_Flow_Factory ();
+  virtual ~TAO_AV_TCP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index c414a81dbb6..8aff37eb556 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -49,10 +49,10 @@ public:
 
   /// Return a reference to the character representation of the Transport
   /// factories name.
-  const ACE_CString &name (void);
+  const ACE_CString &name ();
 
   /// Return a pointer to the Transport factory.
-  TAO_AV_Transport_Factory *factory (void);
+  TAO_AV_Transport_Factory *factory ();
 
   /// Set the factory pointer's valus.
   void factory (TAO_AV_Transport_Factory *factory);
@@ -80,10 +80,10 @@ public:
 
   /// return a reference to the character representation of the Flow_Protocol
   /// factories name.
-  const ACE_CString &name (void);
+  const ACE_CString &name ();
 
   /// return a pointer to the Flow_Protocol factory.
-  TAO_AV_Flow_Protocol_Factory *factory (void);
+  TAO_AV_Flow_Protocol_Factory *factory ();
 
   /// set the factory pointer's valus.
   void factory (TAO_AV_Flow_Protocol_Factory *factory);
@@ -104,22 +104,22 @@ class TAO_AV_Export TAO_AV_Flow_Handler
 {
 public:
   /// Constructor.
-  TAO_AV_Flow_Handler (void);
+  TAO_AV_Flow_Handler ();
 
-  virtual ~TAO_AV_Flow_Handler (void);
+  virtual ~TAO_AV_Flow_Handler ();
   /// Start/stop the flow handler.
   virtual int start (TAO_FlowSpec_Entry::Role role);
   virtual int stop  (TAO_FlowSpec_Entry::Role role);
 
   /// Schedule timer. Uses the get_timeout method on the callback.
-  virtual int schedule_timer (void);
-  virtual int cancel_timer (void);
+  virtual int schedule_timer ();
+  virtual int cancel_timer ();
 
   /// get the transport.
-  TAO_AV_Transport *transport (void);
+  TAO_AV_Transport *transport ();
 
   /// set/get protocol_object.
-  TAO_AV_Protocol_Object* protocol_object (void);
+  TAO_AV_Protocol_Object* protocol_object ();
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// set the callback.
@@ -155,9 +155,9 @@ protected:
 class TAO_AV_Export TAO_AV_Transport
 {
 public:
-  TAO_AV_Transport (void);
+  TAO_AV_Transport ();
 
-  virtual ~TAO_AV_Transport (void);
+  virtual ~TAO_AV_Transport ();
 
   virtual int open (ACE_Addr *address) = 0;
 
@@ -166,7 +166,7 @@ public:
   /// Write the complete Message_Block chain to the connection.
   virtual int mtu (void) = 0;
   virtual ACE_Addr *get_peer_addr (void) = 0;
-  virtual ACE_Addr *get_local_addr (void);
+  virtual ACE_Addr *get_local_addr ();
   virtual ssize_t send (const ACE_Message_Block *mblk,
                         ACE_Time_Value *s = 0) = 0;
 
@@ -208,8 +208,8 @@ class TAO_FlowSpec_Entry;
 class TAO_AV_Export TAO_AV_Acceptor
 {
 public:
-  TAO_AV_Acceptor (void);
-  virtual ~TAO_AV_Acceptor (void);
+  TAO_AV_Acceptor ();
+  virtual ~TAO_AV_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -237,9 +237,9 @@ protected:
 class TAO_AV_Export TAO_AV_Connector
 {
 public:
-  TAO_AV_Connector (void);
-  virtual ~TAO_AV_Connector (void);
-  const char *flowname (void);
+  TAO_AV_Connector ();
+  virtual ~TAO_AV_Connector ();
+  const char *flowname ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -270,15 +270,15 @@ public:
    *  TAO_AV_Connector *get_connector (TAO_AV_Core::Protocol protocol);
    * Return the connector bridges
    */
-  TAO_AV_Connector_Registry (void);
-  ~TAO_AV_Connector_Registry (void);
+  TAO_AV_Connector_Registry ();
+  ~TAO_AV_Connector_Registry ();
   int open (TAO_Base_StreamEndPoint *endpoint,
             TAO_AV_Core *av_core,
             TAO_AV_FlowSpecSet &flow_spec_set);
   int close (TAO_AV_Connector *connector);
-  int close_all (void);
-  TAO_AV_ConnectorSetItor begin (void);
-  TAO_AV_ConnectorSetItor end (void);
+  int close_all ();
+  TAO_AV_ConnectorSetItor begin ();
+  TAO_AV_ConnectorSetItor end ();
 protected:
   TAO_AV_ConnectorSet connectors_;
 };
@@ -293,15 +293,15 @@ typedef ACE_Unbounded_Set_Iterator<TAO_AV_Acceptor*> TAO_AV_AcceptorSetItor;
 class TAO_AV_Export TAO_AV_Acceptor_Registry
 {
 public:
-  TAO_AV_Acceptor_Registry (void);
-  ~TAO_AV_Acceptor_Registry (void);
+  TAO_AV_Acceptor_Registry ();
+  ~TAO_AV_Acceptor_Registry ();
   int open (TAO_Base_StreamEndPoint *endpoint,
             TAO_AV_Core *av_core,
             TAO_AV_FlowSpecSet &flow_spec_set);
   int close (TAO_AV_Acceptor *acceptor);
-  int close_all (void);
-  TAO_AV_AcceptorSetItor begin (void);
-  TAO_AV_AcceptorSetItor end (void);
+  int close_all ();
+  TAO_AV_AcceptorSetItor begin ();
+  TAO_AV_AcceptorSetItor end ();
 protected:
   int open_default (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -317,12 +317,12 @@ class TAO_AV_Export TAO_AV_Transport_Factory : public ACE_Service_Object
 {
 public:
   /// Initialization hook.
-  TAO_AV_Transport_Factory (void);
-  virtual ~TAO_AV_Transport_Factory (void);
+  TAO_AV_Transport_Factory ();
+  virtual ~TAO_AV_Transport_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
   int ref_count;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h
index 638160e8d52..5b2f13a2018 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -28,12 +28,12 @@ class TAO_AV_Export TAO_AV_UDP_Factory : public TAO_AV_Transport_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_UDP_Factory (void);
-  virtual ~TAO_AV_UDP_Factory (void);
+  TAO_AV_UDP_Factory ();
+  virtual ~TAO_AV_UDP_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_UDP_Flow_Handler;
@@ -47,18 +47,18 @@ class TAO_AV_Export TAO_AV_UDP_Transport
   :public TAO_AV_Transport
 {
 public:
-  TAO_AV_UDP_Transport (void);
+  TAO_AV_UDP_Transport ();
 
   TAO_AV_UDP_Transport (TAO_AV_UDP_Flow_Handler *handler);
 
-  virtual  ~TAO_AV_UDP_Transport (void);
+  virtual  ~TAO_AV_UDP_Transport ();
   virtual int open (ACE_Addr *addr);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
-  virtual ACE_Addr *get_peer_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
 
   virtual int set_remote_address (const ACE_INET_Addr &address);
 
@@ -111,11 +111,11 @@ class TAO_AV_Export TAO_AV_UDP_Flow_Handler
 public:
   ///Ctor
   /// Dtor
-  TAO_AV_UDP_Flow_Handler (void);
-  virtual ~TAO_AV_UDP_Flow_Handler (void);
+  TAO_AV_UDP_Flow_Handler ();
+  virtual ~TAO_AV_UDP_Flow_Handler ();
   int open (ACE_Addr &address);
-  int close (void);
-  virtual TAO_AV_Transport *transport (void);
+  int close ();
+  virtual TAO_AV_Transport *transport ();
   virtual int set_remote_address (ACE_Addr *address);
   virtual ACE_HANDLE get_handle () const;
   virtual int handle_input (ACE_HANDLE fd);
@@ -139,8 +139,8 @@ class TAO_AV_Export TAO_AV_UDP_Acceptor
   :public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_UDP_Acceptor (void);
-  virtual ~TAO_AV_UDP_Acceptor (void);
+  TAO_AV_UDP_Acceptor ();
+  virtual ~TAO_AV_UDP_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -157,7 +157,7 @@ public:
 
   virtual int open_i (ACE_INET_Addr *address, int is_default_open);
 
-  virtual int close (void);
+  virtual int close ();
   virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler);
 
 protected:
@@ -177,8 +177,8 @@ class TAO_AV_Export TAO_AV_UDP_Connector
   :public TAO_AV_Connector
 {
 public:
-  TAO_AV_UDP_Connector (void);
-  ~TAO_AV_UDP_Connector (void);
+  TAO_AV_UDP_Connector ();
+  ~TAO_AV_UDP_Connector ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_AV_Flow_Protocol_Factory *factory);
@@ -188,7 +188,7 @@ public:
                        TAO_AV_Core::Flow_Component flow_comp =
                            TAO_AV_Core::TAO_AV_DATA);
   virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler);
-  virtual int close (void);
+  virtual int close ();
 protected:
   ACE_INET_Addr *control_inet_address_;
   bool delete_control_inet_address_;
@@ -231,9 +231,9 @@ public:
                      TAO_AV_Transport *transport = 0);
 
   /// Dtor
-  virtual ~TAO_AV_UDP_Object (void);
+  virtual ~TAO_AV_UDP_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -247,7 +247,7 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 private:
   /// Pre-allocated memory to receive the data...
@@ -262,8 +262,8 @@ class TAO_AV_Export TAO_AV_UDP_Flow_Factory : public TAO_AV_Flow_Protocol_Factor
 {
 public:
   /// Initialization hook.
-  TAO_AV_UDP_Flow_Factory (void);
-  virtual ~TAO_AV_UDP_Flow_Factory (void);
+  TAO_AV_UDP_Flow_Factory ();
+  virtual ~TAO_AV_UDP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index c3023b5f101..9e8c51af060 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -56,7 +56,7 @@ public:
 class TAO_SFP_Fragment_Table_Entry
 {
 public:
-  TAO_SFP_Fragment_Table_Entry (void)
+  TAO_SFP_Fragment_Table_Entry ()
     :last_received_ (0),
      num_fragments_ (0)
     {}
@@ -138,7 +138,7 @@ public:
     START_RECEIVED
   };
 
-  TAO_SFP_Base (void);
+  TAO_SFP_Base ();
   static CORBA::Boolean start_frame (CORBA::Octet flags,
                                      flowProtocol::MsgType type,
                                      TAO_OutputCDR &msg);
@@ -217,7 +217,7 @@ public:
                   TAO_AV_Transport *transport);
   // We should add a sfp options parameter.
 
-  virtual ~TAO_SFP_Object (void);
+  virtual ~TAO_SFP_Object ();
   // Dtor
 
   virtual int handle_input (void) = 0;
@@ -231,7 +231,7 @@ public:
   virtual int send_frame (const char*buf,
                           size_t len);
 
-  virtual int destroy (void);
+  virtual int destroy ();
   virtual int set_policies (const TAO_AV_PolicyList &policies);
 
 protected:
@@ -256,7 +256,7 @@ public:
   TAO_SFP_Producer_Object (TAO_AV_Callback *callback,
                            TAO_AV_Transport *transport,
                            const char *flow_options);
-  virtual int handle_input (void);
+  virtual int handle_input ();
 protected:
   CORBA::ULong credit_sequence_num_;
 };
@@ -271,7 +271,7 @@ public:
   TAO_SFP_Consumer_Object (TAO_AV_Callback *callback,
                            TAO_AV_Transport *transport,
                            ACE_CString& flow_options);
-  virtual int handle_input (void);
+  virtual int handle_input ();
 };
 
 /**
@@ -281,8 +281,8 @@ public:
 class TAO_AV_Export TAO_AV_SFP_Factory : public TAO_AV_Flow_Protocol_Factory
 {
 public:
-  TAO_AV_SFP_Factory (void);
-  virtual ~TAO_AV_SFP_Factory (void);
+  TAO_AV_SFP_Factory ();
+  virtual ~TAO_AV_SFP_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialization hook.
   virtual int match_protocol (const char *flow_string);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 5dfc74f87ac..136e2727a04 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -48,23 +48,23 @@ class TAO_Concurrency_Serv_Export CC_Lock
 {
 public:
   /// Creates the lock with mode = intention_read (weakest)
-  CC_Lock (void);
+  CC_Lock ();
 
   /// Creates the lock with the desired mode
   CC_Lock (CosConcurrencyControl::lock_mode mode);
 
   /// Deletes the lock
-  ~CC_Lock (void);
+  ~CC_Lock ();
 
   /// Acquires this lock. Blocks until lock is obtained
-  void lock (void);
+  void lock ();
 
   /// Tries to acquire this lock. If it is not possible to acquire the
   /// lock, false is returned
-  CORBA::Boolean try_lock (void);
+  CORBA::Boolean try_lock ();
 
   /// Releases this lock.
-  void unlock (void);
+  void unlock ();
 
   /// Changes the mode of this lock.
   void change_mode (CosConcurrencyControl::lock_mode new_mode);
@@ -79,16 +79,16 @@ public:
   CORBA::Boolean Compatible (CosConcurrencyControl::lock_mode mode);
 
   /// Returns the mode of the lock.
-  CosConcurrencyControl::lock_mode GetMode (void);
+  CosConcurrencyControl::lock_mode GetMode ();
 
   /// Returns the number of times this lock have been locked
-  int GetLocksHeld(void);
+  int GetLocksHeld();
 
   /// Decrements the number of locks held in this mode. Used by change_mode.
-  void DecLocksHeld(void);
+  void DecLocksHeld();
 
   /// Dumps the state of the object to stdout
-  void dump(void);
+  void dump();
 
 protected:
   /// Holds the lock's mode.
@@ -116,23 +116,23 @@ class TAO_Concurrency_Serv_Export CC_LockModeIterator
 {
 public:
   /// Default constructor
-  CC_LockModeIterator(void);
+  CC_LockModeIterator();
 
   /// Destructor
-  ~CC_LockModeIterator(void);
+  ~CC_LockModeIterator();
 
   /// Reset the iterator to the first element
-  void First(void);
+  void First();
 
   /// Advance the iterator to the next element
   /// Throws exception if out of range
-  void Next(void);
+  void Next();
 
   /// Returns true if the iterator has reached the last element
-  CORBA::Boolean IsDone(void);
+  CORBA::Boolean IsDone();
 
   /// Get the current element
-  CosConcurrencyControl::lock_mode GetLockMode(void);
+  CosConcurrencyControl::lock_mode GetLockMode();
 
 private:
   CosConcurrencyControl::lock_mode current_;
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 139e389bf01..6e2d6de6bb1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -76,14 +76,14 @@ class TAO_Concurrency_Serv_Export CC_LockSet :  public POA_CosConcurrencyControl
 {
 public:
   /// Default constructor
-  CC_LockSet (void);
+  CC_LockSet ();
 
   /// Constructor used if create_related is used to create the lock
   /// set.
   CC_LockSet (CosConcurrencyControl::LockSet_ptr related);
 
   /// Destructor.
-  ~CC_LockSet (void);
+  ~CC_LockSet ();
 
   // = CosConcurrencyControl methods
   /// Acquires this lock. Blocks until lock is obtained
@@ -102,7 +102,7 @@ public:
 
   // = Debugging methods
   /// Dump the state of the object to stdout
-  void dump (void);
+  void dump ();
 
 private:
   /// Converts the CORBA specification's lock mode to the internal
@@ -111,7 +111,7 @@ private:
 
   /// Initiatlizes the lock set array and acquires the initial
   /// semaphore.
-  void Init (void);
+  void Init ();
 
   /// Returns true if the held lock and the requested lock are compatible
   CORBA::Boolean compatible (CC_LockModeEnum mr);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index 8690633dff9..4c032f823de 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -37,10 +37,10 @@ class TAO_Concurrency_Serv_Export CC_LockSetFactory
 {
 public:
   /// Default constructor.
-  CC_LockSetFactory (void);
+  CC_LockSetFactory ();
 
   /// Destructor.
-  ~CC_LockSetFactory (void);
+  ~CC_LockSetFactory ();
 
   virtual CosConcurrencyControl::LockSet_ptr create ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 2b5d4362b06..4d14f2e112a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -31,10 +31,10 @@ class TAO_Concurrency_Serv_Export TAO_Concurrency_Loader : public TAO_Object_Loa
 {
 public:
   /// Constructor
-  TAO_Concurrency_Loader (void);
+  TAO_Concurrency_Loader ();
 
   /// Destructor
-  ~TAO_Concurrency_Loader (void);
+  ~TAO_Concurrency_Loader ();
 
   /// Called by the Service Configurator framework to initialize the
   /// Event Service. Defined in <ace/Service_Config.h>
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index 2338e119ff0..b71e392b930 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -39,7 +39,7 @@ class TAO_Concurrency_Serv_Export TAO_Concurrency_Server
 {
 public:
   ///Default constructor.
-  TAO_Concurrency_Server (void);
+  TAO_Concurrency_Server ();
 
   /// Takes the POA under which to register the Concurrency Service
   /// implementation object.
@@ -47,17 +47,17 @@ public:
                           PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~TAO_Concurrency_Server (void);
+  ~TAO_Concurrency_Server ();
 
   /// Initialize the concurrency server under the given ORB and POA.
   CORBA::Object_ptr init (CORBA::ORB_ptr orb,
                           PortableServer::POA_ptr poa);
 
   /// Cleanup resources.
-  int fini (void);
+  int fini ();
 
   /// Get the lock set factory.
-  CC_LockSetFactory *GetLockSetFactory (void);
+  CC_LockSetFactory *GetLockSetFactory ();
 
 private:
   /// This is the lock set factory activated under the POA.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 4b72ce2fc6c..aca1ebd3610 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -57,7 +57,7 @@ public:
   TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel);
 
   /// Destructor...
-  virtual ~TAO_CEC_ConsumerAdmin (void);
+  virtual ~TAO_CEC_ConsumerAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
@@ -77,16 +77,16 @@ public:
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void);
+      obtain_push_supplier ();
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-      obtain_pull_supplier (void);
+      obtain_pull_supplier ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index e21474a5230..10e7c9015f4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -48,15 +48,15 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerControl
 {
 public:
   /// Constructor
-  TAO_CEC_ConsumerControl (void);
+  TAO_CEC_ConsumerControl ();
 
   /// Destructor
-  virtual ~TAO_CEC_ConsumerControl (void);
+  virtual ~TAO_CEC_ConsumerControl ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the consumers
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
 
   /**
    * When pushing an event to the consumer a CORBA::OBJECT_NOT_EXIST
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index 84403d50e75..071686cf93f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -43,14 +43,14 @@ class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory
 {
 public:
   /// Constructor
-  TAO_CEC_Default_Factory (void);
+  TAO_CEC_Default_Factory ();
 
   /// destructor...
-  virtual ~TAO_CEC_Default_Factory (void);
+  virtual ~TAO_CEC_Default_Factory ();
 
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
@@ -110,9 +110,9 @@ public:
       destroy_proxy_pull_supplier_collection (
           TAO_CEC_ProxyPullSupplier_Collection*);
 
-  virtual ACE_Lock* create_consumer_lock (void);
+  virtual ACE_Lock* create_consumer_lock ();
   virtual void destroy_consumer_lock (ACE_Lock*);
-  virtual ACE_Lock* create_supplier_lock (void);
+  virtual ACE_Lock* create_supplier_lock ();
   virtual void destroy_supplier_lock (ACE_Lock*);
 
   virtual TAO_CEC_ConsumerControl*
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 2a92dd1fde7..599d80974b3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -44,7 +44,7 @@ class TAO_Event_Serv_Export TAO_CEC_Dispatching
 {
 public:
   /// destructor...
-  virtual ~TAO_CEC_Dispatching (void);
+  virtual ~TAO_CEC_Dispatching ();
 
   /// Initialize all the data structures, activate any internal threads,
   /// etc.
@@ -85,11 +85,11 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispat
 public:
   /// The scheduler is used to find the range of priorities and similar
   /// info.
-  TAO_CEC_Reactive_Dispatching (void);
+  TAO_CEC_Reactive_Dispatching ();
 
   // = The CEC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
                      const CORBA::Any &event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 5561bbca026..ac9311ddbf0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -78,7 +78,7 @@ public:
                            ACE_Allocator *mb_allocator = 0);
 
   /// Destructor
-  virtual ~TAO_CEC_Dispatch_Command (void);
+  virtual ~TAO_CEC_Dispatch_Command ();
 
   /// Command callback
   virtual int execute (void) = 0;
@@ -93,7 +93,7 @@ public:
   TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 // ****************************************************************
@@ -108,10 +108,10 @@ public:
                         ACE_Allocator *mb_allocator);
 
   /// Destructor
-  virtual ~TAO_CEC_Push_Command (void);
+  virtual ~TAO_CEC_Push_Command ();
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   /// The proxy
@@ -134,10 +134,10 @@ public:
                           ACE_Allocator *mb_allocator);
 
   /// Destructor
-  virtual ~TAO_CEC_Invoke_Command (void);
+  virtual ~TAO_CEC_Invoke_Command ();
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index 4f1108e825d..b59e5cf186b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -35,7 +35,7 @@ public:
                                        TAO_CEC_TypedEventChannel *typed_event_channel);
 
   /// Destructor
-  virtual ~TAO_CEC_DynamicImplementationServer (void);
+  virtual ~TAO_CEC_DynamicImplementationServer ();
 
   // = The DynamicImplementation methods.
   virtual void invoke (CORBA::ServerRequest_ptr request);
@@ -44,7 +44,7 @@ public:
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Handles the _is_a call
   virtual void is_a (CORBA::ServerRequest_ptr request);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 90304ed1fd1..2692e29434f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -126,15 +126,15 @@ public:
                         int own_factory = 0);
 
   /// destructor
-  virtual ~TAO_CEC_EventChannel (void);
+  virtual ~TAO_CEC_EventChannel ();
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (void);
+  virtual void activate ();
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching () const;
@@ -183,14 +183,14 @@ public:
   void destroy_proxy_collection (TAO_CEC_ProxyPullConsumer_Collection*);
 
   /// Access the supplier and consumer POAs from the factory.
-  PortableServer::POA_ptr supplier_poa (void);
-  PortableServer::POA_ptr consumer_poa (void);
+  PortableServer::POA_ptr supplier_poa ();
+  PortableServer::POA_ptr consumer_poa ();
 
   /// Locking strategies for the ProxyPushConsumer and
   /// ProxyPushSupplier objects
-  ACE_Lock* create_consumer_lock (void);
+  ACE_Lock* create_consumer_lock ();
   void destroy_consumer_lock (ACE_Lock*);
-  ACE_Lock* create_supplier_lock (void);
+  ACE_Lock* create_supplier_lock ();
   void destroy_supplier_lock (ACE_Lock*);
 
   /// Used to inform the EC that a Consumer has connected or
@@ -228,17 +228,17 @@ public:
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (env);
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void);
+      for_consumers ();
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this (env);
   virtual CosEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void);
+      for_suppliers ();
 
   /// Commit suicide.
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  ServantRetryMap& get_servant_retry_map (void);
+  ServantRetryMap& get_servant_retry_map ();
 
   /// Forwarded to the factory
   CORBA::Policy_ptr
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index f4019a5c167..c28e0872960 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -38,10 +38,10 @@ class TAO_Event_Serv_Export TAO_CEC_Event_Loader : public TAO_Object_Loader
 {
 public:
   /// Constructor
-  TAO_CEC_Event_Loader (void);
+  TAO_CEC_Event_Loader ();
 
   /// Destructor
-  ~TAO_CEC_Event_Loader (void);
+  ~TAO_CEC_Event_Loader ();
 
   //@{
   /**
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 27cdd6becc9..c8d591898f9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -83,7 +83,7 @@ class TAO_Event_Serv_Export TAO_CEC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
-  virtual ~TAO_CEC_Factory (void);
+  virtual ~TAO_CEC_Factory ();
 
   /// Create and destroy the dispatching module.
   virtual TAO_CEC_Dispatching*
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 8d8e725998d..af65ca8e51d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -46,8 +46,8 @@ public:
                          int force_activate);
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_CEC_ProxyPushSupplier* proxy,
                      const CORBA::Any & event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index aeea3d822b8..e172324f8b5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -52,14 +52,14 @@ public:
                              const ACE_Time_Value &timeout);
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPullConsumer (void);
+  virtual ~TAO_CEC_ProxyPullConsumer ();
 
   /// Activate in the POA
   virtual void  activate (
       CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return 0 if no supplier is connected...
   CORBA::Boolean is_connected () const;
@@ -70,7 +70,7 @@ public:
 
   /// Pulls from the supplier, verifies that it is connected.
   CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event);
-  CORBA::Any* pull_from_supplier (void);
+  CORBA::Any* pull_from_supplier ();
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -80,21 +80,21 @@ public:
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The CosEventChannelAdmin::ProxyPullConsumer methods...
   virtual void connect_pull_supplier (
                 CosEventComm::PullSupplier_ptr pull_supplier);
-  virtual void disconnect_pull_consumer (void);
+  virtual void disconnect_pull_consumer ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the supplier, used by some implementations to change the
@@ -106,7 +106,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and
   /// applies policies (when appropriate) to supplier_.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 2660286b370..6d63db1de83 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -59,14 +59,14 @@ public:
                              const ACE_Time_Value &timeout);
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPullSupplier (void);
+  virtual ~TAO_CEC_ProxyPullSupplier ();
 
   /// Activate in the POA
   virtual void activate (
       CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected () const;
@@ -80,7 +80,7 @@ public:
   CosEventComm::PullConsumer_ptr consumer () const;
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
@@ -95,18 +95,18 @@ public:
   // = The CosEventChannelAdmin::ProxyPullSupplier methods...
   virtual void connect_pull_consumer (
                 CosEventComm::PullConsumer_ptr pull_consumer);
-  virtual CORBA::Any * pull (void);
+  virtual CORBA::Any * pull ();
   virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event);
-  virtual void disconnect_pull_supplier (void);
+  virtual void disconnect_pull_supplier ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the consumer, used by some implementations to change the
@@ -118,7 +118,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the child and the consumer
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both consumer_ and nopolicy_consumer_, and
   /// applies policies (when appropriate) to consumer_.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 5bbf33df9f3..0239d91fb73 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -54,14 +54,14 @@ public:
                              const ACE_Time_Value &timeout);
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPushConsumer (void);
+  virtual ~TAO_CEC_ProxyPushConsumer ();
 
   /// Activate in the POA
   virtual void activate (
       CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return false if no supplier is connected...
   CORBA::Boolean is_connected () const;
@@ -78,22 +78,22 @@ public:
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 CosEventComm::PushSupplier_ptr push_supplier);
   virtual void push (const CORBA::Any& event);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the supplier, used by some implementations to change the
@@ -108,7 +108,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and
   /// applies policies (when appropriate) to supplier_.
@@ -164,7 +164,7 @@ public:
                                    TAO_CEC_ProxyPushConsumer *proxy);
 
   /// Destructor
-  ~TAO_CEC_ProxyPushConsumer_Guard (void);
+  ~TAO_CEC_ProxyPushConsumer_Guard ();
 
   /// Returns true if the reference count successfully acquired
   bool locked () const;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index b7fec15b0b8..838b92d8ef1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -70,14 +70,14 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPushSupplier (void);
+  virtual ~TAO_CEC_ProxyPushSupplier ();
 
   /// Activate in the POA
   virtual void activate (
       CosEventChannelAdmin::ProxyPushSupplier_ptr &);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected () const;
@@ -91,7 +91,7 @@ public:
   CosEventComm::PushConsumer_ptr consumer () const;
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Internal methods to push an event to each consumer.
   virtual void push (const CORBA::Any &event);
@@ -119,16 +119,16 @@ public:
   // = The CosEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 CosEventComm::PushConsumer_ptr push_consumer);
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the consumer, used by some implementations to change the
@@ -144,7 +144,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the child and the consumer
-  void cleanup_i (void);
+  void cleanup_i ();
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   CORBA::Boolean is_typed_ec () const;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index 5b0e9843feb..9d11bbdff53 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -39,7 +39,7 @@ class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy
 {
 public:
   /// destructor...
-  virtual ~TAO_CEC_Pulling_Strategy (void);
+  virtual ~TAO_CEC_Pulling_Strategy ();
 
   /// Initialize all the data structures, activate any internal threads,
   /// etc.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 88a17ffeb22..958e8a544e7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -99,15 +99,15 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// destructor...
-  virtual ~TAO_CEC_Reactive_ConsumerControl (void);
+  virtual ~TAO_CEC_Reactive_ConsumerControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_CEC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy);
   virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy);
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
@@ -125,7 +125,7 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (void);
+  void query_consumers ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 3253d29db2a..e8deaffa063 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -85,8 +85,8 @@ public:
                        const void* arg);
 
   // = The CEC_Pulling_Strategy methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
 
 private:
   /// The Adapter for the reactor events
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index cabd907629c..6df5666491a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -97,15 +97,15 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// destructor...
-  virtual ~TAO_CEC_Reactive_SupplierControl (void);
+  virtual ~TAO_CEC_Reactive_SupplierControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_CEC_SupplierControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy);
@@ -126,7 +126,7 @@ public:
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (void);
+  void query_suppliers ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 9441c9087ad..d81786b7263 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -57,7 +57,7 @@ public:
   TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel* event_channel);
 
   /// destructor...
-  virtual ~TAO_CEC_SupplierAdmin (void);
+  virtual ~TAO_CEC_SupplierAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker);
@@ -75,16 +75,16 @@ public:
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void);
+      obtain_push_consumer ();
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-      obtain_pull_consumer (void);
+      obtain_pull_consumer ();
 
   /// The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 33ddb1892b4..1302fd25c21 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -57,15 +57,15 @@ class TAO_Event_Serv_Export TAO_CEC_SupplierControl
 {
 public:
   /// Constructor
-  TAO_CEC_SupplierControl (void);
+  TAO_CEC_SupplierControl ();
 
   /// destructor...
-  virtual ~TAO_CEC_SupplierControl (void);
+  virtual ~TAO_CEC_SupplierControl ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the suppliers
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
 
   /**
    * Invoked by helper classes when they detect that a supplier does
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 41481d88c72..cbc61e407fe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -40,7 +40,7 @@ public:
   TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel* typed_event_channel);
 
   // Destructor
-  virtual ~TAO_CEC_TypedConsumerAdmin (void);
+  virtual ~TAO_CEC_TypedConsumerAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
@@ -56,7 +56,7 @@ public:
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
@@ -66,13 +66,13 @@ public:
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier (void);
+    obtain_push_supplier ();
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier (void);
+    obtain_pull_supplier ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
index df5816d4608..7a47f2ea313 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
@@ -41,7 +41,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedEvent
 {
 public:
   /// constructors...
-  TAO_CEC_TypedEvent (void);
+  TAO_CEC_TypedEvent ();
 
   TAO_CEC_TypedEvent (CORBA::NVList_ptr list,
                       const char * operation);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 43c7cbd5c52..7ffac9043a0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -136,15 +136,15 @@ public:
                              int own_factory = 0);
 
   /// Destructor
-  virtual ~TAO_CEC_TypedEventChannel (void);
+  virtual ~TAO_CEC_TypedEventChannel ();
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (void);
+  virtual void activate ();
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching () const;
@@ -181,14 +181,14 @@ public:
   void destroy_proxy_collection (TAO_CEC_TypedProxyPushConsumer_Collection*);
 
   /// Access the supplier and consumer POAs from the factory.
-  PortableServer::POA_ptr typed_supplier_poa (void);
-  PortableServer::POA_ptr typed_consumer_poa (void);
+  PortableServer::POA_ptr typed_supplier_poa ();
+  PortableServer::POA_ptr typed_consumer_poa ();
 
   /// Locking strategies for the ProxyPushConsumer and
   /// ProxyPushSupplier objects
-  ACE_Lock* create_consumer_lock (void);
+  ACE_Lock* create_consumer_lock ();
   void destroy_consumer_lock (ACE_Lock*);
-  ACE_Lock* create_supplier_lock (void);
+  ACE_Lock* create_supplier_lock ();
   void destroy_supplier_lock (ACE_Lock*);
 
   /// Used to inform the EC that a Consumer has connected or
@@ -245,14 +245,14 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedEventChannel methods...
   virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
 
   virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
-    for_suppliers (void);
+    for_suppliers ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  ServantRetryMap& get_servant_retry_map (void);
+  ServantRetryMap& get_servant_retry_map ();
 
   /// Forwarded to the factory
   CORBA::Policy_ptr
@@ -266,7 +266,7 @@ protected:
   int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters);
 
   /// Function clears the IFR cache
-  int clear_ifr_cache (void);
+  int clear_ifr_cache ();
 
 private:
   /// The POAs used to activate "supplier-side" and "consumer-side"
@@ -339,10 +339,10 @@ class TAO_Event_Serv_Export TAO_CEC_Param
 {
 public:
   /// Constructor
-  TAO_CEC_Param (void);
+  TAO_CEC_Param ();
 
   /// Destructor
-  ~TAO_CEC_Param (void);
+  ~TAO_CEC_Param ();
 
 private:
   /// Only the TypedEventChannel can read the private fields.
@@ -359,7 +359,7 @@ class TAO_Event_Serv_Export TAO_CEC_Operation_Params
   /// constructor
   TAO_CEC_Operation_Params (CORBA::ULong num_params);
   /// destructor
-  ~TAO_CEC_Operation_Params (void);
+  ~TAO_CEC_Operation_Params ();
 
 private:
   /// Only the TypedEventChannel can read the private fields.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 016cb1c681c..d9fc5c8adca 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -43,14 +43,14 @@ public:
       const ACE_Time_Value &timeout);
 
   /// Destructor
-  virtual ~TAO_CEC_TypedProxyPushConsumer (void);
+  virtual ~TAO_CEC_TypedProxyPushConsumer ();
 
   /// Activate in the POA
   virtual void activate (
       CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -60,11 +60,11 @@ public:
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)...
   virtual void connect_push_supplier (
@@ -74,15 +74,15 @@ public:
 
   virtual void invoke (const TAO_CEC_TypedEvent& typed_event);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)...
-  virtual CORBA::Object_ptr get_typed_consumer (void);
+  virtual CORBA::Object_ptr get_typed_consumer ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// The guard needs access to the following protected methods.
@@ -92,7 +92,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and
   /// applies policies (when appropriate) to supplier_.
@@ -156,7 +156,7 @@ public:
       TAO_CEC_TypedProxyPushConsumer *proxy);
 
   /// Destructor
-  ~TAO_CEC_TypedProxyPushConsumer_Guard (void);
+  ~TAO_CEC_TypedProxyPushConsumer_Guard ();
 
   /// Returns 1 if the reference count successfully acquired
   int locked () const;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index 3fd23168cfe..c15b44ebe17 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -39,7 +39,7 @@ public:
    TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel* event_channel);
 
   /// Destructor
-  virtual ~TAO_CEC_TypedSupplierAdmin (void);
+  virtual ~TAO_CEC_TypedSupplierAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker);
@@ -51,7 +51,7 @@ public:
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods...
   virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
@@ -62,13 +62,13 @@ public:
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (void);
+    obtain_push_consumer ();
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer (void);
+    obtain_pull_consumer ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
index be736a7c572..50b35d37d89 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
@@ -10,49 +10,49 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::remove (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::remove ()
 {
   return 0;
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::acquire (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::acquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::release (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::release ()
 {
   return this->adaptee_->idle ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::acquire_read (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::acquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::acquire_write (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::acquire_write ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_read (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_write (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_write ()
 {
   return this->adaptee_->busy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index 62fdae62ef7..3009b5ec526 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    TAO_ESF_Copy_On_Read (void)
+    TAO_ESF_Copy_On_Read ()
 {
 }
 
@@ -101,7 +101,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
-TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown (void)
+TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown ()
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index fd1535e5e4c..0978a668656 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -11,14 +11,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
-TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void)
+TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt ()
 {
   // LOCKING: no locking is required, the caller grabs the mutex.
   return this->refcount_++;
 }
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
-TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
+TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt ()
 {
   // LOCKING: no locking is required, the caller grabs the mutex.
   {
@@ -41,7 +41,7 @@ TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_ESF_Copy_On_Write (void)
+    TAO_ESF_Copy_On_Write ()
       :  pending_writes_ (0),
          writing_ (0),
          cond_ (mutex_)
@@ -51,7 +51,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    ~TAO_ESF_Copy_On_Write (void)
+    ~TAO_ESF_Copy_On_Write ()
 {
   ACE_GUARD (ACE_SYNCH_MUTEX_T, ace_mon, this->mutex_);
 
@@ -119,7 +119,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
-TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::shutdown (void)
+TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::shutdown ()
 {
   // We need to perform a copy to follow the protocol.
   Write_Guard ace_mon (this->mutex_,
@@ -175,7 +175,7 @@ TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    ~TAO_ESF_Copy_On_Write_Write_Guard (void)
+    ~TAO_ESF_Copy_On_Write_Write_Guard ()
 {
   Collection *tmp = 0;
   {
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 56ddea2d0a4..a84699fa475 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -14,7 +14,7 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    ~TAO_ESF_Peer_Admin (void)
+    ~TAO_ESF_Peer_Admin ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 47dc3e6d917..ee2b608dbda 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -19,14 +19,14 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE>
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    ~TAO_ESF_Proxy_Admin (void)
+    ~TAO_ESF_Proxy_Admin ()
 {
   this->event_channel_->destroy_proxy_collection (this->collection_);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    obtain (void)
+    obtain ()
 {
   PROXY* proxy;
   this->event_channel_->create_proxy (proxy);
@@ -44,7 +44,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
-TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::shutdown (void)
+TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::shutdown ()
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
index 64154fe0806..5377484a4ba 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
@@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // ****************************************************************
 
 template<class PROXY>
-TAO_ESF_Proxy_Collection<PROXY>::~TAO_ESF_Proxy_Collection (void)
+TAO_ESF_Proxy_Collection<PROXY>::~TAO_ESF_Proxy_Collection ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index ff57ce85e4e..22783936d19 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY>
-TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void)
+TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List ()
 {
 }
 
@@ -72,7 +72,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (void)
+TAO_ESF_Proxy_List<PROXY>::shutdown ()
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 462e0542d1b..cae70aec586 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY>
-TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree (void)
+TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree ()
 {
 }
 
@@ -70,7 +70,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (void)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown ()
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
index 5ee83f5becd..c8674165ac5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class EC, class P>
-TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void)
+TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard ()
 {
   // Checking for 0 is safe, once the variable reaches 0 the value
   // will stay there.
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
index bf44a389032..21341d12802 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
@@ -6,7 +6,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class Object>
-TAO_ESF_Worker<Object>::~TAO_ESF_Worker (void)
+TAO_ESF_Worker<Object>::~TAO_ESF_Worker ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
index 4a3430d6980..6cbc48c6989 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
@@ -10,49 +10,49 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::remove (void)
+int TAO_EC_Busy_Lock_Adapter<T>::remove ()
 {
   return 0;
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire (void)
+int TAO_EC_Busy_Lock_Adapter<T>::acquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire (void)
+int TAO_EC_Busy_Lock_Adapter<T>::tryacquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::release (void)
+int TAO_EC_Busy_Lock_Adapter<T>::release ()
 {
   return this->adaptee_->idle ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire_read (void)
+int TAO_EC_Busy_Lock_Adapter<T>::acquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire_write (void)
+int TAO_EC_Busy_Lock_Adapter<T>::acquire_write ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_read (void)
+int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write (void)
+int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write ()
 {
   return this->adaptee_->busy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
index 49921468ef9..f60dd53129b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -35,14 +35,14 @@ public:
   // = The ACE_Lock methods, please check $ACE_ROOT/ace/Synch.h for
   // details.
 
-  int remove (void);
-  int acquire (void);
-  int tryacquire (void);
-  int release (void);
-  int acquire_read (void);
-  int acquire_write (void);
-  int tryacquire_read (void);
-  int tryacquire_write (void);
+  int remove ();
+  int acquire ();
+  int tryacquire ();
+  int release ();
+  int acquire_read ();
+  int acquire_write ();
+  int tryacquire_read ();
+  int tryacquire_write ();
 
 private:
   Adaptee* adaptee_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 4f8cf9d0039..c1f296e3dc5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -30,8 +30,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTSchedEvent_Export TAO_EC_Gateway_Sched : public TAO_EC_Gateway_IIOP
 {
 public:
-  TAO_EC_Gateway_Sched (void);
-  ~TAO_EC_Gateway_Sched (void);
+  TAO_EC_Gateway_Sched ();
+  ~TAO_EC_Gateway_Sched ();
 
   /**
    * To do its job this class requires to know the local and remote
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index 4cae0ea5f86..d2b903dcaae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -60,8 +60,8 @@ public:
                             int sched_scope);
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
@@ -74,7 +74,7 @@ public:
 private:
   ACE_Allocator *allocator_;
 
-  void setup_lanes (void);
+  void setup_lanes ();
 
   /// The dispatcher
   Kokyu::Dispatcher_Auto_Ptr dispatcher_;
@@ -96,11 +96,11 @@ public:
   TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator *allocator);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 protected:
   //Protected so can't be put on stack; must be dynamically allocated
-  virtual ~TAO_EC_Kokyu_Shutdown_Command (void);
+  virtual ~TAO_EC_Kokyu_Shutdown_Command ();
 };
 
 // ****************************************************************
@@ -115,11 +115,11 @@ public:
                              ACE_Allocator* allocator);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 protected:
   //Protected so can't be put on stack; must be dynamically allocated
-  virtual ~TAO_EC_Kokyu_Push_Command (void);
+  virtual ~TAO_EC_Kokyu_Push_Command ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
index 11dc877cd2a..3ce04b0af21 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
@@ -34,14 +34,14 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Factory : public TAO_EC_Default_Facto
 {
 public:
   /// Constructor
-  TAO_EC_Kokyu_Factory (void);
+  TAO_EC_Kokyu_Factory ();
 
   /// Helper function to register the Kokyu factory into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   /// destructor...
-  virtual ~TAO_EC_Kokyu_Factory (void);
+  virtual ~TAO_EC_Kokyu_Factory ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index d630ec559f2..a7dae431365 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -56,7 +56,7 @@ public:
                        RtecScheduler::Info_Type_t info_type);
 
   /// Destructor
-  virtual ~TAO_EC_Kokyu_Filter (void);
+  virtual ~TAO_EC_Kokyu_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
@@ -71,7 +71,7 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
+  virtual void clear ();
   virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
@@ -83,7 +83,7 @@ private:
   TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
   /// Compute a new qos_info to push up.
   void compute_qos_info (TAO_EC_QOS_Info& qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
index 7824e07cfa3..a2191c9ab15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
@@ -45,7 +45,7 @@ public:
   TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Kokyu_Filter_Builder (void);
+  virtual ~TAO_EC_Kokyu_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 74dfe4af919..b850ebd6723 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -42,7 +42,7 @@ public:
   TAO_EC_Kokyu_Scheduling (RtecScheduler::Scheduler_ptr scheduler);
 
   /// Destructor
-  virtual ~TAO_EC_Kokyu_Scheduling (void);
+  virtual ~TAO_EC_Kokyu_Scheduling ();
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
@@ -56,7 +56,7 @@ private:
   TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index e610319f21f..8e6c9904924 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -55,8 +55,8 @@ public:
   TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base* ec);
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index 206852bcafc..2b9c3de4272 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -41,7 +41,7 @@ public:
   TAO_EC_Priority_Scheduling (RtecScheduler::Scheduler_ptr scheduler);
 
   /// Destructor
-  virtual ~TAO_EC_Priority_Scheduling (void);
+  virtual ~TAO_EC_Priority_Scheduling ();
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
@@ -55,7 +55,7 @@ private:
   TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index efb1073bf29..5c09eb57871 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -40,11 +40,11 @@ public:
                               RTCORBA::Current_ptr current);
 
   /// Destructor
-  ~TAO_EC_RTCORBA_Dispatching (void);
+  ~TAO_EC_RTCORBA_Dispatching ();
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index d643250f735..492ccc63240 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -41,7 +41,7 @@ public:
                           const RTCORBA::ThreadpoolLanes &lanes);
 
   /// destructor...
-  virtual ~TAO_EC_RTCORBA_Factory (void);
+  virtual ~TAO_EC_RTCORBA_Factory ();
 
   // Decorated methods...
   virtual int init (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
index c2968bd2821..7174244826b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
@@ -33,10 +33,10 @@ class TAO_RTSchedEvent_Export TAO_EC_Sched_Factory : public TAO_EC_Default_Facto
 {
 public:
   /// Constructor
-  TAO_EC_Sched_Factory (void);
+  TAO_EC_Sched_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Sched_Factory (void);
+  virtual ~TAO_EC_Sched_Factory ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 83731da3946..1998c4a2daa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -56,7 +56,7 @@ public:
                        RtecScheduler::Info_Type_t info_type);
 
   /// Destructor
-  virtual ~TAO_EC_Sched_Filter (void);
+  virtual ~TAO_EC_Sched_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
@@ -71,7 +71,7 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
+  virtual void clear ();
   virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
@@ -83,7 +83,7 @@ private:
   TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
   /// Compute a new qos_info to push up.
   void compute_qos_info (TAO_EC_QOS_Info& qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index 110a2cbee86..63a08561ba7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -45,7 +45,7 @@ public:
   TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Sched_Filter_Builder (void);
+  virtual ~TAO_EC_Sched_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 7757a3266da..4067c0f5236 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -59,7 +59,7 @@ public:
   virtual TAO_FT_Request_Duration_Policy *clone () const;
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_policy_value (void);
+  virtual TimeBase::TimeT request_duration_policy_value ();
 
   virtual CORBA::PolicyType policy_type ();
 
@@ -105,7 +105,7 @@ public:
   virtual TAO_FT_Heart_Beat_Policy *clone () const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void);
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value ();
 
   virtual CORBA::PolicyType policy_type ();
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 50843b72b72..aadb44617cf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -70,13 +70,13 @@ namespace TAO
       public virtual ::CORBA::LocalObject
   {
   public:
-    FT_ClientRequest_Interceptor (void);
+    FT_ClientRequest_Interceptor ();
 
     /// Canonical name of the interceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -91,7 +91,7 @@ namespace TAO
     void ft_send_extended_sc (CORBA::Boolean send);
 
   protected:
-    ~FT_ClientRequest_Interceptor (void);
+    ~FT_ClientRequest_Interceptor ();
 
   private:
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
index 51a506575ff..943e53fa019 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
@@ -41,10 +41,10 @@ class TAO_FT_ClientORB_Export TAO_FT_ClientService_Activate : public TAO_Service
 {
 public:
   /// Constructor
-  TAO_FT_ClientService_Activate (void);
+  TAO_FT_ClientService_Activate ();
 
   /// The destructor
-  virtual ~TAO_FT_ClientService_Activate (void);
+  virtual ~TAO_FT_ClientService_Activate ();
 
   /**
    * Create and activate the service callbacks into the orb.
@@ -54,7 +54,7 @@ public:
   virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb);
 
   /// Used to force the initialization.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index 0aac7c2ead0..fb87f562364 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -42,10 +42,10 @@ class TAO_FT_ClientORB_Export TAO_FT_Endpoint_Selector_Factory
 {
 public:
   /// Constructor.
-  TAO_FT_Endpoint_Selector_Factory (void);
+  TAO_FT_Endpoint_Selector_Factory ();
 
   /// Destructor.
-  virtual ~TAO_FT_Endpoint_Selector_Factory (void);
+  virtual ~TAO_FT_Endpoint_Selector_Factory ();
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index af7b62b651b..d3e6fdf8935 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -56,10 +56,10 @@ public:
   /// Our Constructor
   TAO_FT_IOGR_Property (FT::TagFTGroupTaggedComponent &ft_group);
 
-  TAO_FT_IOGR_Property (void);
+  TAO_FT_IOGR_Property ();
 
   /// Destructor
-  ~TAO_FT_IOGR_Property (void);
+  ~TAO_FT_IOGR_Property ();
 
   /// Set the property for the IOGR
   virtual CORBA::Boolean set_property (
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index f3b00de2f72..66820908834 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -46,10 +46,10 @@ class TAO_FT_ClientORB_Export TAO_FT_Invocation_Endpoint_Selector :
 {
 public:
   /// Constructor.
-  TAO_FT_Invocation_Endpoint_Selector (void);
+  TAO_FT_Invocation_Endpoint_Selector ();
 
   /// Destructor.
-  virtual ~TAO_FT_Invocation_Endpoint_Selector (void);
+  virtual ~TAO_FT_Invocation_Endpoint_Selector ();
 
   /// Implementation for FT. Please refer to
   /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h  for details of
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 6a2392367b5..998229a9e3a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -51,10 +51,10 @@ namespace TAO
   {
   public:
     /// Constructor.
-    FT_ServerRequest_Interceptor (void);
+    FT_ServerRequest_Interceptor ();
 
     /// Destructor.
-    ~FT_ServerRequest_Interceptor (void);
+    ~FT_ServerRequest_Interceptor ();
 
     /**
      * @name Methods Required by the Server Request Interceptor
@@ -66,9 +66,9 @@ namespace TAO
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
index 0878f6c3292..14c9d4e103f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
@@ -39,13 +39,13 @@ class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate
 {
 public:
   /// Constructor
-  TAO_FT_ServerService_Activate (void);
+  TAO_FT_ServerService_Activate ();
 
   /// The destructor
-  virtual ~TAO_FT_ServerService_Activate (void);
+  virtual ~TAO_FT_ServerService_Activate ();
 
   /// Used to force the initialization.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 3b584bae7fb..b5ffc6489bf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -10,11 +10,11 @@ static bool initialized = false;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Service_Activate::TAO_FT_Service_Activate (void)
+TAO_FT_Service_Activate::TAO_FT_Service_Activate ()
 {
 }
 
-TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void)
+TAO_FT_Service_Activate::~TAO_FT_Service_Activate ()
 {
 }
 
@@ -34,7 +34,7 @@ TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core)
 
 
 int
-TAO_FT_Service_Activate::Initializer (void)
+TAO_FT_Service_Activate::Initializer ()
 {
   if (initialized == false)
     {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index a37d8e152c4..ff12b16364a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -45,7 +45,7 @@ public:
   TAO_FT_Service_Callbacks (TAO_ORB_Core *);
 
   /// Dtor
-  virtual ~TAO_FT_Service_Callbacks (void);
+  virtual ~TAO_FT_Service_Callbacks ();
 
   /// Select the profile from MProfile as the needs of the services
   /// may be. Return the profile in @a pfile
@@ -83,7 +83,7 @@ public:
       IOP::ServiceContextList &clist,
       TAO_Profile *profile);
 
-  static TimeBase::TimeT now (void);
+  static TimeBase::TimeT now ();
 
 private:
   /// Check whether the right flags are available so that we can issue a
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index fadd913af80..700e13be529 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -45,9 +45,9 @@ public:
   virtual ~FTRT_ClientORB_Interceptor ();
 
   /// Canonical name of the interceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
index 2592c533001..23f28cdca78 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
@@ -33,10 +33,10 @@ namespace TAO_FTRT {
   {
   public:
     /// Constructor.
-    FTRT_ClientORB_Loader (void);
+    FTRT_ClientORB_Loader ();
 
     /// Destructor.
-    virtual ~FTRT_ClientORB_Loader (void);
+    virtual ~FTRT_ClientORB_Loader ();
 
     /// Initialize the TransactionDepth loader hooks.
     virtual int init (int argc,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index 9ffd20d4a17..b18e86faabf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -42,9 +42,9 @@ public:
                                    const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
                           CORBA::ULong object_group_ref_version);
-  virtual int  acquire_read (void);
-  virtual int  acquire_write (void);
-  virtual int  release (void);
+  virtual int  acquire_read ();
+  virtual int  acquire_write ();
+  virtual int  release ();
   PortableServer::POA_ptr poa() { return poa_.in(); }
   CORBA::ORB_ptr orb() { return orb_.in();}
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index 4fd7c56358b..79863015432 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -43,9 +43,9 @@ public:
                           CORBA::ULong object_group_ref_version);
   virtual Replication_Strategy* make_primary_strategy();
 
-  virtual int  acquire_read (void);
-  virtual int  acquire_write (void);
-  virtual int  release (void);
+  virtual int  acquire_read ();
+  virtual int  acquire_write ();
+  virtual int  release ();
 private:
   bool mt_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
index ce33c43dcef..040c75ff3b2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
@@ -33,7 +33,7 @@ public:
   Basic_Replication_Strategy(bool mt);
   ~Basic_Replication_Strategy();
 
-  virtual void check_validity(void);
+  virtual void check_validity();
 
   virtual void replicate_request(const FTRT::State& state,
     RollbackOperation rollback,
@@ -41,9 +41,9 @@ public:
   virtual void add_member(const FTRT::ManagerInfo & info,
                           CORBA::ULong object_group_ref_version);
 
-  virtual int  acquire_read (void);
-  virtual int  acquire_write (void);
-  virtual int  release (void);
+  virtual int  acquire_read ();
+  virtual int  acquire_write ();
+  virtual int  release ();
 
 private:
   FTRT::SequenceNumber sequence_num_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index 87e91459919..9972e1140e4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -29,7 +29,7 @@ int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor)
 }
 
 template <ACE_PEER_STREAM_1>
-void ConnectionAcceptHandler<ACE_PEER_STREAM_2>::destroy (void)
+void ConnectionAcceptHandler<ACE_PEER_STREAM_2>::destroy ()
 {
   // Remove ourselves from the reactor
   reactor_->remove_handler
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
index b2efff697c7..f9299545913 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
@@ -26,7 +26,7 @@ class ConnectionAcceptHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_N
 {
 public:
   virtual int open (void *);
-  virtual void destroy (void);
+  virtual void destroy ();
   virtual int close (u_long flags = 0);
 protected:
   virtual int handle_input (ACE_HANDLE);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index 608a387eb5d..66c7d5aa763 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -54,11 +54,11 @@ public:
   TAO_FTEC_ConsumerAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_FTEC_ConsumerAdmin (void);
+  virtual ~TAO_FTEC_ConsumerAdmin ();
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void);
+      obtain_push_supplier ();
 
   void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index 871789e47b7..700dae63847 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -60,12 +60,12 @@ public:
   /// RtecEventChannelAdmin::EventChannel Interface
 
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void);
+    for_suppliers ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index ce4067245dd..6df055746ff 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -46,11 +46,11 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void);
+      for_consumers ();
 
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void);
+      for_suppliers ();
 
   void get_state (FtRtecEventChannelAdmin::EventChannelState & s);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
index 2af1bb60584..df517e027b1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
@@ -23,7 +23,7 @@ class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory
 {
 public:
     /// Constructor
-  TAO_FTEC_Basic_Factory (void);
+  TAO_FTEC_Basic_Factory ();
   virtual TAO_EC_ConsumerAdmin*
       create_consumer_admin (TAO_EC_Event_Channel_Base*);
   virtual TAO_EC_SupplierAdmin*
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index a2715144718..a3e7005a425 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -38,7 +38,7 @@ public:
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
   void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index 9e90fabda7e..3f628c1aef3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -38,9 +38,9 @@ public:
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
-  virtual void disconnect_push_supplier (void);
-  virtual void suspend_connection (void);
-  virtual void resume_connection (void);
+  virtual void disconnect_push_supplier ();
+  virtual void suspend_connection ();
+  virtual void resume_connection ();
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index ec5d82947ef..e6903983dfa 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -57,12 +57,12 @@ public:
   TAO_FTEC_SupplierAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_FTEC_SupplierAdmin (void);
+  virtual ~TAO_FTEC_SupplierAdmin ();
 
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void);
+      obtain_push_consumer ();
 
   void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index a2734de4911..61c8466e3ca 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -38,7 +38,7 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 typename FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::ProxyInterface_ptr
-FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
+FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy ()
 {
   CORBA::Any_var any = Request_Context_Repository().get_cached_result();
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
index 321a9cf12ec..1139e6aba01 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -31,7 +31,7 @@ public:
   FT_ProxyAdmin(EC_PROXY_ADMIN* admin,
               PortableServer::POA_var poa);
 
-  ProxyInterface_ptr obtain_proxy (void);
+  ProxyInterface_ptr obtain_proxy ();
 
   /// this is used for updating the state
   void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
index 7c710ced244..9cc00e07e80 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -26,9 +26,9 @@ public:
   ForwardCtrlServerInterceptor();
   ~ForwardCtrlServerInterceptor();
 
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 3d239d3d4f4..b114e41ded6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -52,9 +52,9 @@ public:
   ~FtEventServiceInterceptor();
 
   static FtEventServiceInterceptor* instance();
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 8835c3a1bce..278683fe287 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -25,15 +25,15 @@ public:
 
   virtual void start_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void create_group (void);
+  virtual void create_group ();
 
   virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void add_member (void);
+  virtual void add_member ();
 
   virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void set_state (void);
+  virtual void set_state ();
 
   virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder);
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index 962232eeb7c..b541ee3dd86 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -43,7 +43,7 @@ namespace FTRTEC
     /**
      * Used for checking if the incoming replication message is out of sequence.
      */
-    void check_validity(void);
+    void check_validity();
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
       (const FtRtecEventChannelAdmin::ObjectId&);
@@ -64,9 +64,9 @@ namespace FTRTEC
     void add_member(const FTRT::ManagerInfo & info,
                     CORBA::ULong object_group_ref_version);
 
-    int  acquire_read (void);
-    int  acquire_write (void);
-    int  release (void);
+    int  acquire_read ();
+    int  acquire_write ();
+    int  release ();
 
     int threads() const;
   };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index ca15f2614cf..abca6dd0cfc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -35,7 +35,7 @@ public:
    * used for basic replication strategy. It throws FTRT::OutOfSequence when the
    * incoming request is not valid.
    */
-    virtual void check_validity(void);
+    virtual void check_validity();
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
       (const FtRtecEventChannelAdmin::ObjectId&);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index f271278148e..6fbf24ee38e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -56,14 +56,14 @@ public:
 
   void generate_object_id(FtRtecEventChannelAdmin::ObjectId& object_id);
   void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id);
-  FtRtecEventChannelAdmin::ObjectId_var get_object_id(void);
+  FtRtecEventChannelAdmin::ObjectId_var get_object_id();
   FtRtecEventChannelAdmin::ObjectId_var
     get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri);
 
   void set_cached_result(PortableInterceptor::ServerRequestInfo_ptr ri,
                          const CORBA::Any& result);
 
-  CORBA::Any_ptr get_cached_result(void);
+  CORBA::Any_ptr get_cached_result();
   bool is_executed_request();
 
   void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri,
@@ -72,7 +72,7 @@ public:
   void set_sequence_number(FTRT::SequenceNumber);
   FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  FTRT::SequenceNumber get_sequence_number(void);
+  FTRT::SequenceNumber get_sequence_number();
 
   void set_ft_request_service_context(
     PortableInterceptor::ServerRequestInfo_ptr ri,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index 569bc0bd463..554426a3701 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -44,10 +44,10 @@ public:
   virtual ~TAO_Set_Update_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index f4dbc0c5313..36488e0bbc6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -32,16 +32,16 @@ namespace TAO_FTRTEC
           (PortableServer::POA_ptr poa);
 
       RtecEventChannelAdmin::EventChannel_ptr
-        _this(void);
+        _this();
 
       //= The RtecEventChannelAdmin::EventChannel methods
       virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-        for_consumers (void);
+        for_consumers ();
 
       virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-        for_suppliers (void);
+        for_suppliers ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
 
       virtual RtecEventChannelAdmin::Observer_Handle
         append_observer (RtecEventChannelAdmin::Observer_ptr observer);
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
index 5b0db8fcf91..4bd24ee4777 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
@@ -66,14 +66,14 @@ namespace TAO
                 int is_inside);
 
       /// Destructor.
-      ~Acceptor (void);
+      ~Acceptor ();
 
       /// @@ Helper method for the implementation repository, should go
       ///    away
       const ACE::HTBP::Addr& address () const;
 
       /// Returns the array of endpoints in this acceptor
-      const ACE::HTBP::Addr *endpoints (void);
+      const ACE::HTBP::Addr *endpoints ();
 
       typedef TAO_Strategy_Acceptor<Completion_Handler, ACE_SOCK_ACCEPTOR> BASE_ACCEPTOR;
       typedef Creation_Strategy<Completion_Handler> CREATION_STRATEGY;
@@ -97,7 +97,7 @@ namespace TAO
                                 int version_minor,
                                 const char *options = 0);
 
-      virtual int close (void);
+      virtual int close ();
 
       virtual int create_profile (const TAO::ObjectKey &object_key,
                                   TAO_MProfile &mprofile,
@@ -105,7 +105,7 @@ namespace TAO
 
       virtual int is_collocated (const TAO_Endpoint *endpoint);
 
-      virtual CORBA::ULong endpoint_count (void);
+      virtual CORBA::ULong endpoint_count ();
 
       virtual int object_key (IOP::TaggedProfile &profile,
                               TAO::ObjectKey &key);
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
index 2a57d9cd233..0f10f16345e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
@@ -58,7 +58,7 @@ namespace TAO
                           CORBA::Boolean = false);
 
       /// Destructor.
-      ~Completion_Handler (void);
+      ~Completion_Handler ();
 
       /// Called by the <Strategy_Acceptor> when the handler is completely
       /// connected. Argument is unused.
@@ -69,7 +69,7 @@ namespace TAO
        */
       virtual int handle_input (ACE_HANDLE);
 
-      virtual int resume_handler (void);
+      virtual int resume_handler ();
       virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
index 799dc586f49..8922faf363a 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
@@ -53,7 +53,7 @@ namespace TAO
       Connection_Handler (TAO_ORB_Core *orb_core);
 
       /// Destructor.
-      ~Connection_Handler (void);
+      ~Connection_Handler ();
 
       /// Called by the <Strategy_Acceptor> when the handler is completely
       /// connected.  Argument is unused.
@@ -85,8 +85,8 @@ namespace TAO
       //@{
       /** @name Event Handler overloads
        */
-      virtual int resume_handler (void);
-      virtual int close_connection (void);
+      virtual int resume_handler ();
+      virtual int close_connection ();
       virtual int handle_input (ACE_HANDLE);
       virtual int handle_output (ACE_HANDLE);
       virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -94,7 +94,7 @@ namespace TAO
       //@}
 
       /// Add ourselves to Cache.
-      int add_transport_to_cache (void);
+      int add_transport_to_cache ();
 
       /// Process the <listen_list>
       int process_listen_point_list (::HTIOP::ListenPointList &listen_list);
@@ -110,7 +110,7 @@ namespace TAO
       /**
        * @name TAO_Connection Handler overloads
        */
-      virtual int release_os_resources (void);
+      virtual int release_os_resources ();
       virtual int handle_write_ready (const ACE_Time_Value *timeout);
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index 456347e10e1..4c11caf7fa0 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -72,7 +72,7 @@ namespace TAO
       Connector (ACE::HTBP::Environment *ht_env);
 
       /// Destructor.
-      ~Connector (void);
+      ~Connector ();
 
       /// @}
 
@@ -81,7 +81,7 @@ namespace TAO
       /// Transport_Connector.h
       /// {@
       int open (TAO_ORB_Core *orb_core);
-      int close (void);
+      int close ();
 
       TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -102,7 +102,7 @@ namespace TAO
 
       /// More TAO_Connector methods, please check the documentation on
       /// Transport_Connector.h
-      virtual TAO_Profile *make_profile (void);
+      virtual TAO_Profile *make_profile ();
 
       /// Cancel the passed cvs handler from the connector
       /// Its not clear what it means to cancel in HTIOP, since there's no
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
index 8094f89ca66..dfb459d35d7 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
@@ -48,7 +48,7 @@ namespace TAO
       friend class TAO_SSLIOP_Profile;
 
       /// Default constructor.
-      Endpoint (void);
+      Endpoint ();
 
       /// Constructor.  This is the most efficient constructor since it
       /// does not require any address resolution processing.
@@ -67,24 +67,24 @@ namespace TAO
                 const char *htid);
 
       /// Destructor.
-      ~Endpoint (void);
+      ~Endpoint ();
 
       // = Implementation of abstract TAO_Endpoint methods.  See
       // Endpoint.h for their documentation.
 
-      virtual TAO_Endpoint *next (void);
+      virtual TAO_Endpoint *next ();
       virtual int addr_to_string (char *buffer, size_t length);
-      virtual void reset_hint (void);
+      virtual void reset_hint ();
 
       /// Makes a copy of <this>
-      virtual TAO_Endpoint *duplicate (void);
+      virtual TAO_Endpoint *duplicate ();
 
       /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
       /// endpoints are equivalent if their port and host are the same.
       CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
       /// Return a hash value for this object.
-      CORBA::ULong hash (void);
+      CORBA::ULong hash ();
 
       // Allocates memory and returns a copy of <this>
 
@@ -115,7 +115,7 @@ namespace TAO
       /// This object maintains ownership of this string.
       const char *htid (const char *h);
 
-      //Connection_Handler *&hint (void);
+      //Connection_Handler *&hint ();
       // Access to our <hint_>.
 
     private:
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
index d7d854ea193..8111e75da0c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
@@ -41,8 +41,8 @@ namespace TAO
     class HTIOP_Export Protocol_Factory : public TAO_Protocol_Factory
     {
     public:
-      Protocol_Factory (void);
-      virtual ~Protocol_Factory (void);
+      Protocol_Factory ();
+      virtual ~Protocol_Factory ();
 
       // = Service Configurator hooks.
       /// Dynamic linking hook
@@ -59,8 +59,8 @@ namespace TAO
       virtual char options_delimiter () const;
 
       // = Check Protocol_Factory.h for a description of these methods.
-      virtual TAO_Acceptor  *make_acceptor (void);
-      virtual TAO_Connector *make_connector  (void);
+      virtual TAO_Acceptor  *make_acceptor ();
+      virtual TAO_Connector *make_connector  ();
       virtual int requires_explicit_endpoint () const;
 
     private:
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
index 096f7769733..4fe2f1cb8e8 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -53,7 +53,7 @@ namespace TAO
       virtual char object_key_delimiter () const;
 
       /// Return the char string prefix.
-      static const char *prefix (void);
+      static const char *prefix ();
 
       /// Profile constructor, same as above except the object_key has
       /// already been marshaled.
@@ -76,7 +76,7 @@ namespace TAO
       Profile (TAO_ORB_Core *orb_core);
 
       /// Destructor is to be called only through <_decr_refcnt>.
-      ~Profile (void);
+      ~Profile ();
 
       /**
        * Return a string representation for this profile.
@@ -92,10 +92,10 @@ namespace TAO
        * encapsulation of a sequence of structs, each representing a
        * single endpoint.  Data format is specified in iiop_endpoins.pidl.
        */
-      virtual int encode_endpoints (void);
+      virtual int encode_endpoints ();
 
       /// Return pointer to the head of this profile's endpoints list.
-      virtual TAO_Endpoint *endpoint (void);
+      virtual TAO_Endpoint *endpoint ();
 
       /// Return how many endpoints this profile contains.
       virtual CORBA::ULong endpoint_count () const;
@@ -113,7 +113,7 @@ namespace TAO
     protected:
       /// Template methods. Please see Profile.h for the documentation.
       virtual int decode_profile (TAO_InputCDR &cdr);
-      virtual int decode_endpoints (void);
+      virtual int decode_endpoints ();
       virtual void parse_string_i (const char *string);
       virtual void create_profile_body (TAO_OutputCDR &cdr) const;
       virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
index 887a15d272b..647a19e5ea3 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -64,7 +64,7 @@ namespace TAO
                  TAO_ORB_Core *orb_core);
 
       /// Default destructor.
-      ~Transport (void);
+      ~Transport ();
 
     protected:
       /** @name Overridden Template Methods
@@ -73,8 +73,8 @@ namespace TAO
        * details.
        */
       //@{
-      virtual ACE_Event_Handler * event_handler_i (void);
-      virtual TAO_Connection_Handler * invalidate_event_handler_i (void);
+      virtual ACE_Event_Handler * event_handler_i ();
+      virtual TAO_Connection_Handler * invalidate_event_handler_i ();
 
       virtual ssize_t send (iovec *iov, int iovcnt,
                             size_t &bytes_transferred,
@@ -84,7 +84,7 @@ namespace TAO
                             size_t len,
                             const ACE_Time_Value *s = 0);
 
-      virtual int register_handler (void);
+      virtual int register_handler ();
 
 
     public:
@@ -105,7 +105,7 @@ namespace TAO
 
       virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
-      virtual TAO_Connection_Handler * connection_handler_i (void);
+      virtual TAO_Connection_Handler * connection_handler_i ();
 
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
index 592f64f9d89..d229c3442a3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -40,7 +40,7 @@ public:
   TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_AbstractInterfaceDef_i (void);
+  virtual ~TAO_AbstractInterfaceDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index 8c4da3ce878..2a0338413c8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -39,7 +39,7 @@ public:
   TAO_AliasDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_AliasDef_i (void);
+  virtual ~TAO_AliasDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
index a653c332502..bfaa2f3261d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_ArrayDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ArrayDef_i (void);
+  virtual ~TAO_ArrayDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
index bbb11c6e549..12e6029905e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_AttributeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_AttributeDef_i (void);
+  virtual ~TAO_AttributeDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
index 1ee5a6dbb29..580edb1b0c0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -42,7 +42,7 @@ class TAO_IFRService_Export TAO_ComponentContainer_i
 public:
   TAO_ComponentContainer_i (TAO_Repository_i *repo);
 
-  virtual ~TAO_ComponentContainer_i (void);
+  virtual ~TAO_ComponentContainer_i ();
 
   virtual CORBA::ComponentIR::ComponentDef_ptr create_component (
       const char *id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
index d7149023ae1..1a3d97d2c5f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_ComponentDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ComponentDef_i (void);
+  virtual ~TAO_ComponentDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
index 3a752807881..8a68ae611c9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_ComponentModuleDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ComponentModuleDef_i (void);
+  virtual ~TAO_ComponentModuleDef_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index fe780666b2f..5608424d62b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -60,11 +60,11 @@ public:
                              ACE_Configuration *config);
 
   /// Destructor.
-  virtual ~TAO_ComponentRepository_i (void);
+  virtual ~TAO_ComponentRepository_i ();
 
   /// We create a default servant servant for each IR Object
   /// type and its corresponding POA.
-  virtual int create_servants_and_poas (void);
+  virtual int create_servants_and_poas ();
 
   /// Return one of our servants for internal use.
   virtual TAO_IDLType_i *select_idltype (CORBA::DefinitionKind def_kind) const;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
index 5268dffa24a..93d592e3e23 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
@@ -42,32 +42,32 @@ public:
     TAO_ConstantDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ConstantDef_i (void);
+  virtual ~TAO_ConstantDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
-  CORBA::TypeCode_ptr type_i (void);
+  CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::IDLType_ptr type_def (void);
+  virtual CORBA::IDLType_ptr type_def ();
 
-  CORBA::IDLType_ptr type_def_i (void);
+  CORBA::IDLType_ptr type_def_i ();
 
   virtual void type_def (CORBA::IDLType_ptr type_def);
 
   void type_def_i (CORBA::IDLType_ptr type_def);
 
-  virtual CORBA::Any *value (void);
+  virtual CORBA::Any *value ();
 
-  CORBA::Any *value_i (void);
+  CORBA::Any *value_i ();
 
   virtual void value (const CORBA::Any &value);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
index 1fc8dee5386..53b46eafed5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -41,10 +41,10 @@ public:
     TAO_ConsumesDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ConsumesDef_i (void);
+  virtual ~TAO_ConsumesDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
index d3c07d80c08..85dc614ab9f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -44,7 +44,7 @@ public:
   TAO_Contained_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_Contained_i (void);
+  virtual ~TAO_Contained_i ();
 
   /// Remove the repository entry.
   virtual void destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index 52bdaaba2be..8277b00c6f0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -50,7 +50,7 @@ public:
   TAO_Container_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_Container_i (void);
+  virtual ~TAO_Container_i ();
 
   /// Remove our contents.
   virtual void destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
index f083df51766..cbf271df231 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -41,7 +41,7 @@ public:
     TAO_EmitsDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_EmitsDef_i (void);
+  virtual ~TAO_EmitsDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
index 191eb294328..e3e5abaf48e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -39,20 +39,20 @@ public:
   TAO_EnumDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_EnumDef_i (void);
+  virtual ~TAO_EnumDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (void);
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::EnumMemberSeq *members (void);
+  virtual CORBA::EnumMemberSeq *members ();
 
-  CORBA::EnumMemberSeq *members_i (void);
+  CORBA::EnumMemberSeq *members_i ();
 
   virtual void members (const CORBA::EnumMemberSeq &members);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
index a26db003ccf..4df1ebfb039 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
@@ -44,7 +44,7 @@ public:
     TAO_EventDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_EventDef_i (void);
+  virtual ~TAO_EventDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
index ac4e23933d0..41922082a7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -43,11 +43,11 @@ public:
   TAO_EventPortDef_i (TAO_Repository_i *repo);
 
   //// Destructor
-  virtual ~TAO_EventPortDef_i (void);
+  virtual ~TAO_EventPortDef_i ();
 
-  virtual CORBA::ComponentIR::EventDef_ptr event (void);
+  virtual CORBA::ComponentIR::EventDef_ptr event ();
 
-  CORBA::ComponentIR::EventDef_ptr event_i (void);
+  CORBA::ComponentIR::EventDef_ptr event_i ();
 
   virtual void event (CORBA::ComponentIR::EventDef_ptr event);
 
@@ -61,15 +61,15 @@ public:
   /// implemented here.
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
 private:
   /// Dummy method so we can consolidate derived class methods
   /// in this 'abstract' base class.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
index 8ec38e961f6..f9558682b20 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_ExceptionDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExceptionDef_i (void);
+  virtual ~TAO_ExceptionDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
index 22cfa105ce6..f62d6660d92 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -44,9 +44,9 @@ public:
   TAO_ExtAbstractInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtAbstractInterfaceDef_i (void);
+  virtual ~TAO_ExtAbstractInterfaceDef_i ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
index 2472d2ce821..979310f36e4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -40,19 +40,19 @@ public:
   TAO_ExtAttributeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtAttributeDef_i (void);
+  virtual ~TAO_ExtAttributeDef_i ();
 
-  virtual CORBA::ExcDescriptionSeq *get_exceptions (void);
+  virtual CORBA::ExcDescriptionSeq *get_exceptions ();
 
-  CORBA::ExcDescriptionSeq *get_exceptions_i (void);
+  CORBA::ExcDescriptionSeq *get_exceptions_i ();
 
   virtual void get_exceptions (const CORBA::ExcDescriptionSeq &get_exceptions);
 
   void get_exceptions_i (const CORBA::ExcDescriptionSeq &get_exceptions);
 
-  virtual CORBA::ExcDescriptionSeq *set_exceptions (void);
+  virtual CORBA::ExcDescriptionSeq *set_exceptions ();
 
-  CORBA::ExcDescriptionSeq *set_exceptions_i (void);
+  CORBA::ExcDescriptionSeq *set_exceptions_i ();
 
   virtual void set_exceptions (
       const CORBA::ExcDescriptionSeq &set_exceptions);
@@ -60,9 +60,9 @@ public:
   void set_exceptions_i (
       const CORBA::ExcDescriptionSeq &set_exceptions);
 
-  virtual CORBA::ExtAttributeDescription *describe_attribute (void);
+  virtual CORBA::ExtAttributeDescription *describe_attribute ();
 
-  CORBA::ExtAttributeDescription *describe_attribute_i (void);
+  CORBA::ExtAttributeDescription *describe_attribute_i ();
 
   // Utility function that fills sequence elements for a
   // ComponentDescription.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
index 9469e0c6327..92348b91375 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
@@ -47,7 +47,7 @@ public:
   TAO_ExtInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtInterfaceDef_i (void);
+  virtual ~TAO_ExtInterfaceDef_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
index 813fea9382e..28001d8b896 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
@@ -46,7 +46,7 @@ public:
   TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtLocalInterfaceDef_i (void);
+  virtual ~TAO_ExtLocalInterfaceDef_i ();
 
   virtual void destroy ();
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
index a1f381abbe5..f647c198a61 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_ExtValueDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtValueDef_i (void);
+  virtual ~TAO_ExtValueDef_i ();
 
   virtual CORBA::ExtInitializerSeq *ext_initializers ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
index 39dfd6aaaf2..c2b5c2ee8b1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_FactoryDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_FactoryDef_i (void);
+  virtual ~TAO_FactoryDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (    );
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
index f6296e13b07..4223e06b116 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_FinderDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_FinderDef_i (void);
+  virtual ~TAO_FinderDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
index af08c6e6d21..ada6a483f7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_FixedDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_FixedDef_i (void);
+  virtual ~TAO_FixedDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index 62ac705efae..57def2880f6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -46,39 +46,39 @@ public:
   TAO_HomeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_HomeDef_i (void);
+  virtual ~TAO_HomeDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual void destroy_i (void);
+  virtual void destroy_i ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (void);
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::ComponentIR::HomeDef_ptr base_home (void);
+  virtual CORBA::ComponentIR::HomeDef_ptr base_home ();
 
-  CORBA::ComponentIR::HomeDef_ptr base_home_i (void);
+  CORBA::ComponentIR::HomeDef_ptr base_home_i ();
 
   virtual void base_home (CORBA::ComponentIR::HomeDef_ptr base_home);
 
   void base_home_i (CORBA::ComponentIR::HomeDef_ptr base_home);
 
-  virtual CORBA::InterfaceDefSeq *supported_interfaces (void);
+  virtual CORBA::InterfaceDefSeq *supported_interfaces ();
 
-  CORBA::InterfaceDefSeq *supported_interfaces_i (void);
+  CORBA::InterfaceDefSeq *supported_interfaces_i ();
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces);
@@ -86,9 +86,9 @@ public:
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces);
 
-  virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (void);
+  virtual CORBA::ComponentIR::ComponentDef_ptr managed_component ();
 
-  CORBA::ComponentIR::ComponentDef_ptr managed_component_i (void);
+  CORBA::ComponentIR::ComponentDef_ptr managed_component_i ();
 
   virtual void managed_component (
       CORBA::ComponentIR::ComponentDef_ptr managed_component);
@@ -96,9 +96,9 @@ public:
   void managed_component_i (
       CORBA::ComponentIR::ComponentDef_ptr managed_component);
 
-  virtual CORBA::ValueDef_ptr primary_key (void);
+  virtual CORBA::ValueDef_ptr primary_key ();
 
-  CORBA::ValueDef_ptr primary_key_i (void);
+  CORBA::ValueDef_ptr primary_key_i ();
 
   virtual void primary_key (CORBA::ValueDef_ptr primary_key);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
index 85d58bb7496..dc01b97941c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
@@ -46,7 +46,7 @@ public:
   TAO_IDLType_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_IDLType_i (void);
+  virtual ~TAO_IDLType_i ();
   /// Defined in concrete classes.
   virtual CORBA::TypeCode_ptr type () = 0;
   /// Defined in concrete classes.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index 5ecd8df21b4..44dd965e51a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -31,10 +31,10 @@ class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader
 {
 public:
   // Constructor
-  TAO_IFR_Service_Loader (void);
+  TAO_IFR_Service_Loader ();
 
   // Destructor
-  ~TAO_IFR_Service_Loader (void);
+  ~TAO_IFR_Service_Loader ();
 
   // Called by the Service Configurator framework to initialize the
   // Event Service. Defined in <ace/Service_Config.h>
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index 3f1c8b891e3..2f7aa6950e4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -39,7 +39,7 @@ class TAO_Contained_i;
 class TAO_IFRService_Export TAO_IFR_Server
 {
 public:
-  TAO_IFR_Server (void);
+  TAO_IFR_Server ();
 
   /// Initialize the IFR Service with the command line arguments and
   /// the ORB.
@@ -56,24 +56,24 @@ public:
                      int use_multicast_server = 0);
 
   /// Destroy the child POA created in init_with_poa().
-  int fini (void);
+  int fini ();
 
   /// Destructor.
-  ~TAO_IFR_Server (void);
+  ~TAO_IFR_Server ();
 
 protected:
   /// Two persistent POAs, one using a servant locator.
-  int create_poa (void);
+  int create_poa ();
 
   /// Open an ACE_Configuration of the appropriate type.
-  int open_config (void);
+  int open_config ();
 
   /// Create and initialize the repository.
-  int create_repository (void);
+  int create_repository ();
 
   /// Enable the Interface Repository to answer multicast requests
   /// for its IOR.
-  int init_multicast_server (void);
+  int init_multicast_server ();
 
   /// Reference to our ORB.
   CORBA::ORB_var orb_;
@@ -97,9 +97,9 @@ protected:
 class TAO_IFR_Service_Utils
 {
 public:
-  TAO_IFR_Service_Utils (void);
+  TAO_IFR_Service_Utils ();
 
-  ~TAO_IFR_Service_Utils (void);
+  ~TAO_IFR_Service_Utils ();
 
   typedef int (*name_clash_checker)(const char *);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index 9fd8d8213c6..36288e8fdbb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -50,7 +50,7 @@ public:
   TAO_IRObject_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_IRObject_i (void);
+  virtual ~TAO_IRObject_i ();
 
   virtual CORBA::DefinitionKind def_kind ();
 
@@ -65,7 +65,7 @@ public:
 
 protected:
   /// Set our key from the object ID via POACurrent.
-  void update_key (void);
+  void update_key ();
 
 protected:
   /// Pointer to the repository we were constructed from.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
index c92ad55b94b..50f7046b234 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
@@ -42,14 +42,14 @@ public:
   TAO_InterfaceAttrExtension_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_InterfaceAttrExtension_i (void);
+  virtual ~TAO_InterfaceAttrExtension_i ();
 
   virtual
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-  describe_ext_interface (void);
+  describe_ext_interface ();
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-  describe_ext_interface_i (void);
+  describe_ext_interface_i ();
 
   virtual CORBA::ExtAttributeDef_ptr create_ext_attribute (
       const char *id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
index 07e5ee76451..e9e0722422b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -47,30 +47,30 @@ public:
   TAO_InterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_InterfaceDef_i (void);
+  virtual ~TAO_InterfaceDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual void destroy_i (void);
+  virtual void destroy_i ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (void);
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::InterfaceDefSeq *base_interfaces (void);
+  virtual CORBA::InterfaceDefSeq *base_interfaces ();
 
-  CORBA::InterfaceDefSeq *base_interfaces_i (void);
+  CORBA::InterfaceDefSeq *base_interfaces_i ();
 
   virtual void base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces);
 
@@ -82,7 +82,7 @@ public:
 
   virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface ();
 
-  CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (void);
+  CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i ();
 
   virtual CORBA::AttributeDef_ptr create_attribute (
       const char *id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
index 6c9761888de..7f65fdc93d0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -43,10 +43,10 @@ public:
   TAO_LocalInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_LocalInterfaceDef_i (void);
+  virtual ~TAO_LocalInterfaceDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   virtual CORBA::Boolean is_a (const char *interface_id);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
index d00eee81180..42a2e0e7c33 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -46,7 +46,7 @@ public:
   TAO_ModuleDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ModuleDef_i (void);
+  virtual ~TAO_ModuleDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index ed999dd2313..29c266b4c7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -39,7 +39,7 @@ public:
   TAO_NativeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_NativeDef_i (void);
+  virtual ~TAO_NativeDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index 4d212255693..4122ecd1ba7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_OperationDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_OperationDef_i (void);
+  virtual ~TAO_OperationDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
@@ -104,7 +104,7 @@ public:
 
   void make_description (CORBA::OperationDescription &desc);
 
-  CORBA::TypeCode_ptr type_i (void);
+  CORBA::TypeCode_ptr type_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
index 4fcd2a8a564..7f02e77681a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_PrimitiveDef_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_PrimitiveDef_i (void);
+  virtual ~TAO_PrimitiveDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index 322ed19661a..57b239b6db5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -42,7 +42,7 @@ public:
     TAO_ProvidesDef_i (TAO_Repository_i *repoy);
 
   /// Destructor
-  virtual ~TAO_ProvidesDef_i (void);
+  virtual ~TAO_ProvidesDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index a7c90886f93..dcd09899479 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -40,7 +40,7 @@ public:
     TAO_PublishesDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_PublishesDef_i (void);
+  virtual ~TAO_PublishesDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 54be900c98c..ea198eb3f08 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -76,7 +76,7 @@ public:
                     PortableServer::POA_ptr poa,
                     ACE_Configuration *config);
 
-  virtual ~TAO_Repository_i (void);
+  virtual ~TAO_Repository_i ();
 
   /// Accessor for the readonly attribute.
   virtual CORBA::DefinitionKind def_kind ();
@@ -134,10 +134,10 @@ public:
 
   /// We create a default servant servant for each IR Object
   /// type and its corresponding POA.
-  virtual int create_servants_and_poas (void);
+  virtual int create_servants_and_poas ();
 
   /// Create the top-level ACE_Configuration sections.
-  int create_sections (void);
+  int create_sections ();
 
   /// Return one of our servants for internal use.
   virtual TAO_IDLType_i *select_idltype (
@@ -200,7 +200,7 @@ public:
    * destroy() method of the last thing to be destroyed
    * by the test code.
    */
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   /// Reference to our ORB.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
index a444fecd5e9..7ada0df65d6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_SequenceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_SequenceDef_i (void);
+  virtual ~TAO_SequenceDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
index f6f3f9547cd..1c279a30a75 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_StringDef_i (TAO_Repository_i *repoy);
 
   /// Destructor.
-  virtual ~TAO_StringDef_i (void);
+  virtual ~TAO_StringDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
index 3f5c7bdd865..bea3e384469 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_StructDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_StructDef_i (void);
+  virtual ~TAO_StructDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
index c1de5d76f7e..59791162862 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -45,7 +45,7 @@ public:
   TAO_TypedefDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_TypedefDef_i (void);
+  virtual ~TAO_TypedefDef_i ();
 
   /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index 8361d300531..6905e058310 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_UnionDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_UnionDef_i (void);
+  virtual ~TAO_UnionDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
index 7b3947e2196..0ed3020fac6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
@@ -43,7 +43,7 @@ public:
     TAO_UsesDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_UsesDef_i (void);
+  virtual ~TAO_UsesDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
index 3bfb1ad0be0..df2a4089f55 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -40,7 +40,7 @@ public:
   TAO_ValueBoxDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ValueBoxDef_i (void);
+  virtual ~TAO_ValueBoxDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
index 55941ca3b18..86f155f465c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -46,7 +46,7 @@ public:
   TAO_ValueDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ValueDef_i (void);
+  virtual ~TAO_ValueDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
index 76b2f62b9ce..92e031318bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_ValueMemberDef_i (TAO_Repository_i *repoy);
 
   /// Destructor
-  virtual ~TAO_ValueMemberDef_i (void);
+  virtual ~TAO_ValueMemberDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
index 0e41a13bb3e..2755a5ec325 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_WstringDef_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_WstringDef_i (void);
+  virtual ~TAO_WstringDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index b077f2c05ef..bb42f9e451d 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -45,7 +45,7 @@ class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  TAO_IOR_Multicast (void);
+  TAO_IOR_Multicast ();
 
   /// Constructor taking the ior of the service.
   TAO_IOR_Multicast (const char *ior,
@@ -66,7 +66,7 @@ public:
             TAO_Service_ID service_id);
 
   /// Destructor.
-  virtual ~TAO_IOR_Multicast (void);
+  virtual ~TAO_IOR_Multicast ();
 
   /// Callback when input is received on the handle.
   virtual int handle_input (ACE_HANDLE n);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index bf350e62991..fe2d1fe8b7f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -78,7 +78,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~TAO_LB_CPU_Load_Average_Monitor (void);
+  ~TAO_LB_CPU_Load_Average_Monitor ();
 
 private:
   /// The name of the location at which this LoadMonitor resides.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index e0c97f22a96..ecc76293e87 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -75,7 +75,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~TAO_LB_CPU_Utilization_Monitor (void);
+  ~TAO_LB_CPU_Utilization_Monitor ();
 
 private:
   /// The name of the location at which this LoadMonitor resides.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 1786f209790..a9dbb38b525 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -48,7 +48,7 @@ public:
 
 protected:
   /// Register the LB_ClientComponent's ORBInitializer.
-  int register_orb_initializer (void);
+  int register_orb_initializer ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 1a3ad48e1ed..d8993eab02c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -65,9 +65,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index a82d675db16..00d4a388a41 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -68,10 +68,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -92,7 +92,7 @@ public:
 
 private:
   /// Create and register the LoadAlert object with the LoadManager.
-  void register_load_alert (void);
+  void register_load_alert ();
 
 private:
   /// List of stringified object group references.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index a1c56aaee6e..e536d120e14 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -84,7 +84,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -113,7 +113,7 @@ public:
 
 protected:
   /// Destructor.
-  ~TAO_LB_LeastLoaded (void);
+  ~TAO_LB_LeastLoaded ();
 
   /// Retrieve the least loaded location from the given list of
   /// locations.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index 6d0dcad26d8..703189fe58d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -29,7 +29,7 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert
 {
 public:
   /// Constructor.
-  TAO_LB_LoadAlert (void);
+  TAO_LB_LoadAlert ();
 
   /**
    * @name CosLoadBalancing::LoadAlert Methods
@@ -39,10 +39,10 @@ public:
   //@{
   /// Forward requests back to the load manager via the object group
   /// reference.
-  virtual void enable_alert (void);
+  virtual void enable_alert ();
 
   /// Stop forwarding requests, and begin accepting them again.
-  virtual void disable_alert (void);
+  virtual void disable_alert ();
 
   //@}
 
@@ -56,7 +56,7 @@ public:
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  virtual ~TAO_LB_LoadAlert (void);
+  virtual ~TAO_LB_LoadAlert ();
 
 private:
   /// Has this LoadAlert servant been alerted of a high load condition
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 4dec5ef7044..bec4e72c38c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -34,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 struct TAO_LB_LoadAlertInfo
 {
   /// Constructor.
-  TAO_LB_LoadAlertInfo (void);
+  TAO_LB_LoadAlertInfo ();
 
   /// Reference to the LoadAlert object.
   CosLoadBalancing::LoadAlert_var load_alert;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index a35561a416b..3be5fba7503 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -40,18 +40,18 @@ class TAO_LB_LoadAlert_Handler
   : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler
 {
 public:
-  virtual void enable_alert (void);
+  virtual void enable_alert ();
 
   virtual void enable_alert_excep (::Messaging::ExceptionHolder *);
 
-  virtual void disable_alert (void);
+  virtual void disable_alert ();
 
   virtual void disable_alert_excep (::Messaging::ExceptionHolder *);
 
 protected:
   /// Protected destructor to enforce propery memory management
   /// through reference counting.
-  ~TAO_LB_LoadAlert_Handler (void);
+  ~TAO_LB_LoadAlert_Handler ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 1013d609f8d..ef105405869 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -66,7 +66,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -96,7 +96,7 @@ public:
 
 protected:
   /// Destructor.
-  ~TAO_LB_LoadAverage (void);
+  ~TAO_LB_LoadAverage ();
 
   /// Return the effective load.
   CORBA::Float effective_load (CORBA::Float previous_load,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index fd862cb98c7..0cbbbbc399b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -271,7 +271,7 @@ protected:
    * Destructor is protected to enforce correct memory management
    * through reference counting.
    */
-  ~TAO_LB_LoadManager (void);
+  ~TAO_LB_LoadManager ();
 
 private:
   /// Extract the value of the InitialNumberReplicas property from
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index ab40cf82301..7e5c3d24ebc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -85,7 +85,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -114,7 +114,7 @@ public:
 
 protected:
   /// Destructor.
-  ~TAO_LB_LoadMinimum (void);
+  ~TAO_LB_LoadMinimum ();
 
   /// Retrieve the least loaded location from the given list of
   /// locations.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 88168ce7e6e..2d2d522a8ce 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -58,7 +58,7 @@ class TAO_LB_ObjectReferenceFactory
     CORBA::ORB_ptr orb,
     CosLoadBalancing::LoadManager_ptr lm);
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   /**
    * @name PortableInterceptor::ObjectReferenceFactory Methods
@@ -88,7 +88,7 @@ protected:
    * Protected destructor to enforce proper memory management via
    * reference counting.
    */
-  ~TAO_LB_ObjectReferenceFactory (void);
+  ~TAO_LB_ObjectReferenceFactory ();
 
   /// Retrieve the object group reference for objects with the given
   /// RepositoryId.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
index fe9337e0c91..088e39ddff3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
@@ -42,7 +42,7 @@ class TAO_LB_Pull_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor
-  TAO_LB_Pull_Handler (void);
+  TAO_LB_Pull_Handler ();
 
   /// Receive the timeout event.
   virtual int handle_timeout (const ACE_Time_Value &current_time,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index 12dc31cc68b..58347a989c5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -11,7 +11,7 @@ static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern "C" void tao_lb_random_init_routine (void)
+extern "C" void tao_lb_random_init_routine ()
 {
   ACE_OS::srand (static_cast<unsigned int> (ACE_OS::time ()));
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index 6cb33d83633..ccc507c06fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -47,7 +47,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -84,7 +84,7 @@ public:
    * If supported by the platform, initialization code will only run
    * once for a given process.
    */
-  static void init (void);
+  static void init ();
 
 private:
   /// This servant's default POA.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index 0e4996392a0..9099508075e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -49,7 +49,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -76,7 +76,7 @@ public:
 
 protected:
   /// Destructor
-  ~TAO_LB_RoundRobin (void);
+  ~TAO_LB_RoundRobin ();
 
 private:
   /// Keep a copy of location list for verify if the list is changed
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index a3ad143d70b..e51b7e46121 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -60,9 +60,9 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -86,7 +86,7 @@ protected:
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  ~TAO_LB_ServerRequestInterceptor (void);
+  ~TAO_LB_ServerRequestInterceptor ();
 
 private:
   TAO_LB_LoadAlert & load_alert_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 46be5ab995a..5e8f0cbf381 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -64,7 +64,7 @@ public:
   virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
-  void destroy (void);
+  void destroy ();
 
 protected:
   /// Destructor.
@@ -72,7 +72,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~TAO_BasicLog_i (void);
+  ~TAO_BasicLog_i ();
 
 private:
   /// POA.
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index 86e3df16529..e6a88ae9fb8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -57,14 +57,14 @@ public:
   TAO_Event_LogConsumer (TAO_EventLog_i *log);
 
   /// Destructor.
-  ~TAO_Event_LogConsumer (void);
+  ~TAO_Event_LogConsumer ();
 
   /// Connect to EventLog.
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index 885363c084a..e64ea0128b8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -53,7 +53,7 @@ public:
   //= Initialization and termination code.
 
   /// Constructor.
-  TAO_EventLogFactory_i (void);
+  TAO_EventLogFactory_i ();
 
   /// Destructor.
   ~TAO_EventLogFactory_i ();
@@ -82,9 +82,9 @@ public:
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds);
 
   // = Implementation of the CosEventChannelAdmin::ConsumerAdmin methods.
-  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void);
+  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ();
 
-  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void);
+  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ();
 
 protected:
   virtual CORBA::RepositoryId create_repositoryid ();
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index 0a8c449c875..83dc3d14912 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -49,10 +49,10 @@ public:
   TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr);
 
   /// Destructor.
-  ~TAO_EventLogNotification (void);
+  ~TAO_EventLogNotification ();
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 protected:
   /// Used to connect this PushSupplier to the EventChannel
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 0c759a05278..54c1b6c0b66 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -73,18 +73,18 @@ public:
 
   /// Destroy the log object and all contained records.
   void
-  destroy (void);
+  destroy ();
 
   /// Activate the EventLog.
   void
-  activate (void);
+  activate ();
 
   // = The CosEventChannelAdmin::EventChannel interface methods.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (void);
+  for_consumers ();
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (void);
+  for_suppliers ();
 
 protected:
   /// Destructor
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
index 52daecf8ba0..6592d43e014 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
@@ -52,7 +52,7 @@ public:
                        CORBA::ULong max_rec_list_len);
 
   /// Destructor.
-  virtual ~TAO_Hash_Iterator_i (void);
+  virtual ~TAO_Hash_Iterator_i ();
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index 620ffc0f3fb..c9fd471bb60 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -68,13 +68,13 @@ public:
                            const DsLogAdmin::CapacityAlarmThresholdList* thresholds);
 
   /// Destructor.
-  virtual ~TAO_Hash_LogRecordStore (void);
+  virtual ~TAO_Hash_LogRecordStore ();
 
   /// Initialization.
-  virtual int open (void);
+  virtual int open ();
 
   /// Close the record store.
-  virtual int close (void);
+  virtual int close ();
 
 
   // = Log Parameters
@@ -135,7 +135,7 @@ public:
   virtual void set_max_size (CORBA::ULongLong size);
 
   /// Get the weekly scheduling parameters
-  virtual DsLogAdmin::WeekMask* get_week_mask (void);
+  virtual DsLogAdmin::WeekMask* get_week_mask ();
 
   /// Set the weekly scheduling parameters.
   virtual void set_week_mask (const DsLogAdmin::WeekMask & masks);
@@ -143,20 +143,20 @@ public:
   // = LogRecordStore status methods
 
   /// Gets the current size of the log data.
-  virtual CORBA::ULongLong get_current_size (void);
+  virtual CORBA::ULongLong get_current_size ();
 
   /// Get the number of records in the log right now.
-  virtual CORBA::ULongLong get_n_records (void);
+  virtual CORBA::ULongLong get_n_records ();
 
 
   // = LogRecordStore gauge
 
   /// Gets the current value of the "gauge" that measures the total
   /// size of the records written to the log.
-  virtual CORBA::ULongLong get_gauge(void);
+  virtual CORBA::ULongLong get_gauge();
 
   /// Resets the "gauge" to 0
-  virtual void reset_gauge(void);
+  virtual void reset_gauge();
 
   // = Record logging, retrieval, update and removal methods.
 
@@ -165,7 +165,7 @@ public:
   virtual int log (const DsLogAdmin::LogRecord &rec);
 
   /// Deletes "old" records from the store.
-  virtual int purge_old_records (void);
+  virtual int purge_old_records ();
 
   /// Set single record attributes.
   virtual void
@@ -186,7 +186,7 @@ public:
 
   /// Ensure changes have been flushed to persistent media
   /// Returns 0 on success, -1 on failure.
-  virtual int flush (void);
+  virtual int flush ();
 
   /// Returns all records in the log that match the given constraint
   /// <c>.
@@ -214,7 +214,7 @@ public:
   virtual CORBA::ULong
     delete_records_by_id (const DsLogAdmin::RecordIdList & ids);
 
-  virtual CORBA::ULong remove_old_records (void);
+  virtual CORBA::ULong remove_old_records ();
 
   /// Read-Write Lock
   virtual ACE_SYNCH_RW_MUTEX& lock();
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index a5b15400e25..bf0c9028696 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -49,11 +49,11 @@ public:
 
   /// Lists all logs created by the log factory.
   virtual DsLogAdmin::LogList *
-    list_logs (void);
+    list_logs ();
 
   /// Lists all log ids.
   virtual DsLogAdmin::LogIdList *
-    list_logs_by_id (void);
+    list_logs_by_id ();
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 7e4882d8d0b..063318f6f5d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -48,14 +48,14 @@ public:
   TAO_Iterator_i (PortableServer::POA_ptr poa, ACE_Reactor* reactor);
 
   /// Destructor.
-  virtual ~TAO_Iterator_i (void);
+  virtual ~TAO_Iterator_i ();
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
                                        CORBA::ULong how_many) = 0;
 
   /// This destroys the iterator.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   /// POA
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index cd3f112fe4f..fe3e5e8df33 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -47,11 +47,11 @@ public:
 
   /// Lists all log object references.
   DsLogAdmin::LogList *
-    list_logs (void);
+    list_logs ();
 
   /// Lists all log ids.
   DsLogAdmin::LogIdList *
-    list_logs_by_id (void);
+    list_logs_by_id ();
 
   /// Returns a reference to the log with the supplied id.
   DsLogAdmin::Log_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index 819a27257f6..0f0979fad60 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -39,10 +39,10 @@ class TAO_Log_Serv_Export TAO_LogNotification
 {
 public:
   /// Constructor.
-  TAO_LogNotification (void);
+  TAO_LogNotification ();
 
   /// Destructor.
-  virtual ~TAO_LogNotification (void);
+  virtual ~TAO_LogNotification ();
 
   /// Event generated when a new log is created.
   void object_creation (DsLogAdmin::LogId id);
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index b942044cf4a..01440540acb 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -37,7 +37,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 {
 public:
   /// Destructor.
-  virtual ~TAO_LogRecordStore (void);
+  virtual ~TAO_LogRecordStore ();
 
   /// Initialization.
   virtual int open (void) = 0;
@@ -214,7 +214,7 @@ public:
 
 protected:
   /// Constructor.
-  TAO_LogRecordStore (void);
+  TAO_LogRecordStore ();
 
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index d6be0963003..ea7cccc3547 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -46,7 +46,7 @@ public:
   TAO_Log_Constraint_Interpreter (const char* constraints);
 
   /// Destructor.
-  ~TAO_Log_Constraint_Interpreter (void);
+  ~TAO_Log_Constraint_Interpreter ();
 
   /// Returns true if the constraint is evaluated successfully by
   /// the evaluator.
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 5ae33dc3a19..35adee9ef1a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -58,7 +58,7 @@ public:
   ~TAO_Log_i ();
 
   /// Initlialize the Log.
-  void init (void);
+  void init ();
 
   /**
    * @name DsLogAdmin::Log Methods
@@ -67,21 +67,21 @@ public:
    */
   //@{
   /// Return the factory of the log.
-  DsLogAdmin::LogMgr_ptr my_factory (void);
+  DsLogAdmin::LogMgr_ptr my_factory ();
 
   /// Return the id of the log.
-  DsLogAdmin::LogId id (void);
+  DsLogAdmin::LogId id ();
 
   /// Get the list of the QoS properties supported by the log.
   DsLogAdmin::QoSList*
-  get_log_qos (void);
+  get_log_qos ();
 
   /// Set the list of the QoS properties supported by the log.
   void set_log_qos (const DsLogAdmin::QoSList & qos);
 
   /// Get the record life in seconds (0 infinite).
   CORBA::ULong
-  get_max_record_life (void);
+  get_max_record_life ();
 
   /// Set the record life in seconds (0 infinite).
   void
@@ -89,7 +89,7 @@ public:
 
   /// Get the maximum size in octets.
   CORBA::ULongLong
-  get_max_size (void);
+  get_max_size ();
 
   /// Set the maximum size in octets.
   void
@@ -97,15 +97,15 @@ public:
 
   /// Get the current size of the log in octets.
   CORBA::ULongLong
-  get_current_size (void);
+  get_current_size ();
 
   /// Return the number of records in the log.
   CORBA::ULongLong
-  get_n_records (void);
+  get_n_records ();
 
   /// Get the action to be taken when the log reaches its maximum size.
   DsLogAdmin::LogFullActionType
-  get_log_full_action (void);
+  get_log_full_action ();
 
   /// Set the action to be taken when the log reaches its maximum size.
   void
@@ -113,7 +113,7 @@ public:
 
   /// Get the administrative state of the log.
   DsLogAdmin::AdministrativeState
-  get_administrative_state (void);
+  get_administrative_state ();
 
   /// Set the administrative state of the log.
   void
@@ -124,7 +124,7 @@ public:
   /// @@@ Of course!  get_forwarding_state() is virtual in the base
   ///     class dictated by the IDL!  -Ossama
   virtual DsLogAdmin::ForwardingState
-  get_forwarding_state (void);
+  get_forwarding_state ();
 
   /// Set the forwarding state of the log.
   /// @@ Note: is it ok to make this method virtual?
@@ -133,11 +133,11 @@ public:
 
   /// Get the operational state of the log.
   DsLogAdmin::OperationalState
-  get_operational_state (void);
+  get_operational_state ();
 
   /// Get the log duration
   DsLogAdmin::TimeInterval
-  get_interval (void);
+  get_interval ();
 
   /// Set the log duration.
   void
@@ -145,11 +145,11 @@ public:
 
   /// Get the availability status
   DsLogAdmin::AvailabilityStatus
-  get_availability_status (void);
+  get_availability_status ();
 
   /// Get the capacity alarm threshold
   DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (void);
+    get_capacity_alarm_thresholds ();
 
   /**
    * Set the capacity alarm threshold. Threshold values represent
@@ -165,7 +165,7 @@ public:
 
   /// Get the weekly scheduling parameters
   DsLogAdmin::WeekMask*
-  get_week_mask (void);
+  get_week_mask ();
 
   /// Set the weekly scheduling parameters.
   void
@@ -229,30 +229,30 @@ public:
   /// Causes all pending events to be written to storage. Raises
   /// DsLogAdmin::UnsupportedQos
   void
-  flush (void);
+  flush ();
   //@}
 
   /// Remove records that have exceeded max_record_life_.
-  void remove_old_records (void);
+  void remove_old_records ();
 
 protected:
   /// Get the availability status
   /// @note must be called with locks held
   DsLogAdmin::AvailabilityStatus
-  get_availability_status_i (void);
+  get_availability_status_i ();
 
   /// Tells if the Log is scheduled to run now.
   /// @note must be called with locks held
-  CORBA::Boolean scheduled (void);
+  CORBA::Boolean scheduled ();
 
   /// Copy the attributes of the log being passed.
   void copy_attributes (DsLogAdmin::Log_ptr log);
 
   /// Check if threshold reached.
-  void check_capacity_alarm_threshold (void);
+  void check_capacity_alarm_threshold ();
 
   /// Reset capacity alarm threshold.
-  void reset_capacity_alarm_threshold (void);
+  void reset_capacity_alarm_threshold ();
 
   /// Check that valid threshold values have been given.
   static CORBA::Boolean validate_capacity_alarm_thresholds (
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index 5ec6e83e3b3..06360e8cd5c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -58,11 +58,11 @@ public:
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from NotifyLog.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
 protected:
   /// Destructor.
-  virtual ~TAO_Notify_LogConsumer (void);
+  virtual ~TAO_Notify_LogConsumer ();
 
   // = NotifyPublish method
   virtual void offer_change (
@@ -73,7 +73,7 @@ protected:
   // = PushSupplier methods
   virtual void push (const CORBA::Any & event);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// ProxyPushSupplier used to connect to NotifyLog.
   CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index 587648e575a..2e709068e88 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -48,7 +48,7 @@ public:
   //= Initialization and termination code.
 
   /// Constructor - default.
-  TAO_NotifyLogFactory_i (void);
+  TAO_NotifyLogFactory_i ();
 
   /// Constructor.
   TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf);
@@ -81,20 +81,20 @@ public:
 
 
   // = Methods from CosNotifyChannelAdmin::ConsumerAdmin.
-  CosNotifyChannelAdmin::AdminID MyID (void);
+  CosNotifyChannelAdmin::AdminID MyID ();
 
-  CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
+  CosNotifyChannelAdmin::EventChannel_ptr MyChannel ();
 
-  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ();
 
-  CosNotifyFilter::MappingFilter_ptr priority_filter (void);
+  CosNotifyFilter::MappingFilter_ptr priority_filter ();
   void priority_filter (CosNotifyFilter::MappingFilter_ptr);
 
-  CosNotifyFilter::MappingFilter_ptr lifetime_filter (void);
+  CosNotifyFilter::MappingFilter_ptr lifetime_filter ();
   void lifetime_filter (CosNotifyFilter::MappingFilter_ptr);
 
-  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void);
-  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void);
+  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers ();
+  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers ();
 
   CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
     CosNotifyChannelAdmin::ProxyID proxy_id);
@@ -107,18 +107,18 @@ public:
     CosNotifyChannelAdmin::ClientType ctype,
     CosNotifyChannelAdmin::ProxyID& id);
 
-  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void);
+  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ();
 
-  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void);
+  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ();
 
-  void destroy (void);
+  void destroy ();
 
   /// CosNotifyComm::NotifySubscribe.
   void subscription_change (const CosNotification::EventTypeSeq& added,
                             const CosNotification::EventTypeSeq& removed);
 
   /// CosNotification::QoSAdmin.
-  CosNotification::QoSProperties* get_qos (void);
+  CosNotification::QoSProperties* get_qos ();
   void set_qos (const CosNotification::QoSProperties&);
   void validate_qos (const CosNotification::QoSProperties&,
                      CosNotification::NamedPropertyRangeSeq_out);
@@ -127,8 +127,8 @@ public:
   CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr);
   void remove_filter (CosNotifyFilter::FilterID);
   CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID);
-  CosNotifyFilter::FilterIDSeq* get_all_filters (void);
-  void remove_all_filters (void);
+  CosNotifyFilter::FilterIDSeq* get_all_filters ();
+  void remove_all_filters ();
 
 protected:
   virtual CORBA::RepositoryId
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index 808a17206f1..bc753492b4a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -48,7 +48,7 @@ public:
   TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr);
 
   /// Destructor.
-  ~TAO_NotifyLogNotification (void);
+  ~TAO_NotifyLogNotification ();
 
 protected:
   // = Helper methods
@@ -66,7 +66,7 @@ protected:
         const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-    virtual void disconnect_push_supplier (void);
+    virtual void disconnect_push_supplier ();
 
   /// Send the event on the event channel.
   virtual void send_notification (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 84fbe8cea0d..514a8e7286f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -73,29 +73,29 @@ public:
 
   /// Destroy the log object and all contained records.
   void
-  destroy (void);
+  destroy ();
 
   /// Activate the NotifyLog.
   void
-  activate (void);
+  activate ();
 
   // = Methods from CosNotifyChannelAdmin::EventChannel.
   CosNotifyFilter::Filter_ptr
-  get_filter (void);
+  get_filter ();
 
   void set_filter (CosNotifyFilter::Filter_ptr filter);
 
   CosNotifyChannelAdmin::EventChannelFactory_ptr
-  MyFactory (void);
+  MyFactory ();
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  default_consumer_admin (void);
+  default_consumer_admin ();
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
-  default_supplier_admin (void);
+  default_supplier_admin ();
 
   CosNotifyFilter::FilterFactory_ptr
-  default_filter_factory (void);
+  default_filter_factory ();
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
   new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
@@ -112,18 +112,18 @@ public:
   get_supplieradmin (CosNotifyChannelAdmin::AdminID id);
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_consumeradmins (void);
+  get_all_consumeradmins ();
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_supplieradmins (void);
+  get_all_supplieradmins ();
 
   CosNotification::AdminProperties*
-  get_admin (void);
+  get_admin ();
 
   void set_admin (const CosNotification::AdminProperties& admin);
 
   CosNotification::QoSProperties*
-  get_qos (void);
+  get_qos ();
 
   void set_qos (const CosNotification::QoSProperties&);
 
@@ -132,10 +132,10 @@ public:
 
   // = Methods from DsEventLogAdmin::EventLog.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (void);
+  for_consumers ();
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (void);
+  for_suppliers ();
 
 private:
   /// The PushConsumer that consumes the events and stores them
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index fb46ecdf537..a8baebcb5dc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -58,14 +58,14 @@ public:
   TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log);
 
   /// Destructor.
-  ~TAO_Rtec_LogConsumer (void);
+  ~TAO_Rtec_LogConsumer ();
 
   /// Connect to RTEventLog.
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index 7b017277f5d..d513e0e3b27 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -52,7 +52,7 @@ public:
   //= Initialization and termination code.
 
   /// Constructor.
-  TAO_RTEventLogFactory_i (void);
+  TAO_RTEventLogFactory_i ();
 
   /// Destructor.
   ~TAO_RTEventLogFactory_i ();
@@ -65,7 +65,7 @@ public:
 
   /// Activate this servant
   RTEventLogAdmin::EventLogFactory_ptr
-  activate (void);
+  activate ();
 
   /// Used to create a RTEventLog.
   RTEventLogAdmin::EventLog_ptr create (
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index b7b58b6b1da..4c88e83e4f8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -51,17 +51,17 @@ public:
   TAO_RTEventLogNotification (RtecEventChannelAdmin::EventChannel_ptr);
 
   /// Destructor.
-  ~TAO_RTEventLogNotification (void);
+  ~TAO_RTEventLogNotification ();
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 protected:
   // = Helper methods
 
   /// Used to connect this PushSupplier to the EventChannel
   /// that will log these events.
-  void obtainProxyConsumer (void);
+  void obtainProxyConsumer ();
 
   // Send the event on the event channel.
   virtual void send_notification (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index cbc5897acfa..8da3b060a26 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -73,15 +73,15 @@ public:
   virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
-  void destroy (void);
+  void destroy ();
 
   /// Activate the RTEventLog.
-  void activate (void);
+  void activate ();
 
   // = The RtecEventChannelAdmin::EventChannel interface methods.
-  RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
-  RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index 2266e5903fa..7314bc1c34e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -23,7 +23,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (
 }
 
 template <class ITERATOR, class TABLE_ENTRY>
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator ()
 {
   delete hash_iter_;
 
@@ -157,7 +157,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
 }
 
 template <class ITERATOR, class TABLE_ENTRY> void
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy ()
 {
   // Check to make sure this object is still valid.
   if (this->destroyed_)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 22d6ac41ac9..fc2193ccb7e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -58,10 +58,10 @@ public:
                          PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~TAO_Bindings_Iterator (void);
+  ~TAO_Bindings_Iterator ();
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   // = Idl methods.
 
@@ -78,7 +78,7 @@ public:
                          CosNaming::BindingList_out bl);
 
   /// This operation destroys the iterator.
-  void destroy (void);
+  void destroy ();
 
   // = Helper method.
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index c3250e3e6f4..e619665c582 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_IntId
 {
 public:
   /// Constructor.
-  TAO_IntId (void);
+  TAO_IntId ();
 
   /// Constructor.
   TAO_IntId (CORBA::Object_ptr obj,
@@ -51,7 +51,7 @@ public:
   TAO_IntId (const TAO_IntId & rhs);
 
   /// Destructor.
-  ~TAO_IntId (void);
+  ~TAO_IntId ();
 
   /// Assignment operator (does copy memory).
   void operator= (const TAO_IntId & rhs);
@@ -121,10 +121,10 @@ public:
   // = Accessors
 
   /// Return id_ in a const char * format.
-  const char * id (void);
+  const char * id ();
 
   /// Return kind_ in a const char * format.
-  const char * kind (void);
+  const char * kind ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
index 5dac7989663..182737db5d7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
@@ -281,7 +281,7 @@ public:
   void set_global_strategy (const ACE_TCHAR *strat_name);
 
   /// Destructor.
-  ~TAO_FT_Naming_Manager (void);
+  ~TAO_FT_Naming_Manager ();
 
 private:
   /// A utility to ensure we can access the latest object reference for
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
index 6bf7d63ff8a..a841cff7d9e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
@@ -70,12 +70,12 @@ public:
 
   TAO_FT_Naming_Replication_Manager (TAO_FT_Naming_Server &owner);
 
-  virtual ~TAO_FT_Naming_Replication_Manager(void);
+  virtual ~TAO_FT_Naming_Replication_Manager();
 
   virtual int svc ();
   virtual int handle_exception (ACE_HANDLE );
 
-  void stop (void);
+  void stop ();
   void send_context_update (const ACE_CString &ctx,
                             FT_Naming::ChangeType update);
   void send_objgrp_update (PortableGroup::ObjectGroupId id,
@@ -88,8 +88,8 @@ public:
   void send_registration (bool use_combo);
   bool update_peer_registration ();
 
-  bool peer_available (void);
-  char * ior (void);
+  bool peer_available ();
+  char * ior ();
 
 private:
   Replica_var me_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
index 98c8d1492f8..e24e86bfcae 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
@@ -85,11 +85,11 @@ public:
   /// Returns 0 on successful pairing with peer.
   /// Returns 1 if peer IOR file is present, but peer is not responding
   /// Returns -1 if pairing is not possible.
-  void init_replication_pairing (void);
+  void init_replication_pairing ();
 
-  void no_replica (void);
+  void no_replica ();
 
-  //  TAO_FTNS_Notifier &notifier (void);
+  //  TAO_FTNS_Notifier &notifier ();
 
   /// Overridden parse operation. Only allows options supported by the FT_Naming_Server
   /// and adds options for the object group manager
@@ -104,7 +104,7 @@ public:
   /// Factory method to create a naming context factory for use with
   /// the -f option.
   virtual TAO_Persistent_Naming_Context_Factory *
-    persistent_naming_context_factory (void);
+    persistent_naming_context_factory ();
 
   /// Returns the IOR of the replication manager.
   char* replicator_ior ();
@@ -148,7 +148,7 @@ protected:
     IOR_ARRAY_SIZE
   };
 
-  int recover_iors (void);
+  int recover_iors ();
 
   /// The object that implements the ObjectGroupManager, PropertyManager,
   /// and GenericFactory interfaces.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
index 572b5251d65..84f16595d30 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
@@ -80,13 +80,13 @@ public:
    */
   virtual void stale (bool is_stale);
 
-  virtual bool stale (void);
+  virtual bool stale ();
 
   /**
    * An internal utility used to signal that this context was updated.
    * Check the last_changed_ attribute for the time of the write.
    */
-  void context_written (void);
+  void context_written ();
 
   /**
    * An internal callback invoked by the File_Open_Lock_and_Check
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h
index 84ea1bcefac..0777beee44e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h
@@ -47,7 +47,7 @@ public:
   /// this class goes out of scope, its hash_map remains in persistent storage.
   virtual ~TAO_FT_Storable_Naming_Context_Factory () = default;
 
-  TAO_FT_Naming_Replication_Manager * replicator (void);
+  TAO_FT_Naming_Replication_Manager * replicator ();
 
   /// Factory method for creating an implementation object for naming contexts.
   /// If an existing naming context implementation is being rebuilt,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h
index f39b02dc0bb..47d139210bd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h
@@ -66,7 +66,7 @@ public:
    *
    *  @return 0 on success, -1 on failure, -2 on bad argument.
    */
-  int group_list (void);
+  int group_list ();
 
   /**
    *  The naming service shall provide a command line utility to modify the load
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index ca66d6f9fd6..96dc10c433e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -50,7 +50,7 @@ class TAO_Naming_Serv_Export TAO_Bindings_Map
 {
 public:
   /// Destructor.
-  virtual ~TAO_Bindings_Map (void);
+  virtual ~TAO_Bindings_Map ();
 
   /// Return current number of entries (name bindings) in the
   /// underlying hash map.
@@ -119,20 +119,20 @@ public:
   void interface (TAO_Naming_Context *i);
 
   /// Destructor.
-  virtual ~TAO_Hash_Naming_Context (void);
+  virtual ~TAO_Hash_Naming_Context ();
 
   // = Accessors.
 
   /// Get the pointer to our interface.
-  TAO_Naming_Context *interface (void);
+  TAO_Naming_Context *interface ();
 
   /// Returns true if this Naming Context is a root Naming Context for
   /// the server, and false otherwise.
-  int root (void);
+  int root ();
 
   /// Returns true if this context had <destroy> operation invoked on
   /// it, and false otherwise.
-  int destroyed (void);
+  int destroyed ();
 
   // = CosNaming::NamingContext idl interface methods.
 
@@ -205,12 +205,12 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
-  TAO_SYNCH_RW_MUTEX &lock (void);
+  TAO_SYNCH_RW_MUTEX &lock ();
 
 protected:
   // = Helper method used by other methods.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
index e09e93c265d..545608747af 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
@@ -39,7 +39,7 @@ class TAO_Naming_Export TAO_Naming_Client
 {
 public:
   /// Default constructor.
-  TAO_Naming_Client (void);
+  TAO_Naming_Client ();
 
   /**
    * Look for a Naming Service for a period of @a timeout using
@@ -49,7 +49,7 @@ public:
   int init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout = 0);
 
   /// Destructor.
-  ~TAO_Naming_Client (void);
+  ~TAO_Naming_Client ();
 
   /// Returns a pointer to the root Naming Context.
   CosNaming::NamingContext_ptr operator-> () const;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index b4a98572a2a..854368998e1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -49,7 +49,7 @@ public:
   TAO_Naming_Context (TAO_Naming_Context_Impl *impl);
 
   /// Destructor.
-  ~TAO_Naming_Context (void);
+  ~TAO_Naming_Context ();
 
   // = CosNaming::NamingContext idl interface methods.
 
@@ -131,7 +131,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -180,7 +180,7 @@ public:
   void stale (bool value);
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   enum Hint
@@ -243,7 +243,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl
 {
 public:
   /// Destructor.
-  virtual ~TAO_Naming_Context_Impl (void);
+  virtual ~TAO_Naming_Context_Impl ();
 
   // = CosNaming::NamingContext idl interface methods.
 
@@ -347,7 +347,7 @@ public:
    * Query if the the implementation is stale for replicated
    * persistence support.
    */
-  virtual bool stale (void);
+  virtual bool stale ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
index a01b6ba4aaf..58645108b88 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
@@ -128,10 +128,10 @@ public:
   virtual int fini ();
 
   /// Destructor.
-  virtual ~TAO_Naming_Server (void);
+  virtual ~TAO_Naming_Server ();
 
   /// Returns the IOR of the naming service.
-  char * naming_service_ior (void);
+  char * naming_service_ior ();
 
   /// Returns a <NamingContext_ptr> for the root Naming Context.
   CosNaming::NamingContext_ptr operator-> () const;
@@ -188,7 +188,7 @@ protected:
    * the -f option.
    */
   virtual TAO_Persistent_Naming_Context_Factory *
-    persistent_naming_context_factory (void);
+    persistent_naming_context_factory ();
 
   /// The ior_multicast event handler.
   TAO_IOR_Multicast *ior_multicast_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
index babe95ecbab..490b057d00d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
@@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node)
 
 template <class T>
-ACE_NS_Node<T>::~ACE_NS_Node (void)
+ACE_NS_Node<T>::~ACE_NS_Node ()
 {
 }
 
@@ -85,7 +85,7 @@ ACE_Unbounded_List<T>::insert_tail (const T &item)
 }
 
 template <class T> void
-ACE_Unbounded_List<T>::reset (void)
+ACE_Unbounded_List<T>::reset ()
 {
   ACE_TRACE ("reset");
 
@@ -125,7 +125,7 @@ ACE_Unbounded_List<T>::copy_nodes (const ACE_Unbounded_List<T> &us)
 }
 
 template <class T> void
-ACE_Unbounded_List<T>::delete_nodes (void)
+ACE_Unbounded_List<T>::delete_nodes ()
 {
   ACE_NS_Node<T> *curr = this->head_->next_;
 
@@ -147,7 +147,7 @@ ACE_Unbounded_List<T>::delete_nodes (void)
 }
 
 template <class T>
-ACE_Unbounded_List<T>::~ACE_Unbounded_List (void)
+ACE_Unbounded_List<T>::~ACE_Unbounded_List ()
 {
   // ACE_TRACE ("ACE_Unbounded_List<T>::~ACE_Unbounded_List");
 
@@ -246,14 +246,14 @@ ACE_Unbounded_List<T>::remove (const T &item)
 }
 
 template <class T> ACE_Unbounded_List_Iterator<T>
-ACE_Unbounded_List<T>::begin (void)
+ACE_Unbounded_List<T>::begin ()
 {
   // ACE_TRACE ("ACE_Unbounded_List<T>::begin");
   return ACE_Unbounded_List_Iterator<T> (*this);
 }
 
 template <class T> ACE_Unbounded_List_Iterator<T>
-ACE_Unbounded_List<T>::end (void)
+ACE_Unbounded_List<T>::end ()
 {
   // ACE_TRACE ("ACE_Unbounded_List<T>::end");
   return ACE_Unbounded_List_Iterator<T> (*this, 1);
@@ -277,7 +277,7 @@ ACE_Unbounded_List_Iterator<T>::ACE_Unbounded_List_Iterator (ACE_Unbounded_List<
 }
 
 template <class T> int
-ACE_Unbounded_List_Iterator<T>::advance (void)
+ACE_Unbounded_List_Iterator<T>::advance ()
 {
   // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::advance");
   this->current_ = this->current_->next_;
@@ -285,7 +285,7 @@ ACE_Unbounded_List_Iterator<T>::advance (void)
 }
 
 template <class T> int
-ACE_Unbounded_List_Iterator<T>::first (void)
+ACE_Unbounded_List_Iterator<T>::first ()
 {
   // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::first");
   this->current_ = this->set_->head_->next_;
@@ -326,7 +326,7 @@ ACE_Unbounded_List_Iterator<T>::operator++ (int)
 }
 
 template <class T> ACE_Unbounded_List_Iterator<T>&
-ACE_Unbounded_List_Iterator<T>::operator++ (void)
+ACE_Unbounded_List_Iterator<T>::operator++ ()
 {
   // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator++ (void)");
 
@@ -337,7 +337,7 @@ ACE_Unbounded_List_Iterator<T>::operator++ (void)
 }
 
 template <class T> T&
-ACE_Unbounded_List_Iterator<T>::operator* (void)
+ACE_Unbounded_List_Iterator<T>::operator* ()
 {
   //ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator*");
   T *retv = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index df514f3a72a..8897a02cde2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -44,7 +44,7 @@ public:
   friend class ACE_Unbounded_List<T>;
   friend class ACE_Unbounded_List_Iterator<T>;
 
-  ~ACE_NS_Node (void);
+  ~ACE_NS_Node ();
 
 private:
   ACE_NS_Node (const T &i, ACE_NS_Node<T> *n);
@@ -76,11 +76,11 @@ public:
 
   /// Move forward by one element in the List.  Returns 0 when all the
   /// items in the List have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the List.  Returns 0 if the
   /// List is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
   int done () const;
@@ -94,10 +94,10 @@ public:
   ACE_Unbounded_List_Iterator<T> operator++ (int);
 
   /// Prefix advance.
-  ACE_Unbounded_List_Iterator<T>& operator++ (void);
+  ACE_Unbounded_List_Iterator<T>& operator++ ();
 
   /// Returns a reference to the interal element <this> is pointing to.
-  T& operator* (void);
+  T& operator* ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Unbounded_List_Iterator<T> &) const;
@@ -144,7 +144,7 @@ public:
   void operator= (const ACE_Unbounded_List<T> &);
 
   /// Destructor.
-  ~ACE_Unbounded_List (void);
+  ~ACE_Unbounded_List ();
 
   // = Check boundary conditions.
 
@@ -177,11 +177,11 @@ public:
   void dump () const;
 
   /// Reset the <ACE_Unbounded_List> to be empty.
-  void reset (void);
+  void reset ();
 
   // = STL-styled unidirectional iterator factory.
-  ACE_Unbounded_List_Iterator<T> begin (void);
-  ACE_Unbounded_List_Iterator<T> end (void);
+  ACE_Unbounded_List_Iterator<T> begin ();
+  ACE_Unbounded_List_Iterator<T> end ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -192,7 +192,7 @@ private:
   int insert_tail (const T &item);
 
   /// Delete all the nodes in the List.
-  void delete_nodes (void);
+  void delete_nodes ();
 
   /// Copy nodes into this set.
   void copy_nodes (const ACE_Unbounded_List<T> &);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index 82aba1c6c65..dda89d4974a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -99,7 +99,7 @@ public:
    * not deleted, since we want it to keep the state of the Naming
    * Service until the next run.
    */
-  ~TAO_Persistent_Context_Index (void);
+  ~TAO_Persistent_Context_Index ();
 
   // = Methods for adding/removing entries.
 
@@ -117,14 +117,14 @@ public:
   // = Accessors.
 
   /// Return allocator.
-  ACE_Allocator *allocator (void);
+  ACE_Allocator *allocator ();
 
   /// Return orb pointer.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Return a pointer to the root Naming Context (returns a copy - must be
   /// deallocated by the user).
-  CosNaming::NamingContext_ptr root_context (void);
+  CosNaming::NamingContext_ptr root_context ();
 
 private:
   /// Helper for the <init> method.  Iterates over <index_>, and
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index e2d89857f97..69bcbc26986 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_IntId
 {
 public:
   /// Constructor.
-  TAO_Persistent_IntId (void);
+  TAO_Persistent_IntId ();
 
   /// Constructor.
   TAO_Persistent_IntId (char * obj_ref,
@@ -51,7 +51,7 @@ public:
   TAO_Persistent_IntId (const TAO_Persistent_IntId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_IntId (void);
+  ~TAO_Persistent_IntId ();
 
   /// Assignment operator.
   void operator= (const TAO_Persistent_IntId & rhs);
@@ -83,7 +83,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_ExtId
 {
 public:
   /// Constructor.
-  TAO_Persistent_ExtId (void);
+  TAO_Persistent_ExtId ();
 
   /// Constructor.
   TAO_Persistent_ExtId (const char *id,
@@ -93,7 +93,7 @@ public:
   TAO_Persistent_ExtId (const TAO_Persistent_ExtId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_ExtId (void);
+  ~TAO_Persistent_ExtId ();
 
   // = Assignment and comparison methods.
 
@@ -122,8 +122,8 @@ public:
 
   // Accessors.
 
-  const char * id (void);
-  const char * kind (void);
+  const char * id ();
+  const char * kind ();
 };
 
 /**
@@ -143,7 +143,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId
 {
 public:
   /// Constructor.
-  TAO_Persistent_Index_IntId (void);
+  TAO_Persistent_Index_IntId ();
 
   /// Constructor.
   TAO_Persistent_Index_IntId (ACE_UINT32 *counter,
@@ -154,7 +154,7 @@ public:
   TAO_Persistent_Index_IntId (const TAO_Persistent_Index_IntId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_Index_IntId (void);
+  ~TAO_Persistent_Index_IntId ();
 
   /// Assignment operator (does copy memory).
   void operator= (const TAO_Persistent_Index_IntId & rhs);
@@ -186,7 +186,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId
 {
 public:
   /// Constructor.
-  TAO_Persistent_Index_ExtId (void);
+  TAO_Persistent_Index_ExtId ();
 
   /// Constructor.
   TAO_Persistent_Index_ExtId (const char *poa_id);
@@ -195,7 +195,7 @@ public:
   TAO_Persistent_Index_ExtId (const TAO_Persistent_Index_ExtId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_Index_ExtId (void);
+  ~TAO_Persistent_Index_ExtId ();
 
   // = Assignment and comparison methods.
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index ca8c7300426..deb839039e8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -178,7 +178,7 @@ public:
                                  ACE_UINT32 *counter = 0);
 
   /// Destructor.
-  virtual ~TAO_Persistent_Naming_Context (void);
+  virtual ~TAO_Persistent_Naming_Context ();
 
   // = Utility methods.
   /**
@@ -200,7 +200,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (void);
+  virtual CosNaming::NamingContext_ptr new_context ();
 
   /**
    * Returns at most the requested number of bindings @a how_many in
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index 420fd723648..ef6222589ed 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -37,7 +37,7 @@ class TAO_Naming_Serv_Export TAO_Storable_IntId
 {
 public:
   /// Constructor.
-  TAO_Storable_IntId (void);
+  TAO_Storable_IntId ();
 
   /// Constructor.
   TAO_Storable_IntId (/* in */ const char * ior,
@@ -47,7 +47,7 @@ public:
   TAO_Storable_IntId (const TAO_Storable_IntId & rhs);
 
   /// Destructor.
-  ~TAO_Storable_IntId (void);
+  ~TAO_Storable_IntId ();
 
   /// Assignment operator.
   void operator= (const TAO_Storable_IntId & rhs);
@@ -65,7 +65,7 @@ class TAO_Naming_Serv_Export TAO_Storable_ExtId
 {
 public:
   /// Constructor.
-  TAO_Storable_ExtId (void);
+  TAO_Storable_ExtId ();
 
   /// Constructor.
   TAO_Storable_ExtId (/* in */ const char *id,
@@ -75,7 +75,7 @@ public:
   TAO_Storable_ExtId (const TAO_Storable_ExtId & rhs);
 
   /// Destructor.
-  ~TAO_Storable_ExtId (void);
+  ~TAO_Storable_ExtId ();
 
   // = Assignment and comparison methods.
 
@@ -105,8 +105,8 @@ public:
   // Accessors.
   // follow the mapping rules!
 
-  const char * id (void);
-  const char * kind (void);
+  const char * id ();
+  const char * kind ();
 };
 
 
@@ -131,19 +131,19 @@ public:
   TAO_Storable_Bindings_Map (size_t hash_table_size, CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_Storable_Bindings_Map (void);
+  virtual ~TAO_Storable_Bindings_Map ();
 
   // = Accessors.
 
   /// Get a reference to the underlying hash map.
-  HASH_MAP &map (void);
+  HASH_MAP &map ();
 
   /// Return the size of the underlying hash table.
-  size_t total_size (void);
+  size_t total_size ();
 
   /// Return current number of entries (name bindings) in the
   /// underlying hash map.
-  virtual size_t current_size (void);
+  virtual size_t current_size ();
 
   // = Name bindings manipulation methods.
 
@@ -228,7 +228,7 @@ public:
                                size_t hash_table_size = ACE_DEFAULT_MAP_SIZE);
 
   /// Destructor.
-  virtual ~TAO_Storable_Naming_Context (void);
+  virtual ~TAO_Storable_Naming_Context ();
 
   // = Utility methods.
   /**
@@ -264,7 +264,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (void);
+  virtual CosNaming::NamingContext_ptr new_context ();
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -342,14 +342,14 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   /**
    * A helper function to ensure the current object was not destroyed by raising
    * an exception if it was. Uses the lock as a Reader.
    */
-  void verify_not_destroyed (void);
+  void verify_not_destroyed ();
 
   /**
    * A helper function to validate the name argument and return a final context
@@ -364,7 +364,7 @@ protected:
    * This will have been done after the file is closed. Check the
    * last_changed_ attribute for the time of the write.
    */
-  virtual void context_written (void);
+  virtual void context_written ();
 
   /**
    * An internal callback invoked by the File_Open_Lock_and_Check
@@ -440,11 +440,11 @@ protected:
   /// Check if the guarded object is current with the last
   /// update which could have been performed independently of
   /// the owner of this object.
-  virtual bool object_obsolete (void);
+  virtual bool object_obsolete ();
 
   /// Mark the object as current with respect to the
   /// file to which it was persisted.
-  virtual void mark_object_current (void);
+  virtual void mark_object_current ();
 
   /// Mark the time at which the object was modified and
   virtual void set_object_last_changed (const time_t & time);
@@ -461,7 +461,7 @@ protected:
 
 private:
   /// Default constructor
-  File_Open_Lock_and_Check(void);
+  File_Open_Lock_and_Check();
 
   TAO_Storable_Naming_Context * context_;
 }; // end of embedded class File_Open_Lock_and_Check
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h
index 934790c6548..9ace464e04d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h
@@ -44,7 +44,7 @@ public:
 
   /// Destructor.  Does not deallocate the hash map: if an instance of
   /// this class goes out of scope, its hash_map remains in persistent storage.
-  virtual ~TAO_Storable_Naming_Context_Factory (void);
+  virtual ~TAO_Storable_Naming_Context_Factory ();
 
   /// Factory method for creating an implementation object for naming contexts.
   /// If an existing naming context implementation is being rebuilt, the map
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 585b4a3f9fd..5bf39fd6f03 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -43,19 +43,19 @@ public:
   TAO_Transient_Bindings_Map (size_t hash_table_size);
 
   /// Destructor.
-  virtual ~TAO_Transient_Bindings_Map (void);
+  virtual ~TAO_Transient_Bindings_Map ();
 
   // = Accessors.
 
   /// Get a reference to the underlying hash map.
-  HASH_MAP &map (void);
+  HASH_MAP &map ();
 
   /// Return the size of the underlying hash table.
-  size_t total_size (void);
+  size_t total_size ();
 
   /// Return current number of entries (name bindings) in the
   /// underlying hash map.
-  virtual size_t current_size (void);
+  virtual size_t current_size ();
 
   // = Name bindings manipulation methods.
 
@@ -137,7 +137,7 @@ public:
                                 = ACE_DEFAULT_MAP_SIZE);
 
   /// Destructor.
-  virtual ~TAO_Transient_Naming_Context (void);
+  virtual ~TAO_Transient_Naming_Context ();
 
   // = Utility methods.
   /**
@@ -158,7 +158,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (void);
+  virtual CosNaming::NamingContext_ptr new_context ();
 
   /**
    * Returns at most the requested number of bindings <how_many> in
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index ae81025fe23..accd1590bc8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -57,14 +57,14 @@ public:
                       bool experienced_timeout);
 
   /// Access Admin FilterAdmin.
-  TAO_Notify_FilterAdmin& filter_admin (void);
+  TAO_Notify_FilterAdmin& filter_admin ();
 
   /// Set Filter operator
   void filter_operator (
       CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator);
 
   /// Access Filter operator
-  CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator ();
 
   /// Obtain the Admin's subscribed types.
   void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
@@ -72,12 +72,12 @@ public:
   TAO_Notify_EventChannel * event_channel () const;
 
   /// Shutdown
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
     CORBA::Long id, const TAO_Notify::NVPList& attrs);
-  virtual void reconnect (void);
+  virtual void reconnect ();
 
   virtual void validate ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index 79b5819ec45..5040b44ac20 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -40,7 +40,7 @@ class TAO_Notify_Serv_Export TAO_Notify_AdminProperties
 public:
   typedef ACE_Strong_Bound_Ptr<TAO_Notify_AdminProperties, TAO_SYNCH_MUTEX> Ptr;
   /// Constructor
-  TAO_Notify_AdminProperties (void);
+  TAO_Notify_AdminProperties ();
 
   /// Destructor
   virtual ~TAO_Notify_AdminProperties ();
@@ -58,21 +58,21 @@ public:
   const TAO_Notify_Property_Boolean& reject_new_events () const;
 
   // = Non-const accessors
-  TAO_Notify_Property_Long & max_global_queue_length (void);
-  TAO_Notify_Property_Long & max_consumers (void);
-  TAO_Notify_Property_Long & max_suppliers (void);
-  TAO_Notify_Property_Boolean & reject_new_events (void);
+  TAO_Notify_Property_Long & max_global_queue_length ();
+  TAO_Notify_Property_Long & max_consumers ();
+  TAO_Notify_Property_Long & max_suppliers ();
+  TAO_Notify_Property_Boolean & reject_new_events ();
 
-  CORBA::Long& global_queue_length (void);
-  TAO_SYNCH_MUTEX& global_queue_lock (void);
-  TAO_SYNCH_CONDITION& global_queue_not_full (void);
+  CORBA::Long& global_queue_length ();
+  TAO_SYNCH_MUTEX& global_queue_lock ();
+  TAO_SYNCH_CONDITION& global_queue_not_full ();
 
-  TAO_Notify_Atomic_Property_Long& consumers (void);
-  TAO_Notify_Atomic_Property_Long& suppliers (void);
+  TAO_Notify_Atomic_Property_Long& consumers ();
+  TAO_Notify_Atomic_Property_Long& suppliers ();
 
   // = Helper method
   /// Returns true if Queue is full
-  CORBA::Boolean queue_full (void);
+  CORBA::Boolean queue_full ();
 
 protected:
   // @@ Pradeep can you explain why there is any maximum for these
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index e5f29255b3f..1d2b83ce29d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -38,7 +38,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer
  friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_CosEC_ProxyPushConsumer (void);
+  TAO_Notify_CosEC_ProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_CosEC_ProxyPushConsumer ();
@@ -55,10 +55,10 @@ protected:
 
   virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 3657bc830e0..19b45226506 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -43,7 +43,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier
   friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_CosEC_ProxyPushSupplier (void);
+  TAO_Notify_CosEC_ProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_CosEC_ProxyPushSupplier ();
@@ -61,7 +61,7 @@ public:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 425e4f150bc..0d6730ff9d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer
  friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_ProxyPushConsumer (void);
+  TAO_Notify_ProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_ProxyPushConsumer ();
@@ -54,17 +54,17 @@ public:
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void push (const CORBA::Any & data);
 
   virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index 28291efd0f2..af9df23e8f8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -45,7 +45,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier
   friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_ProxyPushSupplier (void);
+  TAO_Notify_ProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_ProxyPushSupplier ();
@@ -57,7 +57,7 @@ public:
   virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
   // = Interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_any_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer);
@@ -66,7 +66,7 @@ public:
 
 private:
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index 9db5444ab0a..1a03411b4a9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -55,14 +55,14 @@ public:
     TAO_Notify_Consumer* old_consumer);
 
 protected:
-  virtual CORBA::Object_ptr get_consumer (void);
+  virtual CORBA::Object_ptr get_consumer ();
 
   /// The Consumer
   CosEventComm::PushConsumer_var push_consumer_;
 
 private:
   /// TAO_Notify_Destroy_Callback methods.
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 419477ac468..efff6bcbe5f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -43,14 +43,14 @@ public:
   virtual ACE_CString get_ior () const;
 
 protected:
-  virtual CORBA::Object_ptr get_supplier (void);
+  virtual CORBA::Object_ptr get_supplier ();
 
   /// The Supplier
   CosEventComm::PushSupplier_var push_supplier_;
 
 private:
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index 3389f7ca2b3..c7c04d1cac5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -62,17 +62,17 @@ public:
                const ACE_Time_Value *abstime);
 
   /// Shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// Provide the time value of the oldest event in the queue.
-  ACE_Time_Value oldest_event (void);
+  ACE_Time_Value oldest_event ();
 
   /// This interface allows tracking of the queue size
   class TAO_Notify_Serv_Export Tracker
   {
   public:
-    Tracker (void);
-    virtual ~Tracker (void);
+    Tracker ();
+    virtual ~Tracker ();
     virtual void update_queue_count (size_t count) = 0;
     virtual void count_queue_overflow (bool local_overflow, bool global_overflow) = 0;
     void register_child (Tracker * child);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index cb371343c37..e3d1907496a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -43,7 +43,7 @@ class TAO_Notify_Object;
 class TAO_Notify_Serv_Export TAO_Notify_Builder
 {
 public:
-  TAO_Notify_Builder (void);
+  TAO_Notify_Builder ();
 
   virtual ~TAO_Notify_Builder ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 0c07aa666a3..709e9a7dbc6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -60,14 +60,14 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr;
   virtual ~TAO_Notify_Consumer ();
 
   /// This method sigantures deliberately match the RefCounting methods required for ESF Proxy
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   /// Access Specific Proxy.
-  TAO_Notify_ProxySupplier* proxy_supplier (void);
+  TAO_Notify_ProxySupplier* proxy_supplier ();
 
   /// Access Base Proxy.
-  virtual TAO_Notify_Proxy* proxy (void);
+  virtual TAO_Notify_Proxy* proxy ();
 
   /// Dispatch Event to consumer
   void deliver (TAO_Notify_Method_Request_Event * request);
@@ -85,19 +85,19 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr;
   DispatchStatus dispatch_batch (const CosNotification::EventBatch& batch);
 
   /// Dispatch the pending events
-  void dispatch_pending (void);
+  void dispatch_pending ();
 
   /// Is the connection suspended?
-  CORBA::Boolean is_suspended (void);
+  CORBA::Boolean is_suspended ();
 
   /// Suspend Connection
-  void suspend (void);
+  void suspend ();
 
   /// Resume Connection
-  void resume (void);
+  void resume ();
 
   /// Shutdown the consumer
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// On reconnect we need to move events from the old consumer
   /// to the new one
@@ -118,7 +118,7 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr;
   ///
   /// The estimate does not include events queued at the admin level which
   /// have not been passed to this consumer for delivery yet.
-  size_t pending_count (void);
+  size_t pending_count ();
 
 protected:
   /// This method is called by the is_alive() method.  It should provide
@@ -158,7 +158,7 @@ protected:
                                    const CosNotification::EventTypeSeq& removed);
 
   /// Get the shared Proxy Lock
-  TAO_SYNCH_MUTEX* proxy_lock (void);
+  TAO_SYNCH_MUTEX* proxy_lock ();
 
 protected:
   virtual int handle_timeout (const ACE_Time_Value& current_time,
@@ -169,7 +169,7 @@ protected:
   void schedule_timer (bool is_error = false);
 
   /// Cancel timer
-  void cancel_timer (void);
+  void cancel_timer ();
 
   ///= Protected Data Members
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 5a3bd59b491..3ba2c54517e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -41,7 +41,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin :
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_ConsumerAdmin > Ptr;
   /// Constructor
-  TAO_Notify_ConsumerAdmin (void);
+  TAO_Notify_ConsumerAdmin ();
 
   /// Destructor
   virtual ~TAO_Notify_ConsumerAdmin ();
@@ -50,8 +50,8 @@ public:
   void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   virtual const char * get_admin_type_name () const;
 
@@ -65,7 +65,7 @@ public:
       size_t position);
 
   /// TAO_Notify_Container_T requires a destroy method
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   TAO_Notify::Topology_Object *load_proxy (
@@ -80,23 +80,23 @@ protected:
                                               const CosNotification::QoSProperties & initial_qos);
 
   /// = CosNotifyChannelAdmin::ConsumerAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (void);
+  virtual CosNotifyChannelAdmin::AdminID MyID ();
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel ();
 
-  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ();
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (void);
+  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter ();
 
   virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter);
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void);
+  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter ();
 
   virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter);
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers ();
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers ();
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id);
 
@@ -108,7 +108,7 @@ protected:
   obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
                                      CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
-  virtual ::CosNotification::QoSProperties * get_qos (void);
+  virtual ::CosNotification::QoSProperties * get_qos ();
 
   virtual void set_qos (const CosNotification::QoSProperties & qos);
 
@@ -124,17 +124,17 @@ protected:
 
   virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter);
 
-  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters ();
 
-  virtual void remove_all_filters (void);
+  virtual void remove_all_filters ();
 
-  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void);
+  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ();
 
-  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void);
+  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ();
 
 private:
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index 0e7c3617a1f..ac31053b549 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -23,7 +23,7 @@ TAO_Notify_Container_T<TYPE>::Destroyer::work (TYPE* type)
 }
 
 template<class TYPE>
-TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T (void)
+TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T ()
   : collection_ (0)
 {
 }
@@ -35,7 +35,7 @@ TAO_Notify_Container_T<TYPE>::~TAO_Notify_Container_T ()
 }
 
 template <class TYPE> void
-TAO_Notify_Container_T<TYPE>::shutdown (void)
+TAO_Notify_Container_T<TYPE>::shutdown ()
 {
   TAO_ESF_Shutdown_Proxy<TYPE> shutdown_worker;
 
@@ -43,7 +43,7 @@ TAO_Notify_Container_T<TYPE>::shutdown (void)
 }
 
 template <class TYPE> void
-TAO_Notify_Container_T<TYPE>::destroy (void)
+TAO_Notify_Container_T<TYPE>::destroy ()
 {
   Destroyer destroyer;
   this->collection_->for_each (&destroyer);
@@ -62,7 +62,7 @@ TAO_Notify_Container_T<TYPE>::remove (TYPE* type)
 }
 
 template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::init (void)
+TAO_Notify_Container_T<TYPE>::init ()
 {
   // get the factory
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 812058573c8..cd231d5ba81 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -32,13 +32,13 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
  public:
   /// Constructor
-  TAO_Notify_Container_T (void);
+  TAO_Notify_Container_T ();
 
   /// Destructor
   virtual ~TAO_Notify_Container_T ();
 
   /// Init this object.
-  void init (void);
+  void init ();
 
   /// Insert object to this container.
   virtual void insert (TYPE* type);
@@ -47,13 +47,13 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
   virtual void remove (TYPE* type);
 
   /// Shutdown
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Call destroy on each contained object
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Collection
-  COLLECTION* collection (void);
+  COLLECTION* collection ();
 
 protected:
   /// The collection data structure that we add objects to.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
index 6bb7d7f993d..2c4136e708d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
@@ -28,7 +28,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosNotify_Initializer
 {
 public:
   /// Constructor
-  TAO_Notify_CosNotify_Initializer (void);
+  TAO_Notify_CosNotify_Initializer ();
 };
 
 static TAO_Notify_CosNotify_Initializer TAO_Notify_CosNotify_initializer;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 42f31efcd2c..1509d8e2949 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service
 {
 public:
   /// Constructor
-  TAO_CosNotify_Service (void);
+  TAO_CosNotify_Service ();
 
   /// Destructor
   virtual ~TAO_CosNotify_Service ();
@@ -69,10 +69,10 @@ protected:
 
 private:
   /// Create the Factory for Notify objects.
-  virtual TAO_Notify_Factory* create_factory (void);
+  virtual TAO_Notify_Factory* create_factory ();
 
   /// Create the Builder for Notify objects.
-  virtual TAO_Notify_Builder* create_builder (void);
+  virtual TAO_Notify_Builder* create_builder ();
 
   /// Set thread options on @a qos.
   void set_threads (CosNotification::QoSProperties &qos, int threads);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index 6f2084f7412..a92de9f4a3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -28,7 +28,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_Factory : public TAO_Notify_Fact
 {
 public:
   /// Constructor
-  TAO_Notify_Default_Factory (void);
+  TAO_Notify_Default_Factory ();
 
   /// Destructor
   virtual ~TAO_Notify_Default_Factory ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 962cb6a2b84..b59bf46cc6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -37,7 +37,7 @@ class TAO_Notify_Constraint_Expr : public TAO_Notify::Topology_Object
 public:
   friend class TAO_Notify_ETCL_Filter;
 
-  TAO_Notify_Constraint_Expr (void);
+  TAO_Notify_Constraint_Expr ();
   virtual ~TAO_Notify_Constraint_Expr ();
 
   void save_persistent (
@@ -55,7 +55,7 @@ public:
 
 private:
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   // = DESCRIPTION
   //   Structure for associating ConstraintInfo with an interpreter.
@@ -83,7 +83,7 @@ public:
                           const TAO_Notify_Object::ID& id);
 
   /// Destructor
-  virtual ~TAO_Notify_ETCL_Filter (void);
+  virtual ~TAO_Notify_ETCL_Filter ();
 
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   void load_attrs(const TAO_Notify::NVPList& attrs);
@@ -91,7 +91,7 @@ public:
     CORBA::Long id, const TAO_Notify::NVPList& attrs);
 
 protected:
-  virtual char * constraint_grammar (void);
+  virtual char * constraint_grammar ();
 
   virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
@@ -100,11 +100,11 @@ protected:
 
   virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void);
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints ();
 
-  virtual void remove_all_constraints (void);
+  virtual void remove_all_constraints ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual CORBA::Boolean match (const CORBA::Any & filterable_data);
 
@@ -116,11 +116,11 @@ protected:
 
   virtual void detach_callback (CosNotifyFilter::CallbackID callback);
 
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ();
 
 private:
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq);
   void add_constraint_i (const CosNotifyFilter::ConstraintInfo& constraint,
@@ -129,7 +129,7 @@ private:
   TAO_Notify_Constraint_Expr*
     add_constraint_i (CosNotifyFilter::ConstraintID cnstr_id);
 
-  void remove_all_constraints_i (void);
+  void remove_all_constraints_i ();
 
   /// Lock to serialize access to data members.
   TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 428407a1c58..6f0086bd3cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -42,7 +42,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory :
 {
 public:
   /// Constructor
-  TAO_Notify_ETCL_FilterFactory (void);
+  TAO_Notify_ETCL_FilterFactory ();
 
   /// Destructor
   virtual ~TAO_Notify_ETCL_FilterFactory ();
@@ -52,7 +52,7 @@ public:
   virtual CosNotifyFilter::FilterFactory_ptr create (
       PortableServer::POA_ptr filter_poa);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   ///= CosNotifyFilter::FilterFactory methods
 
@@ -91,7 +91,7 @@ protected:
   CosNotifyFilter::Filter_ptr find_filter (const TAO_Notify_Object::ID& id);
 
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   /// The POA in which to activate the Filters.
   PortableServer::POA_var filter_poa_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 8a7a61cf680..398f95d1d9e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -47,7 +47,7 @@ public:
   // Codes to distinguish marshaled events in persistent storage
   enum {MARSHAL_ANY=1,MARSHAL_STRUCTURED=2};
   /// Constructor
-  TAO_Notify_Event (void);
+  TAO_Notify_Event ();
 
   /// Destructor
   virtual ~TAO_Notify_Event ();
@@ -122,7 +122,7 @@ private:
   /// Return a pointer to a copy of this event on the heap
   virtual TAO_Notify_Event* copy () const = 0;
 
-  virtual void release (void);
+  virtual void release ();
 
   mutable Ptr clone_;
   bool        is_on_heap_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index f77ff8334f9..498032c2783 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -54,7 +54,7 @@ public:
   typedef CosNotifyChannelAdmin::ChannelIDSeq_var SEQ_VAR;
 
   /// Constructor
-  TAO_Notify_EventChannel (void);
+  TAO_Notify_EventChannel ();
 
   /// Destructor
   virtual ~TAO_Notify_EventChannel ();
@@ -74,8 +74,8 @@ public:
   void remove (TAO_Notify_SupplierAdmin* supplier_admin);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   // TAO_Notify::Topology_Parent
 
@@ -83,7 +83,7 @@ public:
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
                                                    const TAO_Notify::NVPList& attrs);
-  virtual void reconnect (void);
+  virtual void reconnect ();
   virtual void validate ();
 
   virtual TAO_Notify_Object::ID get_id () const {return id();}
@@ -97,11 +97,11 @@ public:
                               bool experienced_timeout);
 
   /// Shutdown
-  virtual int shutdown (void);
+  virtual int shutdown ();
   virtual void load_attrs(const TAO_Notify::NVPList& attrs);
 
   /// TAO_Notify_Container_T requires a destroy method
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// This is public to allow TAO_MonitorConsumerAdmin access.
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -136,11 +136,11 @@ protected:
 
   virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory ();
 
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (void);
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin ();
 
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (void);
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin ();
 
-  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void);
+  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory ();
 
   virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                                                         CosNotifyChannelAdmin::AdminID_out id);
@@ -148,24 +148,24 @@ protected:
   virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                                                         CosNotifyChannelAdmin::AdminID_out id);
 
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void);
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins ();
 
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void);
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins ();
 
-  virtual ::CosNotification::QoSProperties * get_qos (void);
+  virtual ::CosNotification::QoSProperties * get_qos ();
 
   virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
                              CosNotification::NamedPropertyRangeSeq_out available_qos);
 
-  virtual ::CosNotification::AdminProperties * get_admin (void);
+  virtual ::CosNotification::AdminProperties * get_admin ();
 
   virtual void set_admin (const CosNotification::AdminProperties & admin);
 
-  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
-  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
 private:
   TAO_Notify_ConsumerAdmin_Container& ca_container();
@@ -181,7 +181,7 @@ private:
   CosNotifyFilter::FilterFactory_var default_filter_factory_;
   TAO_Notify_FilterFactory * default_filter_factory_servant_;
 
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index 3469c666ef3..9541518d2b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -55,7 +55,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_EventChannelFactory > Ptr;
 
   /// Constructor
-  TAO_Notify_EventChannelFactory (void);
+  TAO_Notify_EventChannelFactory ();
 
   /// Init the factory
   void init (PortableServer::POA_ptr poa);
@@ -64,8 +64,8 @@ public:
   virtual ~TAO_Notify_EventChannelFactory ();
 
   /// = ServantBase  Methods
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   /// Remove @a channel from the <ec_container_>
   virtual void remove (TAO_Notify_EventChannel* channel);
@@ -85,7 +85,7 @@ public:
   /// Use the registered Topology_Factory to create a loader, and
   /// load the topology. If no Topology_Factory is registered
   /// then nothing will be loaded.
-  void load_topology (void);
+  void load_topology ();
 
   /// Use the passed in saver factory to generate topology saver objects.
   /// Does not take ownership.
@@ -96,23 +96,23 @@ public:
   virtual bool is_persistent () const;
 
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
-  virtual bool change_to_parent (void);
+  virtual bool change_to_parent ();
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
                                                    const TAO_Notify::NVPList& attrs);
-  CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (void);
-  virtual void reconnect (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self ();
+  virtual void reconnect ();
   virtual void validate ();
 
   /// at shutdown time, this causes the validator thread to exit.
-  void stop_validator (void);
+  void stop_validator ();
 
   /// Handle change notifications
-  bool handle_change (void);
+  bool handle_change ();
 
-  void load_event_persistence (void);
+  void load_event_persistence ();
 
-  virtual void save_topology (void);
+  virtual void save_topology ();
 
   TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position);
   TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position);
@@ -123,10 +123,10 @@ private:
   /// = Data Members
 
   /// = NotifyExt methods
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// shutdown
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   virtual
   NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
@@ -135,7 +135,7 @@ private:
   virtual void unregister_callback (
       NotifyExt::ReconnectionRegistry::ReconnectionID id);
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
 protected:
   /// = CosNotifyChannelAdmin Methods
@@ -144,7 +144,7 @@ protected:
       const CosNotification::AdminProperties & initial_admin,
       CosNotifyChannelAdmin::ChannelID_out id);
 
-  virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (void);
+  virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ();
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
       CosNotifyChannelAdmin::ChannelID id);
@@ -170,7 +170,7 @@ private:
   Routing_Slip_Set routing_slip_restart_set_;
 
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   ACE_Auto_Ptr <TAO_Notify_validate_client_Task> validate_client_task_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index 5527fd3bf04..767fcfa60ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventType : public TAO_Notify::Topology_
 {
 public:
   /// Constructor
-  TAO_Notify_EventType (void);
+  TAO_Notify_EventType ();
   TAO_Notify_EventType (const char* domain_name, const char* type_name);
   TAO_Notify_EventType (const CosNotification::EventType& event_type);
   // Constructor
@@ -58,7 +58,7 @@ public:
   bool operator!=(const TAO_Notify_EventType& notify_event_type) const;
 
   /// Return the special event type.
-  static TAO_Notify_EventType special (void);
+  static TAO_Notify_EventType special ();
 
   /// Is this the special event (accept everything).
   CORBA::Boolean is_special () const;
@@ -83,7 +83,7 @@ protected:
   void init_i (const char* domain_name, const char* type_name);
 
   /// Recompute the hash value.
-  void recompute_hash (void);
+  void recompute_hash ();
 
   bool domain_is_wildcard (const char* domain) const;
   bool type_is_wildcard (const char* type) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index 1fc01794e2b..f832e1b0b21 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq
 
 public:
   /// Constructor
-  TAO_Notify_EventTypeSeq (void);
+  TAO_Notify_EventTypeSeq ();
   TAO_Notify_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq);
   TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs);
   TAO_Notify_EventTypeSeq & operator = (const TAO_Notify_EventTypeSeq & rhs);
@@ -73,7 +73,7 @@ public:
     const TAO_Notify::NVPList& attrs);
 
 private:
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index 10844c15661..517733dbc09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -55,7 +55,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Event_Manager : public TAO_Notify_Refcou
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Event_Manager > Ptr;
   /// Constructor
-  TAO_Notify_Event_Manager (void);
+  TAO_Notify_Event_Manager ();
 
   /// Destructor
   virtual ~TAO_Notify_Event_Manager ();
@@ -63,10 +63,10 @@ public:
   void release();
 
   /// Init
-  void init (void);
+  void init ();
 
   /// Init
-  void shutdown (void);
+  void shutdown ();
 
   /// Connect ProxySupplier
   void connect (TAO_Notify_ProxySupplier* proxy_supplier);
@@ -81,8 +81,8 @@ public:
   void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Map accessors.
-  TAO_Notify_Consumer_Map& consumer_map (void);
-  TAO_Notify_Supplier_Map& supplier_map (void);
+  TAO_Notify_Consumer_Map& consumer_map ();
+  TAO_Notify_Supplier_Map& supplier_map ();
 
   /// Offer change received on <proxy_consumer>.
   void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 4703cff5773..da4ebceab06 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY>
-TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T ()
   : collection_ (0), count_ (0), usage_count_ (1)
 {
 }
@@ -26,7 +26,7 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::~TAO_Notify_Event_Map_Entry_T ()
 }
 
 template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::init (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::init ()
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index d143715a3a0..fbab796366f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -39,13 +39,13 @@ public:
   typedef TAO_ESF_Proxy_Collection<PROXY> COLLECTION;
 
   /// Constructor
-  TAO_Notify_Event_Map_Entry_T (void);
+  TAO_Notify_Event_Map_Entry_T ();
 
   /// Destructor
-  ~TAO_Notify_Event_Map_Entry_T (void);
+  ~TAO_Notify_Event_Map_Entry_T ();
 
   /// Init - Allocates collection
-  void init (void);
+  void init ();
 
   /// Connect
   void connected (PROXY* proxy);
@@ -54,17 +54,17 @@ public:
   void disconnected (PROXY* proxy);
 
   /// Collection accessor
-  COLLECTION* collection (void);
+  COLLECTION* collection ();
 
   /// Count accessor
-  int count (void);
+  int count ();
 
   ///= Reference counting methods.
   // Incr the ref count.
-  CORBA::ULong _incr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
 
   // Decr the ref count. This object is destroyed when the count is 0.
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _decr_refcnt ();
 
 protected:
   /// The Collection
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 1c86bd16611..9b414efb769 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY, class ACE_LOCK>
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T ()
   :proxy_count_ (0)
 {
 }
@@ -25,7 +25,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::~TAO_Notify_Event_Map_T ()
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init ()
 {
   this->broadcast_entry_.init ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index beb1e84ed5a..29f60d16ce0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -36,13 +36,13 @@ public:
   typedef  TAO_Notify_Event_Map_Entry_T<PROXY> ENTRY;
 
   /// Constructor
-  TAO_Notify_Event_Map_T (void);
+  TAO_Notify_Event_Map_T ();
 
   /// Destructor
   ~TAO_Notify_Event_Map_T ();
 
   /// Init
-  void init (void);
+  void init ();
 
   /// Connect a PROXY
   void connect (PROXY* proxy);
@@ -65,19 +65,19 @@ public:
   ENTRY* find (const TAO_Notify_EventType& event_type);
 
   /// Find the default broadcast list.
-  typename ENTRY::COLLECTION* broadcast_collection (void);
+  typename ENTRY::COLLECTION* broadcast_collection ();
 
   /// Find the update list. This is all the PROXYS connected to this Map.
-  typename ENTRY::COLLECTION* updates_collection (void);
+  typename ENTRY::COLLECTION* updates_collection ();
 
   /// Release the usage count on this entry.
   void release (ENTRY* entry);
 
   /// Access all the event types available
-  const TAO_Notify_EventTypeSeq& event_types (void);
+  const TAO_Notify_EventTypeSeq& event_types ();
 
   /// Access number of proxys connected in all.
-  int proxy_count (void);
+  int proxy_count ();
 
 protected:
   /// The Map that stores eventtype to entry mapping.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index e218316dff5..b30ffbb825c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -38,10 +38,10 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 {
  public:
   /// Constructor
-  TAO_Notify_FilterAdmin (void);
+  TAO_Notify_FilterAdmin ();
 
   /// Destructor
-  virtual ~TAO_Notify_FilterAdmin (void);
+  virtual ~TAO_Notify_FilterAdmin ();
 
   // = match operation on all the filters
   /// See if any of the filters match.
@@ -57,9 +57,9 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter);
 
-  virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+  virtual CosNotifyFilter::FilterIDSeq * get_all_filters ();
 
-  virtual void remove_all_filters (void);
+  virtual void remove_all_filters ();
 
 
   // TAO_Notify::Topology_Object
@@ -73,7 +73,7 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
  private:
   typedef ACE_Hash_Map_Manager <CosNotifyFilter::FilterID, CosNotifyFilter::Filter_var, ACE_SYNCH_NULL_MUTEX> FILTER_LIST;
 
-  virtual void release (void);
+  virtual void release ();
 
   /// Mutex to serialize access to data members.
   TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index f4225943a3a..2b4e9bd9b19 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION>
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T (void)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T ()
   :id_ (0), result_ (0)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index 0f22e06f52a..1c5fd4a61d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -35,7 +35,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TY
 
 public:
   /// Constructor
-  TAO_Notify_Find_Worker_T (void);
+  TAO_Notify_Find_Worker_T ();
 
   /// Find the Type.
   TYPE* find (const TAO_Notify_Object::ID id, CONTAINER& container);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
index 2faafacb001..265a77b00e6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
@@ -31,12 +31,12 @@ class TAO_Notify_Serv_Export TAO_Notify_ID_Factory
 {
 public:
   /// Constructor
-  TAO_Notify_ID_Factory (void);
+  TAO_Notify_ID_Factory ();
 
   /// Destructor
   ~TAO_Notify_ID_Factory ();
 
-  TAO_Notify_Object::ID id (void);
+  TAO_Notify_Object::ID id ();
 
   void set_last_used (const TAO_Notify_Object::ID id);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index d8a1ba1ffad..4cf31b14cdc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -36,7 +36,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request
 {
 public:
   /// Destructor.
-  virtual ~TAO_Notify_Method_Request (void);
+  virtual ~TAO_Notify_Method_Request ();
 
   /// Execute the Request
   virtual int execute (void) = 0;
@@ -60,7 +60,7 @@ public:
   TAO_Notify_Method_Request_Queueable();
   TAO_Notify_Method_Request_Queueable(const TAO_Notify_Event * event);
 
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
   void init (const TAO_Notify_Event * event);
 
   /// The creation time of the event to which this request corresponds.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 0e24d3fb53c..083ed21d808 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// Execute the dispatch operation.
-  int execute_i (void);
+  int execute_i ();
 
 protected:
   /// The Proxy
@@ -115,7 +115,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Dispatch_Queueable ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   TAO_Notify_Event::Ptr event_var_;
@@ -144,10 +144,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Dispatch_No_Copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
   /// Create a copy of this method request
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
 };
 
 /*****************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index a3f251c2fdc..fdc0895dade 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -88,7 +88,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Event_Queueable ();
 
   /// satisfy the pure virtual method.  Should never be called.
-  virtual int execute (void);
+  virtual int execute ();
 private:
   TAO_Notify_Event::Ptr event_var_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 1acdba32f1b..004cfd69492 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -59,7 +59,7 @@ protected:
   TAO_Notify_Method_Request_Lookup (const TAO_Notify::Delivery_Request_Ptr& delivery, TAO_Notify_ProxyConsumer * proxy);
 
   /// Execute the dispatch operation.
-  int execute_i (void);
+  int execute_i ();
 
   ///= TAO_ESF_Worker method
   virtual void work (TAO_Notify_ProxySupplier* proxy_supplier);
@@ -95,7 +95,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Lookup_Queueable ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   TAO_Notify_Event::Ptr event_var_;
@@ -123,10 +123,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Lookup_No_Copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index d30cd2dfb95..8665360a5e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -37,10 +37,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Shutdown ();
 
   /// Create a copy of this object.
-  TAO_Notify_Method_Request_Queueable* copy (void);
+  TAO_Notify_Method_Request_Queueable* copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   // Task to shutdown
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index db70c6eea23..db876a4728c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -46,7 +46,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 /*****************************************************************************/
@@ -74,10 +74,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates_No_Copy ();
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index 57074f426fb..9ca4a06f167 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -44,7 +44,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates_T ();
 
   /// Execute the Request
-  int execute_i (void);
+  int execute_i ();
 
 protected:
   /// Update Added
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
index 5a1457bab05..a34dd62bcf2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
@@ -21,7 +21,7 @@ class TAO_Notify_MC_Export TAO_NS_Control
 {
 public:
   /// This is here due to virtual functions.
-  virtual ~TAO_NS_Control (void);
+  virtual ~TAO_NS_Control ();
 
   /// Return the name of this control object.
   const ACE_CString& name () const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
index 23d3eeadc0a..e99e21d80cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
@@ -39,10 +39,10 @@ public:
   };
 
   /// Return the singleton instance of the registry
-  static TAO_Control_Registry* instance (void);
+  static TAO_Control_Registry* instance ();
 
   /// Empty out the map of objects
-  ~TAO_Control_Registry (void);
+  ~TAO_Control_Registry ();
 
   /// Adds an object to the map.
   /// Throws Map_Error if the object is null or if there
@@ -57,7 +57,7 @@ public:
   bool remove (const ACE_CString& name);
 
   /// Returns a list of names stored in the registry
-  const NameList& names (void);
+  const NameList& names ();
 
   /// Gets an object from the map
   /// Returns the object if it is successfully located.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
index 60c9758d246..f12d4b426b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
@@ -22,7 +22,7 @@ class TAO_Notify_MC_Export TAO_MonitorManager : public ACE_Service_Object
 {
 public:
   /// Perform member initialization
-  TAO_MonitorManager (void);
+  TAO_MonitorManager ();
 
   virtual int init (int argc, ACE_TCHAR* argv[]);
   virtual int fini ();
@@ -30,20 +30,20 @@ public:
   /// Start the ORB task which includes initializtion of the ORB,
   /// creation of the monitor servant and activation.
   /// If run is called more than once, it will silently perform a no-op.
-  int run (void);
+  int run ();
 
   /// This will call the run() method.
-  virtual int resume (void);
+  virtual int resume ();
 
   /// Get the dynamic instance of the TAO_MonitorManager and
   /// shut it down
-  static void shutdown (void);
+  static void shutdown ();
 
 private:
   class ORBTask: public ACE_Task_Base
   {
   public:
-    ORBTask (void);
+    ORBTask ();
     virtual int svc ();
 
     TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
index 779db3ac50f..b2cab713a74 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
@@ -34,7 +34,7 @@ public:
   NotificationServiceMonitor_i (CORBA::ORB_ptr orb = 0);
 
   /// Get a list of statistic names
-  virtual Monitor::NameList* get_statistic_names (void);
+  virtual Monitor::NameList* get_statistic_names ();
 
   /// Get the data from a single statistic
   virtual Monitor::Data*
@@ -68,7 +68,7 @@ public:
   virtual void remove_supplieradmin (const char* name);
 
   /// Call shutdown() on the ORB if one was provided during construction
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   void send_control_command (const char* name, const char* cmd);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h
index 7bcbc93b879..85267b8eb5d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h
@@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_MC_Ext_Export TAO_MC_Notify_Service: public TAO_CosNotify_Service
 {
 public:
-  virtual ~TAO_MC_Notify_Service (void);
+  virtual ~TAO_MC_Notify_Service ();
 
 protected:
   virtual void init_i (CORBA::ORB_ptr orb);
@@ -38,7 +38,7 @@ protected:
                  CosNotifyChannelAdmin::EventChannelFactory_ptr factory);
 
 private:
-  virtual TAO_Notify_Factory* create_factory (void);
+  virtual TAO_Notify_Factory* create_factory ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
index 536b7dc6006..46597279d12 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
@@ -40,10 +40,10 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorConsumerAdmin
 {
 public:
   /// Construct a monitor supplier admin.
-  TAO_MonitorConsumerAdmin (void);
+  TAO_MonitorConsumerAdmin ();
 
   /// Remove the statistics for this event channel.
-  virtual ~TAO_MonitorConsumerAdmin (void);
+  virtual ~TAO_MonitorConsumerAdmin ();
 
   /// Register our statistic and control objects.
   void register_stats_controls (TAO_MonitorEventChannel* mec,
@@ -72,10 +72,10 @@ public:
 
   virtual void count_queue_overflow (bool local_overflow, bool global_overflow);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
-  virtual void remove (void);
+  virtual void remove ();
 
   ACE_CString stat_name_;
   ACE_CString queue_size_stat_name_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
index bbf50f47875..646932ea068 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
@@ -45,7 +45,7 @@ public:
   TAO_MonitorEventChannel (const char* name);
 
   /// Remove the statistics for this event channel.
-  ~TAO_MonitorEventChannel (void);
+  ~TAO_MonitorEventChannel ();
 
   /// Return the name of this event channel.
   const ACE_CString& name () const;
@@ -110,7 +110,7 @@ private:
   TAO_Notify_ThreadPool_Task* get_threadpool_task (
                                 CosNotifyChannelAdmin::AdminID id);
   size_t calculate_queue_size (bool count);
-  double get_oldest_event (void);
+  double get_oldest_event ();
   void determine_slowest_consumer (Monitor_Control_Types::NameList* names);
   bool destroy_consumer (CosNotifyChannelAdmin::ProxyID id);
   bool destroy_supplier (CosNotifyChannelAdmin::ProxyID id);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
index 311fb73d097..fe512ec5696 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
@@ -32,7 +32,7 @@ public:
   TAO_MonitorEventChannelFactory (const char* name);
 
   /// Remove the factory name from the factory names statistic
-  ~TAO_MonitorEventChannelFactory (void);
+  ~TAO_MonitorEventChannelFactory ();
 
   /// Create a named event channel and associate various statistic
   /// objects with it in the statistic registry
@@ -70,8 +70,8 @@ private:
   public:
     Unbinder (Map& map,
               const ACE_CString& name);
-    ~Unbinder (void);
-    void release (void);
+    ~Unbinder ();
+    void release ();
 
   private:
     Map& map_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
index 2bc12122e6d..b4d36658e6b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
@@ -17,7 +17,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename ProxyPushSupplier>
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::TAO_MonitorProxySupplier_T (void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::TAO_MonitorProxySupplier_T ()
   : queue_item_stat_name_ ()
   , overflow_stat_name_ ()
   , queue_item_count_ (0)
@@ -28,7 +28,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::TAO_MonitorProxySupplier_T (void)
 }
 
 template <typename ProxyPushSupplier>
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::~TAO_MonitorProxySupplier_T (void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::~TAO_MonitorProxySupplier_T ()
 {
   if (this->admin_ != 0)
     {
@@ -146,7 +146,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::configure(
 
 template <typename ProxyPushSupplier>
 ACE_CString &
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::queue_item_stat_name(void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::queue_item_stat_name()
 {
   return this->queue_item_stat_name_;
 }
@@ -154,7 +154,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::queue_item_stat_name(void)
 
 template <typename ProxyPushSupplier>
 ACE_CString &
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::overflow_stat_name(void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::overflow_stat_name()
 {
   return this->overflow_stat_name_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
index 3ca80ef6ee4..9bfe7ee793c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
@@ -41,10 +41,10 @@ class TAO_MonitorProxySupplier_T
 {
 public:
   /// Construct a monitor supplier admin
-  TAO_MonitorProxySupplier_T (void);
+  TAO_MonitorProxySupplier_T ();
 
   /// Remove the statistics for this event channel
-  virtual ~TAO_MonitorProxySupplier_T (void);
+  virtual ~TAO_MonitorProxySupplier_T ();
 
   /// Configure the statistics after construction
   /// @param admin the parent admin for this proxy
@@ -58,10 +58,10 @@ public:
   virtual void count_queue_overflow (bool local_overflow, bool global_overflow);
 
   /// Access to Statistics Name
-  ACE_CString & queue_item_stat_name (void);
+  ACE_CString & queue_item_stat_name ();
 
   /// Access to Statistics Name
-  ACE_CString & overflow_stat_name (void);
+  ACE_CString & overflow_stat_name ();
 
 private:
   ACE_CString base_stat_name_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
index 568e731f16e..c780647e817 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
@@ -23,10 +23,10 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorSupplierAdmin:
 {
 public:
   /// Construct a monitor supplier admin
-  TAO_MonitorSupplierAdmin (void);
+  TAO_MonitorSupplierAdmin ();
 
   /// Remove the statistics for this event channel
-  ~TAO_MonitorSupplierAdmin (void);
+  ~TAO_MonitorSupplierAdmin ();
 
   /// Register our statistic and control objects
   void register_stats_controls (TAO_MonitorEventChannel* mec,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index 51748c154a7..3102babfcc8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -37,10 +37,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Constraint_Interpreter
   : public ETCL_Interpreter
 {
 public:
-  TAO_Notify_Constraint_Interpreter (void);
+  TAO_Notify_Constraint_Interpreter ();
 
   /// Destructor
-  virtual ~TAO_Notify_Constraint_Interpreter (void);
+  virtual ~TAO_Notify_Constraint_Interpreter ();
 
   /**
    * This method builds an expression tree representing the
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index 664061b9b38..0e5e5680b8e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor
 {
 public:
   /// Constructor.
-  TAO_Notify_Constraint_Visitor (void);
+  TAO_Notify_Constraint_Visitor ();
 
   /// Put the event data into our hash map.
   int bind_structured_event (const CosNotification::StructuredEvent &s_event);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
index c5c47737ad5..a9fe48f25a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
@@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_CO_Factory
 public:
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
index c25728ba2d6..e222ca1496d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory
 public:
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
index ea0474a021c..0d8aa7ac272 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_EMO_Factory
 public:
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
index b5cc7b4373c..ce23da5d868 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_POA_Factory
 public:
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 25dd6fc3d4d..4132736d229 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -49,7 +49,7 @@ public:
   typedef CORBA::Long ID;
 
   /// Destructor
-  virtual ~TAO_Notify_Object (void);
+  virtual ~TAO_Notify_Object ();
 
   /// This Object's ID
   ID id () const;
@@ -63,45 +63,45 @@ public:
       CORBA::Long id);
 
   /// Deactivate
-  void deactivate (void);
+  void deactivate ();
 
   /// Have we been shutdown. returns true if shutdown.
-  bool has_shutdown (void);
+  bool has_shutdown ();
 
   void execute_task (TAO_Notify_Method_Request& method_request);
 
   /// Get CORBA Ref.
-  CORBA::Object_ptr ref (void);
+  CORBA::Object_ptr ref ();
 
   /// Set the QoS Properties.
   virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   /// Get the QoS Properties.
-  CosNotification::QoSProperties* get_qos (void);
+  CosNotification::QoSProperties* get_qos ();
 
   bool find_qos_property_value (
     const char * name,
     CosNotification::PropertyValue & value)const;
 
   /// Obtain the Timer manager associated with this object.
-  virtual TAO_Notify_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer ();
 
   /// Accessor for the Event Manager
-  TAO_Notify_Event_Manager& event_manager (void);
+  TAO_Notify_Event_Manager& event_manager ();
 
   /// Shutdown. Returns 1 if the shutdown was already run once before.
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Load our attributes. Each derived type should call the superclass
   /// load first before loading its own attributes.
   virtual void load_attrs(const TAO_Notify::NVPList& attrs);
 
   /// Allow access to the underlying worker task.
-  TAO_Notify_Worker_Task* get_worker_task (void);
+  TAO_Notify_Worker_Task* get_worker_task ();
 
 protected:
   /// Constructor
-  TAO_Notify_Object (void);
+  TAO_Notify_Object ();
 
   /// Init this object with data from <rhs>.
   void initialize (TAO_Notify_Object* parent);
@@ -116,13 +116,13 @@ protected:
   void set_primary_as_proxy_poa();
 
   /// Accessor for the proxy_poa_
-  TAO_Notify_POA_Helper* proxy_poa (void);
+  TAO_Notify_POA_Helper* proxy_poa ();
 
   /// Accessor for the object_poa_
-  TAO_Notify_POA_Helper* object_poa (void);
+  TAO_Notify_POA_Helper* object_poa ();
 
   /// Get the POA assigned to us.
-  TAO_Notify_POA_Helper* poa (void);
+  TAO_Notify_POA_Helper* poa ();
 
   // Sets the admin properties
   void set_event_manager(TAO_Notify_Event_Manager* event_manager);
@@ -131,7 +131,7 @@ protected:
   void set_admin_properties(TAO_Notify_AdminProperties* admin_properties);
 
   /// Accessor for the Admin Properties
-  TAO_Notify_AdminProperties& admin_properties (void);
+  TAO_Notify_AdminProperties& admin_properties ();
 
   /// Notification that can be overridden by subclasses to be informed that
   /// <qos_properties_> have been modified.
@@ -161,16 +161,16 @@ private:
   void set_poa (TAO_Notify_POA_Helper* object_poa);
 
   /// Shutdown the current worker task and delete it if we own it.
-  void shutdown_worker_task (void);
+  void shutdown_worker_task ();
 
   /// Shutdown the current proxy poa.
-  void destroy_proxy_poa (void);
+  void destroy_proxy_poa ();
 
   /// Shutdown the current object poa.
-  void destroy_object_poa (void);
+  void destroy_object_poa ();
 
   /// Shutdown the current poa.
-  void destroy_poa (void);
+  void destroy_poa ();
 
 protected:
   /// The mutex to serialize access to state variables.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 171baa9e3e5..3f0451ce7a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled
 {
 public:
   /// Default Constructor
-  TAO_Notify_POA_Helper (void);
+  TAO_Notify_POA_Helper ();
 
   /// Create a new PortableServer::POA.
   void init (PortableServer::POA_ptr parent_poa, const char* poa_name);
@@ -52,10 +52,10 @@ public:
   virtual ~TAO_Notify_POA_Helper ();
 
   /// Get underlying POA
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
 
   /// Destroy underlying POA.
-  void destroy (void);
+  void destroy ();
 
   /// Activate Object, the POA will assign an ID and return its value.
   CORBA::Object_ptr activate (PortableServer::Servant servant,
@@ -76,7 +76,7 @@ public:
   CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant) const;
 
   /// Generate a unique id for each POA created.
-  ACE_CString get_unique_id (void);
+  ACE_CString get_unique_id ();
 
 protected:
   /// Set default POA policies.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 31590d5984e..fd955db9b96 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -36,18 +36,18 @@ class TAO_Notify_Serv_Export TAO_Notify_Peer
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Peer > Ptr;
   /// Constructor
-  TAO_Notify_Peer (void);
+  TAO_Notify_Peer ();
 
   /// Destructor
   virtual ~TAO_Notify_Peer ();
 
   /// This method sigantures deliberately match the RefCounting methods
   /// required for ESF Proxy
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   /// Shutdown the peer.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Access Proxy.
   virtual TAO_Notify_Proxy* proxy (void) = 0;
@@ -60,7 +60,7 @@ public:
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
   /// Handle dispatch exceptions.
-  void handle_dispatch_exception (void);
+  void handle_dispatch_exception ();
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior () const = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 8b7738439c5..566806c7682 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -39,83 +39,83 @@ class TAO_Notify_Serv_Export TAO_Notify_Properties
 {
 public:
   /// Constructor
-  TAO_Notify_Properties (void);
+  TAO_Notify_Properties ();
 
   /// Destructor
   ~TAO_Notify_Properties ();
 
   /// Return a singleton instance of this class.
-  static TAO_Notify_Properties * instance (void);
+  static TAO_Notify_Properties * instance ();
 
-  static void close (void);
+  static void close ();
 
   // = Property Accessors
-  TAO_Notify_Factory* factory (void);
+  TAO_Notify_Factory* factory ();
   void factory (TAO_Notify_Factory* factory);
 
-  TAO_Notify_Builder* builder (void);
+  TAO_Notify_Builder* builder ();
   void builder (TAO_Notify_Builder* builder);
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
   void orb (CORBA::ORB_ptr orb);
-  CORBA::ORB_ptr dispatching_orb (void);
+  CORBA::ORB_ptr dispatching_orb ();
   void dispatching_orb (CORBA::ORB_ptr dispatching_orb);
 
-  PortableServer::POA_ptr default_poa (void);
+  PortableServer::POA_ptr default_poa ();
   void default_poa (PortableServer::POA_ptr default_poa);
 
-  CORBA::Boolean asynch_updates (void);
+  CORBA::Boolean asynch_updates ();
   void asynch_updates (CORBA::Boolean asynch_updates);
 
-  bool allow_reconnect (void);
+  bool allow_reconnect ();
   void allow_reconnect (bool b);
-  bool validate_client (void);
+  bool validate_client ();
   void validate_client (bool b);
-  ACE_Time_Value validate_client_delay (void);
+  ACE_Time_Value validate_client_delay ();
   void validate_client_delay (ACE_Time_Value b);
-  ACE_Time_Value validate_client_interval (void);
+  ACE_Time_Value validate_client_interval ();
   void validate_client_interval (ACE_Time_Value b);
 
   // Turn on/off update messages.
-  CORBA::Boolean updates (void);
+  CORBA::Boolean updates ();
   void updates (CORBA::Boolean updates);
-  bool separate_dispatching_orb (void);
+  bool separate_dispatching_orb ();
   void separate_dispatching_orb (bool b);
 
   // The QoS Property that must be applied to each newly created Event Channel
-  const CosNotification::QoSProperties& default_event_channel_qos_properties (void);
+  const CosNotification::QoSProperties& default_event_channel_qos_properties ();
 
   // Set the default EC QoS Property.
   void default_event_channel_qos_properties (const CosNotification::QoSProperties &ec_qos);
 
   // The QoS Property that must be applied to each newly created Supplier Admin
-  const CosNotification::QoSProperties& default_supplier_admin_qos_properties (void);
+  const CosNotification::QoSProperties& default_supplier_admin_qos_properties ();
 
   // Set the default SA QoS Property.
   void default_supplier_admin_qos_properties (const CosNotification::QoSProperties &sa_qos);
 
   // The QoS Property that must be applied to each newly created Consumer Admin
-  const CosNotification::QoSProperties& default_consumer_admin_qos_properties (void);
+  const CosNotification::QoSProperties& default_consumer_admin_qos_properties ();
 
   // Set the default CA QoS Property.
   void default_consumer_admin_qos_properties (const CosNotification::QoSProperties &ca_qos);
 
   // The QoS Property that must be applied to each newly created Proxy Supplier
-  const CosNotification::QoSProperties& default_proxy_supplier_qos_properties (void);
+  const CosNotification::QoSProperties& default_proxy_supplier_qos_properties ();
 
   // Set the default PS QoS Property.
   void default_proxy_supplier_qos_properties (const CosNotification::QoSProperties &ps_qos);
 
   // The QoS Property that must be applied to each newly created Proxy Consumer
-  const CosNotification::QoSProperties& default_proxy_consumer_qos_properties (void);
+  const CosNotification::QoSProperties& default_proxy_consumer_qos_properties ();
 
   // Set the default PC QoS Property.
   void default_proxy_consumer_qos_properties (const CosNotification::QoSProperties &pc_qos);
 
-  CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp ();
   void defaultConsumerAdminFilterOp (CosNotifyChannelAdmin::InterFilterGroupOperator op);
 
-  CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp ();
   void defaultSupplierAdminFilterOp (CosNotifyChannelAdmin::InterFilterGroupOperator op);
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index e392cf2909d..544993394a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_PropertySeq
 {
 public:
   /// Constructor
-  TAO_Notify_PropertySeq (void);
+  TAO_Notify_PropertySeq ();
 
   /// Destructor
   ~TAO_Notify_PropertySeq ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index 987171f8857..35b02c07772 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -68,7 +68,7 @@ public:
   CORBA::Boolean is_valid () const;
 
   /// Invalidate this property's value.
-  void invalidate (void);
+  void invalidate ();
 
 protected:
   /// The Property name.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index 35ab6008e32..48e2b67e728 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -43,7 +43,7 @@ public:
   typedef CosNotifyChannelAdmin::ProxyIDSeq_var SEQ_VAR;
 
   /// Constructor
-  TAO_Notify_Proxy (void);
+  TAO_Notify_Proxy ();
 
   /// Destructor
   virtual ~TAO_Notify_Proxy ();
@@ -57,7 +57,7 @@ public:
       CORBA::Long id);
 
   /// Deactivate
-  void deactivate (void);
+  void deactivate ();
 
   /// Obtain the Proxy's subscribed types.
   void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
@@ -73,7 +73,7 @@ public:
                       const TAO_Notify_EventTypeSeq& removed);
 
   /// Have updates been turned off.
-  CORBA::Boolean updates_off (void);
+  CORBA::Boolean updates_off ();
 
   /// Destroy this object.
   virtual void destroy (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index dfcb7abf227..2230a958c20 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -39,10 +39,10 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer
 public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> Ptr;
   /// Constructor
-  TAO_Notify_ProxyConsumer (void);
+  TAO_Notify_ProxyConsumer ();
 
   /// Destructor
-  virtual ~TAO_Notify_ProxyConsumer (void);
+  virtual ~TAO_Notify_ProxyConsumer ();
 
   /// init: overrides Topology_Object method
   virtual void init (TAO_Notify::Topology_Parent * topology_parent);
@@ -51,26 +51,26 @@ public:
   void connect (TAO_Notify_Supplier* supplier);
 
   /// Disconnect
-  void disconnect (void);
+  void disconnect ();
 
   /// Shutdown  (TAO_Notify_Container_T method)
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Destroy this object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Return true if connected
   bool is_connected () const;
 
   /// The SA parent.
-  TAO_Notify_SupplierAdmin& supplier_admin (void);
+  TAO_Notify_SupplierAdmin& supplier_admin ();
 
   ACE_Time_Value last_ping() const;
   void last_ping(const ACE_Time_Value& tv);
 
 protected:
   /// Access the Supplier
-  TAO_Notify_Supplier* supplier (void);
+  TAO_Notify_Supplier* supplier ();
 
   /// Accept an event from the Supplier
   void push_i (TAO_Notify_Event * event);
@@ -91,7 +91,7 @@ private:
   ACE_Auto_Ptr<TAO_Notify_Supplier> supplier_;
 
   /// Access our Peer.
-  virtual TAO_Notify_Peer* peer (void);
+  virtual TAO_Notify_Peer* peer ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index 3b329e4723a..4c3ad93164f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -9,7 +9,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T (void)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T ()
 {
 }
 
@@ -26,7 +26,7 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotifica
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin ()
 {
   CosNotifyChannelAdmin::SupplierAdmin_var ret;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index c775c7634b3..1c8903aeb84 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -32,7 +32,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T
 {
 public:
   /// Constructor
-  TAO_Notify_ProxyConsumer_T (void);
+  TAO_Notify_ProxyConsumer_T ();
 
   /// Destructor
   ~TAO_Notify_ProxyConsumer_T ();
@@ -41,7 +41,7 @@ public:
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
                                     const CosNotification::EventTypeSeq & removed);
 
-  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void);
+  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin ();
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index a49ec312c7b..fa49f9d135f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notif
 public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxySupplier> Ptr;
   /// Constructor
-  TAO_Notify_ProxySupplier (void);
+  TAO_Notify_ProxySupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_ProxySupplier ();
@@ -50,16 +50,16 @@ public:
   /// Connect
   void connect (TAO_Notify_Consumer* consumer);
   /// Disconnect
-  void disconnect (void);
+  void disconnect ();
 
   /// Dispatch Event to consumer
   virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request);
 
   /// Override TAO_Notify_Container_T::shutdown  method
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Destroy this object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Destroy this object, but also indicate if it is due to a timeout or
   /// not.
@@ -72,10 +72,10 @@ public:
   bool is_connected () const;
 
   /// Access the Consumer
-  TAO_Notify_Consumer* consumer (void);
+  TAO_Notify_Consumer* consumer ();
 
   /// The CA parent.
-  TAO_Notify_ConsumerAdmin& consumer_admin (void);
+  TAO_Notify_ConsumerAdmin& consumer_admin ();
 
 private:
   ///= Data Members.
@@ -86,7 +86,7 @@ private:
   TAO_Notify_Consumer::Ptr consumer_;
 
   /// Access our Peer.
-  virtual TAO_Notify_Peer* peer (void);
+  virtual TAO_Notify_Peer* peer ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index f65acbbb9c8..8b0bce36406 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -15,7 +15,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T ()
   : is_suspended_ (0)
 {
 }
@@ -96,7 +96,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection ()
 {
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
@@ -113,7 +113,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection ()
 {
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
@@ -129,7 +129,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin ()
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ret;
 
@@ -143,7 +143,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
 /***************************** UNIMPLEMENTED METHODS***************************************/
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -155,7 +155,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mapp
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index ac288d54fe8..a53e6e75705 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -31,7 +31,7 @@ class TAO_Notify_ProxySupplier_T : public virtual TAO_Notify_Proxy_T <SERVANT_TY
 {
 public:
   /// Constructor
-  TAO_Notify_ProxySupplier_T (void);
+  TAO_Notify_ProxySupplier_T ();
 
   /// Destructor
   ~TAO_Notify_ProxySupplier_T ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 8c73a057172..818201dfcc4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -6,7 +6,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
-TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T ()
 {
   // Any object that is used by the POA gets a reference count of 1 at construction
   this->_incr_refcnt();
@@ -18,19 +18,19 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::~TAO_Notify_Proxy_T ()
 }
 
 template <class SERVANT_TYPE> PortableServer::Servant
-TAO_Notify_Proxy_T<SERVANT_TYPE>::servant (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::servant ()
 {
   return this;
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
@@ -42,7 +42,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoS
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -101,7 +101,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter)
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -110,7 +110,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index ab905b368b4..e3f254893d5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -34,17 +34,17 @@ class TAO_Notify_Proxy_T : public SERVANT_TYPE, public virtual TAO_Notify_Proxy
 {
 public:
   /// Constructor
-  TAO_Notify_Proxy_T (void);
+  TAO_Notify_Proxy_T ();
 
   /// Destructor
   ~TAO_Notify_Proxy_T ();
 
   /// Implements TAO_Notify_Object::servant method.
-  virtual PortableServer::Servant servant (void);
+  virtual PortableServer::Servant servant ();
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   virtual void validate_event_qos (
     const CosNotification::QoSProperties & required_qos,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index 201628c5b82..aa0fbb52336 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -33,10 +33,10 @@ class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_Proper
 {
 public:
   /// Constructor
-  TAO_Notify_QoSProperties (void);
+  TAO_Notify_QoSProperties ();
 
   /// Destructor
-  virtual ~TAO_Notify_QoSProperties (void);
+  virtual ~TAO_Notify_QoSProperties ();
 
   /// Return 0 on success, 1 if unsupported properties were detected and -1 on error.
   int init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq);
@@ -67,17 +67,17 @@ public:
   const TAO_Notify_Property_Time& blocking_policy() const;
 
   // The non-const accessors are used during topology load
-  TAO_Notify_Property_Short& event_reliability (void);
-  TAO_Notify_Property_Short& connection_reliability (void);
-  TAO_Notify_Property_Short& priority (void);
-  TAO_Notify_Property_Time& timeout (void);
-  TAO_Notify_Property_Boolean& stop_time_supported (void);
-  TAO_Notify_Property_Long& maximum_batch_size (void);
-  TAO_Notify_Property_Time& pacing_interval (void);
-  TAO_Notify_Property_Long& max_events_per_consumer (void);
-  TAO_Notify_Property_Short& discard_policy(void);
-  TAO_Notify_Property_Short& order_policy(void);
-  TAO_Notify_Property_Time& blocking_policy(void);
+  TAO_Notify_Property_Short& event_reliability ();
+  TAO_Notify_Property_Short& connection_reliability ();
+  TAO_Notify_Property_Short& priority ();
+  TAO_Notify_Property_Time& timeout ();
+  TAO_Notify_Property_Boolean& stop_time_supported ();
+  TAO_Notify_Property_Long& maximum_batch_size ();
+  TAO_Notify_Property_Time& pacing_interval ();
+  TAO_Notify_Property_Long& max_events_per_consumer ();
+  TAO_Notify_Property_Short& discard_policy();
+  TAO_Notify_Property_Short& order_policy();
+  TAO_Notify_Property_Time& blocking_policy();
 
 protected:
   /// Return 1 if <value> is unsupported.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index 09c91139f80..c1c44446beb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_Builder : public TAO_Notify_Builder
 {
 public:
   /// Constructor
-  TAO_Notify_RT_Builder (void);
+  TAO_Notify_RT_Builder ();
 
   /// Destructor
   virtual ~TAO_Notify_RT_Builder ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index 76f83c53632..0286a1ff4f9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service
 {
 public:
   /// Constructor
-  TAO_RT_Notify_Service (void);
+  TAO_RT_Notify_Service ();
 
   /// Destructor
   ~TAO_RT_Notify_Service ();
@@ -42,10 +42,10 @@ protected:
   virtual void init_i (CORBA::ORB_ptr orb);
 
   /// Create the Factory for RT Notify objects.
-  virtual TAO_Notify_Factory* create_factory (void);
+  virtual TAO_Notify_Factory* create_factory ();
 
   /// Creates the Builder for RT Notify objects.
-  virtual TAO_Notify_Builder* create_builder (void);
+  virtual TAO_Notify_Builder* create_builder ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 2c0d9458a5d..624015376f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -30,7 +30,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_POA_Helper : public TAO_Notify_POA_Help
 {
 public:
   /// Destructor
-  ~TAO_Notify_RT_POA_Helper (void);
+  ~TAO_Notify_RT_POA_Helper ();
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
index f1549a4596c..7881aebb5fb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
@@ -29,18 +29,18 @@ class TAO_RT_Notify_Export TAO_Notify_RT_Properties
 {
 public:
   /// Constructor
-  TAO_Notify_RT_Properties (void);
+  TAO_Notify_RT_Properties ();
 
   /// Destructor
   ~TAO_Notify_RT_Properties ();
 
   /// Return singleton instance of this class.
-  static TAO_Notify_RT_Properties * instance (void);
+  static TAO_Notify_RT_Properties * instance ();
 
-  RTCORBA::RTORB_ptr rt_orb (void);
+  RTCORBA::RTORB_ptr rt_orb ();
   void rt_orb (RTCORBA::RTORB_ptr rt_orb);
 
-  RTCORBA::Current_ptr current (void);
+  RTCORBA::Current_ptr current ();
   void current (RTCORBA::Current_ptr current);
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index 1abb78b8df9..db8570672e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -34,32 +34,32 @@ class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task
 {
 public:
   /// Constructor
-  TAO_Notify_Reactive_Task (void);
+  TAO_Notify_Reactive_Task ();
 
   /// Destructor
-  virtual ~TAO_Notify_Reactive_Task (void);
+  virtual ~TAO_Notify_Reactive_Task ();
 
   /// Init the reactive task.
-  void init (void);
+  void init ();
 
   /// Shutdown task
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Exec the request.
   virtual void execute (TAO_Notify_Method_Request& method_request);
 
   /// The object used by clients to register timers. This method returns a Reactor based Timer.
-  virtual TAO_Notify_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer ();
 
   /// Returns NULL.
-  virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void);
+  virtual TAO_Notify_Buffering_Strategy* buffering_strategy ();
 
 private:
   /// The timer.
   TAO_Notify_Timer_Reactor::Ptr timer_;
 
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 8872e8aa555..03689fc674f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -64,7 +64,7 @@ namespace TAO_Notify
     ///
     void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id);
 
-    CORBA::Boolean is_alive (void);
+    CORBA::Boolean is_alive ();
 
     //////////////////////
     // During topology save
@@ -80,7 +80,7 @@ namespace TAO_Notify
     void send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory);
 
   private:
-    void release (void);
+    void release ();
 
     Reconnection_Registry_Type reconnection_registry_;
     ::NotifyExt::ReconnectionRegistry::ReconnectionID highest_id_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index f3c96c621d8..10c53019a7c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -61,7 +61,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_Refcountable> Ptr;
 
   /// Constructor
-  TAO_Notify_Refcountable (void);
+  TAO_Notify_Refcountable ();
 
   /// Destructor
   /// public for stack allocated instances
@@ -69,8 +69,8 @@ public:
 
   /// This method signatures deliberately match the RefCounting methods required for ESF Proxy
   /// Public for bridge implementations and various guard classes
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
 #if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
   static void diagnostic_dump( const char* title = 0 );
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index 23a16a12306..ffc5466e11a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -76,7 +76,7 @@ public:
 
   void set_rspm (Routing_Slip_Persistence_Manager * rspm);
 
-  void reconnect (void);
+  void reconnect ();
 
   /// Destructor (should be private but that inspires compiler wars)
   virtual ~Routing_Slip ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index 8354304bef2..919cb08ae58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -130,7 +130,7 @@ private:
       };
 
     Block_Header(Header_Type type);
-    virtual ~Block_Header (void);
+    virtual ~Block_Header ();
     virtual size_t extract_header(Persistent_Storage_Block& psb,
       size_t offset = 0);
     virtual size_t put_header(Persistent_Storage_Block& psb,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index 8f26f9e0280..9ab3162b23d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
-TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void)
+TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index f0de98edcd8..9f2050785ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -38,7 +38,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T
 
 public:
   /// Constructor
-  TAO_Notify_Seq_Worker_T (void);
+  TAO_Notify_Seq_Worker_T ();
 
   /// Create a SEQ
   SEQ* create (CONTAINER& container);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 33e2f07b2cc..84d6802684d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer
   friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_SequenceProxyPushConsumer (void);
+  TAO_Notify_SequenceProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_SequenceProxyPushConsumer ();
@@ -57,17 +57,17 @@ protected:
   ///= Protected Methods
 
   //= interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier);
 
   virtual void push_structured_events (const CosNotification::EventBatch & notifications);
 
-  virtual void disconnect_sequence_push_consumer (void);
+  virtual void disconnect_sequence_push_consumer ();
 
 private:
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 4d277a370d0..fcc8aa31c2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -45,7 +45,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier
 
 public:
   /// Constructor
-  TAO_Notify_SequenceProxyPushSupplier (void);
+  TAO_Notify_SequenceProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_SequenceProxyPushSupplier ();
@@ -59,7 +59,7 @@ public:
   virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
   /// = Servant methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_sequence_push_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer
@@ -69,7 +69,7 @@ public:
   );
 
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index fff559dd144..2ff7297e9d3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -71,14 +71,14 @@ public:
   virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer);
 
 protected:
-  virtual CORBA::Object_ptr get_consumer (void);
+  virtual CORBA::Object_ptr get_consumer ();
 
   /// The Consumer
   CosNotifyComm::SequencePushConsumer_var push_consumer_;
 
 private:
   /// TAO_Notify_Destroy_Callback methods.
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index bde60ff622b..24c60ab5746 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -40,13 +40,13 @@ public:
   void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier);
 
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior () const;
 
 protected:
-  virtual CORBA::Object_ptr get_supplier (void);
+  virtual CORBA::Object_ptr get_supplier ();
 
  /// The Supplier
   CosNotifyComm::SequencePushSupplier_var push_supplier_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index ce9a97a64ce..4dbac747c3e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -52,11 +52,11 @@ class TAO_Notify_Serv_Export TAO_Notify_Service : public ACE_Service_Object
 {
 public:
   /// Destructor.
-  virtual ~TAO_Notify_Service (void);
+  virtual ~TAO_Notify_Service ();
 
   /// Load an implementation of the TAO_Notify_Service based on which
   /// implementations are loaded.
-  static TAO_Notify_Service* load_default (void);
+  static TAO_Notify_Service* load_default ();
 
   /// Init the service from configurator
   virtual int init (int argc, ACE_TCHAR *argv[]) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index aca08885310..a91576fc880 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_StructuredProxyPushSupplier :
 {
 public:
   /// Constructor
-  TAO_Notify_RT_StructuredProxyPushSupplier (void);
+  TAO_Notify_RT_StructuredProxyPushSupplier ();
 
   /// Destructor
   ~TAO_Notify_RT_StructuredProxyPushSupplier ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 9f65de14594..175ddf44cf2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -40,7 +40,7 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer
 
 public:
   /// Constructor
-  TAO_Notify_StructuredProxyPushConsumer (void);
+  TAO_Notify_StructuredProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_StructuredProxyPushConsumer ();
@@ -52,7 +52,7 @@ public:
 
 protected:
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_structured_push_supplier (
     CosNotifyComm::StructuredPushSupplier_ptr push_supplier
@@ -70,7 +70,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index b2fcf7a7705..c46d36a3a32 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -46,7 +46,7 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier
 
 public:
   /// Constructor
-  TAO_Notify_StructuredProxyPushSupplier (void);
+  TAO_Notify_StructuredProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_StructuredProxyPushSupplier ();
@@ -57,7 +57,7 @@ public:
 
   /// = Servant methods
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_structured_push_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer
@@ -72,7 +72,7 @@ public:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 3b372b4be1d..b66e71b6815 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -61,14 +61,14 @@ public:
 
 
 protected:
-  virtual CORBA::Object_ptr get_consumer (void);
+  virtual CORBA::Object_ptr get_consumer ();
 
   /// The Consumer
   CosNotifyComm::StructuredPushConsumer_var push_consumer_;
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 
   /// Connection valid flag
   int connection_valid;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index 157357ab0fd..456d8e1a095 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -43,14 +43,14 @@ public:
   virtual ACE_CString get_ior () const;
 
 protected:
-  virtual CORBA::Object_ptr get_supplier (void);
+  virtual CORBA::Object_ptr get_supplier ();
 
   /// The Supplier
   CosNotifyComm::StructuredPushSupplier_var push_supplier_;
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index a6a7fcd0db0..4b775ecab63 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -39,10 +39,10 @@ public:
   virtual ~TAO_Notify_Supplier ();
 
   /// Access Specific Proxy.
-  TAO_Notify_ProxyConsumer* proxy_consumer (void);
+  TAO_Notify_ProxyConsumer* proxy_consumer ();
 
   /// Access Base Proxy.
-  virtual TAO_Notify_Proxy* proxy (void);
+  virtual TAO_Notify_Proxy* proxy ();
 
   virtual CORBA::Object_ptr get_supplier (void) = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index 0d6514f04e6..71d6b038e00 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -42,7 +42,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_SupplierAdmin > Ptr;
 
   /// Constructor
-  TAO_Notify_SupplierAdmin (void);
+  TAO_Notify_SupplierAdmin ();
 
   /// Destructor
   virtual ~TAO_Notify_SupplierAdmin ();
@@ -51,8 +51,8 @@ public:
   void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   virtual const char * get_admin_type_name () const;
 
@@ -66,7 +66,7 @@ public:
       size_t position);
 
   /// TAO_Notify_Container_T requires a destroy method
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
     TAO_Notify::Topology_Object *load_proxy (
@@ -82,15 +82,15 @@ protected:
       const CosNotification::QoSProperties & initial_qos);
 
   /// = CosNotifyChannelAdmin::SupplierAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (void);
+  virtual CosNotifyChannelAdmin::AdminID MyID ();
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel ();
 
-  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ();
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers ();
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ();
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
       CosNotifyChannelAdmin::ProxyID proxy_id);
@@ -105,7 +105,7 @@ protected:
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
-  virtual ::CosNotification::QoSProperties* get_qos (void);
+  virtual ::CosNotification::QoSProperties* get_qos ();
 
   virtual void set_qos (const CosNotification::QoSProperties& qos);
 
@@ -124,9 +124,9 @@ protected:
   virtual ::CosNotifyFilter::Filter_ptr get_filter (
       CosNotifyFilter::FilterID filter);
 
-  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters ();
 
-  virtual void remove_all_filters (void);
+  virtual void remove_all_filters ();
 
   virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ();
 
@@ -134,7 +134,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index 58fe638e208..42684e8445c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -44,7 +44,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task
 
 public:
   /// Constructor
-  TAO_Notify_ThreadPool_Task (void);
+  TAO_Notify_ThreadPool_Task ();
 
   /// Destructor
   virtual ~TAO_Notify_ThreadPool_Task ();
@@ -68,10 +68,10 @@ public:
   virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   /// The object used by clients to register timers.
-  virtual TAO_Notify_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer ();
 
   /// Provide access to the underlying buffering strategy
-  TAO_Notify_Buffering_Strategy* buffering_strategy (void);
+  TAO_Notify_Buffering_Strategy* buffering_strategy ();
 
 protected:
   /// Task svc
@@ -79,7 +79,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 
   /// The buffering strategy to use.
   ACE_Auto_Ptr< TAO_Notify_Buffering_Strategy > buffering_strategy_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index a5965725620..2360c3dfd93 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -35,10 +35,10 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer_Queue > Ptr;
 
   /// Constructor
-  TAO_Notify_Timer_Queue (void);
+  TAO_Notify_Timer_Queue ();
 
   /// Destructor
-  virtual ~TAO_Notify_Timer_Queue (void);
+  virtual ~TAO_Notify_Timer_Queue ();
 
   /// Schedule a timer
   virtual long schedule_timer (ACE_Event_Handler *handler,
@@ -49,7 +49,7 @@ public:
   virtual int cancel_timer (long timer_id);
 
   /// Get the native impl.
-  ACE_Timer_Queue& impl (void);
+  ACE_Timer_Queue& impl ();
 
 protected:
   /// The Timer Queue
@@ -57,7 +57,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 3146b11006b..28c9454f642 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -35,7 +35,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer_Reactor > Ptr;
 
   /// Constructor
-  TAO_Notify_Timer_Reactor (void);
+  TAO_Notify_Timer_Reactor ();
 
   /// Destructor
   virtual ~TAO_Notify_Timer_Reactor ();
@@ -54,7 +54,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
index 3a32f0c6411..393212d1a43 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -68,7 +68,7 @@ public:
    * vary based on the type of loader, so we can't include it in the
    * interface.
    */
-  virtual void close (void);
+  virtual void close ();
 };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index dd89b16e07b..214f306bfd4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -55,7 +55,7 @@ namespace TAO_Notify
   {
    public:
     /// Destructor.
-    virtual ~Topology_Savable (void);
+    virtual ~Topology_Savable ();
 
     /// Save our state to a Topology_Saver.
     ///
@@ -92,7 +92,7 @@ namespace TAO_Notify
     /// to any external objects with whom we were interacting.  We should
     /// call the reconnect() method on all of our children to give them
     /// the chance to do the same.
-    virtual void reconnect (void);
+    virtual void reconnect ();
   };
 
   /// \brief Base class for Persistent Topology Objects.
@@ -149,7 +149,7 @@ namespace TAO_Notify
     ///
     ///  see also Topology_Parent::child_change ()
     /// \return false if save will never happen
-    bool self_change (void);
+    bool self_change ();
 
     /// \brief pointer to our topological parent
     ///
@@ -159,7 +159,7 @@ namespace TAO_Notify
     /// \brief Handle details of propagating change
     ///
     /// \return false if save will never happen
-    bool send_change (void);
+    bool send_change ();
 
     /// \brief Handle details of propagating change
     ///  for a deleted object.
@@ -174,7 +174,7 @@ namespace TAO_Notify
     /// (top level of tree)
     /// private virtual because this should only be called from send_change()
     /// \return false if save will never happen
-    virtual bool change_to_parent (void);
+    virtual bool change_to_parent ();
 
   protected:
     /// true if this object changed since last save_persistent
@@ -197,7 +197,7 @@ namespace TAO_Notify
     /// Called by a child that has changed.
     /// A child calls this method to report that it has changed.
     /// \return false if save will never happen
-    bool child_change (void);
+    bool child_change ();
   };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 6a8ab89d4cb..6331ef75469 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -94,7 +94,7 @@ namespace TAO_Notify
      * vary based on the type of saver, so we can't include it in the
      * interface.
      */
-    virtual void close (void);
+    virtual void close ();
   };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
index 10094b7a653..5ab23c46bfa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
@@ -52,11 +52,11 @@ public:
                                      TAO_Notify_EventChannelFactory *ecf);
 
   /// destructor...
-  virtual ~TAO_Notify_validate_client_Task (void);
+  virtual ~TAO_Notify_validate_client_Task ();
 
   virtual int svc ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The delay of first time validate.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 9a66ed58ade..61ded68ec13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -41,7 +41,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Worker_Task > Ptr;
 
   /// Constructor
-  TAO_Notify_Worker_Task (void);
+  TAO_Notify_Worker_Task ();
 
   /// Update QoS Properties.
   virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
index e7083c5dd3d..6308768b7f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -52,7 +52,7 @@ public:
   virtual void end_object (CORBA::Long id,
     const ACE_CString& type);
 
-  virtual void close (void);
+  virtual void close ();
 
 private:
   void backup_file_name (ACE_TCHAR * file_path, size_t nfile);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
index aae684c4044..2299c2da705 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
@@ -44,7 +44,7 @@ namespace TAO_PG
     Fragments_Cleanup_Strategy (int bound);
 
     /// The destructor
-    virtual ~Fragments_Cleanup_Strategy (void);
+    virtual ~Fragments_Cleanup_Strategy ();
 
     /// Sub-classes must implement these methods
     virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 151f99ebc1f..b921a67b2ec 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -100,25 +100,25 @@ public:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (void);
+  char * the_name ();
 
-  PortableServer::POA_ptr the_parent (void);
+  PortableServer::POA_ptr the_parent ();
 
-  PortableServer::POAList *the_children (void);
+  PortableServer::POAList *the_children ();
 
-  PortableServer::POAManager_ptr the_POAManager (void);
+  PortableServer::POAManager_ptr the_POAManager ();
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (void);
+  PortableServer::AdapterActivator_ptr the_activator ();
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator);
 
-  PortableServer::ServantManager_ptr get_servant_manager (void);
+  PortableServer::ServantManager_ptr get_servant_manager ();
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
-  PortableServer::Servant get_servant (void);
+  PortableServer::Servant get_servant ();
 
   void set_servant (PortableServer::Servant servant);
 
@@ -148,7 +148,7 @@ public:
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
 
-  CORBA::OctetSeq *id (void);
+  CORBA::OctetSeq *id ();
 
   // End standard POA interface methods.
 
@@ -161,10 +161,10 @@ public:
            TAO_ORB_Core &orb_core,
            TAO_Object_Adapter *object_adapter);
 
-  virtual ~TAO_GOA (void);
+  virtual ~TAO_GOA ();
 
     // Used to force the initialization of the code.
-    static int Initializer (void);
+    static int Initializer ();
 
 protected:
   /// Template method for creating new POA's of this type.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
index 08026413a2a..3c44029c881 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -28,7 +28,7 @@ namespace TAO
     public:
     /// Used to force the insertion of UIPMC_Factory in the service
     /// configurator.
-    static int Initializer (void);
+    static int Initializer ();
   };
 
   static int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index d3f0b87766b..25f10cc839f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -35,10 +35,10 @@ class TAO_PortableGroup_Export TAO_PG_Default_Property_Validator
 {
 public:
   /// Constructor.
-  TAO_PG_Default_Property_Validator (void);
+  TAO_PG_Default_Property_Validator ();
 
   /// Destructor
-  virtual ~TAO_PG_Default_Property_Validator (void);
+  virtual ~TAO_PG_Default_Property_Validator ();
 
   /// Validate the given properties.  Throw an exception when the
   /// first invalid property is encountered.  The remaining properties
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 9b1b2dc7fb3..fae1f62b208 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -71,7 +71,7 @@ namespace TAO
     PG_FactoryRegistry (const char * name = "FactoryRegistry");
 
     /// virtual Destructor
-    virtual ~PG_FactoryRegistry (void);
+    virtual ~PG_FactoryRegistry ();
 
     /**
      * Parse command line arguments.
@@ -97,7 +97,7 @@ namespace TAO
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Processing to happen when the ORB's event loop is idle.
@@ -120,7 +120,7 @@ namespace TAO
 
     ////////////////////////////////
     // override servant base methods
-    virtual void _remove_ref (void);
+    virtual void _remove_ref ();
 
     //////////////////
     // CORBA interface
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 1eaf3e2409c..691c142f1a4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -54,7 +54,7 @@ public:
                          TAO_PG_PropertyManager & property_manager);
 
   /// Destructor.
-  ~TAO_PG_GenericFactory (void);
+  ~TAO_PG_GenericFactory ();
 
   /**
    * @name TAO_LoadBalancer::GenericFactory methods
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index 92c6ece137b..52fe32a4306 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -104,7 +104,7 @@ namespace TAO
      * return all groups in the factory
      */
     PortableGroup::ObjectGroups *
-    all_groups (void);
+    all_groups ();
 
 
     /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
index eaa37bdee45..ad666863a4d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
@@ -53,10 +53,10 @@ public:
                       const PortableServer::ObjectId & oid);
 
   /// Destructor.
-  ~TAO_PG_Group_Guard (void);
+  ~TAO_PG_Group_Guard ();
 
   /// Relinquish cleanup responsibility.
-  void release (void);
+  void release ();
 
 private:
   /// Reference to the infrastructure TAO_PG_GenericFactory that
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 6848d53a3e1..a78ea1a1c8b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -47,10 +47,10 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager
 {
 public:
   /// Constructor.
-  TAO_PG_ObjectGroupManager (void);
+  TAO_PG_ObjectGroupManager ();
 
   /// Destructor.
-  ~TAO_PG_ObjectGroupManager (void);
+  ~TAO_PG_ObjectGroupManager ();
 
   /**
    * @name PortableGroup::ObjectGroupManager methods
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
index 292e338d13a..dd70623c5c5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
@@ -29,7 +29,7 @@ class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object
 {
 public:
   /// Constructor
-  TAO_PG_Object_Adapter_Factory (void);
+  TAO_PG_Object_Adapter_Factory ();
 
   /// Create adapter.
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 90fb7f9e5dc..39951ceb8f2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -229,7 +229,7 @@ namespace TAO
     /**
      * @@TODO DOC
      */
-    virtual PortableGroup::Locations * locations_of_members (void);
+    virtual PortableGroup::Locations * locations_of_members ();
 
     /**
      * @@TODO DOC
@@ -241,12 +241,12 @@ namespace TAO
     /**
      * @@TODO DOC
      */
-    virtual void initial_populate (void);
+    virtual void initial_populate ();
 
     /**
      * @@TODO DOC
      */
-    virtual void minimum_populate (void);
+    virtual void minimum_populate ();
 
 
     /**
@@ -263,21 +263,21 @@ namespace TAO
 
     virtual void set_name (const char* group_name);
 
-    virtual const char* get_name (void);
+    virtual const char* get_name ();
 
     /////////////////////////
     // Implementation methods
   private:
     int increment_version ();
 
-    void distribute_iogr (void);
+    void distribute_iogr ();
 
     void create_members (size_t count);
 
   protected:
     virtual PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member);
 
-    void clear_members_map (void);
+    void clear_members_map ();
 
     /////////////////////////
     // Forbidden methods
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
index fcd44cac08a..a1826ebc40b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
@@ -115,14 +115,14 @@ namespace TAO
         const char * type_id,
         const PortableGroup::Criteria & the_criteria);
 
-    virtual PortableGroup::Locations * locations_of_members (void);
+    virtual PortableGroup::Locations * locations_of_members ();
 
     virtual CORBA::Object_ptr get_member_reference (
         const PortableGroup::Location & the_location);
 
-    virtual void initial_populate (void);
+    virtual void initial_populate ();
 
-    virtual void minimum_populate (void);
+    virtual void minimum_populate ();
 
     virtual int has_member_at (const PortableGroup::Location & location );
 
@@ -130,7 +130,7 @@ namespace TAO
 
     virtual void set_name (const char* group_name);
 
-    virtual const char* get_name (void);
+    virtual const char* get_name ();
 
     virtual PortableGroup::ObjectGroupId  get_object_group_id () const;
 
@@ -165,7 +165,7 @@ namespace TAO
     /**
      * Signals that this context was updated.
      */
-    virtual void state_written (void);
+    virtual void state_written ();
 
     /**
      * A callback invoked by the object group file guard
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index 2307a500f86..1db783c17dd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -92,7 +92,7 @@ namespace TAO
      * resource leaks.
      * @returns a newly allocated PortableGroup::Properties.
      */
-    PortableGroup::Properties * get_default_properties (void);
+    PortableGroup::Properties * get_default_properties ();
 
     /**
      * Undefine default properties that appear in props.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 2491568dc71..acb8c6cfa95 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -64,7 +64,7 @@ namespace TAO
     /**
      * constructor: empty set with no defaults.
      */
-    PG_Property_Set (void);
+    PG_Property_Set ();
 
     /**
      * constructor
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index 21dd42c133d..84cb3013f4b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -33,7 +33,7 @@ class TAO_PortableGroup_Export TAO_PG_Servant_Dispatcher
   : public TAO_Servant_Dispatcher
 {
 public:
-  virtual ~TAO_PG_Servant_Dispatcher (void);
+  virtual ~TAO_PG_Servant_Dispatcher ();
 
   /// Pre_invoke remote request.
   void pre_invoke_remote_request (TAO_Root_POA &poa,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index b63011fe697..82934b24c9e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -63,16 +63,16 @@ public:
   };
 
   ///  Default constructor.
-  TAO_PortableGroup_Acceptor_Registry (void);
+  TAO_PortableGroup_Acceptor_Registry ();
 
   ///  Default destructor.
-  ~TAO_PortableGroup_Acceptor_Registry (void);
+  ~TAO_PortableGroup_Acceptor_Registry ();
 
   /// Open an acceptor based on a tagged profile.
   void open (const TAO_Profile* profile, TAO_ORB_Core &orb_core);
 
   /// Close all open acceptors.
-  int close_all (void);
+  int close_all ();
 
   typedef ACE_Unbounded_Queue<Entry> Acceptor_Registry;
   typedef ACE_Unbounded_Queue_Iterator<Entry> Acceptor_Registry_Iterator;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index fc8c91bc883..00054102207 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -42,13 +42,13 @@ class TAO_PortableGroup_Export TAO_PortableGroup_Loader
 {
 public:
   /// Constructor.
-  TAO_PortableGroup_Loader (void);
+  TAO_PortableGroup_Loader ();
 
   /// Initialize the PortableGroup loader hooks.
   virtual int init (int argc, ACE_TCHAR *[]);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index 632e3c0aa14..ba9fb25eecd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -39,7 +39,7 @@ class TAO_PortableGroup_Export PortableGroup_Request_Dispatcher
 
 public:
   /// Destructor.
-  virtual ~PortableGroup_Request_Dispatcher (void);
+  virtual ~PortableGroup_Request_Dispatcher ();
 
   /**
    * Dispatch a request.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index 59657e554b9..a3cb206cd03 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -85,7 +85,7 @@ public:
   TAO_Portable_Group_Map ();
 
   /// Destructor.
-  ~TAO_Portable_Group_Map (void);
+  ~TAO_Portable_Group_Map ();
 
   /// Add a GroupId->ObjectKey mapping to the map.
   /// This function takes ownership of the memory pointed to be group_id
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index ab40b91faef..5ab7b942067 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -50,14 +50,14 @@ public:
                       const char *listener_interfaces);
 
   /// Destructor.
-  ~TAO_UIPMC_Acceptor (void);
+  ~TAO_UIPMC_Acceptor ();
 
   /// @@ Helper method for the implementation repository, should go
   ///    away
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   /**
    * The TAO_Acceptor methods, check the documentation in
@@ -74,12 +74,12 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
index 20b45315b43..b95a2407a90 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
@@ -59,7 +59,7 @@ public:
 
 
   /// Destructor.
-  ~TAO_UIPMC_Connection_Handler (void);
+  ~TAO_UIPMC_Connection_Handler ();
 
   //@{
   /** @name Connection Handler overloads
@@ -74,8 +74,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -85,7 +85,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   /// Set Diff-Serv codepoint on outgoing packets.
   int set_dscp_codepoint (CORBA::Boolean set_network_priority);
@@ -118,7 +118,7 @@ protected:
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 5b2371230ea..d19bc1c9f22 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -40,15 +40,15 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_UIPMC_Connector (void);
+  TAO_UIPMC_Connector ();
 
   /// Destructor.
-  ~TAO_UIPMC_Connector (void);
+  ~TAO_UIPMC_Connector ();
 
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
   virtual int check_prefix (const char *endpoint);
@@ -64,7 +64,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (void);
+  virtual TAO_Profile * make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
index 914b80c6f61..9be6f5e6a1b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -40,7 +40,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Endpoint : public TAO_Endpoint
 {
 public:
   /// Default constructor.
-  TAO_UIPMC_Endpoint (void);
+  TAO_UIPMC_Endpoint ();
 
   /// Constructor.
   TAO_UIPMC_Endpoint (const ACE_INET_Addr &addr);
@@ -50,23 +50,23 @@ public:
                       CORBA::UShort port);
 
   /// Destructor.
-  ~TAO_UIPMC_Endpoint (void);
+  ~TAO_UIPMC_Endpoint ();
 
   // = Implementation of abstract TAO_Endpoint methods.  See
   // Endpoint.h for their documentation.
 
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
 
   /// Makes a copy of this TAO_Endpoint.
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (void);
+  CORBA::ULong hash ();
 
   // Allocates memory and returns a copy of <this>
 
@@ -88,7 +88,7 @@ public:
   /// Set the port number.
   CORBA::UShort port (CORBA::UShort p); //@@ Frank - deprecate this.
 
-  //TAO_UIPMC_Connection_Handler *&hint (void);
+  //TAO_UIPMC_Connection_Handler *&hint ();
   // Access to our <hint_>.
   /// Do we have a preferred local network interface set for this target?
   bool is_preferred_network () const;
@@ -110,7 +110,7 @@ private:
   void uint_ip_addr (ACE_UINT32 ip_addr);
 
   /// Helper method to update the cached object address.  @@ Vadym - deprecate this.
-  void update_object_addr (void);
+  void update_object_addr ();
 
   /// IP Multicast address.  @@ Frank - deprecate this.
   CORBA::Octet class_d_address_[4];
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
index aa6b8127098..15e98f38630 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -31,8 +31,8 @@ class TAO_Connector;
 class TAO_PortableGroup_Export TAO_UIPMC_Protocol_Factory : public TAO_Protocol_Factory
 {
 public:
-  TAO_UIPMC_Protocol_Factory (void);
-  virtual ~TAO_UIPMC_Protocol_Factory (void);
+  TAO_UIPMC_Protocol_Factory ();
+  virtual ~TAO_UIPMC_Protocol_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -49,8 +49,8 @@ public:
   virtual char options_delimiter () const;
 
   // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
index 6f5cdb32aa6..149e933831f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
@@ -58,7 +58,7 @@ public:
   TAO_UIPMC_Mcast_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_UIPMC_Mcast_Connection_Handler (void);
+  ~TAO_UIPMC_Mcast_Connection_Handler ();
 
   //@{
   /** @name Connection Handler overloads
@@ -73,8 +73,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -84,7 +84,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   // UIPMC Additions - Begin
   const ACE_INET_Addr &addr () const;
@@ -120,7 +120,7 @@ protected:
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 };
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
index 5a2236c3e1d..8c0a23f2086 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
@@ -57,7 +57,7 @@ public:
                              TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_UIPMC_Mcast_Transport (void);
+  ~TAO_UIPMC_Mcast_Transport ();
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
@@ -69,8 +69,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler *event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler *event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   /// Shouldn't ever be called on the server side.
@@ -84,7 +84,7 @@ protected:
                         size_t,
                         ACE_Time_Value const *);
 
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
 public:
   /// @@TODO: These methods IMHO should have more meaningful
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index d15514aa6bd..5a5589dcba4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -54,7 +54,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, default. Used when the profile contents
   /// are not yet known or when it is being decoded from an IOR.
@@ -71,7 +71,7 @@ public:
                      TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through _decr_refcnt.
-  ~TAO_UIPMC_Profile (void);
+  ~TAO_UIPMC_Profile ();
 
   /// Template methods. Please see tao/Profile.h for documentation.
 
@@ -81,12 +81,12 @@ public:
   virtual int decode (TAO_InputCDR &cdr);
   virtual void parse_string (const char *string);
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
+  virtual int encode_endpoints ();
   virtual void encodeAddressInfo (TAO_OutputCDR &stream) const;
-  virtual TAO_Endpoint *endpoint (void);
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
-  virtual IOP::TaggedProfile &create_tagged_profile (void);
+  virtual IOP::TaggedProfile &create_tagged_profile ();
   virtual void request_target_specifier (
     TAO_Target_Specification &target_spec,
     TAO_Target_Specification::TAO_Target_Address r);
@@ -104,11 +104,11 @@ public:
 protected:
   /// Template methods, please see documentation in tao/Profile.h
   virtual int decode_profile (TAO_InputCDR& cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual void parse_string_i (const char *);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
-  virtual void update_cached_group_component (void);
+  virtual void update_cached_group_component ();
 
 protected:
   /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 7f2e48da9de..000dc9cdc7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -44,7 +44,7 @@ public:
                        TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_UIPMC_Transport (void);
+  ~TAO_UIPMC_Transport ();
 
 protected:
   /** @name Overridden Template Methods
@@ -52,8 +52,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler *event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler *event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
@@ -65,7 +65,7 @@ protected:
                         size_t len,
                         ACE_Time_Value const *s = 0);
 
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
 public:
   /// @@TODO: These methods IMHO should have more meaningful
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
index 2bf20d34d9d..b796f6b7c3d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
@@ -36,7 +36,7 @@ namespace TAO_PG
   public:
     UIPMC_Recv_Packet_Cleanup_Guard (TAO_UIPMC_Mcast_Transport *transport);
 
-    ~UIPMC_Recv_Packet_Cleanup_Guard (void);
+    ~UIPMC_Recv_Packet_Cleanup_Guard ();
 
   private:
     TAO_UIPMC_Mcast_Transport *transport_;
@@ -51,9 +51,9 @@ namespace TAO_PG
   {
   public:
     /// Constructs a new recv packet.
-    UIPMC_Recv_Packet (void);
+    UIPMC_Recv_Packet ();
 
-    ~UIPMC_Recv_Packet (void);
+    ~UIPMC_Recv_Packet ();
 
     /// Adds a new fragment to the packet and if it fails marks the packet
     /// as broken.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index 93d8c76ca9e..cf9e22a29f3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -36,14 +36,14 @@ public:
   TAO_UIPMC_Wait_Never (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_UIPMC_Wait_Never (void);
+  virtual ~TAO_UIPMC_Wait_Never ();
 
   // = Documented in TAO_Wait_Strategy.
   virtual int sending_request (TAO_ORB_Core *orb_core,
                                TAO_Message_Semantics msg_semantics);
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
-  virtual int register_handler (void);
+  virtual int register_handler ();
   virtual bool non_blocking () const;
   virtual bool can_process_upcalls () const;
 };
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
index f872dd5c504..3f74cdeb86a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
@@ -49,10 +49,10 @@ class TAO_PortableGroup_Export TAO_MIOP_Resource_Factory
 {
 public:
   /// Constructor.
-  TAO_MIOP_Resource_Factory (void);
+  TAO_MIOP_Resource_Factory ();
 
   /// Destructor.
-  virtual ~TAO_MIOP_Resource_Factory (void);
+  virtual ~TAO_MIOP_Resource_Factory ();
 
   /**
    * @name Service Configurator Hooks
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 53d03738806..f96232753fe 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -42,7 +42,7 @@ class TAO_Property_Serv_Export CosProperty_Hash_Key
   //     Key for the Hash Table. The EXT_ID of the
   //     ACE_Hash_Map_Manager.
 public:
-  CosProperty_Hash_Key (void);
+  CosProperty_Hash_Key ();
   // Default constructor.
 
   CosProperty_Hash_Key (const char * &name);
@@ -54,7 +54,7 @@ public:
   CosProperty_Hash_Key (const CosProperty_Hash_Key &hash_key);
   // Copy constructor.
 
-  virtual ~CosProperty_Hash_Key (void);
+  virtual ~CosProperty_Hash_Key ();
   // Destructor.
 
   virtual bool operator == (const CosProperty_Hash_Key &hash_key) const;
@@ -74,7 +74,7 @@ class TAO_Property_Serv_Export CosProperty_Hash_Value
   //     This will be the value part in the Hash_Table. The INT_ID of
   //     the ACE_Hash_Map_Manager.
 public:
-  CosProperty_Hash_Value (void);
+  CosProperty_Hash_Value ();
   // Default constructor.
 
   CosProperty_Hash_Value (const CORBA::Any &any,
@@ -84,7 +84,7 @@ public:
   CosProperty_Hash_Value (const CosProperty_Hash_Value &hash_value);
   // Copy constructor.
 
-  virtual ~CosProperty_Hash_Value (void);
+  virtual ~CosProperty_Hash_Value ();
   // Destructor.
 
 //private:
@@ -110,14 +110,14 @@ class TAO_Property_Serv_Export TAO_PropertySetFactory :  public virtual POA_CosP
   // = DESCRIPTION
   //     The object may be created with some predfined properties.
 public:
-  TAO_PropertySetFactory (void);
+  TAO_PropertySetFactory ();
   // Constructor.
 
-  virtual ~TAO_PropertySetFactory (void);
+  virtual ~TAO_PropertySetFactory ();
   // Destructor.
 
   virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (void);
+  create_propertyset ();
   // Returns a  new TAO_PropertySet object. "The property set returned
   // will *not* have any initial properties."
 
@@ -154,14 +154,14 @@ class TAO_Property_Serv_Export TAO_PropertySetDefFactory : public virtual POA_Co
   // = DESCRIPTION
   //     The object creation may be done with some predefined properties.
 public:
-  TAO_PropertySetDefFactory(void);
+  TAO_PropertySetDefFactory();
   // Constructor.
 
-  virtual ~TAO_PropertySetDefFactory (void);
+  virtual ~TAO_PropertySetDefFactory ();
   // Destructor.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (void);
+  create_propertysetdef ();
   // Returns a new TAO_PropertySetDef object.
 
   virtual CosPropertyService::PropertySetDef_ptr
@@ -196,7 +196,7 @@ public:
   friend class TAO_PropertiesIterator;
 
   /// Default constructor.
-  TAO_PropertySet (void);
+  TAO_PropertySet ();
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                    const CosPropertyService::Properties allowed_properties);
@@ -209,7 +209,7 @@ public:
                    const CORBA::ULong number_of_allowed_propertydefs);
   // PropertySetDef's construction needs this.
 
-  virtual ~TAO_PropertySet (void);
+  virtual ~TAO_PropertySet ();
   // Destructor function.
 
   virtual void define_property (const char *property_name,
@@ -221,7 +221,7 @@ public:
   virtual void define_properties (const CosPropertyService::Properties &nproperties);
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (void);
+  virtual CORBA::ULong get_number_of_properties ();
   // Get the number of properties that are currently defined in the
   // PropertySet.
 
@@ -251,7 +251,7 @@ public:
   virtual void delete_properties (const CosPropertyService::PropertyNames &property_names);
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (void);
+  virtual CORBA::Boolean delete_all_properties ();
   // Delete everything from this property set.
 
   virtual CORBA::Boolean is_property_defined (const char *property_name);
@@ -316,7 +316,7 @@ class TAO_Property_Serv_Export TAO_PropertySetDef : public virtual POA_CosProper
   //     provide more client access and control of the characteristics
   //     (metadata) of a PropertySet.
 public:
-  TAO_PropertySetDef (void);
+  TAO_PropertySetDef ();
   // Constructor.
 
   TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
@@ -326,7 +326,7 @@ public:
   TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs);
   // This is also for the factory.
 
-  virtual ~TAO_PropertySetDef (void);
+  virtual ~TAO_PropertySetDef ();
   // Destructor.
 
   virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types);
@@ -409,10 +409,10 @@ public:
   TAO_PropertyNamesIterator (TAO_PropertySet &property_set);
   // Constructor.
 
-  virtual ~TAO_PropertyNamesIterator (void);
+  virtual ~TAO_PropertyNamesIterator ();
   // Destructor.
 
-  virtual void reset (void);
+  virtual void reset ();
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
@@ -430,7 +430,7 @@ public:
   // with at most the how_many number of names. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Destroys the iterator.
 private:
   typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
@@ -465,10 +465,10 @@ public:
   TAO_PropertiesIterator (TAO_PropertySet &property_set);
   // Constructor.
 
-  virtual ~TAO_PropertiesIterator (void);
+  virtual ~TAO_PropertiesIterator ();
   // Destructor.
 
-  virtual void reset (void);
+  virtual void reset ();
   // Resets the position in an iterator to the first property, if one exists.
 
   virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty);
@@ -485,7 +485,7 @@ public:
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Destroys the iterator.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 39f3b8e1dc7..ca57772158a 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -175,7 +175,7 @@ public:
    * of scheduled priorities.  All scheduled priorities range from 0
    * to the number returned, inclusive.
    */
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void);
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority ();
 
   virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
index 7a7e5de736d..ed178833178 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
@@ -48,12 +48,12 @@ namespace TAO
     typedef TAO_Accept_Strategy<IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_ACCEPT_STRATEGY;
 
     /// Constructor.
-    IIOP_SSL_Acceptor (void);
+    IIOP_SSL_Acceptor ();
 
     /// Destructor.
-    ~IIOP_SSL_Acceptor (void);
+    ~IIOP_SSL_Acceptor ();
 
-    virtual int close (void);
+    virtual int close ();
 
   private:
     /// The concrete acceptor, as a pointer to it's base class.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 7879eab0f76..f0a4d3c4b84 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -51,7 +51,7 @@ namespace TAO
     IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core);
 
     /// Destructor.
-    ~IIOP_SSL_Connection_Handler (void);
+    ~IIOP_SSL_Connection_Handler ();
   };
 
   // ****************************************************************
@@ -80,7 +80,7 @@ namespace TAO
                           int &result);
 
     /// Destructor that restores the previous TSS SSL state.
-    ~Null_SSL_State_Guard (void);
+    ~Null_SSL_State_Guard ();
 
   private:
     /// The SSLIOP::Current implementation that was previously
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index e788d7e538d..53aafa75c65 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -42,13 +42,13 @@ namespace TAO
   {
   public:
     /// Constructor.
-    IIOP_SSL_Connector (void);
+    IIOP_SSL_Connector ();
 
     /// Destructor.
-    ~IIOP_SSL_Connector (void);
+    ~IIOP_SSL_Connector ();
 
     int open (TAO_ORB_Core *orb_core);
-    int close (void);
+    int close ();
 
   public:
     typedef TAO_Connect_Concurrency_Strategy<IIOP_SSL_Connection_Handler>
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
index 1a31541d446..9610fc16d8d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
@@ -60,7 +60,7 @@ namespace TAO
                         TAO_ORB_Core *orb_core);
 
     /// Default destructor.
-    ~IIOP_SSL_Transport (void);
+    ~IIOP_SSL_Transport ();
 
     /** @name Overridden Template Methods
      *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index 6a60f33a322..dfa877b7a3b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -51,7 +51,7 @@ namespace TAO
                 bool check_host);
 
       /// Destructor.
-      ~Acceptor (void);
+      ~Acceptor ();
 
       typedef TAO_Strategy_Acceptor<Connection_Handler, ACE_SSL_SOCK_Acceptor> BASE_ACCEPTOR;
       typedef TAO_Creation_Strategy<Connection_Handler> CREATION_STRATEGY;
@@ -75,7 +75,7 @@ namespace TAO
                                 int version_major,
                                 int version_minor,
                                 const char *options = 0);
-      virtual int close (void);
+      virtual int close ();
       virtual int create_profile (const TAO::ObjectKey &object_key,
                                   TAO_MProfile &mprofile,
                                   CORBA::Short priority);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index 73fce84efc9..0ccf7f7cefa 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -66,7 +66,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (void);
+      virtual char * context_id ();
 
       virtual SecurityLevel3::Principal * client_principal ();
 
@@ -82,13 +82,13 @@ namespace TAO
 
       virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ();
 
-      virtual CORBA::Boolean client_authentication (void);
+      virtual CORBA::Boolean client_authentication ();
 
-      virtual CORBA::Boolean target_authentication (void);
+      virtual CORBA::Boolean target_authentication ();
 
-      virtual CORBA::Boolean confidentiality (void);
+      virtual CORBA::Boolean confidentiality ();
 
-      virtual CORBA::Boolean integrity (void);
+      virtual CORBA::Boolean integrity ();
       //@}
 
     protected:
@@ -97,7 +97,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~ClientCredentials (void);
+      ~ClientCredentials ();
 
     private:
       /// Reference to the OpenSSL @c SSL data structure associated
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 5838e7579f7..757f3944cec 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -56,7 +56,7 @@ namespace TAO
       Connection_Handler (TAO_ORB_Core *orb_core);
 
       /// Destructor.
-      ~Connection_Handler (void);
+      ~Connection_Handler ();
 
       /**
        * @name Connection Handler overloads
@@ -74,8 +74,8 @@ namespace TAO
       //@{
       /** @name Event Handler overloads
        */
-      virtual int resume_handler (void);
-      virtual int close_connection (void);
+      virtual int resume_handler ();
+      virtual int close_connection ();
       virtual int handle_input (ACE_HANDLE);
       virtual int handle_output (ACE_HANDLE);
       virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -85,7 +85,7 @@ namespace TAO
       //@}
 
       /// Add ourselves to cache.
-      int add_transport_to_cache (void);
+      int add_transport_to_cache ();
 
       /// Process the @a listen_list.
       int process_listen_point_list (IIOP::ListenPointList &listen_list);
@@ -103,14 +103,14 @@ namespace TAO
 
       /// Return true if the host name matches the name/domain in the peer
       /// certificate.
-      bool check_host (void);
+      bool check_host ();
 
     protected:
       //@{
       /**
        * @name TAO_Connection Handler overloads
        */
-      virtual int release_os_resources (void);
+      virtual int release_os_resources ();
       virtual void pos_io_hook (int & return_value);
       virtual int handle_write_ready (const ACE_Time_Value *timeout);
       //@}
@@ -146,7 +146,7 @@ namespace TAO
                    int &result);
 
       /// Destructor that tears down the TSS SSL state.
-      ~State_Guard (void);
+      ~State_Guard ();
 
     private:
       /// Pointer to the connection handler currently handling the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index c553948bbfb..89c05b99db5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -63,7 +63,7 @@ namespace TAO
        */
       //@{
       virtual int open (TAO_ORB_Core *orb_core);
-      virtual int close (void);
+      virtual int close ();
       virtual TAO_Transport *connect (TAO::Profile_Transport_Resolver *r,
                                       TAO_Transport_Descriptor_Interface *desc,
                                       ACE_Time_Value *timeout);
@@ -82,12 +82,12 @@ namespace TAO
        * @see @c TAO_Connector
        */
       //@{
-      virtual TAO_Profile * make_profile (void);
+      virtual TAO_Profile * make_profile ();
       virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
       //@}
 
       /// SSL-specific profile
-      TAO_Profile * make_secure_profile (void);
+      TAO_Profile * make_secure_profile ();
 
       /// IIOP-specific connection establishment.
       /**
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index d468ae1ac59..f0fccca7a66 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -72,13 +72,13 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * creds_id (void);
+      virtual char * creds_id ();
 
       virtual SecurityLevel3::CredentialsType creds_type (void) = 0;
 
       virtual SecurityLevel3::CredentialsUsage creds_usage ();
 
-      virtual TimeBase::UtcT expiry_time (void);
+      virtual TimeBase::UtcT expiry_time ();
 
       virtual SecurityLevel3::CredentialsState creds_state ();
 
@@ -95,7 +95,7 @@ namespace TAO
        * @note Caller owns the returned object.  Use a
        *       TAO::SSLIOP::X509_var.
        */
-      ::X509 *x509 (void);
+      ::X509 *x509 ();
       //@}
 
       /// Return a pointer to the underlying private key.
@@ -105,7 +105,7 @@ namespace TAO
        * @note Caller owns the returned object.  Use a
        *       TAO::SSLIOP::EVP_PKEY_var.
        */
-      ::EVP_PKEY *evp (void);
+      ::EVP_PKEY *evp ();
       //@}
 
       bool operator== (const SSLIOP_Credentials &rhs);
@@ -117,7 +117,7 @@ namespace TAO
 
       static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj);
 
-      static SSLIOP::Credentials_ptr _nil (void)
+      static SSLIOP::Credentials_ptr _nil ()
       {
         return (SSLIOP::Credentials_ptr) 0;
       }
@@ -130,7 +130,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting  mechanism.
        */
-      ~SSLIOP_Credentials (void);
+      ~SSLIOP_Credentials ();
 
     protected:
       /// Reference to the X.509 certificate associated with this SSLIOP
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index c0e216cc120..7187d87a588 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -70,13 +70,13 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * acquisition_method (void);
+      virtual char * acquisition_method ();
 
       virtual SecurityLevel3::AcquisitionStatus current_status ();
 
-      virtual CORBA::ULong nth_iteration (void);
+      virtual CORBA::ULong nth_iteration ();
 
-      virtual CORBA::Any * get_continuation_data (void);
+      virtual CORBA::Any * get_continuation_data ();
 
       virtual SecurityLevel3::AcquisitionStatus continue_acquisition (
           const CORBA::Any & acquisition_arguments);
@@ -84,7 +84,7 @@ namespace TAO
       virtual SecurityLevel3::OwnCredentials_ptr get_credentials (
           CORBA::Boolean on_list);
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
     protected:
@@ -93,12 +93,12 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~CredentialsAcquirer (void);
+      ~CredentialsAcquirer ();
 
     private:
       /// Verify that this CredentialsAcquirer object is still valid,
       /// i.e. hasn't been destroyed.
-      void check_validity (void);
+      void check_validity ();
 
       /// Create an OpenSSL X.509 certificate data structure.
       static ::X509 * make_X509 (const ::SSLIOP::File &certificate);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index dc39617d0f5..1a4fa1cdaa0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -86,7 +86,7 @@ namespace TAO
        * @return @c true if the current execution context is not
        *         within a SSL session.
        */
-      virtual CORBA::Boolean no_context (void);
+      virtual CORBA::Boolean no_context ();
 
       /// Set the TSS slot ID assigned to this object.
       void tss_slot (size_t slot);
@@ -111,7 +111,7 @@ namespace TAO
 
       static Current_ptr _narrow (CORBA::Object_ptr obj);
 
-      static Current_ptr _nil (void)
+      static Current_ptr _nil ()
       {
         return (Current_ptr)0;
       }
@@ -121,13 +121,13 @@ namespace TAO
 
     protected:
       /// Destructor
-      ~Current (void);
+      ~Current ();
 
       /// Set the TSS SSLIOP::Current implementation.
       int implementation (Current_Impl *impl);
 
       /// Return the TSS SSLIOP::Current implementation.
-      Current_Impl *implementation (void);
+      Current_Impl *implementation ();
 
     private:
       Current (const Current &) = delete;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index b82328f752e..22940d963c9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -58,7 +58,7 @@ namespace TAO
                 TAO_IIOP_Endpoint *iiop_endp);
 
       /// Destructor.
-      virtual ~TAO_SSLIOP_Endpoint (void);
+      virtual ~TAO_SSLIOP_Endpoint ();
 
       /// Need to have an assignment operator since the SSLIOP_Profile class
       /// may have to reorder its list of endpoints based on filtering by
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index cd5d30e77c1..ba514b4ccc7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -53,10 +53,10 @@ namespace TAO
     {
     public:
       /// Constructor.
-      Protocol_Factory (void);
+      Protocol_Factory ();
 
       /// Destructor.
-      virtual ~Protocol_Factory (void);
+      virtual ~Protocol_Factory ();
 
       // = Service Configurator hooks.
       /// Dynamic linking hook
@@ -73,8 +73,8 @@ namespace TAO
       virtual char options_delimiter () const;
 
       // = Check Protocol_Factory.h for a description of these methods.
-      virtual TAO_Acceptor  * make_acceptor (void);
-      virtual TAO_Connector * make_connector  (void);
+      virtual TAO_Acceptor  * make_acceptor ();
+      virtual TAO_Connector * make_connector  ();
       virtual int requires_explicit_endpoint () const;
 
     private:
@@ -100,7 +100,7 @@ namespace TAO
       static ACE_CString pem_passwd_;
 
       /// Create and register the SSLIOP ORB initializer.
-      int register_orb_initializer (void);
+      int register_orb_initializer ();
 
       /// Default quality-of-protection settings for the SSLIOP
       /// pluggable protocol.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 12617d2179c..317b38cba03 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -78,9 +78,9 @@ namespace TAO
        * PortableInterceptor::ServerRequestInterceptor interface.
        */
       //@{
-      virtual char * name (void);
+      virtual char * name ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
 
       virtual void receive_request_service_contexts (
           PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -104,7 +104,7 @@ namespace TAO
        * Protected destructor to force deallocation by the reference
        * counting mechanism.
        */
-      ~Server_Invocation_Interceptor (void);
+      ~Server_Invocation_Interceptor ();
 
     private:
       /**
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
index d0c5057b00a..11ea42ad9f8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
@@ -75,14 +75,14 @@ namespace TAO
        * Constructors.
        */
       //@{
-      OpenSSL_st_var (void);
+      OpenSSL_st_var ();
       OpenSSL_st_var (T * st);
       OpenSSL_st_var (OpenSSL_st_var<T> const & v);
       OpenSSL_st_var (T const & st);
       //@}
 
       /// Destructor
-      ~OpenSSL_st_var (void);
+      ~OpenSSL_st_var ();
 
       /**
        * @name Assignment operators.
@@ -96,15 +96,15 @@ namespace TAO
       //@}
 
       T const * operator-> () const;
-      T* operator-> (void);
+      T* operator-> ();
 
       operator const T& () const;
       operator T& ();
 
       T*  in () const;
-      T*& inout (void);
-      T*& out (void);
-      T*  _retn (void);
+      T*& inout ();
+      T*& out ();
+      T*  _retn ();
       T*  ptr () const;
 
     private:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 4b180f5f005..866a332d8fd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -60,7 +60,7 @@ namespace TAO
       OwnCredentials (::X509 *cert, ::EVP_PKEY *evp);
 
       static OwnCredentials_ptr _duplicate (OwnCredentials_ptr obj);
-      static OwnCredentials_ptr _nil (void);
+      static OwnCredentials_ptr _nil ();
       static OwnCredentials_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
@@ -70,7 +70,7 @@ namespace TAO
        * interface.
        */
       //@{
-      SecurityLevel3::CredentialsType creds_type (void);
+      SecurityLevel3::CredentialsType creds_type ();
       //@}
 
       /**
@@ -84,7 +84,7 @@ namespace TAO
 
       virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor ();
 
-      virtual void release_credentials (void);
+      virtual void release_credentials ();
       //@}
 
     protected:
@@ -93,7 +93,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~OwnCredentials (void);
+      ~OwnCredentials ();
     };
   } // End SSLIOP namespace
 }  // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 3c98dcb63ac..87fcf32105d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -74,8 +74,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
       // = Please see Profile.h for the documentation of these methods.
       virtual int decode (TAO_InputCDR& cdr);
-      virtual int encode_endpoints (void);
-      virtual TAO_Endpoint *endpoint (void);
+      virtual int encode_endpoints ();
+      virtual TAO_Endpoint *endpoint ();
 
       /**
        * Override parse_string() from the base class to update the SSL
@@ -109,7 +109,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~TAO_SSLIOP_Profile (void);
+      ~TAO_SSLIOP_Profile ();
 
       /// Profile equivalence template method.
       /**
@@ -129,7 +129,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
        *       but sadly others pay the price (of footprint) under
        *       normal operations.
        */
-      int decode_tagged_endpoints (void);
+      int decode_tagged_endpoints ();
 
       /**
        * Head of this profile's list of endpoints.  This endpoint is
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index b67de885b0c..83bddb92835 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -60,7 +60,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (void);
+      virtual char * context_id ();
 
       virtual SecurityLevel3::Principal * client_principal ();
 
@@ -76,19 +76,19 @@ namespace TAO
 
       virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ();
 
-      virtual CORBA::Boolean client_authentication (void);
+      virtual CORBA::Boolean client_authentication ();
 
-      virtual CORBA::Boolean target_authentication (void);
+      virtual CORBA::Boolean target_authentication ();
 
-      virtual CORBA::Boolean confidentiality (void);
+      virtual CORBA::Boolean confidentiality ();
 
-      virtual CORBA::Boolean integrity (void);
+      virtual CORBA::Boolean integrity ();
 
-      virtual CORBA::Boolean target_embodied (void);
+      virtual CORBA::Boolean target_embodied ();
 
-      virtual CORBA::Boolean target_endorsed (void);
+      virtual CORBA::Boolean target_endorsed ();
 
-      virtual void release (void);
+      virtual void release ();
       //@}
     };
   }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 05fd173c5cd..a5e2d041101 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -63,7 +63,7 @@ namespace TAO
                  TAO_ORB_Core *orb_core);
 
       /// Default destructor.
-      ~Transport (void);
+      ~Transport ();
 
       /// Overload of the handle_input () in the TAO_Transport
       /// class. This is required to set up the state guard. The
@@ -79,8 +79,8 @@ namespace TAO
        * TAO_Transport.
        */
       //@{
-      virtual ACE_Event_Handler * event_handler_i (void);
-      virtual TAO_Connection_Handler *connection_handler_i (void);
+      virtual ACE_Event_Handler * event_handler_i ();
+      virtual TAO_Connection_Handler *connection_handler_i ();
 
       /// Write the complete Message_Block chain to the connection.
       virtual ssize_t send (iovec *iov, int iovcnt,
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 164c534ac38..4caa6059e8f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -33,8 +33,8 @@ class TAO_RTSched_Export ACE_Config_Scheduler
   //   distributed with the EC.
 {
 public:
-  ACE_Config_Scheduler (void);
-  virtual ~ACE_Config_Scheduler (void);
+  ACE_Config_Scheduler ();
+  virtual ~ACE_Config_Scheduler ();
 
   virtual RtecScheduler::handle_t create (const char * entry_point);
 
@@ -81,7 +81,7 @@ public:
   // provide the thread priority and queue type for the given priority level
 
   virtual RtecScheduler::Preemption_Priority_t
-      last_scheduled_priority (void);
+      last_scheduled_priority ();
   // Returns the last priority number assigned to an operation in the
   // schedule.
   // The number returned is one less than the total number of
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index 375bbbebaec..665fdfbb5ce 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -279,7 +279,7 @@ protected:
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set);
 
   /// = store assigned information back into the RT_Infos
-  virtual status_t store_assigned_info (void);
+  virtual status_t store_assigned_info ();
 
   // = Set the minimum priority value.
   void minimum_priority_queue (const Preemption_Priority minimum_priority_queue_number);
@@ -420,11 +420,11 @@ private:
   status_t output_dispatch_priorities (FILE *file);
 
   // = Set up the task entry data structures
-  status_t setup_task_entries (void);
+  status_t setup_task_entries ();
 
   // = Relate the task entries according to the
   //   dependencies of the underlying RT_Infos
-  status_t relate_task_entries (void);
+  status_t relate_task_entries ();
 
   // recursively traverse dependency graph, relating
   // task entries and performing DFS start/end marking
@@ -436,13 +436,13 @@ private:
                       ACE_CString & unresolved_remotes);
 
   // checks for cycles in the dependency graph
-  status_t check_dependency_cycles (void);
+  status_t check_dependency_cycles ();
 
   // recursion used to check for cycles in the dependency graph
   status_t check_dependency_cycles_recurse (Task_Entry &entry);
 
   // = Aggregate the scheduling parameters of the threads
-  status_t aggregate_thread_parameters (void);
+  status_t aggregate_thread_parameters ();
 
   // = recursion over oneway dependencies used to aggregate thread parameters
   status_t aggregate_oneways_recurse (Task_Entry &entry);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index f780aa82ba9..68e1021b5bd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -139,7 +139,7 @@ public:
                        long &tuple_count);
 
   /// Accessor for stored original RT_Info data.
-  TAO_RT_Info_Ex & orig_rt_info_data (void);
+  TAO_RT_Info_Ex & orig_rt_info_data ();
 
   /// Mutator for stored original RT_Info data.
   void orig_rt_info_data (TAO_RT_Info_Ex &data);
@@ -401,7 +401,7 @@ class TAO_RTSched_Export TAO_Reconfig_Sched_Entry_Visitor
 {
 public:
   /// Destructor.
-  virtual ~TAO_Reconfig_Sched_Entry_Visitor (void);
+  virtual ~TAO_Reconfig_Sched_Entry_Visitor ();
 
   /// Visit a Reconfig Scheduler Entry.
   virtual int visit (TAO_Reconfig_Scheduler_Entry &) = 0;
@@ -442,7 +442,7 @@ class TAO_RTSched_Export TAO_RT_Info_Tuple_Visitor
 {
 public:
   /// Destructor.
-  virtual ~TAO_RT_Info_Tuple_Visitor (void);
+  virtual ~TAO_RT_Info_Tuple_Visitor ();
 
   /// Visit a RT_Info tuple.
   virtual int visit (TAO_RT_Info_Tuple &) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index a02b5821535..1b234e9f203 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -336,7 +336,7 @@ TAO_RSE_SCC_Visitor
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-number_of_cycles (void)
+number_of_cycles ()
 {
   return this->number_of_cycles_;
 }
@@ -347,7 +347,7 @@ number_of_cycles (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-in_a_cycle (void)
+in_a_cycle ()
 {
   return this->in_a_cycle_;
 }
@@ -553,7 +553,7 @@ TAO_RSE_Forward_Propagation_Visitor
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_locals (void)
+unresolved_locals ()
 {
   return this->unresolved_locals_;
 }
@@ -573,7 +573,7 @@ unresolved_locals (int i)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_remotes (void)
+unresolved_remotes ()
 {
   return this->unresolved_remotes_;
 }
@@ -592,7 +592,7 @@ unresolved_remotes (int i)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-thread_specification_errors (void)
+thread_specification_errors ()
 {
   return this->thread_specification_errors_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index d55095ca06d..915645bdb6b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -173,11 +173,11 @@ public:
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
 
   /// Accessor for number of cycles detected in traversal.
-  int number_of_cycles (void);
+  int number_of_cycles ();
 
   /// Accessor for whether or not the recursion is within a previously
   /// detected cycle.
-  int in_a_cycle (void);
+  int in_a_cycle ();
 
   /// Mutator for whether or not the recursion is within a previously
   /// detected cycle.
@@ -289,19 +289,19 @@ public:
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
 
   /// Accessor for number of nodes with unresolved local dependencies.
-  int unresolved_locals (void);
+  int unresolved_locals ();
 
   /// Mutator for numberof nodes with unresolved local dependencies.
   void unresolved_locals (int);
 
   /// Accessor for number of nodes with unresolved remote dependencies.
-  int unresolved_remotes (void);
+  int unresolved_remotes ();
 
   /// Mutator for number of nodes with unresolved remote dependencies.
   void unresolved_remotes (int);
 
   /// Accessor for number of nodes with thread specification errors.
-  int thread_specification_errors (void);
+  int thread_specification_errors ();
 
   /// Mutator for number of nodes with thread specification errors.
   void thread_specification_errors (int);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 4f36228d52f..fc548a13ac9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -308,7 +308,7 @@ init (int config_count,
 
 // Closes the scheduler, releasing all current resources.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -1434,7 +1434,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::Preemption_Priority_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-last_scheduled_priority (void)
+last_scheduled_priority ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2172,7 +2172,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
 // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dfs_traverse_i (void)
+dfs_traverse_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2209,7 +2209,7 @@ dfs_traverse_i (void)
 // checks for loops, marks unresolved remote dependencies.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-detect_cycles_i (void)
+detect_cycles_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2253,7 +2253,7 @@ detect_cycles_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-perform_admission_i (void)
+perform_admission_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2313,7 +2313,7 @@ perform_admission_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-crit_dfs_traverse_i (void)
+crit_dfs_traverse_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2347,7 +2347,7 @@ crit_dfs_traverse_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_criticalities_i (void)
+propagate_criticalities_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2389,7 +2389,7 @@ propagate_criticalities_i (void)
 // Propagates periods, sets total frame size.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_characteristics_i (void)
+propagate_characteristics_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2428,7 +2428,7 @@ propagate_characteristics_i (void)
 // Sets last scheduled priority.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-assign_priorities_i (void)
+assign_priorities_i ()
 {
   int i;
 #if defined (SCHEDULER_LOGGING)
@@ -2572,7 +2572,7 @@ assign_priorities_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-refresh_tuple_ptr_array_i (void)
+refresh_tuple_ptr_array_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2803,7 +2803,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_utilization_i (void)
+compute_utilization_i ()
 {
   TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY> util_visitor;
   for (int i = 0; i < this->rt_info_count_; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index cb3cdf44ac6..3a8d9fbe6a9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -105,7 +105,7 @@ public:
             u_long stability_flags);
 
   /// Closes the scheduler, releasing all current resources.
-  void close (void);
+  void close ();
 
   /**
    * Create an RT_Info.  If it does not exist, a new RT_Info is
@@ -247,7 +247,7 @@ public:
    * of scheduled priorities.  All scheduled priorities range from 0
    * to the number returned, inclusive.
    */
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void);
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority ();
 
   /// Provides the set of Config_Infos associated with the current schedule.
   virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs);
@@ -434,15 +434,15 @@ protected:
 
   /// Traverses dependency graph, assigning a topological ordering.
   /// Resets DFS map entries, do DFS traversal, constructs DFS map.
-  virtual void dfs_traverse_i (void);
+  virtual void dfs_traverse_i ();
 
   /// Sorts an array of RT_info handles in topological order, then
   /// checks for loops, marks unresolved remote dependencies.
-  virtual void detect_cycles_i (void);
+  virtual void detect_cycles_i ();
 
   /// Compute aggregate execution times, then performs admission over
   /// rate tuples.
-  void perform_admission_i (void);
+  void perform_admission_i ();
 
 
   /**
@@ -450,29 +450,29 @@ protected:
    * ordering.  Resets DFS map entries, do DFS traversal, constructs
    * DFS map.
    */
-  void crit_dfs_traverse_i (void);
+  void crit_dfs_traverse_i ();
 
 
   /// Propagates criticalities.
-  void propagate_criticalities_i (void);
+  void propagate_criticalities_i ();
 
 
   /// Propagates effective execution time and period, sets total frame size.
-  void propagate_characteristics_i (void);
+  void propagate_characteristics_i ();
 
   /**
    * Sort operations by urgency (done by strategy), then assign
    * priorities and subpriorities in one pass.  (Re)computes utilization
    * and sets last scheduled priority and last feasible priority.
    */
-  virtual void assign_priorities_i (void);
+  virtual void assign_priorities_i ();
 
   /// Refreshes the array of tuple pointers, corrects the count.
-  void refresh_tuple_ptr_array_i (void);
+  void refresh_tuple_ptr_array_i ();
 
   /// Compute utilization, set last feasible priority.
 /* WSOA merge - commented out
-  virtual void compute_utilization_i (void);
+  virtual void compute_utilization_i ();
 
 
   /// Helper method to give an RT_Info some reasonable default values
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index 2db996da3d6..9f25a876c4a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -117,7 +117,7 @@ public:
   ACE_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
 
   /// Destructor.
-  virtual ~ACE_Scheduler_Strategy (void);
+  virtual ~ACE_Scheduler_Strategy ();
 
     /**
      * = Compares two dispatch entries in strategy specific high to low
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index cc6d0633dc1..0c80a8b9bb6 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -157,7 +157,7 @@ public:
    * from main, after resolve_initial_references.
    */
   static int server (RtecScheduler::Scheduler_ptr);
-  static RtecScheduler::Scheduler_ptr server (void);
+  static RtecScheduler::Scheduler_ptr server ();
 
   /**
    * This helper function will dump the schedule returned by a
@@ -200,7 +200,7 @@ public:
    * the factory is uninitialized, or in a config or runtime mode of
    * operation.
    */
-  static Factory_Status status (void);
+  static Factory_Status status ();
 
   // = Access the (OS independent) preemption priority of the calling thread.
   /// Returns (u_int) -1 if the preemption priority hadn't been set.
@@ -250,7 +250,7 @@ protected:
    * code emitted for the run-time scheduler, automagically disabling
    * the config_run() when that code is linked in.
    */
-  static int no_config_run (void);
+  static int no_config_run ();
 
 private:
   static RtecScheduler::Scheduler_ptr server_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index f0972555b06..535be94399f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -60,16 +60,16 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
       /// Return the "establish trust" value associated with this
       /// policy.
-      virtual ::Security::EstablishTrust trust (void);
+      virtual ::Security::EstablishTrust trust ();
 
     protected:
       /// Destructor
@@ -77,7 +77,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~EstablishTrustPolicy (void);
+      ~EstablishTrustPolicy ();
 
     private:
       /// Quality of protection which can be specified for an object
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index 08595155c0d..151c0df9924 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -58,16 +58,16 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
       /// Return the Quality-of-Protection value associated with this
       /// policy.
-      virtual ::Security::QOP qop (void);
+      virtual ::Security::QOP qop ();
 
     protected:
       /// Destructor
@@ -75,7 +75,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechansim.
        */
-      ~QOPPolicy (void);
+      ~QOPPolicy ();
 
     private:
       /// Quality of protection which can be specified for an object
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
index 1eb5c216138..99fa61fcb67 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
@@ -54,8 +54,8 @@ namespace TAO
     {
     public:
       /*! Constructor */
-      AccessDecision (void);
-      ~AccessDecision (void);
+      AccessDecision ();
+      ~AccessDecision ();
 
       virtual ::CORBA::Boolean access_allowed (
         const ::SecurityLevel2::CredentialsList & cred_list,
@@ -71,10 +71,10 @@ namespace TAO
           const char * operation_name,
           ::CORBA::Boolean collocated_invocation);
 
-      virtual ::CORBA::Boolean default_decision (void);
+      virtual ::CORBA::Boolean default_decision ();
       virtual void default_decision (::CORBA::Boolean d);
 
-      virtual ::CORBA::Boolean default_collocated_decision (void);
+      virtual ::CORBA::Boolean default_collocated_decision ();
       virtual void default_collocated_decision (::CORBA::Boolean d);
 
       virtual void add_object (const char * orbid,
@@ -203,7 +203,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      virtual ~SecurityManager (void);
+      virtual ~SecurityManager ();
 
     private:
       /// The ORB-specific SecurityLevel2::PrincipalAuthenticator
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 19523a409b2..38512da9fb5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -74,11 +74,11 @@ namespace TAO
 
       virtual SecurityLevel3::FeatureDirective use_integrity ();
 
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
     protected:
@@ -87,7 +87,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~ContextEstablishmentPolicy (void);
+      ~ContextEstablishmentPolicy ();
 
     private:
       SecurityLevel3::CredsDirective     creds_directive_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
index fa53a20768d..7a43e265113 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -43,7 +43,7 @@ namespace TAO
     {
     public:
       /// Destructor.
-      virtual ~CredentialsAcquirerFactory (void);
+      virtual ~CredentialsAcquirerFactory ();
 
       /// Create a TAO::SL3::CredentialsAcquirerFactory.
       virtual SecurityLevel3::CredentialsAcquirer_ptr make (
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index 3b052972d9e..6b0e0806ef6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -81,10 +81,10 @@ namespace TAO
       typedef Credentials_Table::iterator Credentials_Iterator;
 
       /// Constructor
-      CredentialsCurator (void);
+      CredentialsCurator ();
 
       static CredentialsCurator_ptr _duplicate (CredentialsCurator_ptr obj);
-      static CredentialsCurator_ptr _nil (void);
+      static CredentialsCurator_ptr _nil ();
       static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
@@ -130,7 +130,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~CredentialsCurator (void);
+      ~CredentialsCurator ();
 
     private:
       /// Lock used to synchronize access to underlying tables.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index 8771e870726..54ac5630e5d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -64,11 +64,11 @@ namespace TAO
       //@{
       virtual SecurityLevel3::OwnCredentialsList * creds_list ();
 
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
     protected:
@@ -77,7 +77,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~ObjectCredentialsPolicy (void);
+      ~ObjectCredentialsPolicy ();
 
     private:
       /// List of POA-specific OwnCredentials.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index 0f88e7e2863..b88602c2f30 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -68,7 +68,7 @@ namespace TAO
       //@{
       virtual SecurityLevel3::ClientCredentials_ptr client_credentials ();
 
-      virtual CORBA::Boolean request_is_local (void);
+      virtual CORBA::Boolean request_is_local ();
       //@}
 
       /// Return the TSS slot ID assigned to the "SecurityCurrent"
@@ -85,7 +85,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~SecurityCurrent (void);
+      ~SecurityCurrent ();
 
     private:
       /// Set the thread-specific storage
@@ -100,7 +100,7 @@ namespace TAO
        * There is no function that places the implementation pointer
        * in TSS.  The underlying security mechanism does that.
        */
-      SecurityCurrent_Impl * implementation (void);
+      SecurityCurrent_Impl * implementation ();
 
     private:
       /**
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 1290e329877..101cc200fca 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -46,7 +46,7 @@ namespace TAO
     {
     public:
       /// Destructor.
-      virtual ~SecurityCurrent_Impl (void);
+      virtual ~SecurityCurrent_Impl ();
 
       /**
        * @name SecurityLevel3::Current Methods
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 8c301266429..6954f63476a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -81,7 +81,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      virtual ~SecurityManager (void);
+      virtual ~SecurityManager ();
 
     private:
       /// The ORB-specific SecurityLevel3::CredentialsCurator
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index a247302d9f0..7feb54267cd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -85,11 +85,11 @@ public:
 protected:
   /// Destructor
   /// Protected to force allocation on the heap.
-  ~TAO_Security_Current (void);
+  ~TAO_Security_Current ();
 
   /// Fully initialize this object.  This method is used predominantly
   /// to set the ORB core pointer.
-  int init (void);
+  int init ();
 
   /// Set the TSS Security::Current implementation.
   /**
@@ -101,7 +101,7 @@ protected:
    * There is no function that places the implementation pointer in
    * TSS.  The underlying security mechanism does that.
    */
-  TAO::Security::Current_Impl *implementation (void);
+  TAO::Security::Current_Impl *implementation ();
 
 private:
   TAO_Security_Current (const TAO_Security_Current &) = delete;
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index 4c5c82673d9..b71ac970fd8 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -45,7 +45,7 @@ namespace TAO
     {
     public:
       /// Destructor.
-      virtual ~Current_Impl (void);
+      virtual ~Current_Impl ();
 
       /**
        * @name SecurityLevel1::Current Methods
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index 2bfb6946e00..1fda2481d34 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -39,7 +39,7 @@ public:
            TimeBase::TimeT upper);
 
   /// Destructor.
-  ~TAO_TIO (void);
+  ~TAO_TIO ();
 
   /// This is the get method for the attribute time interval.
   virtual TimeBase::IntervalT  time_interval ();
@@ -70,7 +70,7 @@ public:
    * time interval in the TIO and time value is the midpoint of the
    * interval.
    */
-  virtual CosTime::UTO_ptr time (void);
+  virtual CosTime::UTO_ptr time ();
 
 private:
   /// This attribute returns an IntervalT structure with the values of
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 2a7f45e1a0f..0f564a41b61 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -49,11 +49,11 @@ public:
                           const IORS& server);
 
   /// Destructor.
-  ~TAO_Time_Service_Clerk (void);
+  ~TAO_Time_Service_Clerk ();
 
   /// This operation returns the global time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (void);
+  virtual CosTime::UTO_ptr universal_time ();
 
   /**
    * This operation returns the global time in a UTO only if the time
@@ -61,7 +61,7 @@ public:
    * operation is not implemented and throws a CORBA::NO_IMPLEMENT
    * exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (void);
+  virtual CosTime::UTO_ptr secure_universal_time ();
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
@@ -76,16 +76,16 @@ public:
                                          TimeBase::TimeT upper);
 
   /// Return the globally synchronized time.
-  virtual CORBA::ULongLong get_time (void);
+  virtual CORBA::ULongLong get_time ();
 
   /// Returns the time displacement factor.
-  CORBA::Short time_displacement_factor (void);
+  CORBA::Short time_displacement_factor ();
 
   /// Set the TDF.
   void time_displacement_factor (CORBA::Short);
 
   /// Get method for inaccuracy.
-  TimeBase::InaccuracyT inaccuracy (void);
+  TimeBase::InaccuracyT inaccuracy ();
 
   /// Set method for inaccuracy.
   void inaccuracy (TimeBase::InaccuracyT inaccuracy);
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 2a7b5a0fc05..b18940177c8 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -36,21 +36,21 @@ class TAO_Time_Serv_Export TAO_Time_Service_Server : public POA_CosTime::TimeSer
 {
 public:
   /// Constructor.
-  TAO_Time_Service_Server (void);
+  TAO_Time_Service_Server ();
 
   /// Destructor.
-  ~TAO_Time_Service_Server (void);
+  ~TAO_Time_Service_Server ();
 
   /// This operation returns the current system time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (void);
+  virtual CosTime::UTO_ptr universal_time ();
 
   /**
    * This operation returns the current time in a UTO only if the time
    * can be guaranteed to have been obtained securely. Currently this operation
    * is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (void);
+  virtual CosTime::UTO_ptr secure_universal_time ();
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index df5b7066692..76e1b1faace 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -46,27 +46,27 @@ public:
            TimeBase::TdfT tdf);
 
   /// Destructor.
-  ~TAO_UTO (void);
+  ~TAO_UTO ();
 
   /// For the readonly attribute <time>.
   virtual TimeBase::TimeT time ();
 
   /// For the readonly attribute <inaccuracy>.
-  virtual TimeBase::InaccuracyT  inaccuracy (void);
+  virtual TimeBase::InaccuracyT  inaccuracy ();
 
   /// For the readonly attribute <tdf>, which is the "time displacement
   /// factor".
-  virtual TimeBase::TdfT tdf (void);
+  virtual TimeBase::TdfT tdf ();
 
   /// For the readonly attribute <utc_time>.
-  virtual TimeBase::UtcT utc_time (void);
+  virtual TimeBase::UtcT utc_time ();
 
   /**
    * Absolute time = Relative time + Base time.
    * ?? Find out more about the Base Time, UTC and
    *    Distributed Time Sync. Algos. [3
    */
-  CosTime::UTO_ptr absolute_time (void);
+  CosTime::UTO_ptr absolute_time ();
 
   /// Compares the time contained in the object with the time in the
   /// supplied uto according to the supplied comparison type.
@@ -84,7 +84,7 @@ public:
 
   /// Returns a TIO object representing the error interval around the
   /// time value in the UTO.
-  CosTime::TIO_ptr interval (void);
+  CosTime::TIO_ptr interval ();
 
 private:
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index 68dbfe5f082..96a014ef9f3 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -48,10 +48,10 @@ class TAO_Time_Serv_Export Timer_Helper : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Timer_Helper (void);
+  Timer_Helper ();
 
   /// Destructor.
-  ~Timer_Helper (void);
+  ~Timer_Helper ();
 
   /// Constructor that sets the clerk.
   Timer_Helper (TAO_Time_Service_Clerk *clerk);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 1014f848399..f22d6f41cee 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -95,7 +95,7 @@ public:
                               const char* preference);
 
   /// Destructor
-  ~TAO_Preference_Interpreter(void);
+  ~TAO_Preference_Interpreter();
 
   void order_offer (CosTrading::Offer* offer,
                     CosTrading::OfferId offer_id = 0);
@@ -114,7 +114,7 @@ public:
   int remove_offer (CosTrading::Offer*& offer);
 
   /// Return the number of offers remaining in the ordering.
-  size_t num_offers (void);
+  size_t num_offers ();
 
   struct Preference_Info
   {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index 1d95f7eba8e..842fbcfb34a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -154,14 +154,14 @@ public:
   TAO_Unary_Constraint (TAO_Expression_Type op_type,
                         TAO_Constraint* operand);
 
-  virtual ~TAO_Unary_Constraint (void);
+  virtual ~TAO_Unary_Constraint ();
 
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
   virtual TAO_Expression_Type expr_type () const
     { return this->op_; }
 
-  TAO_Constraint* operand (void);
+  TAO_Constraint* operand ();
 
 private:
   TAO_Unary_Constraint (const TAO_Unary_Constraint&);
@@ -185,7 +185,7 @@ class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint
 public:
   TAO_Property_Constraint (const char* name);
 
-  virtual ~TAO_Property_Constraint (void);
+  virtual ~TAO_Property_Constraint ();
 
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
@@ -211,7 +211,7 @@ private:
 class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 {
 public:
-  TAO_Literal_Constraint (void);
+  TAO_Literal_Constraint ();
 
   // = Constructors for each of the various types of literals.
 
@@ -226,7 +226,7 @@ public:
   TAO_Literal_Constraint (const TAO_Literal_Constraint& lit);
 
   /// Destructor.
-  ~TAO_Literal_Constraint(void);
+  ~TAO_Literal_Constraint();
 
   /// Visitor accept methods.
   virtual int accept (TAO_Constraint_Visitor* visitor);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index 8bbbced6a32..0fc16992296 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -808,7 +808,7 @@ static int input ( void );
 
 extern int yylex ();
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int yylex ()
 #endif /* !YY_DECL */
 
 
@@ -1477,9 +1477,9 @@ static int yy_get_next_buffer ()
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-    static int yyinput (void)
+    static int yyinput ()
 #else
-    static int input  (void)
+    static int input  ()
 #endif
 
 {
@@ -2288,7 +2288,7 @@ trader_strtoll(const char* s, unsigned int base)
 }
 
 int
-yywrap (void)
+yywrap ()
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index f3a9f0daf72..164b10f653c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -51,7 +51,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 #  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
 # endif
 #else
-# define YYPARSE_DECL() yyparse(void)
+# define YYPARSE_DECL() yyparse()
 #endif
 
 /* Parameters sent to lex. */
@@ -59,7 +59,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 # define YYLEX_DECL() yylex(void *YYLEX_PARAM)
 # define YYLEX yylex(YYLEX_PARAM)
 #else
-# define YYLEX_DECL() yylex(void)
+# define YYLEX_DECL() yylex()
 # define YYLEX yylex()
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index 9c07d2de9aa..67d355d0894 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -32,10 +32,10 @@ class TAO_Trading_Serv_Export TAO_Interpreter
 {
 protected:
   /// Constructor.
-  TAO_Interpreter (void);
+  TAO_Interpreter ();
 
   /// Destructor.
-  ~TAO_Interpreter (void);
+  ~TAO_Interpreter ();
 
   /// Using the Yacc generated parser, construct an expression tree
   /// representing <constraints> from the tokens returned by it.
@@ -52,9 +52,9 @@ private:
 };
 
 // Functions we need for parsing.
-extern int yyparse (void);
+extern int yyparse ();
 extern void yyrestart (FILE*);
-extern int yylex (void);
+extern int yylex ();
 
 // Have yylex read from the constraint string, not from stdin.
 #undef YY_INPUT
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index f2aff058875..f0f7ff6c27d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -79,7 +79,7 @@ public:
 
   /// Return an iterator that will traverse and return all the offer
   /// ids in the service type map.
-  TAO_Offer_Id_Iterator* retrieve_all_offer_ids (void);
+  TAO_Offer_Id_Iterator* retrieve_all_offer_ids ();
 
   struct Offer_Map_Entry
   {
@@ -155,19 +155,19 @@ public:
                               TAO_Offer_Database<LOCK_TYPE>& offer_database);
 
   /// Release all the locks acquired.
-  ~TAO_Service_Offer_Iterator (void);
+  ~TAO_Service_Offer_Iterator ();
 
   /// Returns 1 if there are more offers, 0 otherwise.
-  int has_more_offers (void);
+  int has_more_offers ();
 
   /// Get the id for the current offer.
-  CosTrading::OfferId get_id (void);
+  CosTrading::OfferId get_id ();
 
   /// Returns the next offer in the series.
-  CosTrading::Offer* get_offer (void);
+  CosTrading::Offer* get_offer ();
 
   /// Advances the iterator 1.
-  void next_offer (void);
+  void next_offer ();
 
  private:
   /// Lock the top_level map.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 3b666b1647b..e2a6d8b9306 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -46,7 +46,7 @@ class TAO_Offer_Iterator
 public:
   TAO_Offer_Iterator (const TAO_Property_Filter& property_filter);
 
-  virtual ~TAO_Offer_Iterator (void);
+  virtual ~TAO_Offer_Iterator ();
 
   /**
    * BEGIN SPEC
@@ -55,7 +55,7 @@ public:
    * destroyed.
    * END SPEC
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add an offer to the collection of offers the iterator will
   /// iterate over.
@@ -116,7 +116,7 @@ class TAO_Query_Only_Offer_Iterator
 public:
   TAO_Query_Only_Offer_Iterator (const TAO_Property_Filter& pfilter);
 
-  virtual ~TAO_Query_Only_Offer_Iterator (void);
+  virtual ~TAO_Query_Only_Offer_Iterator ();
 
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
@@ -124,7 +124,7 @@ public:
                                  CosTrading::OfferSeq_out offers);
 
   /// Return the number of items left in the iterator.
-  virtual CORBA::ULong max_left (void);
+  virtual CORBA::ULong max_left ();
 
   /// Add an offer the iterator should iterate over.
   void add_offer (CosTrading::OfferId offer_id,
@@ -163,19 +163,19 @@ class TAO_Offer_Iterator_Collection :
 public:
   // = Constructors.
 
-  TAO_Offer_Iterator_Collection (void);
+  TAO_Offer_Iterator_Collection ();
 
-  virtual ~TAO_Offer_Iterator_Collection (void);
+  virtual ~TAO_Offer_Iterator_Collection ();
 
   /// Retrieve n offers from the set of iterators.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers);
 
   /// Destroy the collection of iterators.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Determine how many offers are left in the collection.
-  virtual CORBA::ULong max_left (void);
+  virtual CORBA::ULong max_left ();
 
   /// Add an iterator to the collection.
   void add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter);
@@ -212,9 +212,9 @@ class TAO_Offer_Id_Iterator :
 {
  public:
   /// No op constructor
-  TAO_Offer_Id_Iterator(void);
+  TAO_Offer_Id_Iterator();
 
-  ~TAO_Offer_Id_Iterator (void);
+  ~TAO_Offer_Id_Iterator ();
 
   /**
    * The max_left operation returns the number of offer identifiers
@@ -223,14 +223,14 @@ class TAO_Offer_Id_Iterator :
    * identifiers (e.g., if the iterator determines its set of offer
    * identifiers through lazy evaluation).
    */
-  virtual CORBA::ULong max_left(void);
+  virtual CORBA::ULong max_left();
 
   /**
    * The destroy operation destroys the iterator. No further
    * operations can be invoked on an iterator after it has been
    * destroyed.
    */
-  virtual void destroy(void);
+  virtual void destroy();
 
   /**
    * The next_n operation returns a set of offer identifiers in the
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index e98e2905485..0b8227a2edc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -16,7 +16,7 @@ TAO_Register_Offer_Iterator (TAO_Offer_Database<MAP_LOCK_TYPE> &db,
 
 template <class MAP_LOCK_TYPE>
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-~TAO_Register_Offer_Iterator (void)
+~TAO_Register_Offer_Iterator ()
 {
   while (! this->offer_ids_.is_empty ())
     {
@@ -37,7 +37,7 @@ add_offer (CosTrading::OfferId id,
 
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (void)
+max_left ()
 {
   return static_cast<CORBA::ULong> (this->offer_ids_.size ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 56781cb073f..32e7a17a33b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -45,7 +45,7 @@ public:
                                const TAO_Property_Filter& pfilter);
 
   /// Destructor.
-  virtual ~TAO_Register_Offer_Iterator (void);
+  virtual ~TAO_Register_Offer_Iterator ();
 
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
@@ -58,7 +58,7 @@ public:
    * the trader will have all the offers it has now when the time
    * to return them comes.
    */
-  virtual CORBA::ULong max_left (void);
+  virtual CORBA::ULong max_left ();
 
   /// Add an offer the iterator should iterate over.
   void add_offer (CosTrading::OfferId id,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index c8fac5d4ee5..f7a9692cd5e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -38,10 +38,10 @@ public:
    */
   TAO_Service_Type_Repository (ACE_Lock *lock = 0);
 
-  ~TAO_Service_Type_Repository (void);
+  ~TAO_Service_Type_Repository ();
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (void);
+    incarnation ();
 
   /**
    * BEGIN SPEC
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index ae5b660b3b3..fbc1b384a24 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -84,7 +84,7 @@ private:
                      TAO_TRADER_STANDALONE,
                      TAO_TRADER_LINKED };
 
-  TAO_TRADER* manufacture_trader (void);
+  TAO_TRADER* manufacture_trader ();
 
   void parse_args (int& argc, ACE_TCHAR** argv);
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index f4841634760..fa06efa1c1a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -267,7 +267,7 @@ class TAO_Register :
 public:
   TAO_Register (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  virtual ~TAO_Register (void);
+  virtual ~TAO_Register ();
 
   virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
                                            const char *type,
@@ -511,7 +511,7 @@ class TAO_Admin :
 public:
   TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  ~TAO_Admin (void);
+  ~TAO_Admin ();
 
   // = Importing Parameters (used by the Lookup Interface)
 
@@ -559,7 +559,7 @@ public:
     set_type_repos (CosTrading::TypeRepository_ptr repository);
 
   virtual CosTrading::Admin::OctetSeq*
-    request_id_stem (void);
+    request_id_stem ();
 
   virtual CosTrading::Admin::OctetSeq*
     set_request_id_stem (const CosTrading::Admin::OctetSeq& stem);
@@ -619,7 +619,7 @@ class TAO_Link :
 public:
   TAO_Link (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  ~TAO_Link (void);
+  ~TAO_Link ();
 
   /**
    * BEGIN SPEC
@@ -706,7 +706,7 @@ public:
   // state.
   // END SPEC
 
-  virtual CosTrading::LinkNameSeq* list_links (void);
+  virtual CosTrading::LinkNameSeq* list_links ();
 
   // BEGIN SPEC
   // The list_links operation returns a list of the names of all
@@ -774,7 +774,7 @@ class TAO_Proxy :
 public:
   TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  ~TAO_Proxy (void);
+  ~TAO_Proxy ();
 
   virtual CosTrading::OfferId
     export_proxy (CosTrading::Lookup_ptr,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index b8fcb9539dd..88b34092830 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -78,7 +78,7 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
+TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader ()
 {
   // Remove Trading Components from POA
 
@@ -108,13 +108,13 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Offer_Database<MAP_LOCK_TYPE>&
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::offer_database (void)
+TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::offer_database ()
 {
   return this->offer_database_;
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> ACE_Lock &
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::lock (void)
+TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::lock ()
 {
   return this->lock_;
 }
@@ -127,31 +127,31 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 }
 
 template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (void)
+TAO_Trader_Components<IF>::lookup_if ()
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (void)
+TAO_Trader_Components<IF>::register_if ()
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (void)
+TAO_Trader_Components<IF>::admin_if ()
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (void)
+TAO_Trader_Components<IF>::proxy_if ()
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (void)
+TAO_Trader_Components<IF>::link_if ()
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
 }
@@ -163,19 +163,19 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (void)
+TAO_Support_Attributes<IF>::supports_modifiable_properties ()
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (void)
+TAO_Support_Attributes<IF>::supports_dynamic_properties ()
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (void)
+TAO_Support_Attributes<IF>::supports_proxy_offers ()
 {
   return this->attrs_.supports_proxy_offers ();
 }
@@ -194,67 +194,67 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (void)
+TAO_Import_Attributes<IF>::def_search_card ()
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (void)
+TAO_Import_Attributes<IF>::max_search_card ()
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (void)
+TAO_Import_Attributes<IF>::def_match_card ()
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (void)
+TAO_Import_Attributes<IF>::max_match_card ()
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (void)
+TAO_Import_Attributes<IF>::def_return_card ()
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (void)
+TAO_Import_Attributes<IF>::max_return_card ()
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (void)
+TAO_Import_Attributes<IF>::max_list ()
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (void)
+TAO_Import_Attributes<IF>::def_hop_count ()
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (void)
+TAO_Import_Attributes<IF>::max_hop_count ()
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (void)
+TAO_Import_Attributes<IF>::def_follow_policy ()
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (void)
+TAO_Import_Attributes<IF>::max_follow_policy ()
 {
   return this->attrs_.max_follow_policy ();
 }
@@ -267,7 +267,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (void)
+TAO_Link_Attributes<IF>::max_link_follow_policy ()
 {
   return this->attrs_.max_link_follow_policy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index 187a4e1b0b6..91f2d0fcc1d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -70,13 +70,13 @@ public:
   TAO_Trader (Trader_Components components = LOOKUP);
 
   /// Destructor.
-  virtual ~TAO_Trader (void);
+  virtual ~TAO_Trader ();
 
   /// Accessor for the structure with all the service offers.
-  Offer_Database& offer_database (void);
+  Offer_Database& offer_database ();
 
   /// Returns the trader
-  ACE_Lock &lock (void);
+  ACE_Lock &lock ();
 
 protected:
   typedef TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> TRADER_SELF;
@@ -109,23 +109,23 @@ public:
   // = CosTrading::TraderComponents methods.
   /// Returns an object reference to the Lookup interface of the trader.
   /// Returns nil if the trader does not support Lookup interface.
-  virtual CosTrading::Lookup_ptr lookup_if (void);
+  virtual CosTrading::Lookup_ptr lookup_if ();
 
   /// Returns object reference for the Register interface of the trader.
   /// Returns nil if the trader does not support Register interface.
-  virtual CosTrading::Register_ptr register_if (void);
+  virtual CosTrading::Register_ptr register_if ();
 
   /// Returns object reference for the Link interface of the trader.
   /// Returns nil if the trader does not support Link interface.
-  virtual CosTrading::Link_ptr link_if (void);
+  virtual CosTrading::Link_ptr link_if ();
 
   /// Returns object reference to the Proxy interface of the trader.
   /// Returns nil if the trader does not support Proxy interface.
-  virtual CosTrading::Proxy_ptr proxy_if (void);
+  virtual CosTrading::Proxy_ptr proxy_if ();
 
   /// Returns object reference for the Admin interface of the trader.
   /// Returns nil if the trader does not support Admin interface.
-  virtual CosTrading::Admin_ptr admin_if (void);
+  virtual CosTrading::Admin_ptr admin_if ();
 
 private:
   const TAO_Trading_Components_i& comps_;
@@ -139,13 +139,13 @@ public:
 
   // = CosTrading::SupportAttributes methods.
 
-  virtual CORBA::Boolean supports_modifiable_properties (void);
+  virtual CORBA::Boolean supports_modifiable_properties ();
 
-  virtual CORBA::Boolean supports_dynamic_properties (void);
+  virtual CORBA::Boolean supports_dynamic_properties ();
 
-  virtual CORBA::Boolean supports_proxy_offers (void);
+  virtual CORBA::Boolean supports_proxy_offers ();
 
-  virtual CosTrading::TypeRepository_ptr type_repos (void);
+  virtual CosTrading::TypeRepository_ptr type_repos ();
 
 private:
   const TAO_Support_Attributes_i& attrs_;
@@ -159,37 +159,37 @@ public:
 
   // = CosTrading::ImportAttributes methods.
 
-  virtual CORBA::ULong def_search_card (void);
+  virtual CORBA::ULong def_search_card ();
 
-  virtual CORBA::ULong max_search_card (void);
+  virtual CORBA::ULong max_search_card ();
 
   // Search cardinality determines the maximum number of offers searched
   // before not considering other offers.
 
-  virtual CORBA::ULong def_match_card (void);
+  virtual CORBA::ULong def_match_card ();
 
-  virtual CORBA::ULong max_match_card (void);
+  virtual CORBA::ULong max_match_card ();
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
 
-  virtual CORBA::ULong def_return_card (void);
+  virtual CORBA::ULong def_return_card ();
 
-  virtual CORBA::ULong max_return_card (void);
+  virtual CORBA::ULong max_return_card ();
 
   // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
 
-  virtual CORBA::ULong max_list (void);
+  virtual CORBA::ULong max_list ();
 
-  virtual CORBA::ULong def_hop_count (void);
+  virtual CORBA::ULong def_hop_count ();
 
-  virtual CORBA::ULong max_hop_count (void);
+  virtual CORBA::ULong max_hop_count ();
 
-  virtual CosTrading::FollowOption def_follow_policy (void);
+  virtual CosTrading::FollowOption def_follow_policy ();
 
-  virtual CosTrading::FollowOption max_follow_policy (void);
+  virtual CosTrading::FollowOption max_follow_policy ();
 
 private:
   const TAO_Import_Attributes_i& attrs_;
@@ -202,7 +202,7 @@ public:
   TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs);
 
   // = CosTrading::LinkAttributes methods
-  virtual CosTrading::FollowOption max_link_follow_policy (void);
+  virtual CosTrading::FollowOption max_link_follow_policy ();
 
 private:
   const TAO_Link_Attributes_i& attrs_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 5d59d850685..099fadafa46 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -175,9 +175,9 @@ class TAO_Trading_Serv_Export TAO_Dynamic_Property
 {
 public:
   TAO_Dynamic_Property (void) {}
-  virtual ~TAO_Dynamic_Property (void);
+  virtual ~TAO_Dynamic_Property ();
 
-  void destroy (void);
+  void destroy ();
 
   /// Dynamic property evaluation call-back method.
   virtual CORBA::Any* evalDP(const char* name,
@@ -261,7 +261,7 @@ public:
   // DuplicatePolicyName exception is raised.
   // END SPEC
 
-  ~TAO_Policies (void);
+  ~TAO_Policies ();
 
   CORBA::ULong search_card () const;
 
@@ -625,11 +625,11 @@ public:
 
   /// It's ok to consider more offers when lookup hasn't exceeded the
   /// cardinality values for searching and matching offers.
-  CORBA::Boolean ok_to_consider_more (void);
+  CORBA::Boolean ok_to_consider_more ();
 
   /// Signal that the Lookup method has matched an offer; decrement the
   /// match_card.
-  void matched_offer (void);
+  void matched_offer ();
 
   // = Return the limits applied.
   /**
@@ -643,7 +643,7 @@ public:
    * returned.
    * END SPEC
    */
-  CosTrading::PolicyNameSeq* limits_applied (void);
+  CosTrading::PolicyNameSeq* limits_applied ();
 
   /// Accessors to retrieve the adjusted cardinalities.
   CORBA::ULong search_card_remaining () const;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index 70f4fe30cee..a6c520ab1b1 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
 #include "tao/ORB_Constants.h"
 
-ORBInitializer::ORBInitializer (void)
+ORBInitializer::ORBInitializer ()
   : load_alert_ ()
 {
 }
@@ -34,7 +34,7 @@ ORBInitializer::post_init (
 
 
 TAO_LB_LoadAlert &
-ORBInitializer::load_alert (void)
+ORBInitializer::load_alert ()
 {
   return this->load_alert_;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index b0045236621..7e179cecec7 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -31,7 +31,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index c47830f82ad..90c8481eb15 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -22,7 +22,7 @@ public:
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
                                        Test::number cl_number);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 032a70bbe8a..92b419a1ce0 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -6,7 +6,7 @@
 
 #include "tao/ORB_Constants.h"
 
-ORBInitializer::ORBInitializer (void)
+ORBInitializer::ORBInitializer ()
   : load_alert_ (),
     interceptor_ (0)
 {
@@ -52,7 +52,7 @@ ORBInitializer::post_init (
 
 
 TAO_LB_LoadAlert &
-ORBInitializer::load_alert (void)
+ORBInitializer::load_alert ()
 {
   return this->load_alert_;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index a2d731ec00a..9073cbcdbb8 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -21,12 +21,12 @@ RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor)
   this->location_[0].kind = CORBA::string_dup ("UUID");
 }
 
-RPS_Monitor::~RPS_Monitor (void)
+RPS_Monitor::~RPS_Monitor ()
 {
 }
 
 CosLoadBalancing::Location *
-RPS_Monitor::the_location (void)
+RPS_Monitor::the_location ()
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -41,7 +41,7 @@ RPS_Monitor::the_location (void)
 }
 
 CosLoadBalancing::LoadList *
-RPS_Monitor::loads (void)
+RPS_Monitor::loads ()
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 484d20cc47c..d83bd0c5fa0 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -64,7 +64,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~RPS_Monitor (void);
+  ~RPS_Monitor ();
 
 private:
   /// The name of the location at which this LoadMonitor resides.
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index 5e27f49fbfa..7915d8f2a61 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -24,7 +24,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index c47830f82ad..90c8481eb15 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -22,7 +22,7 @@ public:
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
                                        Test::number cl_number);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index 2af202455c5..05012b1fb74 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -1,22 +1,22 @@
 #include "ServerRequestInterceptor.h"
 
-ServerRequestInterceptor::ServerRequestInterceptor (void)
+ServerRequestInterceptor::ServerRequestInterceptor ()
   : request_count_ (0)
 {
 }
 
-ServerRequestInterceptor::~ServerRequestInterceptor (void)
+ServerRequestInterceptor::~ServerRequestInterceptor ()
 {
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
@@ -52,7 +52,7 @@ ServerRequestInterceptor::send_other (
 }
 
 CORBA::Long
-ServerRequestInterceptor::request_count (void)
+ServerRequestInterceptor::request_count ()
 {
   const CORBA::Long r = this->request_count_.value ();
   this->request_count_ = 0;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index d13ec9d6a4c..74e42791eb2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -47,7 +47,7 @@ class ServerRequestInterceptor
 {
 public:
   /// Constructor.
-  ServerRequestInterceptor (void);
+  ServerRequestInterceptor ();
 
   /**
    * @name Methods Required by the ServerRequestInterceptor
@@ -57,9 +57,9 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -77,7 +77,7 @@ public:
       PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
-  CORBA::Long request_count (void);
+  CORBA::Long request_count ();
 
 protected:
   /// Destructor.
@@ -85,7 +85,7 @@ protected:
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  ~ServerRequestInterceptor (void);
+  ~ServerRequestInterceptor ();
 
 private:
   /// The number of requests that have arrived on the server.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index 326d70b369a..b2d69704b43 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -26,7 +26,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index aa2c400f3af..3affd4e1a81 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -17,7 +17,7 @@ public:
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
                                        CORBA::Long workload_in_usecs);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 45bea32dbde..da1bbbdc517 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -30,7 +30,7 @@ public:
 
   virtual void run_test (void) = 0;
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     this->barrier_->wait ();
     try
@@ -67,7 +67,7 @@ public:
   {
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     for (int i = 0; i != this->iterations_; ++i)
       {
@@ -110,13 +110,13 @@ public:
   {
   }
 
-  void stop (void)
+  void stop ()
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     this->stopped_ = 1;
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     for (;;)
       {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 14ed3bef69e..be8d7d607e5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -10,7 +10,7 @@ Callback::Callback (int iterations,
 }
 
 ACE_Sample_History &
-Callback::sample_history (void)
+Callback::sample_history ()
 {
   return this->sample_history_;
 }
@@ -27,7 +27,7 @@ Callback::sample (Test::Timestamp the_timestamp)
 }
 
 PortableServer::POA_ptr
-Callback::_default_POA (void)
+Callback::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
index 91c21047769..2dce97a8261 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
@@ -27,14 +27,14 @@ public:
             PortableServer::POA_ptr poa);
 
   /// Access the history of samples
-  ACE_Sample_History &sample_history (void);
+  ACE_Sample_History &sample_history ();
 
   //@{
   /** @name The RtecEventComm::PushCallback methods
    */
   virtual void sample (Test::Timestamp the_timestamp);
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index fa37c2c2ee1..2af0b2aa734 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -15,13 +15,13 @@ Session::sample (Test::Timestamp the_timestamp)
 }
 
 void
-Session::shutdown (void)
+Session::shutdown ()
 {
   Implicit_Deactivator deactivator (this);
 }
 
 PortableServer::POA_ptr
-Session::_default_POA (void)
+Session::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index fc611073c89..935d3bc9e97 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -17,9 +17,9 @@ public:
   // = The skeleton methods
   virtual void sample (Test::Timestamp the_timestamp);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   Test::Callback_var cb_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index b25dd442757..944fa5df865 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -19,13 +19,13 @@ Session_Factory::create_new_session (Test::Callback_ptr cb)
 }
 
 void
-Session_Factory::shutdown (void)
+Session_Factory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-Session_Factory::_default_POA (void)
+Session_Factory::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index 13665b0a280..a40b375bb4a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -17,9 +17,9 @@ public:
   // = The skeleton methods
   virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 2f1082f663d..22fb16de51d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -36,7 +36,7 @@ public:
 
   virtual void run_test (void) = 0;
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     this->the_barrier_->wait ();
     try
@@ -72,7 +72,7 @@ public:
   {
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     Test::Callback_var cb =
       callback->_this ();
@@ -126,13 +126,13 @@ public:
   {
   }
 
-  void stop (void)
+  void stop ()
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     this->stopped_ = 1;
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     Test::Callback_var cb =
       callback->_this ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index d9ab67712a4..31f9ccc903d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -26,7 +26,7 @@ public:
                   ACE_Barrier * the_barrier,
                   int period_in_usecs);
 
-  void stop(void);
+  void stop();
 
   virtual int svc ();
 
@@ -129,14 +129,14 @@ Scavenger_Task::Scavenger_Task(ACE_TCHAR const * endpoint,
 }
 
 void
-Scavenger_Task::stop(void)
+Scavenger_Task::stop()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->stopped_ = 1;
 }
 
 int
-Scavenger_Task::svc(void)
+Scavenger_Task::svc()
 {
   this->the_barrier_->wait ();
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting scavenger thread\n"));
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 9e69761b528..a84d0aea668 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -61,7 +61,7 @@ Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Client_Group::disconnect (void)
+Client_Group::disconnect ()
 {
   Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_);
   Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
index 86d5de46f3e..9771c9565a0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
@@ -30,7 +30,7 @@ public:
    * We need a default constructor because this class is often used in
    * arrays.
    */
-  Client_Group (void);
+  Client_Group ();
 
   /// Initialize the consumer/supplier pair(s)
   /**
@@ -72,7 +72,7 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index cc8c9a1bc54..64b9ad83e9a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -66,7 +66,7 @@ Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Client_Pair::disconnect (void)
+Client_Pair::disconnect ()
 {
   Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_);
   Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
index d2a3e8c656b..fb28e230ceb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
@@ -30,7 +30,7 @@ public:
    * We need a default constructor because this class is often used in
    * arrays.
    */
-  Client_Pair (void);
+  Client_Pair ();
 
   /// Initialize the consumer/supplier pair
   /**
@@ -75,7 +75,7 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 3e0a502b12b..a8061afd993 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -60,7 +60,7 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -79,7 +79,7 @@ Consumer::disconnect (void)
 }
 
 ACE_Sample_History &
-Consumer::sample_history (void)
+Consumer::sample_history ()
 {
   return this->sample_history_;
 }
@@ -108,7 +108,7 @@ Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_supplier_ =
@@ -116,7 +116,7 @@ Consumer::disconnect_push_consumer (void)
 }
 
 PortableServer::POA_ptr
-Consumer::_default_POA (void)
+Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index 852ec158906..b113107cadd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -38,17 +38,17 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   /// Access the history of samples
-  ACE_Sample_History &sample_history (void);
+  ACE_Sample_History &sample_history ();
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_consumer ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index ffcc2320f5a..f47b21d8dac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -32,7 +32,7 @@ Control::Control (size_t peers_expected,
 {
 }
 
-Control::~Control (void)
+Control::~Control ()
 {
   delete[] this->peers_;
 }
@@ -149,7 +149,7 @@ Control::join (Federated_Test::Peer_ptr peer)
 }
 
 PortableServer::POA_ptr
-Control::_default_POA (void)
+Control::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
index 75a79fc653f..9bd10c31d2b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
@@ -29,14 +29,14 @@ public:
            PortableServer::POA_ptr poa);
 
   /// Destructor
-  virtual ~Control (void);
+  virtual ~Control ();
 
   //@{
   /** @name The Federated_Test::Control methods
    */
   virtual void join (Federated_Test::Peer_ptr peer);
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 08b2b33d1b0..8a8d41b4139 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -11,7 +11,7 @@ EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
 }
 
-EC_Destroyer::~EC_Destroyer (void)
+EC_Destroyer::~EC_Destroyer ()
 {
   try{
     this->ec_->destroy ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
index f4078e534df..fd43d0b6760 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
@@ -31,7 +31,7 @@ public:
    * @todo This method could benefit from the error logging described
    * in Servant_var.cpp
    */
-  ~EC_Destroyer (void);
+  ~EC_Destroyer ();
 
 private:
   /// The event channel
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
index 27ae34b7d98..75224f06c73 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
@@ -26,13 +26,13 @@ public:
   Implicit_Deactivator& operator= (Implicit_Deactivator& rhs);
 
   /// Destructor
-  ~Implicit_Deactivator (void);
+  ~Implicit_Deactivator ();
 
   /// Assignment operator
   Implicit_Deactivator& operator= (PortableServer::Servant servant);
 
   /// Release the servant, i.e. the destructor does not deactivate anything
-  void release (void);
+  void release ();
 
 private:
   /// The POA
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index 2b3fb36040b..3e1d3770922 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -23,7 +23,7 @@ Loopback::Loopback (CORBA::Long experiment_id,
 }
 
 void
-Loopback::disconnect (void)
+Loopback::disconnect ()
 {
   Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
index 343d42eeb33..36a75f3e24e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
@@ -31,7 +31,7 @@ public:
   //@{
   /** @name The Federated_Test::Loopback methods
    */
-  virtual void disconnect (void);
+  virtual void disconnect ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 345057c7172..cc0c39a05cb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -56,7 +56,7 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Loopback_Consumer::disconnect (void)
+Loopback_Consumer::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -83,7 +83,7 @@ Loopback_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Loopback_Consumer::disconnect_push_consumer (void)
+Loopback_Consumer::disconnect_push_consumer ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_supplier_ =
@@ -91,7 +91,7 @@ Loopback_Consumer::disconnect_push_consumer (void)
 }
 
 PortableServer::POA_ptr
-Loopback_Consumer::_default_POA (void)
+Loopback_Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index c67aec4f208..52fccda55b8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -33,14 +33,14 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_consumer ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index a4ce22f8232..908d4b06f0f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -40,7 +40,7 @@ Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Loopback_Pair::disconnect (void)
+Loopback_Pair::disconnect ()
 {
   Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_);
   Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
index d21244b7387..947d3798a07 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
@@ -30,7 +30,7 @@ public:
    * We need a default constructor because this class is often used in
    * arrays.
    */
-  Loopback_Pair (void);
+  Loopback_Pair ();
 
   /**
    * @param experiment_id For tests that run multiple experiments
@@ -54,7 +54,7 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index f5fb3d79e2c..a0882566973 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -48,7 +48,7 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Loopback_Supplier::disconnect (void)
+Loopback_Supplier::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -101,7 +101,7 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source)
 }
 
 void
-Loopback_Supplier::disconnect_push_supplier (void)
+Loopback_Supplier::disconnect_push_supplier ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_consumer_ =
@@ -109,7 +109,7 @@ Loopback_Supplier::disconnect_push_supplier (void)
 }
 
 PortableServer::POA_ptr
-Loopback_Supplier::_default_POA (void)
+Loopback_Supplier::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 7144ce82d48..dc4c43c99ff 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -37,15 +37,15 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   void push (const RtecEventComm::EventSet &events);
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_supplier ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
index c83ad1204c4..e3823cddb70 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
@@ -80,7 +80,7 @@ Low_Priority_Setup (int consumer_count,
 }
 
 template<class Client_Type> void
-Low_Priority_Setup<Client_Type>::stop_all_threads (void)
+Low_Priority_Setup<Client_Type>::stop_all_threads ()
 {
   ACE_DEBUG ((LM_DEBUG, "Stopping:"));
   for (int i = 0; i != this->nthreads_; ++i)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
index 4a7d23bd95c..9c69b56917b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
@@ -51,7 +51,7 @@ public:
                       ACE_Barrier *barrier);
 
   /// Stop all running threads
-  void stop_all_threads (void);
+  void stop_all_threads ();
 
   /// Collect the stats from all the clients
   void collect_basic_stats (ACE_Basic_Stats &stats);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index 75efcf6017a..d47dddb16dc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -16,7 +16,7 @@ ORB_Holder::ORB_Holder (int &argc, ACE_TCHAR *argv[],
 {
 }
 
-ORB_Holder::~ORB_Holder (void)
+ORB_Holder::~ORB_Holder ()
 {
   try{
     this->orb_->destroy ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
index bf6af28b4a8..24640eae3dd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
@@ -31,11 +31,11 @@ public:
    * @todo This method could benefit from the error logging described
    * in Servant_var.cpp
    */
-  ~ORB_Holder (void);
+  ~ORB_Holder ();
 
   /// Access the underlying ORB, using the canonical CORBA memory
   /// management model
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Implicit conversion to CORBA::ORB_ptr
   /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index 4fda1aca169..7789e6f28f9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -16,7 +16,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h
index fc7ece30b54..cd19e3a4acc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h
@@ -27,7 +27,7 @@ public:
   ORB_Task (CORBA::ORB_ptr orb);
 
   /// Run the event loop
-  int svc (void);
+  int svc ();
 
   /// Smart-pointer operator
   CORBA::ORB_ptr operator-> () const;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index 9023da05e18..a71ccc09284 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -10,7 +10,7 @@
 #include "ORB_Task_Activator.inl"
 #endif /* __ACE_INLINE__ */
 
-ORB_Task_Activator::~ORB_Task_Activator (void)
+ORB_Task_Activator::~ORB_Task_Activator ()
 {
   if (this->task_ == 0)
     return;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h
index cecd975359e..123e7d6bd4d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h
@@ -29,7 +29,7 @@ public:
                       ORB_Task *task);
 
   /// Destructor, stop the task and wait for it
-  ~ORB_Task_Activator (void);
+  ~ORB_Task_Activator ();
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 2017a94ba4b..ccd880bebe7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -38,12 +38,12 @@ Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
     RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 }
 
-Peer_Base::~Peer_Base (void)
+Peer_Base::~Peer_Base ()
 {
 }
 
 void
-Peer_Base::shutdown (void)
+Peer_Base::shutdown ()
 {
   {
     EC_Destroyer ec_destroyer (this->event_channel_.in ());
@@ -55,7 +55,7 @@ Peer_Base::shutdown (void)
 }
 
 CORBA::Object_ptr
-Peer_Base::channel (void)
+Peer_Base::channel ()
 {
   return CORBA::Object::_duplicate (this->event_channel_.in ());
 }
@@ -105,7 +105,7 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
 }
 
 PortableServer::POA_ptr
-Peer_Base::_default_POA (void)
+Peer_Base::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index 7d12128f02e..b10fc3c5770 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -31,22 +31,22 @@ public:
              RTServer_Setup &rtserver_setup);
 
   /// Destructor
-  virtual ~Peer_Base (void);
+  virtual ~Peer_Base ();
 
   //@{
   /** @name The Federated_Test::Peer methods
    */
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   virtual CORBA::Object_ptr
-      channel (void);
+      channel ();
 
   virtual void connect (Federated_Test::Peer_ptr remote_peer);
 
   Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id,
                                                CORBA::Long base_event_type);
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
   //@}
 
 protected:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index 00786c73bde..95529604032 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -37,6 +37,6 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
   policy_list[0]->destroy ();
 }
 
-PriorityBand_Setup::~PriorityBand_Setup (void)
+PriorityBand_Setup::~PriorityBand_Setup ()
 {
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
index f0f23d54db3..1b0c6cd0a9d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
@@ -32,7 +32,7 @@ public:
   /**
    * It is a no-op, but it shuts up g++
    */
-  ~PriorityBand_Setup (void);
+  ~PriorityBand_Setup ();
 };
 
 #endif /* TAO_PERF_RTEC_PRIORITYBAND_SETUP_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
index 14a4131bfb2..b3cf176933e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
@@ -37,7 +37,7 @@ public:
   int use_rt_corba () const;
 
   /// Return the underlying RTCORBA_Setup pointer
-  RTCORBA_Setup *rtcorba_setup (void);
+  RTCORBA_Setup *rtcorba_setup ();
 
 private:
   int use_rt_corba_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
index 03f667f3c6b..f84f16b36e3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
@@ -28,7 +28,7 @@ public:
   RTPOA_Setup (CORBA::ORB_ptr orb,
                const RTCORBA_Setup &rtcorba_setup);
 
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
index e47418236c2..1df03597255 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
@@ -31,7 +31,7 @@ public:
                   int nthreads);
 
   /// Return the POA configured by the RTPOA_Setup
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
index 3dd562582f1..1ddb29e57e0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
@@ -13,7 +13,7 @@
 #include "RT_Class.inl"
 #endif /* __ACE_INLINE__ */
 
-RT_Class::RT_Class (void)
+RT_Class::RT_Class ()
   : prc_sched_class_ (ACE_SCHED_FIFO)
   , thr_sched_class_ (THR_SCHED_FIFO)
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h
index 09c7381a4d9..053c5b3d8a5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h
@@ -23,7 +23,7 @@ class TAO_RTEC_Perf_Export RT_Class
 {
 public:
   /// Constructor
-  RT_Class (void);
+  RT_Class ();
 
   /** @name Return the test scheduling parameters
    */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 187083f2e32..5461015c222 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -11,7 +11,7 @@
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
 
-Send_Task::Send_Task (void)
+Send_Task::Send_Task ()
   : iterations_ (0)
   , period_in_usecs_ (0)
   , startup_sleep_ (0)
@@ -42,14 +42,14 @@ Send_Task::init (int iterations,
 }
 
 void
-Send_Task::stop (void)
+Send_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->stop_ = 1;
 }
 
 int
-Send_Task::svc (void)
+Send_Task::svc ()
 {
   if (this->barrier_ == 0)
     return -1;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
index fe51de17e49..1a81ac7064e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
@@ -28,7 +28,7 @@ class TAO_RTEC_Perf_Export Send_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Send_Task (void);
+  Send_Task ();
 
   /// This is for compilers that are a PITA complaining that we are
   /// hiding something.
@@ -46,10 +46,10 @@ public:
              ACE_Barrier *barrier);
 
   /// Run the experiment
-  int svc (void);
+  int svc ();
 
   /// Stop the experiment
-  void stop (void);
+  void stop ();
 
 private:
   int iterations_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
index c9f89e370d5..997d86b9029 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
@@ -10,7 +10,7 @@
 #include "Send_Task_Stopper.inl"
 #endif /* __ACE_INLINE__ */
 
-Send_Task_Stopper::~Send_Task_Stopper (void)
+Send_Task_Stopper::~Send_Task_Stopper ()
 {
   if (this->task_ == 0)
     return;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h
index 4ce7b82f017..0bcc0c76555 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h
@@ -28,7 +28,7 @@ public:
                      Send_Task *task);
 
   /// Destructor, stop the task and wait for it
-  ~Send_Task_Stopper (void);
+  ~Send_Task_Stopper ();
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index dc97130f944..00765d26048 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -52,7 +52,7 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -88,7 +88,7 @@ Supplier::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_consumer_ =
@@ -96,7 +96,7 @@ Supplier::disconnect_push_supplier (void)
 }
 
 PortableServer::POA_ptr
-Supplier::_default_POA (void)
+Supplier::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index b60a44281bc..abf5158972d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -38,15 +38,15 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   void push (const RtecEventComm::EventSet &events);
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_supplier ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index a75014c780a..c45d24df28d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -44,6 +44,6 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb,
   policy_list[0]->destroy ();
 }
 
-SyncScope_Setup::~SyncScope_Setup (void)
+SyncScope_Setup::~SyncScope_Setup ()
 {
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
index 75689632305..818bd412fb7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
@@ -32,7 +32,7 @@ public:
   /**
    * It is a no-op, but it shuts up g++
    */
-  ~SyncScope_Setup (void);
+  ~SyncScope_Setup ();
 
 private:
   /// Implement the shared code between both constructors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp
index 6af0a4eded0..5a0d22ea8d2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp
@@ -41,7 +41,7 @@ Task_Activator<Task>::Task_Activator (int priority,
 }
 
 template<class Task>
-Task_Activator<Task>::~Task_Activator (void)
+Task_Activator<Task>::~Task_Activator ()
 {
   if (this->task_ == 0)
     return;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h
index 5a8f9ecf2b5..51f65fd5895 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h
@@ -63,10 +63,10 @@ public:
    * cooperative termination protocol in the destructor of the derived
    * class.
    */
-  ~Task_Activator (void);
+  ~Task_Activator ();
 
   /// Release the task, do not terminate it
-  void release (void);
+  void release ();
 
 protected:
   Task *task_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 15a3da0fa7a..857b9061edb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -1,10 +1,10 @@
 #include "Connection_Manager.h"
 
-Connection_Manager::Connection_Manager (void)
+Connection_Manager::Connection_Manager ()
 {
 }
 
-Connection_Manager::~Connection_Manager (void)
+Connection_Manager::~Connection_Manager ()
 {
 }
 
@@ -214,7 +214,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::find_receivers (void)
+Connection_Manager::find_receivers ()
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -464,7 +464,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (void)
+Connection_Manager::connect_to_sender ()
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -586,19 +586,19 @@ Connection_Manager::destroy (const ACE_CString &flowname)
 }
 
 Connection_Manager::Receivers &
-Connection_Manager::receivers (void)
+Connection_Manager::receivers ()
 {
   return this->receivers_;
 }
 
 Connection_Manager::Protocol_Objects &
-Connection_Manager::protocol_objects (void)
+Connection_Manager::protocol_objects ()
 {
   return this->protocol_objects_;
 }
 
 Connection_Manager::StreamCtrls &
-Connection_Manager::streamctrls (void)
+Connection_Manager::streamctrls ()
 {
   return this->streamctrls_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 4288e5cc846..1db47f8201c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -37,10 +37,10 @@ class Connection_Manager
 {
 public:
   /// Constructor
-  Connection_Manager (void);
+  Connection_Manager ();
 
   /// Destructor
-  ~Connection_Manager (void);
+  ~Connection_Manager ();
 
   /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
@@ -59,10 +59,10 @@ public:
                        AVStreams::MMDevice_ptr receiver);
 
   /// Connect to the sender that we found.
-  void connect_to_sender (void);
+  void connect_to_sender ();
 
   /// Destroy all streams.
-  void destroy (void);
+  void destroy ();
 
   /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
@@ -97,14 +97,14 @@ public:
           EP_Addr;
 
   // Map accessors.
-  Receivers &receivers (void);
-  Protocol_Objects &protocol_objects (void);
-  StreamCtrls &streamctrls (void);
+  Receivers &receivers ();
+  Protocol_Objects &protocol_objects ();
+  StreamCtrls &streamctrls ();
 
   void load_ep_addr (const char* file_name);
 
 protected:
-  void find_receivers (void);
+  void find_receivers ();
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 167b84ac85e..1f3f044273f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -41,7 +41,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -79,7 +79,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Distributer_Callback::end_stream\n"));
@@ -90,7 +90,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Distributer::Distributer (void)
+Distributer::Distributer ()
   : sender_name_ ("sender")
   , distributer_name_ ("distributer")
   , done_ (0)
@@ -98,12 +98,12 @@ Distributer::Distributer (void)
 {
 }
 
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
 {
 }
 
 Connection_Manager &
-Distributer::connection_manager (void)
+Distributer::connection_manager ()
 {
   return this->connection_manager_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 498a2d37b03..9d3ffed6471 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -28,7 +28,7 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Distributer_Receiver_Callback (void);
+  Distributer_Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -38,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Count of the frames passing through us.
@@ -111,10 +111,10 @@ class Distributer
 {
 public:
   /// Constructor
-  Distributer (void);
+  Distributer ();
 
   /// Destructor.
-  ~Distributer (void);
+  ~Distributer ();
 
   /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -127,7 +127,7 @@ public:
   void done (int);
 
   /// Accessor to connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
 protected:
   /// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 8cf78960834..607a97e84d1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -75,7 +75,7 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     output_file_name_ (ACE_TEXT ("output")),
     addr_file_ (ACE_TEXT ("addr_file")),
@@ -84,7 +84,7 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
@@ -165,7 +165,7 @@ Receiver::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_TString
-Receiver::output_file_name (void)
+Receiver::output_file_name ()
 {
   return this->output_file_name_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index cdc2308ac61..863f5d6aafa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -28,7 +28,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -38,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -76,10 +76,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -88,7 +88,7 @@ public:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Name of the output file.
-  ACE_TString output_file_name (void);
+  ACE_TString output_file_name ();
 
 protected:
   /// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index 03e265cdfe4..8739741efa0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -38,7 +38,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *flowname,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     frame_count_ (0),
     filename_ (ACE_TEXT("input")),
@@ -148,7 +148,7 @@ Sender::init (int argc, ACE_TCHAR *argv[])
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -267,7 +267,7 @@ Sender::pace_data (void)
 }
 
 Connection_Manager &
-Sender::connection_manager (void)
+Sender::connection_manager ()
 {
   return this->connection_manager_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index 9c723e92832..15dc9543efa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -58,17 +58,17 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Accessor to the connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
 private:
   /// Method to parse the command line arguments.
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 531173b6d4f..c4a529fc542 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -33,7 +33,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1),
       mb_ (BUFSIZ)
 {
@@ -103,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -130,7 +130,7 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     frame_rate_ (30),
     input_file_ (0),
@@ -140,7 +140,7 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
@@ -245,13 +245,13 @@ Receiver::init (int argc,
 }
 
 TAO_AV_Protocol_Object*
-Receiver::protocol_object (void)
+Receiver::protocol_object ()
 {
   return this->protocol_object_;
 }
 
 FILE *
-Receiver::input_file (void)
+Receiver::input_file ()
 {
   return this->input_file_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 257c20d783f..e84bb472b2f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -86,10 +86,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
@@ -99,9 +99,9 @@ public:
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// Set the protocol object corresponding to the transport protocol chosen.
-  TAO_AV_Protocol_Object * protocol_object (void);
+  TAO_AV_Protocol_Object * protocol_object ();
 
-  FILE * input_file (void);
+  FILE * input_file ();
 
 protected:
   /// The Naming Service Client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index da72c56164b..0c607516030 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -33,7 +33,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender_Callback::Sender_Callback (void)
+Sender_Callback::Sender_Callback ()
   : frame_count_ (1)
 {
 }
@@ -73,7 +73,7 @@ Sender_Callback::receive_frame (ACE_Message_Block *frame,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -95,13 +95,13 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Sender::eof (void)
+Sender::eof ()
 {
   return this->eof_;
 }
 
 void
-Sender::shutdown (void)
+Sender::shutdown ()
 {
   try
   {
@@ -152,7 +152,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -282,7 +282,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index 785eb117420..5bbc4cc5e4a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -28,7 +28,7 @@ class Sender_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Sender_Callback (void);
+  Sender_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -38,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  //  int handle_destroy (void);
+  //  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -86,28 +86,28 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
-  int eof (void);
+  int eof ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index c3639d2f62e..8ca32e2dd21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -1,11 +1,11 @@
 #include "Connection_Manager.h"
 #include "tao/debug.h"
 
-Connection_Manager::Connection_Manager (void)
+Connection_Manager::Connection_Manager ()
 {
 }
 
-Connection_Manager::~Connection_Manager (void)
+Connection_Manager::~Connection_Manager ()
 {
 }
 
@@ -95,7 +95,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::find_receivers (void)
+Connection_Manager::find_receivers ()
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -159,7 +159,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list)
 }
 
 void
-Connection_Manager::connect_to_receivers (void)
+Connection_Manager::connect_to_receivers ()
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -316,7 +316,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (void)
+Connection_Manager::connect_to_sender ()
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -551,19 +551,19 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
 }
 
 Connection_Manager::Receivers &
-Connection_Manager::receivers (void)
+Connection_Manager::receivers ()
 {
   return this->receivers_;
 }
 
 Connection_Manager::Protocol_Objects &
-Connection_Manager::protocol_objects (void)
+Connection_Manager::protocol_objects ()
 {
   return this->protocol_objects_;
 }
 
 Connection_Manager::StreamCtrls &
-Connection_Manager::streamctrls (void)
+Connection_Manager::streamctrls ()
 {
   return this->streamctrls_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 34d8269cb04..8668d308985 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -33,10 +33,10 @@ class Connection_Manager
 {
 public:
   /// Constructor
-  Connection_Manager (void);
+  Connection_Manager ();
 
   /// Destructor
-  ~Connection_Manager (void);
+  ~Connection_Manager ();
 
   /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
@@ -47,7 +47,7 @@ public:
                           AVStreams::MMDevice_ptr sender);
 
   /// Connect to the receivers that we found.
-  void connect_to_receivers (void);
+  void connect_to_receivers ();
 
   /// Bind receiver to the sender.
   void bind_to_sender (const ACE_CString &sender_name,
@@ -55,7 +55,7 @@ public:
                        AVStreams::MMDevice_ptr receiver);
 
   /// Connect to the sender that we found.
-  void connect_to_sender (void);
+  void connect_to_sender ();
 
   /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
@@ -92,12 +92,12 @@ public:
           StreamCtrls;
 
   // Map accessors.
-  Receivers &receivers (void);
-  Protocol_Objects &protocol_objects (void);
-  StreamCtrls &streamctrls (void);
+  Receivers &receivers ();
+  Protocol_Objects &protocol_objects ();
+  StreamCtrls &streamctrls ();
 
 protected:
-  void find_receivers (void);
+  void find_receivers ();
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index fbe163dff5c..5a7d703a2e8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -9,7 +9,7 @@
 typedef ACE_Unmanaged_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
 
 // constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
 {
 }
 
@@ -127,13 +127,13 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
 }
 
 
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
   : frame_count_ (1)
 {
 }
 
 ACE_CString &
-Distributer_Receiver_Callback::flowname (void)
+Distributer_Receiver_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -177,7 +177,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
 {
   /// Called when the sender requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -192,7 +192,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
 }
 
 ACE_CString &
-Distributer_Sender_Callback::flowname (void)
+Distributer_Sender_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -204,7 +204,7 @@ Distributer_Sender_Callback::flowname (const ACE_CString &flowname)
 }
 
 int
-Distributer_Sender_Callback::handle_destroy (void)
+Distributer_Sender_Callback::handle_destroy ()
 {
   /// Called when the sender requests the stream to be shutdown.
 
@@ -220,7 +220,7 @@ Distributer_Sender_Callback::handle_destroy (void)
   return 0;
 }
 
-Distributer::Distributer (void)
+Distributer::Distributer ()
   : distributer_receiver_mmdevice_ (0),
     sender_name_ ("sender"),
     distributer_name_ ("distributer"),
@@ -229,18 +229,18 @@ Distributer::Distributer (void)
 {
 }
 
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
 {
 }
 
 void
-Distributer::stream_created (void)
+Distributer::stream_created ()
 {
   ++this->stream_count_;
 }
 
 void
-Distributer::stream_destroyed (void)
+Distributer::stream_destroyed ()
 {
   --this->stream_count_;
 
@@ -250,7 +250,7 @@ Distributer::stream_destroyed (void)
 
 
 Connection_Manager &
-Distributer::connection_manager (void)
+Distributer::connection_manager ()
 {
   return this->connection_manager_;
 }
@@ -370,7 +370,7 @@ Distributer::done () const
 }
 
 void
-Distributer::shut_down (void)
+Distributer::shut_down ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 7e7bdc750a6..e4c61ab7f7b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -26,7 +26,7 @@
 class Signal_Handler : public ACE_Event_Handler
 {
 public:
-  Signal_Handler (void);
+  Signal_Handler ();
 
   /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
@@ -44,7 +44,7 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
 public:
   //// Constructor.
-  Distributer_Receiver_Callback (void);
+  Distributer_Receiver_Callback ();
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -54,10 +54,10 @@ public:
 
   /// Called when the sender is done sending data and wants to close
   /// down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback.
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
@@ -82,10 +82,10 @@ class Distributer_Sender_Callback : public TAO_AV_Callback
 public:
   //// Called when the sender has finished reading the file and wants
   //// to close down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback.
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
@@ -166,10 +166,10 @@ class Distributer
 {
 public:
   //// Constructor
-  Distributer (void);
+  Distributer ();
 
   //// Destructor.
-  ~Distributer (void);
+  ~Distributer ();
 
   //// Initialize data components.
   int init (int argc,
@@ -184,16 +184,16 @@ public:
   void done (bool);
 
   //// Accessor to connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
   //// Called when stream created
-  void stream_created (void);
+  void stream_created ();
 
   //// Called when stream destroyed
-  void stream_destroyed (void);
+  void stream_destroyed ();
 
   ////Unbind the sender and receiver from the Naming Service
-  void shut_down (void);
+  void shut_down ();
 
 protected:
   //// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index b6a113c5e18..68262b9a5a5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -11,7 +11,7 @@ static int done = 0;
 /// Flag set when a signal is raised.
 
 // constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
 {
 }
 
@@ -72,13 +72,13 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
   return 1;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
 
 ACE_CString &
-Receiver_Callback::flowname (void)
+Receiver_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -90,7 +90,7 @@ Receiver_Callback::flowname (const ACE_CString &flowname)
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   /// Called when the sender requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -134,7 +134,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     output_file_name_ ("output"),
     sender_name_ ("distributer"),
@@ -142,18 +142,18 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
 ACE_CString
-Receiver::sender_name (void)
+Receiver::sender_name ()
 {
   return this->sender_name_;
 }
 
 ACE_CString
-Receiver::receiver_name (void)
+Receiver::receiver_name ()
 {
   return this->receiver_name_;
 }
@@ -244,13 +244,13 @@ Receiver::parse_args (int argc,
 }
 
 ACE_CString
-Receiver::output_file_name (void)
+Receiver::output_file_name ()
 {
   return this->output_file_name_;
 }
 
 void
-Receiver::shut_down (void)
+Receiver::shut_down ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 87407f68ad3..812ab6f7916 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -26,7 +26,7 @@
 class Signal_Handler : public ACE_Event_Handler
 {
 public:
-  Signal_Handler (void);
+  Signal_Handler ();
 
   /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
@@ -43,7 +43,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   //// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -51,10 +51,10 @@ public:
                      TAO_AV_frame_info *frame_info,
                      const ACE_Addr &peer_address);
 
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback.
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
@@ -99,10 +99,10 @@ class Receiver
 {
 public:
   //// Constructor
-  Receiver (void);
+  Receiver ();
 
   //// Destructor.
-  virtual ~Receiver (void);
+  virtual ~Receiver ();
 
   //// Initialize data components.
   int init (int argc,
@@ -113,12 +113,12 @@ public:
                   ACE_TCHAR **argv);
 
   //// Name of the output file.
-  ACE_CString output_file_name (void);
+  ACE_CString output_file_name ();
 
-  ACE_CString sender_name (void);
-  ACE_CString receiver_name (void);
+  ACE_CString sender_name ();
+  ACE_CString receiver_name ();
 
-  void shut_down (void);
+  void shut_down ();
 
 protected:
   //// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index e2958400895..d8a91aecb9b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -17,7 +17,7 @@ int g_shutdown = 0;
 /// Flag set when a signal is raised.
 
 // constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
 {
 }
 
@@ -36,7 +36,7 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
 }
 
 ACE_CString &
-Sender_Callback::flowname (void)
+Sender_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -49,7 +49,7 @@ Sender_Callback::flowname (const ACE_CString &flowname)
 
 
 int
-Sender_Callback::handle_destroy (void)
+Sender_Callback::handle_destroy ()
 {
   SENDER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ());
 
@@ -128,7 +128,7 @@ Sender_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &flowspec)
   return 1;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     frame_count_ (0),
     filename_ ("input"),
@@ -139,7 +139,7 @@ Sender::Sender (void)
 {
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -147,7 +147,7 @@ Sender::~Sender (void)
 }
 
 void
-Sender::shut_down (void)
+Sender::shut_down ()
 {
   try
     {
@@ -271,7 +271,7 @@ Sender::init (int argc,
 
 /// Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   /// The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -404,25 +404,25 @@ Sender::pace_data (void)
 }
 
 Connection_Manager &
-Sender::connection_manager (void)
+Sender::connection_manager ()
 {
   return this->connection_manager_;
 }
 
 //  void
-//  Sender::add_stream (void)
+//  Sender::add_stream ()
 //  {
 //    this->stream_count_++;
 //  }
 
 //  void
-//  Sender::remove_stream (void)
+//  Sender::remove_stream ()
 //  {
 //    this->stream_count_--;
 //  }
 
 //  int
-//  Sender::stream_alive (void)
+//  Sender::stream_alive ()
 //  {
 //    return this->stream_count_;
 //  }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 624cf488220..9d40a9f9312 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -26,7 +26,7 @@
 class Signal_Handler : public ACE_Event_Handler
 {
 public:
-  Signal_Handler (void);
+  Signal_Handler ();
 
   /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
@@ -49,10 +49,10 @@ public:
    * to close down the connection. Also called when the distributer
    * tears down the connection when it switches to a new sender.
    */
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
@@ -105,22 +105,22 @@ class Sender
 {
 public:
   //// Constructor
-  Sender (void);
+  Sender ();
 
   //// Destructor
-  ~Sender (void);
+  ~Sender ();
 
-  void shut_down (void);
+  void shut_down ();
 
   //// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   //// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   //// Accessor to the connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
 private:
   //// Method to parse the command line arguments.
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 0bd805403cb..90667f6c708 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -1,13 +1,13 @@
 #include "ftp.h"
 
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
   :count_ (0)
 {
 }
 
 int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
 {
   TAO_AV_CORE::instance ()->stop_run ();
   return 0;
@@ -73,7 +73,7 @@ FTP_Client_Callback::handle_timeout (void *)
   return 0;
 }
 
-FTP_Client_Producer::FTP_Client_Producer (void)
+FTP_Client_Producer::FTP_Client_Producer ()
   :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
 {
 }
@@ -155,19 +155,19 @@ Client::parse_args (int argc,
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 const char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_.c_str();
 }
 
 AVStreams::protocolSpec
-Client::protocols (void)
+Client::protocols ()
 {
   AVStreams::protocolSpec protocols (1);
   protocols.length (1);
@@ -178,25 +178,25 @@ Client::protocols (void)
 }
 
 const char *
-Client::format (void)
+Client::format ()
 {
   return "UNS:ftp";
 }
 
 const char *
-Client::address (void)
+Client::address ()
 
 {
   return this->address_.c_str ();
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
-Client::Client (void)
+Client::Client ()
   : fp_ (0),
     protocol_ (ACE_OS::strdup ("UDP")),
     orb_ (TAO_AV_CORE::instance ()->orb ()),
@@ -258,7 +258,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index ee8214651a8..805f58fd42c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -19,7 +19,7 @@ class FTP_Client_Producer
   :public virtual TAO_FlowProducer
 {
 public:
-  FTP_Client_Producer (void);
+  FTP_Client_Producer ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
   int set_protocol_object (const char *flowname,
@@ -32,9 +32,9 @@ class FTP_Client_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Client_Callback (void);
+  FTP_Client_Callback ();
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
@@ -49,15 +49,15 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Nul
 class Client
 {
 public:
-  Client (void);
+  Client ();
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  const char *flowname (void);
-  TAO_StreamCtrl* streamctrl (void);
-  AVStreams::protocolSpec protocols (void);
-  const char *format (void);
-  const char *address (void);
+  int run ();
+  FILE *file ();
+  const char *flowname ();
+  TAO_StreamCtrl* streamctrl ();
+  AVStreams::protocolSpec protocols ();
+  const char *format ();
+  const char *address ();
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 74090d97812..77bcbdfd30f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -1,6 +1,6 @@
 #include "server.h"
 
-FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
+FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint ()
   :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ())
 {
   AVStreams::protocolSpec protocols (2);
@@ -29,12 +29,12 @@ FTP_Server_FlowEndPoint::get_callback (const char *,
   return 0;
 }
 
-FTP_Server_Callback::FTP_Server_Callback (void)
+FTP_Server_Callback::FTP_Server_Callback ()
 {
 }
 
 int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -62,14 +62,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
 {
   CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb ();
   orb->shutdown ();
   return 0;
 }
 
-Server::Server (void)
+Server::Server ()
   :orb_ (TAO_AV_CORE::instance ()->orb ()),
    poa_ (TAO_AV_CORE::instance ()->poa ())
 {
@@ -78,7 +78,7 @@ Server::Server (void)
 }
 
 AVStreams::protocolSpec
-Server::protocols (void)
+Server::protocols ()
 {
   AVStreams::protocolSpec protocols (2);
   protocols.length (2);
@@ -88,7 +88,7 @@ Server::protocols (void)
 }
 
 const char*
-Server::format (void)
+Server::format ()
 {
   return "UNS:ftp";
 }
@@ -146,7 +146,7 @@ Server::init (int argc,
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   try
     {
@@ -194,7 +194,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 FILE*
-Server::file (void)
+Server::file ()
 {
   return this->fp_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index 0901c0e4e69..3025cc70017 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -15,19 +15,19 @@ class FTP_Server_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Server_Callback (void);
-  virtual int handle_stop (void);
+  FTP_Server_Callback ();
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *,
                              const ACE_Addr &);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
 };
 
 class FTP_Server_FlowEndPoint
   :public TAO_FlowConsumer
 {
 public:
-  FTP_Server_FlowEndPoint (void);
+  FTP_Server_FlowEndPoint ();
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 };
@@ -35,17 +35,17 @@ public:
 class Server
 {
 public:
-  Server (void);
+  Server ();
   int init (int argc,
             ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  AVStreams::protocolSpec protocols (void);
-  CORBA::ORB_ptr orb (void);
+  int run ();
+  FILE *file ();
+  AVStreams::protocolSpec protocols ();
+  CORBA::ORB_ptr orb ();
   void orb (CORBA::ORB_ptr orb_in);
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
   void poa (PortableServer::POA_ptr poa_in);
-  const char *format (void);
+  const char *format ();
 protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 72d5d0e4b7f..6b1135648a4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -184,7 +184,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Ping_Recv::Ping_Recv (void)
+Ping_Recv::Ping_Recv ()
   :  TAO_FlowConsumer ("Ping",
                        ping_protocols,
                        "UNS:ping")
@@ -200,13 +200,13 @@ Ping_Recv::get_callback (const char *,
   return 0;
 }
 
-Ping_Recv_Callback::Ping_Recv_Callback (void)
+Ping_Recv_Callback::Ping_Recv_Callback ()
   : count_ (0)
 {
 }
 
 int
-Ping_Recv_Callback::handle_stop (void)
+Ping_Recv_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::stop"));
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
@@ -257,7 +257,7 @@ Ping_Recv_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Ping_Recv_Callback::handle_destroy (void)
+Ping_Recv_Callback::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::destroy\n"));
   return 0;
@@ -265,7 +265,7 @@ Ping_Recv_Callback::handle_destroy (void)
 
 // ****************************************************************
 
-Pong_Send::Pong_Send (void)
+Pong_Send::Pong_Send ()
   :  TAO_FlowProducer ("Pong",
                        pong_protocols,
                        "UNS:pong")
@@ -298,7 +298,7 @@ Pong_Send_Callback::handle_timeout (void *)
 }
 
 int
-Pong_Send_Callback::handle_end_stream (void)
+Pong_Send_Callback::handle_end_stream ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
index d291d427f57..70e3d743bef 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -19,12 +19,12 @@
 class Ping_Recv_Callback : public TAO_AV_Callback
 {
 public:
-  Ping_Recv_Callback (void);
-  virtual int handle_stop (void);
+  Ping_Recv_Callback ();
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info = 0,
                              const ACE_Addr &peer_address = ACE_Addr::sap_any);
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
  protected:
   int count_;
 };
@@ -32,7 +32,7 @@ public:
 class Ping_Recv : public TAO_FlowConsumer
 {
 public:
-  Ping_Recv (void);
+  Ping_Recv ();
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -50,7 +50,7 @@ public:
   int send_response (ACE_hrtime_t stamp);
 
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
 };
@@ -58,7 +58,7 @@ public:
 class Pong_Send : public TAO_FlowProducer
 {
 public:
-  Pong_Send (void);
+  Pong_Send ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index c636d9d9977..4ea62edf998 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -202,7 +202,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Pong_Recv::Pong_Recv (void)
+Pong_Recv::Pong_Recv ()
   :  TAO_FlowConsumer ("Pong",
                        pong_protocols,
                        "UNS:pong")
@@ -219,7 +219,7 @@ Pong_Recv::get_callback (const char *,
 }
 
 int
-Pong_Recv_Callback::handle_stop (void)
+Pong_Recv_Callback::handle_stop ()
 {
   // ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::stop"));
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
@@ -259,7 +259,7 @@ Pong_Recv_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Pong_Recv_Callback::handle_destroy (void)
+Pong_Recv_Callback::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::destroy\n"));
   return 0;
@@ -267,7 +267,7 @@ Pong_Recv_Callback::handle_destroy (void)
 
 // ****************************************************************
 
-Ping_Send::Ping_Send (void)
+Ping_Send::Ping_Send ()
   :  TAO_FlowProducer ("Ping",
                        ping_protocols,
                        "UNS:ping")
@@ -283,7 +283,7 @@ Ping_Send::get_callback (const char *,
   return 0;
 }
 
-Ping_Send_Callback::Ping_Send_Callback (void)
+Ping_Send_Callback::Ping_Send_Callback ()
   :count_ (0)
 {
   this->timeout_ = ACE_Time_Value (2);
@@ -334,7 +334,7 @@ Ping_Send_Callback::handle_timeout (void *)
 }
 
 int
-Ping_Send_Callback::handle_end_stream (void)
+Ping_Send_Callback::handle_end_stream ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
index 042874c5726..065af4f4f5a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -17,17 +17,17 @@
 class Pong_Recv_Callback : public TAO_AV_Callback
 {
 public:
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info = 0,
                              const ACE_Addr &peer_address = ACE_Addr::sap_any);
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
 };
 
 class Pong_Recv : public TAO_FlowConsumer
 {
 public:
-  Pong_Recv (void);
+  Pong_Recv ();
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -40,10 +40,10 @@ private:
 class Ping_Send_Callback : public TAO_AV_Callback
 {
 public:
-  Ping_Send_Callback (void);
+  Ping_Send_Callback ();
 
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
 
@@ -59,7 +59,7 @@ private:
 class Ping_Send : public TAO_FlowProducer
 {
 public:
-  Ping_Send (void);
+  Ping_Send ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index fa2b9a8bb5c..0cab42145e8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -38,7 +38,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (0)
 {
 }
@@ -126,7 +126,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -145,12 +145,12 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index e7e42a437dd..5a6cea84bdc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -18,7 +18,7 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-  Receiver_Callback (void);
+  Receiver_Callback ();
   /// Constructor.
 
   /// Method that is called when there is data to be received from a
@@ -29,7 +29,7 @@ public:
 
   /// Called when the sender is done sending data and wants to close
   /// down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Set the related stream control for this flow.
   void streamctrl (AVStreams::StreamCtrl_ptr streamctrl);
@@ -59,10 +59,10 @@ private:
 class Receiver
 {
 public:
-  Receiver (void);
+  Receiver ();
   /// Constructor
 
-  ~Receiver (void);
+  ~Receiver ();
   /// Destructor.
 
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index f5f5ac9169a..2acff233303 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -63,7 +63,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   return 1;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -117,7 +117,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -237,7 +237,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time between two consecutive frames.
   inter_frame_time.set (1 / (double) this->frame_rate_);
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index b83bbeb5c48..68302f92daa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -53,14 +53,14 @@ SENDER_ENDPOINT_STRATEGY;
 class Sender
 {
 public:
-  Sender (void);
+  Sender ();
   /// Constructor
 
   int init (int argc,
             ACE_TCHAR *argv[]);
   /// Method to initialize the various data components.
 
-  int pace_data (void);
+  int pace_data ();
   /// Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -70,7 +70,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   /// Method to parse the command line arguments.
 
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
   /// Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 37a8dfefa2f..b367afdda76 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -1,18 +1,18 @@
 #include "ftp.h"
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
   : count_ (0)
 {
 }
 
 int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
 {
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
 }
 
-FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
+FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint ()
   : callback_ (0)
 {
 }
@@ -151,24 +151,24 @@ Client::parse_args (int argc,
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_;
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
-Client::Client (void)
+Client::Client ()
   :endpoint_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa (),this),
    client_mmdevice_ (&endpoint_strategy_),
    address_ (ACE_OS::strdup ("224.9.9.2:12345")),
@@ -242,7 +242,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index ca1ffbe22be..18aa68d2b6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -16,8 +16,8 @@ class FTP_Client_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Client_Callback (void);
-  virtual int handle_end_stream (void);
+  FTP_Client_Callback ();
+  virtual int handle_end_stream ();
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
   virtual int handle_timeout (void *arg);
   virtual void get_timeout (ACE_Time_Value *&tv,
@@ -32,7 +32,7 @@ class FTP_Client_StreamEndPoint
   :public TAO_Client_StreamEndPoint
 {
 public:
-  FTP_Client_StreamEndPoint (void);
+  FTP_Client_StreamEndPoint ();
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -66,12 +66,12 @@ private:
 class Client
 {
 public:
-  Client (void);
+  Client ();
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  char *flowname (void);
-  TAO_StreamCtrl* streamctrl (void);
+  int run ();
+  FILE *file ();
+  char *flowname ();
+  TAO_StreamCtrl* streamctrl ();
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   int bind_to_server (const char *name);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index d5efa17a616..662c18e9217 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -2,7 +2,7 @@
 
 int done = 0;
 
-FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint (void)
+FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint\n"));
 }
@@ -19,7 +19,7 @@ FTP_Server_StreamEndPoint::get_callback (const char *,
 }
 
 int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -47,14 +47,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::end_stream\n"));
   done = 1;
   return 0;
 }
 
-Server::Server (void)
+Server::Server ()
 {
   reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
                       TAO_AV_CORE::instance ()->poa ());
@@ -115,7 +115,7 @@ Server::init (int argc,
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb();
   try
@@ -169,7 +169,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 FILE*
-Server::file (void)
+Server::file ()
 {
   return this->fp_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index a20ed2ce30b..a260b4ae471 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -14,7 +14,7 @@ class FTP_Server_StreamEndPoint
   :public TAO_Server_StreamEndPoint
 {
 public:
-  FTP_Server_StreamEndPoint (void);
+  FTP_Server_StreamEndPoint ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
 };
@@ -23,21 +23,21 @@ class FTP_Server_Callback
   :public TAO_AV_Callback
 {
 public:
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *,
                              const ACE_Addr &);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
 };
 
 class Server
 {
 public:
-  Server (void);
+  Server ();
   int init (int argc,
             ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
+  int run ();
+  FILE *file ();
 protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index c07f8cc9356..7d435d90afb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -1,13 +1,13 @@
 #include "ftp.h"
 #include "tao/debug.h"
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
   :count_ (0)
 {
 }
 
 int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
 {
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
@@ -72,7 +72,7 @@ FTP_Client_Callback::handle_timeout (void *)
   return 0;
 }
 
-FTP_Client_Producer::FTP_Client_Producer (void)
+FTP_Client_Producer::FTP_Client_Producer ()
   :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
 {
 }
@@ -131,19 +131,19 @@ Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_;
 }
 
 AVStreams::protocolSpec
-Client::protocols (void)
+Client::protocols ()
 {
   AVStreams::protocolSpec protocols (1);
   protocols.length (1);
@@ -154,25 +154,25 @@ Client::protocols (void)
 }
 
 const char *
-Client::format (void)
+Client::format ()
 {
   return "UNS:ftp";
 }
 
 const char *
-Client::address (void)
+Client::address ()
 
 {
   return this->address_;
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
-Client::Client (void)
+Client::Client ()
   : client_mmdevice_ (&endpoint_strategy_),
     fdev_ (0),
     address_ (ACE_OS::strdup ("224.9.9.2:10002")),
@@ -271,7 +271,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index 7144b72f254..458bdbf8479 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -16,7 +16,7 @@ class FTP_Client_Producer
   :public virtual TAO_FlowProducer
 {
 public:
-  FTP_Client_Producer (void);
+  FTP_Client_Producer ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
   int set_protocol_object (const char *flowname,
@@ -29,9 +29,9 @@ class FTP_Client_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Client_Callback (void);
+  FTP_Client_Callback ();
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
   //  virtual int get_frame (ACE_Message_Block *&block,TAO_AV_frame_info *&frame_info);
@@ -50,15 +50,15 @@ typedef TAO_FDev <FTP_Client_Producer,TAO_FlowConsumer> FTP_Client_FDev;
 class Client
 {
 public:
-  Client (void);
+  Client ();
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  char *flowname (void);
-  TAO_StreamCtrl* streamctrl (void);
-  AVStreams::protocolSpec protocols (void);
-  const char *format (void);
-  const char *address (void);
+  int run ();
+  FILE *file ();
+  char *flowname ();
+  TAO_StreamCtrl* streamctrl ();
+  AVStreams::protocolSpec protocols ();
+  const char *format ();
+  const char *address ();
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   int bind_to_server (const char *name);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 568822bd25d..59ba69be705 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -1,6 +1,6 @@
 #include "server.h"
 
-FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
+FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint ()
   :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (),FTP_SERVER::instance ()->format ())
 {
   AVStreams::protocolSpec protocols (2);
@@ -30,7 +30,7 @@ FTP_Server_FlowEndPoint::get_callback (const char *,
 }
 
 int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -58,7 +58,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_SFP_Callback::end_stream\n"));
   CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb ();
@@ -66,7 +66,7 @@ FTP_Server_Callback::handle_end_stream (void)
   return 0;
 }
 
-// FTP_Server_FDev::FTP_Server_FDev (void)
+// FTP_Server_FDev::FTP_Server_FDev ()
 //   :TAO_FDev ("Data")
 // {
 // }
@@ -86,14 +86,14 @@ FTP_Server_Callback::handle_end_stream (void)
 //   return endpoint->_this ();
 // }
 
-Server::Server (void)
+Server::Server ()
 {
   reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
                            TAO_AV_CORE::instance ()->poa ());
 }
 
 AVStreams::protocolSpec
-Server::protocols (void)
+Server::protocols ()
 {
   AVStreams::protocolSpec protocols (2);
   protocols.length (2);
@@ -103,7 +103,7 @@ Server::protocols (void)
 }
 
 const char*
-Server::format (void)
+Server::format ()
 {
   return "UNS:ftp";
 }
@@ -168,7 +168,7 @@ Server::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   try
     {
@@ -210,7 +210,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 FILE*
-Server::file (void)
+Server::file ()
 {
   return this->fp_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 5cec3a1236f..753935e0b05 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -12,18 +12,18 @@ class FTP_Server_Callback
   :public TAO_AV_Callback
 {
 public:
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info,
                              const ACE_Addr &);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
 };
 
 class FTP_Server_FlowEndPoint
   :public TAO_FlowConsumer
 {
 public:
-  FTP_Server_FlowEndPoint (void);
+  FTP_Server_FlowEndPoint ();
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 };
@@ -32,7 +32,7 @@ public:
 //   :public TAO_FDev
 // {
 // public:
-//   FTP_Server_FDev (void);
+//   FTP_Server_FDev ();
 //   virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester,
 //                                                        AVStreams::QoS & the_qos,
 //                                                        CORBA::Boolean_out met_qos,
@@ -48,13 +48,13 @@ typedef TAO_FDev <TAO_FlowProducer, FTP_Server_FlowEndPoint> FTP_Server_FDev;
 class Server
 {
 public:
-  Server (void);
+  Server ();
   int init (int argc,
             ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  AVStreams::protocolSpec protocols (void);
-  const char *format (void);
+  int run ();
+  FILE *file ();
+  AVStreams::protocolSpec protocols ();
+  const char *format ();
 protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 6ee1789465a..e7989d81d56 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -40,7 +40,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1),
       mb_ (BUFSIZ)
 {
@@ -103,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -114,7 +114,7 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     frame_rate_ (30),
     frame_count_ (0),
@@ -123,7 +123,7 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
@@ -216,7 +216,7 @@ Receiver::init (int argc,
 }
 
 TAO_AV_Protocol_Object*
-Receiver::protocol_object (void)
+Receiver::protocol_object ()
 {
   return this->protocol_object_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index f77e96f88d9..0f5cdd0207e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   void flowname (const char*);
 
@@ -88,10 +88,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
@@ -101,7 +101,7 @@ public:
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// Set the protocol object corresponding to the transport protocol chosen.
-  TAO_AV_Protocol_Object * protocol_object (void);
+  TAO_AV_Protocol_Object * protocol_object ();
 
 protected:
   /// The Naming Service Client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 887f61024ab..bcd859a1f5b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -52,7 +52,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 void
-Sender::shutdown (void)
+Sender::shutdown ()
 {
   // File reading is complete, destroy the stream.
   AVStreams::flowSpec stop_spec;
@@ -96,7 +96,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -228,7 +228,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index 0c24070105d..1d1c5311c02 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -61,26 +61,26 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 2062fc50c38..034592b6f83 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -9,11 +9,11 @@ ACE_High_Res_Timer last_frame_sent_time;
 ACE_Time_Value inter_frame_time;
 // The time that should lapse between two consecutive frames sent.
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
 {
 }
 
-FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
+FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint ()
 {
 }
 
@@ -36,7 +36,7 @@ FTP_Client_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Client::Client (void)
+Client::Client ()
   :client_mmdevice_ (&endpoint_strategy_),
    count_ (0),
    address_ (0),
@@ -99,26 +99,26 @@ Client::parse_args (int argc,
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_;
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
 
 int
-Client::frame_rate (void)
+Client::frame_rate ()
 {
   return this->frame_rate_;
 }
@@ -126,7 +126,7 @@ Client::frame_rate (void)
 
 // Method to get the object reference of the server
 int
-Client::bind_to_server (void)
+Client::bind_to_server ()
 {
   // Initialize the naming services
   if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -278,7 +278,7 @@ Client::init (int argc,
 
 // Method to send data at the specified rate
 int
-Client::pace_data (void)
+Client::pace_data ()
 {
   // Rate at which frames of data need to be sent.
   this->frame_rate_ = CLIENT::instance ()->frame_rate ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index b3075bfe36a..f7d997fb99c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -35,7 +35,7 @@ class FTP_Client_Callback : public TAO_AV_Callback
 {
 public:
   ///Constructor
-  FTP_Client_Callback (void);
+  FTP_Client_Callback ();
 };
 
 
@@ -52,7 +52,7 @@ class FTP_Client_StreamEndPoint  : public TAO_Client_StreamEndPoint
 {
 public:
   /// Constructor
-  FTP_Client_StreamEndPoint (void);
+  FTP_Client_StreamEndPoint ();
 
   /// Create the application client callback and return its handle to the
   /// AVStreams for further application callbacks
@@ -83,7 +83,7 @@ class Client
 {
 public:
   /// Constructor
-  Client (void);
+  Client ();
 
   /// Method to initialize the various data components.
   int init (int argc,
@@ -93,26 +93,26 @@ public:
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// File handle from which data is read to be sent.
-  FILE *file (void);
+  FILE *file ();
 
   /// The stream control interface that manages the stream set up
-  TAO_StreamCtrl* streamctrl (void);
+  TAO_StreamCtrl* streamctrl ();
 
   /// name of the flow set up.
-  char *flowname (void);
+  char *flowname ();
 
   /// The requested frame rate for sending each frame of data read from the file.
-  int frame_rate (void);
+  int frame_rate ();
 
 private:
   /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the ftp client to the server
-  int bind_to_server (void);
+  int bind_to_server ();
 
   /// The reacfive strategy of the client.
   ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 27c0cc9c762..9acfb82641a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -51,7 +51,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_destroy (void)
+FTP_Server_Callback::handle_destroy ()
 {
   // Called when the ftp client requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -60,12 +60,12 @@ FTP_Server_Callback::handle_destroy (void)
   return 0;
 }
 
-Server::Server (void)
+Server::Server ()
   : mmdevice_ (0)
 {
 }
 
-Server::~Server (void)
+Server::~Server ()
 {
   delete this->mmdevice_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index c0d90d7c4a5..fea72eda173 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -34,7 +34,7 @@ public:
 
   // Called when the ftp client has finished reading the file and wants
   // to close4 down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 };
 
 /**
@@ -69,10 +69,10 @@ class Server
 {
 public:
   /// Constructor
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 090fbf54245..f52576c9482 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -19,7 +19,7 @@ TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
 
 
 int
-TimeStamp_Protocol_Object::handle_input (void)
+TimeStamp_Protocol_Object::handle_input ()
 {
   ssize_t n = this->transport_->recv (this->frame_->rd_ptr (),
                                       this->frame_->size ());
@@ -33,7 +33,7 @@ TimeStamp_Protocol_Object::handle_input (void)
 }
 
 //  int
-//  TimeStamp_Protocol_Object::handle_input (void)
+//  TimeStamp_Protocol_Object::handle_input ()
 //  {
 //    iovec iov;
 //    int iovcnt;
@@ -167,18 +167,18 @@ TimeStamp_Protocol_Object::send_frame (const char* buf,
 
 /// end the stream.
 int
-TimeStamp_Protocol_Object::destroy (void)
+TimeStamp_Protocol_Object::destroy ()
 {
   this->callback_->handle_destroy ();
   return 0;
 }
 
 
-TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory (void)
+TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory ()
 {
 }
 
-TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory (void)
+TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index f940cb1133a..4e0b055a32f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -16,7 +16,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
   TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
                              TAO_AV_Transport *transport);
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -30,7 +30,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
  private:
   /// Pre-allocated memory to receive the data...
@@ -41,8 +41,8 @@ class TAO_TS_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac
 {
  public:
   /// Initialization hook.
-  TimeStamp_Protocol_Factory (void);
-  virtual ~TimeStamp_Protocol_Factory (void);
+  TimeStamp_Protocol_Factory ();
+  virtual ~TimeStamp_Protocol_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   // Note : Some platforms still don't support Covariant returns
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index e470d872208..77b08b6b154 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -20,7 +20,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -68,7 +68,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -78,12 +78,12 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 565824238c0..872f4213484 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -28,7 +28,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -38,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -76,10 +76,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 7e567f8abf3..330e26f925e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -85,7 +85,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -205,7 +205,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index e1e92fced3c..806320d3b2d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -58,14 +58,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -75,7 +75,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 08e7e6c15ab..364a896a791 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -39,7 +39,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -69,7 +69,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
 {
   // Called when the sender requests the stream to be shutdown.
   try
@@ -104,12 +104,12 @@ Distributer::sender_protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 TAO_AV_Protocol_Object *
-Distributer::sender_protocol_object (void)
+Distributer::sender_protocol_object ()
 {
   return this->sender_protocol_object_;
 }
 
-Distributer::Distributer (void)
+Distributer::Distributer ()
   : distributer_receiver_mmdevice_ (0),
     distributer_sender_mmdevice_ (0),
     sender_protocol_object_ (0),
@@ -119,7 +119,7 @@ Distributer::Distributer (void)
 {
 }
 
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
 {
 }
 
@@ -263,7 +263,7 @@ Distributer::init (int /*argc*/,
 }
 
 TAO_StreamCtrl *
-Distributer::receiver_streamctrl (void)
+Distributer::receiver_streamctrl ()
 {
   return this->receiver_streamctrl_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index cb035503a16..fa3ac21e854 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -28,7 +28,7 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Distributer_Receiver_Callback (void);
+  Distributer_Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -38,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Count of the frames passing through us.
@@ -111,10 +111,10 @@ class Distributer
 {
 public:
   /// Constructor
-  Distributer (void);
+  Distributer ();
 
   /// Destructor.
-  ~Distributer (void);
+  ~Distributer ();
 
   /// Initialize data components.
   int init (int argc,
@@ -125,11 +125,11 @@ public:
                          const ACE_CString &mmdevice_name);
 
   /// Get the stream control of the receiver
-  TAO_StreamCtrl *receiver_streamctrl (void);
+  TAO_StreamCtrl *receiver_streamctrl ();
 
   /// Accessor methods to set/get our sender protocol object
   int sender_protocol_object  (TAO_AV_Protocol_Object *object);
-  TAO_AV_Protocol_Object *sender_protocol_object (void);
+  TAO_AV_Protocol_Object *sender_protocol_object ();
 
   // Flag to know when we are done.
   int done () const;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index db2f5ae960b..01c127152ad 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -75,12 +75,12 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index 565824238c0..872f4213484 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -28,7 +28,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -38,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -76,10 +76,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 53cb840518c..b874d5fb03c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -50,7 +50,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -171,7 +171,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 6b3e764d532..7b3a97863aa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -58,14 +58,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
index 8fb1f0083e1..3ca0e7fa23a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
@@ -33,7 +33,7 @@ public:
    * The number of samples is pre-allocated, and cannot changes once
    * the class is initialized.
    */
-  Receiver_Stats (void);
+  Receiver_Stats ();
 
   /// The number of samples received so far
   ACE_UINT32 samples_count () const;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 403c5ac0893..65b377646a3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (0)
 {
 }
@@ -115,7 +115,7 @@ Receiver_Callback::dump_samples (const char* file)
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -136,12 +136,12 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 562a0c7b7f3..c1ecdd5966c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   void dump_samples (const char* file);
 
@@ -81,10 +81,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index f1ad51fba21..1ef57c5fc35 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -32,7 +32,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -139,7 +139,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -290,7 +290,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 672880fdae1..dfd7069736a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -58,14 +58,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -75,7 +75,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 222c21eaaf0..1dda9921bb7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -18,7 +18,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (0)
 {
 }
@@ -57,7 +57,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -76,12 +76,12 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 79df05554f7..39981ceb659 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback
 {
 public:
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -77,10 +77,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 0936a4361c2..e75a3ebf319 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -56,7 +56,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -183,7 +183,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -340,7 +340,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time between two consecutive frames.
   inter_frame_time.set (1.0 / this->frame_rate_);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index c3a323f966f..36c44d8c2f2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -60,14 +60,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -80,7 +80,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index a8a0be20826..cbe94d65983 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -11,13 +11,13 @@ class Time_impl :
 {
 public:
   virtual TimeModule::TimeOfDay
-    get_gmt (void);
+    get_gmt ();
 
-  void Shutdown (void);
+  void Shutdown ();
 };
 
 
-TimeModule::TimeOfDay Time_impl::get_gmt (void)
+TimeModule::TimeOfDay Time_impl::get_gmt ()
 {
   time_t time_now   = ACE_OS::time(0);
   struct tm *time_p = ACE_OS::gmtime(&time_now);
@@ -32,7 +32,7 @@ TimeModule::TimeOfDay Time_impl::get_gmt (void)
 }
 
 void
-Time_impl::Shutdown (void)
+Time_impl::Shutdown ()
 {
   ACE_OS::exit(0);
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index 64e3ab0b89a..ff10ea68735 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -28,13 +28,13 @@ Test_i::Test_i (CORBA::ORB_ptr orb) :
     }
 }
 
-Test_i::~Test_i (void)
+Test_i::~Test_i ()
 {
   this->policies_[0]->destroy ();
 }
 
 int
-Test_i::try_and_create_POA (void)
+Test_i::try_and_create_POA ()
 {
   try
     {
@@ -62,7 +62,7 @@ Test_i::try_and_create_POA (void)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
    orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index cc58a7f592a..8170db6196d 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -13,12 +13,12 @@ public:
    Test_i (CORBA::ORB_ptr orb);
 
    /// Destructor
-   ~Test_i (void);
+   ~Test_i ();
 
    /// Try and create a persistant POA
-   int try_and_create_POA (void);
+   int try_and_create_POA ();
 
-   void shutdown (void);
+   void shutdown ();
 
 protected:
    CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index 296091f8adf..8eb96ccb635 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -14,7 +14,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
index 8114d09b443..4a29671bfd8 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
@@ -15,7 +15,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
   // Our constructor
 
-  int init (void);
+  int init ();
   // Initialize the ORB etc.
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 04240e20fac..31316978ce2 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -117,7 +117,7 @@ ACE_TMAIN (int argc,
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
   :orb_ (0),
    merged_set_ (0)
 {
@@ -146,7 +146,7 @@ Manager::init (int argc,
 }
 
 int
-Manager::make_merged_iors (void)
+Manager::make_merged_iors ()
 {
   // First  server
   object_primary =
@@ -186,7 +186,7 @@ Manager::make_merged_iors (void)
 }
 
 int
-Manager::set_properties (void)
+Manager::set_properties ()
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -228,7 +228,7 @@ Manager::set_properties (void)
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   try
     {
@@ -245,7 +245,7 @@ Manager::run (void)
 }
 
 int
-Manager::write_to_file (void)
+Manager::write_to_file ()
 {
   //
   CORBA::String_var iorref =
@@ -267,7 +267,7 @@ Manager::write_to_file (void)
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return this->orb_.in ();
 }
@@ -512,7 +512,7 @@ int run_full_shutdown_test (Simple_Server_ptr server)
 }
 
 int
-Client_i::init (void)
+Client_i::init ()
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index faf7974845d..74eb1df0b67 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
@@ -13,7 +13,7 @@
 class Manager
 {
 public:
-  Manager (void);
+  Manager ();
   // Ctor
 
   void init (int argc,
@@ -21,19 +21,19 @@ public:
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (void);
+  int make_merged_iors ();
   // Merges the different IORS
 
-  int set_properties (void);
+  int set_properties ();
   // Sets the properties for the profiles
 
-  int run (void);
+  int run ();
   // Run the  ORB event loop..
 
-  int write_to_file (void);
+  int write_to_file ();
   // Write the merged IOR to a file
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
   // Return the pointer to the copy of our ORB
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 2979804966c..73da3a1b889 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, const char* key)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 char*
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%C)> executing remote_call()\n", _key.in()));
 
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index d19daef2f93..87404054b51 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -15,11 +15,11 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb, const char* key);
   // ctor
 
-  Simple_Server_i (void);
+  Simple_Server_i ();
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (void);
+  char* remote_call ();
 
   char* shutdown (const char* key);
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index 1c6cbd957a5..f3cd250942b 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
@@ -26,7 +26,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
 
   /// Initialize the ORB etc.
-  int init (void);
+  int init ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index ab461eda26e..4472202635c 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 
 #include "Server_Request_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
   : server_interceptor_ ()
 {
 }
@@ -37,7 +37,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
index 9ef8038e345..d8ca966bf5b 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
@@ -40,7 +40,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -48,7 +48,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index bbf5b376e30..f51aa60d6c3 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -6,12 +6,12 @@
 #include "tao/CDR.h"
 #include "testS.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
     : request_forwarded_ (0)
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
@@ -23,13 +23,13 @@ Server_Request_Interceptor::forward_reference (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index 0ca097fd5e4..7b752e9d8b3 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -34,10 +34,10 @@ class Server_Request_Interceptor
 {
 public:
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_reference (const char* iorstr);
@@ -52,9 +52,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 2e3634eef67..99e5e9ab739 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -112,7 +112,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
 {
   //no-op
 }
@@ -139,7 +139,7 @@ Manager::init (int& argc,
 }
 
 int
-Manager::make_merged_iors (void)
+Manager::make_merged_iors ()
 {
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
@@ -260,7 +260,7 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   try
     {
@@ -308,7 +308,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const ACE_TCHAR *ior_output_file)
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return this->orb_.in ();
 }
@@ -448,7 +448,7 @@ int run_test (Simple_Server_ptr server)
 }
 
 int
-Client_i::init (void)
+Client_i::init ()
 {
   char iogrstr[1024];
   ACE_OS::sprintf (iogrstr, "file://%s", ACE_TEXT_ALWAYS_CHAR (first_iogr_file));
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index ef85b83dc8a..047620f5d42 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
@@ -12,7 +12,7 @@
 class Manager
 {
 public:
-  Manager (void);
+  Manager ();
   // Ctor
 
   void init (int& argc,
@@ -20,17 +20,17 @@ public:
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (void);
+  int make_merged_iors ();
   // Merges the different IORS
 
   /// Run the  ORB event loop..
-  int run (void);
+  int run ();
 
   /// Write the merged IOGRs to a file
-  int write_to_files (void);
+  int write_to_files ();
 
   /// Return the pointer to the copy of our ORB
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
   /// Write the merged IOGRs to a file
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index 306ab9f96e6..0ff6c3fa130 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, const char* key)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 char*
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%C)> executing remote_call()\n", _key.in()));
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index 392ba9fcdea..5b6e84639df 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -15,11 +15,11 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb, const char* key);
   // ctor
 
-  Simple_Server_i (void);
+  Simple_Server_i ();
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (void);
+  char* remote_call ();
 
   char* shutdown (const char* key);
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index e0dafe75c04..a47abab6868 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -11,19 +11,19 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Hello::throw_exception (void)
+Hello::throw_exception ()
 {
   throw Test::MyException ();
 }
@@ -38,7 +38,7 @@ Hello::call_me_back (Test::Hello_ptr me)
 
 // Nested sequence step 2 - This op called by the server on the client
 CORBA::Boolean
-Hello::call_back (void)
+Hello::call_back ()
 {
   CORBA::Boolean result = server_->check_request_id ();
   return result;
@@ -46,7 +46,7 @@ Hello::call_back (void)
 
 // Nested sequence step 3 - This op called by the client on the server
 CORBA::Boolean
-Hello::check_request_id (void)
+Hello::check_request_id ()
 {
   // The server request interceptor will have set this public static member
   // false if the same retention id has been used twice
@@ -54,7 +54,7 @@ Hello::check_request_id (void)
 }
 
 CORBA::ULong
-Hello::drop_down_dead (void)
+Hello::drop_down_dead ()
 {
   return server_id_;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index aa5305f1866..5b58bbb8183 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -19,19 +19,19 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void throw_exception (void);
+  virtual void throw_exception ();
 
   virtual CORBA::Boolean call_me_back (Test::Hello_ptr me);
 
-  virtual CORBA::Boolean call_back (void);
+  virtual CORBA::Boolean call_back ();
 
-  virtual CORBA::Boolean check_request_id (void);
+  virtual CORBA::Boolean check_request_id ();
 
-  virtual CORBA::ULong drop_down_dead (void);
+  virtual CORBA::ULong drop_down_dead ();
 
   static CORBA::Boolean ids_differ_;
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index 27b6c365b28..97b3505f83b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -11,25 +11,25 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor ()
 : orb_ (0),
   client_id_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor ()
 {
 }
 
 
 char *
-TAO249_ServerRequest_Interceptor::name (void)
+TAO249_ServerRequest_Interceptor::name ()
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor");
 }
 
 void
-TAO249_ServerRequest_Interceptor::destroy (void)
+TAO249_ServerRequest_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index 8089136cce8..00bd3d8fea5 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -23,10 +23,10 @@ class TAO249_ServerRequest_Interceptor
 {
 public:
 /// Constructor.
-TAO249_ServerRequest_Interceptor (void);
+TAO249_ServerRequest_Interceptor ();
 
 /// Destructor.
-~TAO249_ServerRequest_Interceptor (void);
+~TAO249_ServerRequest_Interceptor ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
@@ -38,9 +38,9 @@ TAO249_ServerRequest_Interceptor (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void);
+virtual char * name ();
 
-virtual void destroy (void);
+virtual void destroy ();
 
 virtual void receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index c2425cca81a..50f3f99a44f 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -13,25 +13,25 @@
 #include "Hello.h"
 #include "ace/OS_NS_sys_time.h"
 
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 ()
 : orb_ (0),
   client_id_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 ()
 {
 }
 
 
 char *
-TAO249_ServerRequest_Interceptor2::name (void)
+TAO249_ServerRequest_Interceptor2::name ()
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
-TAO249_ServerRequest_Interceptor2::destroy (void)
+TAO249_ServerRequest_Interceptor2::destroy ()
 {
 }
 
@@ -175,7 +175,7 @@ catch (const CORBA::Exception& ex)
 }
 
 TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
+TAO249_ServerRequest_Interceptor2::get_now ()
 {
   // 1582...
   const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index f1816a2676c..1e2765ca15b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -24,10 +24,10 @@ class TAO249_ServerRequest_Interceptor2
 {
 public:
 /// Constructor.
-TAO249_ServerRequest_Interceptor2 (void);
+TAO249_ServerRequest_Interceptor2 ();
 
 /// Destructor.
-~TAO249_ServerRequest_Interceptor2 (void);
+~TAO249_ServerRequest_Interceptor2 ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
@@ -39,9 +39,9 @@ TAO249_ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void);
+virtual char * name ();
 
-virtual void destroy (void);
+virtual void destroy ();
 
 virtual void receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -60,7 +60,7 @@ virtual void send_other (
 //@}
 
 protected:
-  TimeBase::TimeT get_now (void);
+  TimeBase::TimeT get_now ();
 
 private:
 CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index 7a8b89da632..c63bd4a210c 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -7,19 +7,19 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Hello::ping (void)
+Hello::ping ()
 {
   return;
 }
 
 void
-Hello::throw_location_forward (void)
+Hello::throw_location_forward ()
 {
   return;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index 93461daa94d..4ca11570043 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -19,11 +19,11 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void throw_location_forward (void);
+  virtual void throw_location_forward ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index 5becd14b268..8b6ebd8a2b5 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -5,7 +5,7 @@
 #include "tao/Exception.h"
 
 
-Server_ORBInitializer2::Server_ORBInitializer2 (void)
+Server_ORBInitializer2::Server_ORBInitializer2 ()
   : sri_ (0)
 {
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index 9abb165e2f1..8ab29827aa2 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -25,7 +25,7 @@ class Server_ORBInitializer2 :
   public virtual ::CORBA::LocalObject
 {
 public:
-  Server_ORBInitializer2 (void);
+  Server_ORBInitializer2 ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index ef1519b4a3d..720ac6d87dc 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -14,24 +14,24 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 ()
 : orb_ (0),
   expired_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 ()
 {
 }
 
 char *
-TAO249_ServerRequest_Interceptor2::name (void)
+TAO249_ServerRequest_Interceptor2::name ()
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
-TAO249_ServerRequest_Interceptor2::destroy (void)
+TAO249_ServerRequest_Interceptor2::destroy ()
 {
 }
 
@@ -111,7 +111,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
 }
 
 TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
+TAO249_ServerRequest_Interceptor2::get_now ()
 {
   // 1582...
   const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index 9582c2fc71e..ad930572875 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -24,10 +24,10 @@ class TAO249_ServerRequest_Interceptor2
 {
 public:
   /// Constructor.
-  TAO249_ServerRequest_Interceptor2 (void);
+  TAO249_ServerRequest_Interceptor2 ();
 
   /// Destructor.
-  ~TAO249_ServerRequest_Interceptor2 (void);
+  ~TAO249_ServerRequest_Interceptor2 ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -67,7 +67,7 @@ public:
   CORBA::Object_var server_iogr_;
 
 protected:
-  TimeBase::TimeT get_now (void);
+  TimeBase::TimeT get_now ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index 822aec3cc9f..51d7cae2ccc 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -9,19 +9,19 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Hello::ping (void)
+Hello::ping ()
 {
   return;
 }
 
 CORBA::Boolean
-Hello::has_ft_request_service_context (void)
+Hello::has_ft_request_service_context ()
 {
   return ServerRequest_Interceptor2::has_ft_request_sc_;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index 5f48cef8b47..0d37a35b486 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -19,11 +19,11 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual CORBA::Boolean has_ft_request_service_context (void);
+  virtual CORBA::Boolean has_ft_request_service_context ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 25eac5e2ed5..8edbe615942 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -17,23 +17,23 @@
 CORBA::Boolean
 ServerRequest_Interceptor2::has_ft_request_sc_ = false;
 
-ServerRequest_Interceptor2::ServerRequest_Interceptor2 (void)
+ServerRequest_Interceptor2::ServerRequest_Interceptor2 ()
 : orb_ (0)
 {
 }
 
-ServerRequest_Interceptor2::~ServerRequest_Interceptor2 (void)
+ServerRequest_Interceptor2::~ServerRequest_Interceptor2 ()
 {
 }
 
 char *
-ServerRequest_Interceptor2::name (void)
+ServerRequest_Interceptor2::name ()
 {
   return CORBA::string_dup ("ServerRequest_Interceptor2");
 }
 
 void
-ServerRequest_Interceptor2::destroy (void)
+ServerRequest_Interceptor2::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index 90e7b28be04..5e2354ef9fc 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -23,10 +23,10 @@ class ServerRequest_Interceptor2
 {
 public:
 /// Constructor.
-ServerRequest_Interceptor2 (void);
+ServerRequest_Interceptor2 ();
 
 /// Destructor.
-~ServerRequest_Interceptor2 (void);
+~ServerRequest_Interceptor2 ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
@@ -38,9 +38,9 @@ ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void);
+virtual char * name ();
 
-virtual void destroy (void);
+virtual void destroy ();
 
 virtual void receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index 6fe6f190c88..ea65e8cdb2d 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -84,7 +84,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
 }
 
 /// Thread entry point
-int Client_Task::svc (void)
+int Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
index adf9b07397b..c13b3f15298 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
@@ -19,7 +19,7 @@ public:
      CORBA::ULong group_version);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var corb_;
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index f7904897fff..457285eeac9 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
index 881b0dddb18..4010d61c399 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
@@ -15,7 +15,7 @@ public:
     ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index f0be3e754a6..63010aacfcf 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -7,14 +7,14 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
 }
 
 // virtual
-void TestImpl::myMethod (void)
+void TestImpl::myMethod ()
 {
   ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
 }
 
 
 // virtual
-void TestImpl::shutdown (void)
+void TestImpl::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
index 6e31010ec83..7e19e202d18 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
@@ -8,9 +8,9 @@ public:
   TestImpl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void myMethod (void);
+  virtual void myMethod ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
index 4efc517a981..0ce11d8abb5 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
index c11d9ebe239..7e9b59fda89 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
@@ -6,7 +6,7 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
 }
 
 void
-NsShutdown::shutdown (void)
+NsShutdown::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
index 1a6c841d700..c849efdebb5 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
@@ -13,7 +13,7 @@ public:
   /// Constructor
   NsShutdown (CORBA::ORB_ptr orb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
index bcbbebb7f2d..bb3257e2aca 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
@@ -5,7 +5,7 @@
 #include "tao/Exception.h"
 
 
-Server_ORBInitializer2::Server_ORBInitializer2 (void)
+Server_ORBInitializer2::Server_ORBInitializer2 ()
   : sri_ (0)
 {
 }
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
index 9abb165e2f1..8ab29827aa2 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
@@ -25,7 +25,7 @@ class Server_ORBInitializer2 :
   public virtual ::CORBA::LocalObject
 {
 public:
-  Server_ORBInitializer2 (void);
+  Server_ORBInitializer2 ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index cb01b6ce8e3..bb71b45abee 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -16,13 +16,13 @@
 
 int invocation_count = 0;
 
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 ()
 : orb_ (0),
   expired_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 ()
 {
 }
 
@@ -138,7 +138,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
 }
 
 TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
+TAO249_ServerRequest_Interceptor2::get_now ()
 {
   // 1582...
   const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
index 9582c2fc71e..ad930572875 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
@@ -24,10 +24,10 @@ class TAO249_ServerRequest_Interceptor2
 {
 public:
   /// Constructor.
-  TAO249_ServerRequest_Interceptor2 (void);
+  TAO249_ServerRequest_Interceptor2 ();
 
   /// Destructor.
-  ~TAO249_ServerRequest_Interceptor2 (void);
+  ~TAO249_ServerRequest_Interceptor2 ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -67,7 +67,7 @@ public:
   CORBA::Object_var server_iogr_;
 
 protected:
-  TimeBase::TimeT get_now (void);
+  TimeBase::TimeT get_now ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index fa4b6386745..fe9ba1b094a 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -10,13 +10,13 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor ()
 : orb_ (0),
   client_id_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
index d499c499f0b..78ed68f0631 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
@@ -23,10 +23,10 @@ class TAO249_ServerRequest_Interceptor
 {
 public:
 /// Constructor.
-TAO249_ServerRequest_Interceptor (void);
+TAO249_ServerRequest_Interceptor ();
 
 /// Destructor.
-~TAO249_ServerRequest_Interceptor (void);
+~TAO249_ServerRequest_Interceptor ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index 164895340fb..f889b69ae73 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -75,7 +75,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
index ad99b055f31..90cb0343cef 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
@@ -10,7 +10,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
index 3c88fae18c2..776f2b80058 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
@@ -7,12 +7,12 @@
   CORBA::Boolean
   ClientRequest_Interceptor::success_flag_ = 0;
 
-  ClientRequest_Interceptor::ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::ClientRequest_Interceptor ()
     : name_ ("ClientRequest_Interceptor")
   {
   }
 
-  ClientRequest_Interceptor::~ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::~ClientRequest_Interceptor ()
   {
   }
 
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
index 36235e54b3a..1ba41d68aba 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
@@ -28,9 +28,9 @@ class ClientRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
-ClientRequest_Interceptor (void);
+ClientRequest_Interceptor ();
 
-~ClientRequest_Interceptor (void);
+~ClientRequest_Interceptor ();
 
 /// Canonical name of the interceptor.
 virtual char * name ();
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
index 4efc517a981..0ce11d8abb5 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
@@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
index c11d9ebe239..7e9b59fda89 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
@@ -6,7 +6,7 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
 }
 
 void
-NsShutdown::shutdown (void)
+NsShutdown::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
index 1a6c841d700..c849efdebb5 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
@@ -13,7 +13,7 @@ public:
   /// Constructor
   NsShutdown (CORBA::ORB_ptr orb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
index 189f408731f..e9840f46d6e 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
@@ -53,7 +53,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
index ec19adb739f..0106a7436b7 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
@@ -9,7 +9,7 @@ UIPMC_Object_Impl::UIPMC_Object_Impl (CORBA::ORB_ptr orb,
 {
 }
 
-UIPMC_Object_Impl::~UIPMC_Object_Impl (void)
+UIPMC_Object_Impl::~UIPMC_Object_Impl ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
index 25aad8e5c45..ae2aa913035 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
@@ -9,7 +9,7 @@ class UIPMC_Object_Impl : public virtual POA_Test::UIPMC_Object
 {
 public:
   UIPMC_Object_Impl (CORBA::ORB_ptr orb, CORBA::ULong num_threads);
-  ~UIPMC_Object_Impl (void);
+  ~UIPMC_Object_Impl ();
 
   // The skeleton methods
   virtual void process ();
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index d1ee5370765..a03559bd56a 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -16,7 +16,7 @@ Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
index 6148938a66b..2961144d06f 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
@@ -22,7 +22,7 @@ public:
                CORBA::Boolean result);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   CosNaming::NamingContext_var root_context_;
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
index f047a361bee..ae17e626300 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -12,7 +12,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -54,7 +54,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
index 9b72cfaecad..8b398a90449 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (CosNaming::NamingContext_ptr root_context,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
index f4bdbbf8f0c..b909a5aef7c 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
@@ -28,7 +28,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   CosNaming::NamingContext_var root_context_;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 1f02ddec574..89ff1865f37 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -25,7 +25,7 @@
 
 
 // Constructor.
-CC_Client::CC_Client (void)
+CC_Client::CC_Client ()
   : naming_service_ (0),
     cc_factory_ior_file_ (0),
     cc_factory_key_ (0),
@@ -39,7 +39,7 @@ CC_Client::CC_Client (void)
 {
 }
 
-CC_Client::~CC_Client (void)
+CC_Client::~CC_Client ()
 {
   // Free resources and close the ior files.
   if (this->cc_factory_ior_file_)
@@ -81,7 +81,7 @@ CC_Client::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-CC_Client::parse_args (void)
+CC_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dc:sf:k:xbhe:"));
   int c;
@@ -141,7 +141,7 @@ CC_Client::parse_args (void)
 // Execute client example code.
 
 int
-CC_Client::run (void)
+CC_Client::run ()
 {
   int tests_run = 0;
   // Tells whether any tests have been run
@@ -204,7 +204,7 @@ CC_Client::run (void)
 // This function runs basic tests concerned with only one lock set
 
 int
-CC_Client::run_basic_tests (void)
+CC_Client::run_basic_tests ()
 {
   Test_Single_Lock_With_Mode t1 (naming_service_,
                                  CosConcurrencyControl::read);
@@ -337,7 +337,7 @@ CC_Client::run_extended_tests (ACE_TCHAR *params)
 }
 
 void
-CC_Client::print_usage (void)
+CC_Client::print_usage ()
 {
   ACE_ERROR ((LM_ERROR,
               "usage:  %s"
@@ -353,7 +353,7 @@ CC_Client::print_usage (void)
 }
 
 int
-CC_Client::init_naming_service (void)
+CC_Client::init_naming_service ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index 475c869b6c8..0902623fd3f 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -28,7 +28,7 @@
 #define _CC_CLIENT_H_
 
 // Stuff to be used by the command file parser
-int ace_cc_yyparse(void);
+int ace_cc_yyparse();
 int line_no = 1;
 char line_buf[500];
 CC_CommandList *cmdlist;
@@ -49,30 +49,30 @@ class CC_Client
 {
 public:
   /// Default constructor.
-  CC_Client (void);
+  CC_Client ();
 
   /// Destructor.
-  ~CC_Client (void);
+  ~CC_Client ();
 
   /// Run the test.
-  int run (void);
+  int run ();
 
   /// Initialize the test with the parameters from the command line.
   int init (int argc, ACE_TCHAR **argv);
 
 private:
   /// Function to initialize the naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Function to parse the command line arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Function to read the ior from the given file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Runs the basic tests (on a single lock set). Returns CC_SUCCESS
   /// upon success CC_FAIL otherwise.
-  int run_basic_tests (void);
+  int run_basic_tests ();
 
   /// Runs the extended tests (on more lock sets). Returns CC_SUCCESS
   /// upon success CC_FAIL otherwise.
@@ -131,6 +131,6 @@ private:
   ACE_TCHAR *script_file_;
 
   /// Prints out the options to the program.
-  void print_usage (void);
+  void print_usage ();
 };
 #endif /* !defined (_CC_CLIENT_H_) */
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 02c06d83899..28b22d7c5d4 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -20,7 +20,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-CC_Command::~CC_Command(void)
+CC_Command::~CC_Command()
 {
 }
 
@@ -29,7 +29,7 @@ int CC_Command::execute()
   return 0;
 }
 
-CC_Command::CC_Command(void)
+CC_Command::CC_Command()
 {
 }
 
@@ -88,7 +88,7 @@ CC_Start_Cmd::~CC_Start_Cmd()
     }
 }
 
-int CC_Start_Cmd::execute(void)
+int CC_Start_Cmd::execute()
 {
   if (excep_)
     {
@@ -136,7 +136,7 @@ CC_CreateLockSet_Cmd::~CC_CreateLockSet_Cmd()
     }
 }
 
-int CC_CreateLockSet_Cmd::execute(void)
+int CC_CreateLockSet_Cmd::execute()
 {
   if(excep_)
     {
@@ -185,7 +185,7 @@ CC_Lock_Cmd::~CC_Lock_Cmd()
   ACE_OS::free (this->name_);
 }
 
-int CC_Lock_Cmd::execute(void)
+int CC_Lock_Cmd::execute()
 {
   if(excep_)
     {
@@ -226,7 +226,7 @@ CC_UnLock_Cmd::~CC_UnLock_Cmd()
   ACE_OS::free (this->name_);
 }
 
-int CC_UnLock_Cmd::execute(void)
+int CC_UnLock_Cmd::execute()
 {
   if(excep_)
     {
@@ -267,7 +267,7 @@ CC_TryLock_Cmd::~CC_TryLock_Cmd()
   ACE_OS::free (this->name_);
 }
 
-int CC_TryLock_Cmd::execute(void)
+int CC_TryLock_Cmd::execute()
 {
   if(excep_)
     {
@@ -327,7 +327,7 @@ CC_ChangeMode_Cmd::~CC_ChangeMode_Cmd()
   ACE_OS::strdup (this->name_);
 }
 
-int CC_ChangeMode_Cmd::execute(void)
+int CC_ChangeMode_Cmd::execute()
 {
   if(excep_)
     {
@@ -363,7 +363,7 @@ CC_Sleep_Cmd::~CC_Sleep_Cmd()
 {
 }
 
-int CC_Sleep_Cmd::execute(void)
+int CC_Sleep_Cmd::execute()
 {
   if(excep_)
     {
@@ -388,7 +388,7 @@ CC_Repeat_Cmd::~CC_Repeat_Cmd()
 {
 }
 
-int CC_Repeat_Cmd::execute(void)
+int CC_Repeat_Cmd::execute()
 {
   if(excep_)
     {
@@ -413,7 +413,7 @@ CC_Wait_Cmd::~CC_Wait_Cmd()
   ACE_OS::free (this->prompt_);
 }
 
-int CC_Wait_Cmd::execute(void)
+int CC_Wait_Cmd::execute()
 {
   if (excep_)
     {
@@ -437,13 +437,13 @@ CC_Excep_Cmd::CC_Excep_Cmd (const char *excep)
   //  printf("CC_Excep_Cmd::CC_Excep_Cmd: excep: %s\n", excep);
 }
 
-CC_Excep_Cmd::~CC_Excep_Cmd(void)
+CC_Excep_Cmd::~CC_Excep_Cmd()
 {
   ACE_OS::free (this->ex_);
 }
 
 int
-CC_Excep_Cmd::execute(void)
+CC_Excep_Cmd::execute()
 {
   ACE_OS::printf ("Executing excep command (expected: %s)\n", ex_);
   // First we check to see if an exception has occurred. If not we fail
@@ -467,16 +467,16 @@ CC_Excep_Cmd::execute(void)
     }
 }
 
-CC_Dummy_Cmd::CC_Dummy_Cmd(void)
+CC_Dummy_Cmd::CC_Dummy_Cmd()
 {
 }
 
-CC_Dummy_Cmd::~CC_Dummy_Cmd(void)
+CC_Dummy_Cmd::~CC_Dummy_Cmd()
 {
 }
 
 int
-CC_Dummy_Cmd::execute(void)
+CC_Dummy_Cmd::execute()
 {
   return 1; // CC_SUCCESS
 }
@@ -486,13 +486,13 @@ CC_Print_Cmd::CC_Print_Cmd (const char * message)
 {
 }
 
-CC_Print_Cmd::~CC_Print_Cmd(void)
+CC_Print_Cmd::~CC_Print_Cmd()
 {
   ACE_OS::free(msg_);
 }
 
 int
-CC_Print_Cmd::execute(void)
+CC_Print_Cmd::execute()
 {
   ACE_OS::printf ("%s\n", msg_);
   return 1; // CC_SUCCESS
@@ -513,7 +513,7 @@ CC_Lookup_Cmd::~CC_Lookup_Cmd()
 }
 
 int
-CC_Lookup_Cmd::execute(void)
+CC_Lookup_Cmd::execute()
 {
   if(excep_)
     {
@@ -552,17 +552,17 @@ CC_CommandElem::CC_CommandElem(CC_Command *cmd, CC_CommandElem *next)
 {
 }
 
-CC_CommandElem::~CC_CommandElem(void)
+CC_CommandElem::~CC_CommandElem()
 {
 }
 
-CC_Command *CC_CommandElem::GetCommand(void)
+CC_Command *CC_CommandElem::GetCommand()
 {
   return cmd_;
 }
 
 CC_CommandElem *
-CC_CommandElem::GetNext(void)
+CC_CommandElem::GetNext()
 {
   return next_;
 }
@@ -573,13 +573,13 @@ CC_CommandElem::SetNext(CC_CommandElem *next)
   next_ = next;
 }
 
-CC_CommandList::CC_CommandList(void)
+CC_CommandList::CC_CommandList()
   : head_ (0), last_ (0), times_ (1)
 {
   ACE_OS::printf("CC_CommandList::CC_CommandList\n");
 }
 
-CC_CommandList::~CC_CommandList(void)
+CC_CommandList::~CC_CommandList()
 {
 }
 
@@ -601,7 +601,7 @@ CC_CommandList::add(CC_Command *cmd)
 }
 
 int
-CC_CommandList::execute(void)
+CC_CommandList::execute()
 {
   CC_CommandElem *current = head_;
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index 91f2299127d..3e322c09dac 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -32,7 +32,7 @@ class CC_Command
 {
  public:
   /// Destructor
-  virtual ~CC_Command(void);
+  virtual ~CC_Command();
 
   /// Abstract execute method
   virtual int execute() = 0;
@@ -44,7 +44,7 @@ class CC_Command
     GetLockSet (const char *lock_set_name);
 
   /// Default constructor. We do not want instances of this class
-  CC_Command(void);
+  CC_Command();
 
   /**
    * The last exception raised in one of the test commands. This variable
@@ -83,7 +83,7 @@ class CC_Start_Cmd : public CC_Command
 
   /// Start the child process. The current version does not wait for the
   /// process to terminate.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name of the script file
@@ -110,7 +110,7 @@ class CC_CreateLockSet_Cmd : public CC_Command
 
   /// Executes the command, i.e. creates the lock set and binds the name
   /// in the naming service.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name used to bind in the naming service.
@@ -137,7 +137,7 @@ class CC_Lock_Cmd:public CC_Command
 
   /// Executes the command, i.e. looks up the lock set with the requested
   /// name in the naming server and executes the lock command on that lock set.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -170,7 +170,7 @@ class CC_UnLock_Cmd:public CC_Command
    * name in the naming server and executes the unlock command on that
    * lock set.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -203,7 +203,7 @@ class CC_TryLock_Cmd:public CC_Command
    * name in the naming server and executes the try_lock command on that
    * lock set.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -237,7 +237,7 @@ class CC_ChangeMode_Cmd:public CC_Command
    * name in the naming server and executes the change_mode command on that
    * lock set.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -269,7 +269,7 @@ class CC_Sleep_Cmd:public CC_Command
   virtual ~CC_Sleep_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
 
  private:
   /// The number of seconds to sleep
@@ -295,7 +295,7 @@ class CC_Repeat_Cmd:public CC_Command
   virtual ~CC_Repeat_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
  private:
   /// The number of times the commands should be repeated
   int times_;
@@ -320,7 +320,7 @@ class CC_Wait_Cmd:public CC_Command
   virtual ~CC_Wait_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The prompt to print on the screen
@@ -343,14 +343,14 @@ class CC_Excep_Cmd : public CC_Command
   CC_Excep_Cmd (const char *excep);
 
   /// Destructor.
-  virtual ~CC_Excep_Cmd(void);
+  virtual ~CC_Excep_Cmd();
 
   /**
    * Executes the command. Checks to see if the excep_ class variable is set,
    * and if that's the case check that it is of the expected type. If not the
    * test fails.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The string representation of the expected exception
@@ -369,13 +369,13 @@ class CC_Dummy_Cmd: public CC_Command
 {
  public:
   /// Constructor.
-  CC_Dummy_Cmd(void);
+  CC_Dummy_Cmd();
 
   /// Destructor.
-  virtual ~CC_Dummy_Cmd(void);
+  virtual ~CC_Dummy_Cmd();
 
   /// Executes the command, i.e. does nothing.
-  virtual int execute(void);
+  virtual int execute();
 
  private:
 };
@@ -395,10 +395,10 @@ public:
   CC_Print_Cmd (const char *message);
 
   /// Destructor.
-  virtual ~CC_Print_Cmd(void);
+  virtual ~CC_Print_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// Holds the message to print
@@ -425,7 +425,7 @@ public:
 
   /// Executes the command, i.e. looks up the lock set with the requested
   /// name in the naming server and sets the cc_lockset_ variable.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -448,13 +448,13 @@ class CC_CommandElem
   CC_CommandElem (CC_Command *cmd, CC_CommandElem *next);
 
   /// Destructor.
-  ~CC_CommandElem(void);
+  ~CC_CommandElem();
 
   /// Returns a pointer to the command in this element
-  CC_Command *GetCommand(void);
+  CC_Command *GetCommand();
 
   /// Returns the pointer to the next element
-  CC_CommandElem *GetNext(void);
+  CC_CommandElem *GetNext();
 
   /// Sets the next pointer
   void SetNext(CC_CommandElem *next);
@@ -480,16 +480,16 @@ class CC_CommandList
 {
  public:
   /// Constructor.
-  CC_CommandList(void);
+  CC_CommandList();
 
   /// Destructor.
-  ~CC_CommandList(void);
+  ~CC_CommandList();
 
   /// Adds the command to the list
   int add(CC_Command *cmd);
 
   /// Executes all the commands in the list from head to tail
-  int execute(void);
+  int execute();
 
   /// Sets the number of times to repeat the script
   void setrepeat(int times);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 9ca80305f9e..a6e3b6a798c 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -32,7 +32,7 @@
 #include "ace/OS_NS_stdio.h"
 
 void ace_cc_yyerror (const char* s);
-int ace_cc_yylex(void);
+int ace_cc_yylex();
 
 extern int line_no;
 extern char line_buf[500];
@@ -436,7 +436,7 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count)
 #ifdef ACE_CC_YYPARSE_PARAM
 int ace_cc_yyparse (void *);
 #else
-int ace_cc_yyparse (void);
+int ace_cc_yyparse ();
 #endif
 #endif
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 573e991246f..b9a1d4ecdb6 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -26,7 +26,7 @@ CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
   instance_ = this;
 }
 
-CC_naming_service::CC_naming_service(void)
+CC_naming_service::CC_naming_service()
   : cc_factory_key_ (0),
     orb_ (0),
     factory_ (0)
@@ -43,7 +43,7 @@ CC_naming_service::Init(CORBA::ORB_var orb)
     throw CORBA::INTERNAL ();
 }
 
-CC_naming_service::~CC_naming_service (void)
+CC_naming_service::~CC_naming_service ()
 {
   //  if(instance_!=0)
   // delete instance_;
@@ -51,7 +51,7 @@ CC_naming_service::~CC_naming_service (void)
 }
 
 CC_naming_service *
-CC_naming_service::Instance(void)
+CC_naming_service::Instance()
 {
   if(instance_ == 0)
     {
@@ -118,13 +118,13 @@ CC_naming_service::bind_name (const char *n,
 }
 
 CosConcurrencyControl::LockSetFactory_var
-CC_naming_service::get_lock_set_factory (void)
+CC_naming_service::get_lock_set_factory ()
 {
   return this->factory_;
 }
 
 int
-CC_naming_service::init_naming_service (void)
+CC_naming_service::init_naming_service ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 05f8032d130..1fa453174d1 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -37,7 +37,7 @@ public:
   CC_naming_service (CORBA::ORB_var orb_);
 
   /// Default destructor.
-  ~CC_naming_service (void);
+  ~CC_naming_service ();
 
   /// Initialization method must be called after first call of Instance()
   /// in order to initialize the object correctly
@@ -52,14 +52,14 @@ public:
                   CORBA::Object_ptr obj);
 
   /// Gets the cc lock set factory which is common for all tests.
-  CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
+  CosConcurrencyControl::LockSetFactory_var get_lock_set_factory ();
 
   /// The naming service object is a singleton
-  static CC_naming_service *Instance(void);
+  static CC_naming_service *Instance();
 
 private:
   /// Function to initialize the naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Key of factory obj ref.
   char *cc_factory_key_;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 84a8735d485..60a98f4fc27 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -36,7 +36,7 @@ char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_TestUtils::create_lock_set (void)
+CC_TestUtils::create_lock_set ()
 {
   // Create the lock set and return an obj ref corresponding to the
   // key.
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
index a9176e5874e..bf1f3791ec0 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -24,7 +24,7 @@ class CC_TestUtils
 
   /// Creates a lock set by means of th lock set factory in the concurrency
   /// service server.
-  static CosConcurrencyControl::LockSet_ptr create_lock_set (void);
+  static CosConcurrencyControl::LockSet_ptr create_lock_set ();
  private:
 };
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 5073a4f2aab..0dc8df76628 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -20,12 +20,12 @@ CC_Test::CC_Test (CC_naming_service *ns)
 {
 }
 
-CC_Test::~CC_Test (void)
+CC_Test::~CC_Test ()
 {
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_Test::create_lock_set (void)
+CC_Test::create_lock_set ()
 {
   // Create the lock set and return an obj ref corresponding to the
   // key.
@@ -79,7 +79,7 @@ Test_Single_Lock_With_Mode::Test_Single_Lock_With_Mode (CC_naming_service *namin
 {
 }
 
-Test_Single_Lock_With_Mode::~Test_Single_Lock_With_Mode (void)
+Test_Single_Lock_With_Mode::~Test_Single_Lock_With_Mode ()
 {
 }
 
@@ -152,7 +152,7 @@ Test_Setup_LockSet::Test_Setup_LockSet (CC_naming_service *naming_service,
 {
 }
 
-Test_Setup_LockSet::~Test_Setup_LockSet (void)
+Test_Setup_LockSet::~Test_Setup_LockSet ()
 {
 }
 
@@ -192,7 +192,7 @@ Test_Use_Already_Created_LockSet (CC_naming_service *naming_service,
 {
 }
 
-Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
+Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet ()
 {
 }
 
@@ -229,7 +229,7 @@ Test_Unlock_Already_Created_LockSet (CC_naming_service *naming_service,
 {
 }
 
-Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
+Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet ()
 {
 }
 
@@ -264,7 +264,7 @@ Test_Release_Not_Held_Lock::Test_Release_Not_Held_Lock (CC_naming_service *namin
 {
 }
 
-Test_Release_Not_Held_Lock::~Test_Release_Not_Held_Lock (void)
+Test_Release_Not_Held_Lock::~Test_Release_Not_Held_Lock ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
index 0582031aede..d07b084c718 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
@@ -40,7 +40,7 @@ public:
   CC_Test (CC_naming_service *ns);
 
   /// Destructor
-  virtual ~CC_Test (void);
+  virtual ~CC_Test ();
 
   /// Run the test times_to_run number of times. Returns CC_SUCCESS on
   /// success CC_FAIL otherwise.
@@ -48,7 +48,7 @@ public:
 
   /// Create a new lock set using the default global lock set factory
   /// from the naming service.
-  CosConcurrencyControl::LockSet_ptr create_lock_set (void);
+  CosConcurrencyControl::LockSet_ptr create_lock_set ();
 
   /// Returns a human readable string from the lock mode enum.
   char *get_lock_mode_name (CosConcurrencyControl::lock_mode mode);
@@ -79,7 +79,7 @@ public:
                               CosConcurrencyControl::lock_mode mode);
 
   /// Destructor
-  virtual ~Test_Single_Lock_With_Mode (void);
+  virtual ~Test_Single_Lock_With_Mode ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -107,7 +107,7 @@ public:
                       char *name);
 
   /// Destructor
-  virtual ~Test_Setup_LockSet (void);
+  virtual ~Test_Setup_LockSet ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -135,7 +135,7 @@ public:
                                    char *name);
 
   /// Destructor
-  virtual ~Test_Use_Already_Created_LockSet (void);
+  virtual ~Test_Use_Already_Created_LockSet ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -163,7 +163,7 @@ public:
                                        char *name);
 
   /// Destructor
-  virtual ~Test_Unlock_Already_Created_LockSet (void);
+  virtual ~Test_Unlock_Already_Created_LockSet ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -188,7 +188,7 @@ public:
                                 CosConcurrencyControl::lock_mode mode_);
 
   /// Destructor
-  virtual ~Test_Release_Not_Held_Lock (void);
+  virtual ~Test_Release_Not_Held_Lock ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 9ad047ca96e..3074ea3b246 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -113,7 +113,7 @@ MTD_Task::svc ()
 }
 
 void
-MTD_Task::run_iteration (void)
+MTD_Task::run_iteration ()
 {
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 4864aa04f86..db266b65cc2 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -26,10 +26,10 @@ public:
         int use_callbacks);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
   /// Run a single iteration of the test
-  void run_iteration (void);
+  void run_iteration ();
 
 private:
   /// The event channel used on the test
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 8ad7a6de0f8..f962621288c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -25,7 +25,7 @@ deactivate_servant (PortableServer::Servant servant)
 }
 
 
-RND_Driver::RND_Driver (void)
+RND_Driver::RND_Driver ()
   :  nsuppliers_ (4),
      nconsumers_ (4),
      max_recursion_ (1)
@@ -326,7 +326,7 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin)
 }
 
 void
-RND_Consumer::disconnect (void)
+RND_Consumer::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -344,7 +344,7 @@ RND_Consumer::push (const CORBA::Any &event)
 }
 
 void
-RND_Consumer::disconnect_push_consumer (void)
+RND_Consumer::disconnect_push_consumer ()
 {
 }
 
@@ -376,7 +376,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin)
 }
 
 void
-RND_Supplier::disconnect (void)
+RND_Supplier::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -388,7 +388,7 @@ RND_Supplier::disconnect (void)
 }
 
 void
-RND_Supplier::push_new_event (void)
+RND_Supplier::push_new_event ()
 {
   CORBA::Any event;
   CORBA::Long recursion = 0;
@@ -415,12 +415,12 @@ RND_Supplier::push (CORBA::Any &event)
 }
 
 void
-RND_Supplier::disconnect_push_supplier (void)
+RND_Supplier::disconnect_push_supplier ()
 {
 }
 
 int
-RND_Supplier::svc (void)
+RND_Supplier::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "Thread %t started\n"));
   int percent = 10;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index b273a714725..2f1f0cb015e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -35,10 +35,10 @@ public:
   RND_Consumer (RND_Driver *driver);
 
   void push (const CORBA::Any &event);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin);
-  void disconnect (void);
+  void disconnect ();
 
 protected:
   /// The driver
@@ -68,16 +68,16 @@ class RND_Supplier
 {
 public:
   /// Constructor
-  RND_Supplier (void);
+  RND_Supplier ();
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event...
-  void push_new_event (void);
+  void push_new_event ();
   void push (CORBA::Any &event);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Active method
   virtual int svc ();
@@ -91,7 +91,7 @@ private:
 };
 
 inline
-RND_Supplier::RND_Supplier (void)
+RND_Supplier::RND_Supplier ()
 {
 }
 
@@ -100,7 +100,7 @@ RND_Supplier::RND_Supplier (void)
 class RND_Driver
 {
 public:
-  RND_Driver (void);
+  RND_Driver ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 2a800d6cd5a..702214b989d 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -26,7 +26,7 @@ CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-CEC_Counting_Consumer::disconnect (void)
+CEC_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -79,7 +79,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&)
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (void)
+CEC_Counting_Consumer::disconnect_push_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
@@ -113,7 +113,7 @@ CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr con
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (void)
+CEC_Pull_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -131,7 +131,7 @@ CEC_Pull_Counting_Consumer::disconnect (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (void)
+CEC_Pull_Counting_Consumer::pull ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -180,7 +180,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
@@ -214,20 +214,20 @@ CEC_Counting_Consumer_Task::svc ()
 }
 
 void
-CEC_Counting_Consumer_Task::stop (void)
+CEC_Counting_Consumer_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-CEC_Counting_Consumer_Task::pull_count (void)
+CEC_Counting_Consumer_Task::pull_count ()
 {
   return this->pull_count_;
 }
 
 void
-CEC_Counting_Consumer_Task::run (void)
+CEC_Counting_Consumer_Task::run ()
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index 1fe0e7dbb14..7147c487958 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -36,7 +36,7 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
@@ -46,7 +46,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const CORBA::Any& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
@@ -79,18 +79,18 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
   void dump_results (int expected_count, int tolerance);
 
-  CORBA::Any *pull (void);
+  CORBA::Any *pull ();
   CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
   /// The skeleton methods.
-  virtual void disconnect_pull_consumer (void);
+  virtual void disconnect_pull_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
@@ -116,13 +116,13 @@ public:
                               int milliseconds = 0);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong pull_count (void);
+  void stop ();
+  CORBA::ULong pull_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The consumer we are turning into an active object
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index f097d4e47e4..734fae09013 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -2,7 +2,7 @@
 #include "ace/OS_NS_unistd.h"
 
 
-CEC_Counting_Supplier::CEC_Counting_Supplier (void)
+CEC_Counting_Supplier::CEC_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0)
 {
@@ -25,7 +25,7 @@ CEC_Counting_Supplier::connect (
 }
 
 void
-CEC_Counting_Supplier::disconnect (void)
+CEC_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -56,7 +56,7 @@ CEC_Counting_Supplier::push (const CORBA::Any&)
 }
 
 void
-CEC_Counting_Supplier::disconnect_push_supplier (void)
+CEC_Counting_Supplier::disconnect_push_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
@@ -90,20 +90,20 @@ CEC_Counting_Supplier_Task::svc ()
 }
 
 void
-CEC_Counting_Supplier_Task::stop (void)
+CEC_Counting_Supplier_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-CEC_Counting_Supplier_Task::push_count (void)
+CEC_Counting_Supplier_Task::push_count ()
 {
   return this->push_count_;
 }
 
 void
-CEC_Counting_Supplier_Task::run (void)
+CEC_Counting_Supplier_Task::run ()
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -133,7 +133,7 @@ CEC_Counting_Supplier_Task::run (void)
 
 // ****************************************************************
 
-CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
+CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0)
 {
@@ -156,7 +156,7 @@ CEC_Pull_Counting_Supplier::connect (
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect (void)
+CEC_Pull_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -174,7 +174,7 @@ CEC_Pull_Counting_Supplier::disconnect (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (void)
+CEC_Pull_Counting_Supplier::pull ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     throw CosEventComm::Disconnected ();
@@ -217,7 +217,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event)
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index f505200c8fb..73ee061f1c3 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -32,19 +32,19 @@ class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSuppl
 {
 public:
   /// Constructor
-  CEC_Counting_Supplier (void);
+  CEC_Counting_Supplier ();
 
   // = The CosEventComm::PushSupplier methods
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Push an event.
   void push (const CORBA::Any& events);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;
@@ -65,13 +65,13 @@ public:
                               int milliseconds = 0);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong push_count (void);
+  void stop ();
+  CORBA::ULong push_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The supplier we are turning into an active object
@@ -103,18 +103,18 @@ class CEC_Test_Export CEC_Pull_Counting_Supplier : public POA_CosEventComm::Pull
 {
 public:
   /// Constructor
-  CEC_Pull_Counting_Supplier (void);
+  CEC_Pull_Counting_Supplier ();
 
   // = The CosEventComm::PullSupplier methods
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  void disconnect (void);
+  void disconnect ();
 
   // The PullSupplier methods.
-  CORBA::Any* pull (void);
+  CORBA::Any* pull ();
   CORBA::Any* try_pull (CORBA::Boolean_out has_event);
-  virtual void disconnect_pull_supplier (void);
+  virtual void disconnect_pull_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 9473b645f16..5ca3fcfad91 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -25,7 +25,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Driver::Driver (void)
+Driver::Driver ()
   : n_consumers_ (1),
     event_count_ (100),
     event_a_ (ACE_ES_EVENT_UNDEFINED),
@@ -274,7 +274,7 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel)
 }
 
 void
-Driver::disconnect_consumers (void)
+Driver::disconnect_consumers ()
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -383,7 +383,7 @@ Test_Consumer::connect (int event_a,
 }
 
 void
-Test_Consumer::disconnect (void)
+Test_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -402,6 +402,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Consumer::disconnect_push_consumer (void)
+Test_Consumer::disconnect_push_consumer ()
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 1294bcf411b..625bbcf9b55 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -37,11 +37,11 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
@@ -64,7 +64,7 @@ class Driver
   // = DESCRIPTION
   //
 public:
-  Driver (void);
+  Driver ();
 
   enum {
     MAX_CONSUMERS = 16
@@ -85,7 +85,7 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 316116add8d..8c51234d305 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -15,7 +15,7 @@
 #include "ace/OS_NS_errno.h"
 
 
-ECMS_Driver::ECMS_Driver (void)
+ECMS_Driver::ECMS_Driver ()
   : n_suppliers_ (1),
     event_count_ (100),
     event_period_ (100),
@@ -286,7 +286,7 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel)
 }
 
 void
-ECMS_Driver::activate_suppliers (void)
+ECMS_Driver::activate_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -295,7 +295,7 @@ ECMS_Driver::activate_suppliers (void)
 }
 
 void
-ECMS_Driver::disconnect_suppliers (void)
+ECMS_Driver::disconnect_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -435,7 +435,7 @@ Test_Supplier::connect (const char* name,
 }
 
 void
-Test_Supplier::disconnect (void)
+Test_Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -470,7 +470,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (void)
+Test_Supplier::disconnect_push_supplier ()
 {
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -482,7 +482,7 @@ int Test_Supplier::supplier_id () const
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-Test_Supplier::consumer_proxy (void)
+Test_Supplier::consumer_proxy ()
 {
   return this->consumer_proxy_.in ();
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 9726d936a7e..de843e6632f 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -32,7 +32,7 @@ class Test_Supplier : public ACE_Task<ACE_SYNCH>
 public:
   Test_Supplier (ECMS_Driver *driver);
 
-  int svc (void);
+  int svc ();
   // Run the test, just forwards to the driver
 
   void connect (const char* name,
@@ -41,16 +41,16 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id () const;
   // The supplier ID.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void);
+  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy ();
   // We talk to the EC (as a supplier) using this proxy, no duplicates
   // are done here...
 
@@ -80,7 +80,7 @@ class ECMS_Driver
   // = DESCRIPTION
   //
 public:
-  ECMS_Driver (void);
+  ECMS_Driver ();
 
   enum {
     MAX_SUPPLIERS = 16
@@ -107,10 +107,10 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
-  void activate_suppliers (void);
+  void activate_suppliers ();
   // Activate the suppliers, i.e. they start generating events.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 9874912832e..6c9004deb79 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -38,7 +38,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   try
     {
@@ -81,7 +81,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index a3f09d10e17..401740731d9 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -20,19 +20,19 @@ class Consumer : public POA_RtecEventComm::PushConsumer
   //   It simply subscribes to one event type.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index c0e4a5641a7..0b4c78f6b54 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -32,7 +32,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   // Disconnect from the EC
   try
@@ -51,7 +51,7 @@ Supplier::disconnect (void)
 }
 
 void
-Supplier::perform_push (void)
+Supplier::perform_push ()
 {
   try
     {
@@ -71,7 +71,7 @@ Supplier::perform_push (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 3f131c1d4fa..8f848d01721 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -21,21 +21,21 @@ class Supplier : public POA_RtecEventComm::PushSupplier
   //   method is invoked it pushes the event through the event service
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the event channel
 
-  void perform_push (void);
+  void perform_push ();
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 37fa4b842c3..2c8792999f2 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -21,7 +21,7 @@
 #include "EC_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
-ECM_Driver::ECM_Driver (void)
+ECM_Driver::ECM_Driver ()
   : event_period_ (250000),
     event_count_ (100),
     config_filename_ (0),
@@ -214,7 +214,7 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-ECM_Driver::close_federations (void)
+ECM_Driver::close_federations ()
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -251,7 +251,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-ECM_Driver::close_senders (void)
+ECM_Driver::close_senders ()
 {
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
@@ -277,7 +277,7 @@ ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-ECM_Driver::close_receivers (void)
+ECM_Driver::close_receivers ()
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -286,7 +286,7 @@ ECM_Driver::close_receivers (void)
 }
 
 void
-ECM_Driver::dump_results (void)
+ECM_Driver::dump_results ()
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -369,7 +369,7 @@ ECM_Driver::parse_args (int argc, ACE_TCHAR *argv [])
 }
 
 int
-ECM_Driver::parse_config_file (void)
+ECM_Driver::parse_config_file ()
 {
   FILE* cfg = 0;
   if (this->config_filename_ != 0)
@@ -566,7 +566,7 @@ ECM_Federation::ECM_Federation (char* name,
     }
 }
 
-ECM_Federation::~ECM_Federation (void)
+ECM_Federation::~ECM_Federation ()
 {
   delete[] this->consumer_ipaddr_;
   delete[] this->supplier_ipaddr_;
@@ -605,13 +605,13 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
 }
 
 void
-ECM_Federation::close (void)
+ECM_Federation::close ()
 {
   this->sender_->shutdown ();
 }
 
 RtecUDPAdmin::AddrServer_ptr
-ECM_Federation::addr_server (void)
+ECM_Federation::addr_server ()
 {
   return this->addr_server_._this ();
 }
@@ -656,7 +656,7 @@ ECM_Supplier::open (const char* name,
 }
 
 void
-ECM_Supplier::close (void)
+ECM_Supplier::close ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -710,13 +710,13 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events)
 }
 
 void
-ECM_Supplier::disconnect_push_supplier (void)
+ECM_Supplier::disconnect_push_supplier ()
 {
   // this->supplier_proxy_->disconnect_push_supplier ();
 }
 
 void
-ECM_Supplier::disconnect_push_consumer (void)
+ECM_Supplier::disconnect_push_consumer ()
 {
 }
 
@@ -786,7 +786,7 @@ ECM_Consumer::connect (unsigned int *seed)
 }
 
 void
-ECM_Consumer::disconnect (void)
+ECM_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -799,7 +799,7 @@ ECM_Consumer::disconnect (void)
 }
 
 void
-ECM_Consumer::close (void)
+ECM_Consumer::close ()
 {
   try
     {
@@ -823,7 +823,7 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-ECM_Consumer::disconnect_push_consumer (void)
+ECM_Consumer::disconnect_push_consumer ()
 {
 }
 
@@ -855,7 +855,7 @@ ECM_Local_Federation::ECM_Local_Federation (ECM_Federation *federation,
            CORBA::Boolean[this->consumer_types ()]);
 }
 
-ECM_Local_Federation::~ECM_Local_Federation (void)
+ECM_Local_Federation::~ECM_Local_Federation ()
 {
   delete mcast_eh_;
   delete[] this->subscription_subset_;
@@ -882,7 +882,7 @@ ECM_Local_Federation::open (int event_count,
 }
 
 void
-ECM_Local_Federation::close (void)
+ECM_Local_Federation::close ()
 {
   this->consumer_.close ();
 
@@ -1014,7 +1014,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 void
-ECM_Local_Federation::close_receiver (void)
+ECM_Local_Federation::close_receiver ()
 {
   this->receiver_->shutdown ();
   this->mcast_eh_->shutdown ();
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 1311ca53bf9..a472b11e5b6 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -86,7 +86,7 @@ public:
   // Constructor, it assumes ownership of the buffers, strings must be
   // allocated using CORBA::string_alloc(), buffers using operator new.
 
-  ~ECM_Federation (void);
+  ~ECM_Federation ();
   // Dtor
 
   const char* name () const;
@@ -117,13 +117,13 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect the UDP sender to the EC.
 
-  void close (void);
+  void close ();
   // Close the UDP sender, disconnect from the EC
 
   int sender_local_addr (ACE_INET_Addr& addr);
   // Return the sender local address
 
-  RtecUDPAdmin::AddrServer_ptr addr_server (void);
+  RtecUDPAdmin::AddrServer_ptr addr_server ();
   // This address server can be used to convert event headers
   // (type,source) to UDP addresses (ipaddr,port)
 
@@ -169,7 +169,7 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
@@ -180,11 +180,11 @@ public:
   // The supplier ID.
 
   void push (const RtecEventComm::EventSet& events);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   ECM_Local_Federation* federation_;
@@ -222,17 +222,17 @@ public:
              unsigned int *seed);
   // This method connects the consumer to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   void connect (unsigned int *seed);
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   ECM_Local_Federation* federation_;
@@ -255,14 +255,14 @@ public:
   ECM_Local_Federation (ECM_Federation *federation,
                         ECM_Driver *driver);
   // Constructor.
-  ~ECM_Local_Federation (void);
+  ~ECM_Local_Federation ();
   // Destructor
 
   void open (int event_count,
              RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // Connect both the supplier and the consumer.
 
-  void close (void);
+  void close ();
   // Disconnect everybody from the EC
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
@@ -283,7 +283,7 @@ public:
                       TAO_ECG_Refcounted_Endpoint ignore_from);
   // Connect the UDP receiver to the EC.
 
-  void close_receiver (void);
+  void close_receiver ();
   // Close the UDP receiver, disconnect from the EC
 
   void dump_results () const;
@@ -386,7 +386,7 @@ class ECM_Driver
   //   receive and send multicast messages, etc.
   //
 public:
-  ECM_Driver (void);
+  ECM_Driver ();
 
   enum {
     MAX_EVENTS = 1024,
@@ -414,7 +414,7 @@ private:
   void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Activate all the federations
 
-  void close_federations (void);
+  void close_federations ();
   // Close the federations, i.e. disconnect from the EC, deactivate
   // the objects, etc.
 
@@ -425,19 +425,19 @@ private:
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
 
-  void close_senders (void);
+  void close_senders ();
   // Close all the senders to cleanup resources.
 
-  void close_receivers (void);
+  void close_receivers ();
   // Close all the receivers to cleanup resources.
 
-  int shutdown (void);
+  int shutdown ();
   // Called when the main thread.
 
   int parse_args (int argc, ACE_TCHAR* argv[]);
   // parse the command line arguments
 
-  int parse_config_file (void);
+  int parse_config_file ();
   // parse the command line arguments
 
   int parse_name_list (FILE* file, int n, char** names,
@@ -448,7 +448,7 @@ private:
                    const char* error_msg);
   // skip the blanks in the file.
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results to the standard output.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 4ae2fb8e539..5ab4ea8cdc8 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -25,7 +25,7 @@
 # include <sys/lwp.h> /* for _lwp_self */
 #endif /* sun */
 
-Test_ECG::Test_ECG (void)
+Test_ECG::Test_ECG ()
   : lcl_name_ ("Test_ECG"),
     rmt_name_ (""),
     scheduling_type_ (Test_ECG::ss_runtime),
@@ -598,7 +598,7 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
 }
 
 void
-Test_ECG::disconnect_suppliers (void)
+Test_ECG::disconnect_suppliers ()
 {
   for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
     {
@@ -655,7 +655,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 }
 
 void
-Test_ECG::disconnect_consumers (void)
+Test_ECG::disconnect_consumers ()
 {
   for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i)
     {
@@ -892,7 +892,7 @@ Test_ECG::push_consumer (void *consumer_cookie,
 }
 
 void
-Test_ECG::wait_until_ready (void)
+Test_ECG::wait_until_ready ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ready_mon, this->ready_mtx_);
   while (!this->ready_)
@@ -945,7 +945,7 @@ Test_ECG::shutdown_consumer (int id)
 }
 
 int
-Test_ECG::shutdown (void)
+Test_ECG::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n"));
 
@@ -959,7 +959,7 @@ Test_ECG::shutdown (void)
 }
 
 void
-Test_ECG::dump_results (void)
+Test_ECG::dump_results ()
 {
   const int bufsize = 512;
   ACE_TCHAR buf[bufsize];
@@ -1259,7 +1259,7 @@ Test_Supplier::open (const char* name,
 }
 
 void
-Test_Supplier::close (void)
+Test_Supplier::close ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -1387,7 +1387,7 @@ Test_Supplier::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Supplier::disconnect_push_supplier (void)
+Test_Supplier::disconnect_push_supplier ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -1396,7 +1396,7 @@ Test_Supplier::disconnect_push_supplier (void)
 }
 
 void
-Test_Supplier::disconnect_push_consumer (void)
+Test_Supplier::disconnect_push_consumer ()
 {
 }
 
@@ -1458,7 +1458,7 @@ Test_Consumer::open (const char* name,
 }
 
 void
-Test_Consumer::close (void)
+Test_Consumer::close ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -1476,7 +1476,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Consumer::disconnect_push_consumer (void)
+Test_Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 1ed57831bdc..a45e6f85f68 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -53,7 +53,7 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   void activate (const char* name,
@@ -61,11 +61,11 @@ public:
                  RtecEventChannelAdmin::EventChannel_ptr ec);
 
   void push (const RtecEventComm::EventSet& events);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id () const;
@@ -118,11 +118,11 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
@@ -158,7 +158,7 @@ class Test_ECG
   //   and publications list.
   //
 public:
-  Test_ECG (void);
+  Test_ECG ();
 
   enum {
     MAX_EVENTS = 1024,
@@ -199,7 +199,7 @@ private:
   // Helper routine to obtain an EC given its name.
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
   void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
@@ -212,20 +212,20 @@ private:
   // Publications list.
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
-  int shutdown (void);
+  int shutdown ();
   // Called when the main thread (i.e. not the scavenger thread) is
   // shutting down.
 
   int parse_args (int argc, ACE_TCHAR* argv[]);
   // parse the command line args
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results to the standard output.
 
-  void wait_until_ready (void);
+  void wait_until_ready ();
   // Block event delivery until all the consumers are ready.
 
   struct Stats;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index b81e9af1c92..afefd875ca2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -71,7 +71,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
 }
 
 void
-Test_Consumer::disconnect (void)
+Test_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -165,6 +165,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Consumer::disconnect_push_consumer (void)
+Test_Consumer::disconnect_push_consumer ()
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 61afa504683..96d859e2945 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -49,7 +49,7 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
   void dump_results (const ACE_TCHAR* name,
@@ -60,7 +60,7 @@ public:
   // Add our throughput and latency statistics to <stats>
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index e63814343d8..cdd00671df5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-ECT_Consumer_Driver::ECT_Consumer_Driver (void)
+ECT_Consumer_Driver::ECT_Consumer_Driver ()
   : n_consumers_ (1),
     n_suppliers_ (1),
     type_start_ (ACE_ES_EVENT_UNDEFINED),
@@ -35,7 +35,7 @@ ECT_Consumer_Driver::ECT_Consumer_Driver (void)
 {
 }
 
-ECT_Consumer_Driver::~ECT_Consumer_Driver (void)
+ECT_Consumer_Driver::~ECT_Consumer_Driver ()
 {
 }
 
@@ -234,7 +234,7 @@ ECT_Consumer_Driver::connect_consumers
 }
 
 void
-ECT_Consumer_Driver::dump_results (void)
+ECT_Consumer_Driver::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
@@ -252,7 +252,7 @@ ECT_Consumer_Driver::dump_results (void)
 }
 
 void
-ECT_Consumer_Driver::disconnect_consumers (void)
+ECT_Consumer_Driver::disconnect_consumers ()
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 9732e3d4558..32b92e1cc6d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -32,8 +32,8 @@ class ECT_Consumer_Driver : public ECT_Driver
   // = DESCRIPTION
   //
 public:
-  ECT_Consumer_Driver (void);
-  virtual ~ECT_Consumer_Driver (void);
+  ECT_Consumer_Driver ();
+  virtual ~ECT_Consumer_Driver ();
 
   enum {
     MAX_CONSUMERS = 16
@@ -54,10 +54,10 @@ private:
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
-  void dump_results (void);
+  void dump_results ();
   // Print out the results
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 2e088db72f5..f04b2a66959 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -2,6 +2,6 @@
 #include "ace/High_Res_Timer.h"
 
 
-ECT_Driver::~ECT_Driver (void)
+ECT_Driver::~ECT_Driver ()
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 1d8a800c539..be17fda434b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -31,7 +31,7 @@ class ECT_Driver
   // = DESCRIPTION
   //
 public:
-  virtual ~ECT_Driver (void);
+  virtual ~ECT_Driver ();
 
   virtual void shutdown_consumer (void* consumer_cookie) = 0;
   // Callback method for consumers, each consumer will call this
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 60cfca06515..869c4277d90 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -95,7 +95,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
 }
 
 void
-Test_Supplier::disconnect (void)
+Test_Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -216,7 +216,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (void)
+Test_Supplier::disconnect_push_supplier ()
 {
 }
 
@@ -226,7 +226,7 @@ int Test_Supplier::supplier_id () const
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-Test_Supplier::consumer_proxy (void)
+Test_Supplier::consumer_proxy ()
 {
   return this->consumer_proxy_.in ();
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 2a2a442a65a..90d9b416f69 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -33,7 +33,7 @@ class Test_Supplier : public ACE_Task<ACE_SYNCH>
 public:
   Test_Supplier (ECT_Driver *driver);
 
-  int svc (void);
+  int svc ();
   // Run the test, just forwards to the driver
 
   void connect (RtecScheduler::Scheduler_ptr scheduler,
@@ -47,16 +47,16 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id () const;
   // The supplier ID.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void);
+  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy ();
   // We talk to the EC (as a supplier) using this proxy, no duplicates
   // are done here...
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 8f64e4f77f4..b4db10c3107 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-ECT_Supplier_Driver::ECT_Supplier_Driver (void)
+ECT_Supplier_Driver::ECT_Supplier_Driver ()
   : n_suppliers_ (1),
     burst_count_ (10),
     burst_size_ (100),
@@ -35,7 +35,7 @@ ECT_Supplier_Driver::ECT_Supplier_Driver (void)
 {
 }
 
-ECT_Supplier_Driver::~ECT_Supplier_Driver (void)
+ECT_Supplier_Driver::~ECT_Supplier_Driver ()
 {
 }
 
@@ -231,7 +231,7 @@ ECT_Supplier_Driver::connect_suppliers
 }
 
 void
-ECT_Supplier_Driver::activate_suppliers (void)
+ECT_Supplier_Driver::activate_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -240,7 +240,7 @@ ECT_Supplier_Driver::activate_suppliers (void)
 }
 
 void
-ECT_Supplier_Driver::disconnect_suppliers (void)
+ECT_Supplier_Driver::disconnect_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -252,7 +252,7 @@ ECT_Supplier_Driver::disconnect_suppliers (void)
 }
 
 void
-ECT_Supplier_Driver::dump_results (void)
+ECT_Supplier_Driver::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index 960a697e712..7eb995f7b1f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -30,8 +30,8 @@ class ECT_Supplier_Driver : public ECT_Driver
   // = DESCRIPTION
   //
 public:
-  ECT_Supplier_Driver (void);
-  virtual ~ECT_Supplier_Driver (void);
+  ECT_Supplier_Driver ();
+  virtual ~ECT_Supplier_Driver ();
 
   virtual void shutdown_consumer (void* consumer_cookie);
   // Not used....
@@ -50,13 +50,13 @@ private:
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
-  void activate_suppliers (void);
+  void activate_suppliers ();
   // Activate the suppliers, i.e. they start generating events.
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results for each supplier.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 12f9bffe059..29e4c432adc 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -31,7 +31,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-ECT_Throughput::ECT_Throughput (void)
+ECT_Throughput::ECT_Throughput ()
   : n_consumers_ (1),
     n_suppliers_ (1),
     burst_count_ (10),
@@ -51,7 +51,7 @@ ECT_Throughput::ECT_Throughput (void)
 {
 }
 
-ECT_Throughput::~ECT_Throughput (void)
+ECT_Throughput::~ECT_Throughput ()
 {
 }
 
@@ -364,7 +364,7 @@ ECT_Throughput::connect_suppliers
 }
 
 void
-ECT_Throughput::activate_suppliers (void)
+ECT_Throughput::activate_suppliers ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -383,7 +383,7 @@ ECT_Throughput::activate_suppliers (void)
 }
 
 void
-ECT_Throughput::disconnect_suppliers (void)
+ECT_Throughput::disconnect_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -392,7 +392,7 @@ ECT_Throughput::disconnect_suppliers (void)
 }
 
 void
-ECT_Throughput::disconnect_consumers (void)
+ECT_Throughput::disconnect_consumers ()
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -401,7 +401,7 @@ ECT_Throughput::disconnect_consumers (void)
 }
 
 void
-ECT_Throughput::dump_results (void)
+ECT_Throughput::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 9d2a48261b1..5849a90d5b9 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -23,9 +23,9 @@
 class ECT_Throughput : public ECT_Driver
 {
 public:
-  ECT_Throughput (void);
+  ECT_Throughput ();
 
-  virtual ~ECT_Throughput (void);
+  virtual ~ECT_Throughput ();
 
   enum {
     MAX_CONSUMERS = 16,
@@ -48,18 +48,18 @@ private:
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
-  void activate_suppliers (void);
+  void activate_suppliers ();
   // Activate the suppliers, i.e. they start generating events.
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results for each supplier.
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 095c7869dae..79461b2ec01 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -15,7 +15,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_BCast::EC_BCast (void)
+EC_BCast::EC_BCast ()
   : bcast_address_ (ACE_TEXT("255.255.255.255")),
     bcast_port_ (12345)
 {
@@ -58,7 +58,7 @@ EC_BCast::print_args () const
 }
 
 void
-EC_BCast::print_usage (void)
+EC_BCast::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
@@ -69,7 +69,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_BCast::execute_test (void)
+EC_BCast::execute_test ()
 {
   // Subscription determining which EC events will get sent out on the
   // UDP socket.
@@ -123,7 +123,7 @@ EC_BCast::execute_test (void)
 }
 
 void
-EC_BCast::dump_results (void)
+EC_BCast::dump_results ()
 {
   this->EC_Driver::dump_results ();
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 60953f5bc95..a1fcc91f865 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -26,22 +26,22 @@ class EC_BCast : public EC_Driver
 {
 public:
   /// Constructor
-  EC_BCast (void);
+  EC_BCast ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable bcastions
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// set the bcastion flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
 private:
   /// The IP address used to broadcast
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 727ab33817c..e6a4e04c443 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -115,7 +115,7 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (void)
+Task::run_iteration ()
 {
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index f1047ca6ceb..53ba9a2af11 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -26,10 +26,10 @@ public:
         int use_callbacks);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
   /// Run a single iteration of the test
-  void run_iteration (void);
+  void run_iteration ();
 
 private:
   /// The event channel used on the test
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index dc00e890387..c04a9ec350d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -16,14 +16,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Master::EC_Master (void)
+EC_Master::EC_Master ()
   :  seed_ (0),
      n_channels_ (4),
      channels_ (0)
 {
 }
 
-EC_Master::~EC_Master (void)
+EC_Master::~EC_Master ()
 {
   if (this->channels_ != 0)
     {
@@ -220,7 +220,7 @@ EC_Observer::EC_Observer (EC_Master *master,
   this->root_poa_ = PortableServer::POA::_duplicate (root_poa);
 }
 
-EC_Observer::~EC_Observer (void)
+EC_Observer::~EC_Observer ()
 {
   if (this->gwys_ != 0)
     delete[] this->gwys_;
@@ -244,13 +244,13 @@ EC_Observer::print_args () const
 }
 
 void
-EC_Observer::print_usage (void)
+EC_Observer::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
 
 void
-EC_Observer::execute_test (void)
+EC_Observer::execute_test ()
 {
   int peer_count = this->master_->channel_count ();
   ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]);
@@ -286,7 +286,7 @@ EC_Observer::execute_test (void)
 }
 
 void
-EC_Observer::run_cleanup (void)
+EC_Observer::run_cleanup ()
 {
   for (int j = 0; j != this->master_->channel_count (); ++j)
     {
@@ -302,7 +302,7 @@ EC_Observer::run_cleanup (void)
 }
 
 void
-EC_Observer::dump_results (void)
+EC_Observer::dump_results ()
 {
   ACE_DEBUG ((LM_DEBUG, "===== Results for %d =====\n", this->id_));
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index 5dc1f40ce7e..5240135ff47 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -31,9 +31,9 @@ class EC_Observer;
 class EC_Master
 {
 public:
-  EC_Master (void);
+  EC_Master ();
 
-  virtual ~EC_Master (void);
+  virtual ~EC_Master ();
 
   /// Execute the test.
   virtual int run (int argc, ACE_TCHAR* argv[]);
@@ -79,20 +79,20 @@ public:
                int id);
 
   /// Destructor
-  ~EC_Observer (void);
+  ~EC_Observer ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable observerions
   virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]);
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// Run the suppliers, using the <thread_manager> parameter
-  void execute_test (void);
-  void run_cleanup (void);
+  void execute_test ();
+  void run_cleanup ();
 
-  void dump_results (void);
+  void dump_results ();
   void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 724d404cdb9..d3c94ac4582 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -29,7 +29,7 @@ deactivate_servant (PortableServer::Servant servant)
 }
 
 
-RND_Driver::RND_Driver (void)
+RND_Driver::RND_Driver ()
   :  timer_ (this),
      supplier_ (0),
      nsuppliers_ (4),
@@ -386,7 +386,7 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
 }
 
 void
-RND_Consumer::disconnect (void)
+RND_Consumer::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -404,7 +404,7 @@ RND_Consumer::push (const RtecEventComm::EventSet &event)
 }
 
 void
-RND_Consumer::disconnect_push_consumer (void)
+RND_Consumer::disconnect_push_consumer ()
 {
 }
 
@@ -433,7 +433,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
 }
 
 void
-RND_Supplier::disconnect (void)
+RND_Supplier::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -445,7 +445,7 @@ RND_Supplier::disconnect (void)
 }
 
 void
-RND_Supplier::push_new_event (void)
+RND_Supplier::push_new_event ()
 {
   RtecEventComm::EventSet event (1);
   event.length (1);
@@ -473,12 +473,12 @@ RND_Supplier::push (RtecEventComm::EventSet &event)
 }
 
 void
-RND_Supplier::disconnect_push_supplier (void)
+RND_Supplier::disconnect_push_supplier ()
 {
 }
 
 int
-RND_Supplier::svc (void)
+RND_Supplier::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "Thread %t started\n"));
   int percent = 10;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 2db23e8c8a3..82de8a0d9ac 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -32,11 +32,11 @@ public:
   RND_Consumer (RND_Driver *driver);
 
   void push (const RtecEventComm::EventSet &event);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
-  void disconnect (void);
+  void disconnect ();
 
 protected:
   /// The driver
@@ -86,13 +86,13 @@ public:
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
                 const RtecEventChannelAdmin::SupplierQOS &qos);
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event...
-  void push_new_event (void);
+  void push_new_event ();
   void push (RtecEventComm::EventSet &event);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Active method
   virtual int svc ();
@@ -119,7 +119,7 @@ RND_Supplier::RND_Supplier (int verbose)
 class RND_Driver
 {
 public:
-  RND_Driver (void);
+  RND_Driver ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index cf10b808d83..8816d9d8190 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Reconnect::EC_Reconnect (void)
+EC_Reconnect::EC_Reconnect ()
   : allow_consumer_reconnect_ (0),
     allow_supplier_reconnect_ (0),
     disconnections_ (1000)
@@ -69,7 +69,7 @@ EC_Reconnect::print_args () const
 }
 
 void
-EC_Reconnect::print_usage (void)
+EC_Reconnect::print_usage ()
 {
   this->EC_Driver::print_usage ();
 
@@ -84,7 +84,7 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Reconnect::execute_test (void)
+EC_Reconnect::execute_test ()
 {
   this->execute_consumer_test ();
   this->execute_supplier_test ();
@@ -98,12 +98,12 @@ EC_Reconnect::execute_test (void)
 }
 
 void
-EC_Reconnect::dump_results (void)
+EC_Reconnect::dump_results ()
 {
 }
 
 void
-EC_Reconnect::execute_consumer_test (void)
+EC_Reconnect::execute_consumer_test ()
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
@@ -159,7 +159,7 @@ EC_Reconnect::execute_consumer_test (void)
 }
 
 void
-EC_Reconnect::execute_supplier_test (void)
+EC_Reconnect::execute_supplier_test ()
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
index 77b9275e1f5..b541edd8dde 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
@@ -37,26 +37,26 @@ class EC_Reconnect : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Reconnect (void);
+  EC_Reconnect ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable reconnections
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// set the reconnection flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
   /// Separate the suppliers and consumers.
-  void execute_consumer_test (void);
-  void execute_supplier_test (void);
+  void execute_consumer_test ();
+  void execute_supplier_test ();
 
 private:
   /// What aspect of reconnection are we going to test?
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index 4723d3c58b0..4af4b4d0092 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Schedule::EC_Schedule (void)
+EC_Schedule::EC_Schedule ()
   :  scheduler_impl_ (0)
 {
 }
@@ -40,13 +40,13 @@ EC_Schedule::print_args () const
 }
 
 void
-EC_Schedule::print_usage (void)
+EC_Schedule::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
 
 void
-EC_Schedule::initialize_ec_impl (void)
+EC_Schedule::initialize_ec_impl ()
 {
   this->scheduler_impl_ = new ACE_Config_Scheduler;
   this->scheduler_ = this->scheduler_impl_->_this ();
@@ -61,14 +61,14 @@ EC_Schedule::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Schedule::cleanup_ec (void)
+EC_Schedule::cleanup_ec ()
 {
   this->EC_Driver::cleanup_ec ();
   delete this->scheduler_impl_;
 }
 
 void
-EC_Schedule::execute_test (void)
+EC_Schedule::execute_test ()
 {
   CORBA::Long min_priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -195,6 +195,6 @@ EC_Schedule::build_supplier_qos (
 }
 
 void
-EC_Schedule::dump_results (void)
+EC_Schedule::dump_results ()
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index f4f4827af2f..601a797316d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -40,25 +40,25 @@ class EC_Schedule : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Schedule (void);
+  EC_Schedule ();
 
   // = The EC_Driver methods
   /// add some command line args to change the scheduling service to
   /// use.
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// Set the scheduling service attribute
-  void initialize_ec_impl (void);
-  void cleanup_ec (void);
+  void initialize_ec_impl ();
+  void cleanup_ec ();
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just compute the schedule.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
   /// This time really connect to the scheduler
   virtual void build_consumer_qos (
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index c8248e4d06a..c329a989165 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -12,14 +12,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Shutdown::EC_Shutdown (void)
+EC_Shutdown::EC_Shutdown ()
   :  consumer_disconnects_ (0),
      supplier_disconnects_ (0)
 {
 }
 
 void
-EC_Shutdown::execute_test (void)
+EC_Shutdown::execute_test ()
 {
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n"));
@@ -49,7 +49,7 @@ EC_Shutdown::execute_test (void)
 }
 
 void
-EC_Shutdown::dump_results (void)
+EC_Shutdown::dump_results ()
 {
   if (this->consumer_disconnects_ != this->n_consumers_)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
index 0f796f87b5b..c1b4d2edd3c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
@@ -30,14 +30,14 @@ class EC_Shutdown : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Shutdown (void);
+  EC_Shutdown ();
 
   // = The EC_Driver methods
   /// Don't run the suppliers just create the EC and then destroy it.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
   /// One of the consumers in the test has been disconnected from the EC
   virtual void consumer_disconnect (void* consumer_cookie);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index acfd331e622..91465be463b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -2,14 +2,14 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include <memory>
 
-EC_Wrapper::EC_Wrapper (void)
+EC_Wrapper::EC_Wrapper ()
   : ec_impl_ (0),
     orb_ ()
 {
 }
 
 PortableServer::Servant_var<EC_Wrapper>
-EC_Wrapper::create (void)
+EC_Wrapper::create ()
 {
   PortableServer::Servant_var<EC_Wrapper> w;
   ACE_NEW_RETURN (w,
@@ -18,7 +18,7 @@ EC_Wrapper::create (void)
   return w;
 }
 
-EC_Wrapper::~EC_Wrapper (void)
+EC_Wrapper::~EC_Wrapper ()
 {
   try
     {
@@ -71,7 +71,7 @@ EC_Wrapper::init (CORBA::ORB_ptr orb,
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-EC_Wrapper::for_consumers (void)
+EC_Wrapper::for_consumers ()
 {
   if (this->ec_impl_)
     return this->ec_impl_->for_consumers ();
@@ -80,7 +80,7 @@ EC_Wrapper::for_consumers (void)
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-EC_Wrapper::for_suppliers (void)
+EC_Wrapper::for_suppliers ()
 {
   if (this->ec_impl_)
     return this->ec_impl_->for_suppliers ();
@@ -89,7 +89,7 @@ EC_Wrapper::for_suppliers (void)
 }
 
 void
-EC_Wrapper::destroy_ec (void)
+EC_Wrapper::destroy_ec ()
 {
   std::unique_ptr<TAO_EC_Event_Channel> ec_impl_aptr (this->ec_impl_);
   this->ec_impl_ = 0;
@@ -101,7 +101,7 @@ EC_Wrapper::destroy_ec (void)
 }
 
 void
-EC_Wrapper::destroy (void)
+EC_Wrapper::destroy ()
 {
   // Deregister from POA.
   this->deactivator_.deactivate ();
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index cf73b4bca21..c089c8f6ff5 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -29,10 +29,10 @@ public:
   /// Create a new EC_Wrapper object.
   /// (Constructor access is restricted to insure that all
   /// EC_Wrapper objects are heap-allocated.)
-  static PortableServer::Servant_var<EC_Wrapper> create (void);
+  static PortableServer::Servant_var<EC_Wrapper> create ();
 
   /// Destructor.  Destroys the Event Channel implementation.
-  virtual ~EC_Wrapper (void);
+  virtual ~EC_Wrapper ();
 
   /// Create and initialize underlying EC servant.
   int init (CORBA::ORB_ptr orb,
@@ -41,13 +41,13 @@ public:
   /// RtecEventChannelAdmin::Event_Channel methods.
   //@{
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void);
+    for_suppliers ();
 
   /// Destroy the Event Channel, deactivate from POA, and shut down
   /// the ORB.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer);
@@ -57,12 +57,12 @@ public:
 protected:
   /// Constructor (protected).  Clients can create new
   /// EC_Wrapper objects using the static create() method.
-  EC_Wrapper (void);
+  EC_Wrapper ();
 
 private:
   /// Helper - destroys Event Channel and deactivate from POA, if
   /// necessary.
-  void destroy_ec (void);
+  void destroy_ec ();
 
   /// Event Channel implementation.
   /*
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 1163e50c20a..e81c7e39244 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -6,7 +6,7 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_stdio.h"
 
-Gateway_EC::Gateway_EC (void)
+Gateway_EC::Gateway_EC ()
   : ec_ior_file_ (ACE_TEXT("gateway-ec.ior"))
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
index 455a9149cc9..86756de78f2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
@@ -21,7 +21,7 @@ class ECMcastTests_Export Gateway_EC
 {
 public:
   /// Constructor.
-  Gateway_EC (void);
+  Gateway_EC ();
 
   /// Run the server.
   /// Valid arguments: [-i ior_filename].
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 645816641d2..71df48f6d3c 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -19,12 +19,12 @@ public:
   virtual void push (const RtecEventComm::EventSet &events);
 
   /// No-op.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Helper - destroys EC, shutdowns the ORB and prints number of
   /// events received.
-  void disconnect (void);
+  void disconnect ();
 
   /// Number of events of different types pushed to us by EC.
   //@{
@@ -82,12 +82,12 @@ EC_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-EC_Consumer::disconnect_push_consumer (void)
+EC_Consumer::disconnect_push_consumer ()
 {
 }
 
 void
-EC_Consumer::disconnect (void)
+EC_Consumer::disconnect ()
 {
   if (this->a_events_ == 100
       && this->b_events_ == 100
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 62aaa088c5a..8586ae2efc4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -17,13 +17,13 @@ public:
   /// Logs each event.  Initiates shutdown after receiving 100 events.
   virtual void push (const RtecEventComm::EventSet &events);
   /// No-op.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   //@}
 
 private:
   /// Helper - destroys EC, shutdowns the ORB and prints number of
   /// events received.
-  void disconnect (void);
+  void disconnect ();
 
   /// Number of events pushed to us by EC.
   size_t n_events_;
@@ -55,12 +55,12 @@ EC_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-EC_Consumer::disconnect_push_consumer (void)
+EC_Consumer::disconnect_push_consumer ()
 {
 }
 
 void
-EC_Consumer::disconnect (void)
+EC_Consumer::disconnect ()
 {
   if (this->n_events_ == 100)
     {
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index c810cb37229..a756d6575f9 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -40,10 +40,10 @@ class Heartbeat_Application :
 {
 public:
   /// Constructor.
-  Heartbeat_Application (void);
+  Heartbeat_Application ();
 
   /// Destructor.
-  ~Heartbeat_Application (void);
+  ~Heartbeat_Application ();
 
   // Initializes the object: connects with EC as a supplier and a
   // consumer and registers with reactor for timeouts.  If init ()
@@ -59,7 +59,7 @@ public:
   // No-op if the object hasn't been fully initialized.  Otherwise,
   // deregister from reactor and poa, destroy ec or just disconnect from it
   // (based on <destroy_ec> flag), and shut down the orb.
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
   /// Send another heartbeat or, if we already sent/attempted the required
@@ -73,7 +73,7 @@ public:
   virtual void push (const RtecEventComm::EventSet &events);
 
   /// Initiate shutdown().
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   //@}
 
 private:
@@ -101,16 +101,16 @@ private:
   int check_args (CORBA::ORB_var orb,
                   RtecEventChannelAdmin::EventChannel_var ec);
   /// Connects to EC as a supplier.
-  void connect_as_supplier (void);
+  void connect_as_supplier ();
   /// Connects to EC as a consumer.  Activate with default POA.
-  void connect_as_consumer (void);
+  void connect_as_consumer ();
   /// Call destroy() on the EC.  Does not propagate exceptions.
-  void destroy_ec (void);
+  void destroy_ec ();
   /// Registers with orb's reactor for timeouts ocurring every 0.5
   /// seconds. Returns 0 on success, -1 on error.
-  int register_for_timeouts (void);
+  int register_for_timeouts ();
   /// Deregister from reactor.
-  void stop_timeouts (void);
+  void stop_timeouts ();
   //@}
 
   /// Flag indicating whether this object has been fully initialized.
@@ -171,7 +171,7 @@ handle_timeout (const ACE_Time_Value& tv,
 
 // **************************************************************************
 
-Heartbeat_Application::Heartbeat_Application (void)
+Heartbeat_Application::Heartbeat_Application ()
   : initialized_ (0)
   , timeout_handler_ (this)
   , n_timeouts_ (0)
@@ -183,7 +183,7 @@ Heartbeat_Application::Heartbeat_Application (void)
 {
 }
 
-Heartbeat_Application::~Heartbeat_Application (void)
+Heartbeat_Application::~Heartbeat_Application ()
 {
 }
 
@@ -266,7 +266,7 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
 }
 
 int
-Heartbeat_Application::register_for_timeouts (void)
+Heartbeat_Application::register_for_timeouts ()
 {
   // Schedule timeout every 0.5 seconds, for sending heartbeat events.
   ACE_Time_Value timeout_interval (0, 500000);
@@ -286,7 +286,7 @@ Heartbeat_Application::register_for_timeouts (void)
 }
 
 void
-Heartbeat_Application::stop_timeouts (void)
+Heartbeat_Application::stop_timeouts ()
 {
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
   if (!reactor
@@ -299,7 +299,7 @@ Heartbeat_Application::stop_timeouts (void)
 }
 
 void
-Heartbeat_Application::connect_as_supplier (void)
+Heartbeat_Application::connect_as_supplier ()
 {
   // Obtain reference to SupplierAdmin.
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -322,7 +322,7 @@ Heartbeat_Application::connect_as_supplier (void)
 }
 
 void
-Heartbeat_Application::connect_as_consumer (void)
+Heartbeat_Application::connect_as_consumer ()
 {
   // Activate with poa.
   RtecEventComm::PushConsumer_var consumer_ref;
@@ -441,13 +441,13 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Heartbeat_Application::disconnect_push_consumer (void)
+Heartbeat_Application::disconnect_push_consumer ()
 {
   this->shutdown ();
 }
 
 void
-Heartbeat_Application::destroy_ec (void)
+Heartbeat_Application::destroy_ec ()
 {
   if (!CORBA::is_nil (this->ec_.in ()))
     {
@@ -465,7 +465,7 @@ Heartbeat_Application::destroy_ec (void)
     }
 }
 void
-Heartbeat_Application::shutdown (void)
+Heartbeat_Application::shutdown ()
 {
   if (!this->initialized_)
     return;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index f810a281bc7..4bf80a412d2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -15,13 +15,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Connect::EC_Connect (void)
+EC_Connect::EC_Connect ()
   : order_ (0)
 {
 }
 
 void
-EC_Connect::execute_test (void)
+EC_Connect::execute_test ()
 {
   // this->EC_Driver::execute_test ();
 }
@@ -70,7 +70,7 @@ EC_Connect::parse_args (int& argc, ACE_TCHAR* argv[])
 }
 
 void
-EC_Connect::print_usage (void)
+EC_Connect::print_usage ()
 {
   this->EC_Driver::print_usage ();
 
@@ -92,7 +92,7 @@ EC_Connect::print_args () const
 }
 
 void
-EC_Connect::dump_results (void)
+EC_Connect::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
@@ -142,7 +142,7 @@ EC_Connect::allocate_supplier (int i)
 }
 
 void
-EC_Connect::connect_clients (void)
+EC_Connect::connect_clients ()
 {
   this->start_time_ = ACE_OS::gethrtime ();
   switch (this->order_)
@@ -187,7 +187,7 @@ EC_Connect::connect_clients (void)
 }
 
 void
-EC_Connect::disconnect_clients (void)
+EC_Connect::disconnect_clients ()
 {
   switch (this->order_)
     {
@@ -247,7 +247,7 @@ EC_Connect::disconnect_clients (void)
 }
 
 void
-EC_Connect::disconnect_consumers (void)
+EC_Connect::disconnect_consumers ()
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_consumers_; ++i)
@@ -269,7 +269,7 @@ EC_Connect::disconnect_consumers (void)
 }
 
 void
-EC_Connect::disconnect_suppliers (void)
+EC_Connect::disconnect_suppliers ()
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_suppliers_; ++i)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index 22623793bea..418cd5353f3 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -38,17 +38,17 @@ class EC_Connect : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Connect (void);
+  EC_Connect ();
 
   // = The EC_Driver methods
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
-  virtual void print_usage (void);
+  virtual void print_usage ();
   virtual void print_args () const;
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
-  virtual void dump_results (void);
+  virtual void dump_results ();
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
@@ -56,14 +56,14 @@ public:
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     int i);
-  virtual void disconnect_consumers (void);
-  virtual void disconnect_suppliers (void);
+  virtual void disconnect_consumers ();
+  virtual void disconnect_suppliers ();
 
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
-  virtual void connect_clients (void);
-  virtual void disconnect_clients (void);
+  virtual void connect_clients ();
+  virtual void disconnect_clients ();
 
 private:
   ACE_hrtime_t start_time_;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index 8c949bfcd1e..b6e082e55be 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -15,7 +15,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Inversion::EC_Inversion (void)
+EC_Inversion::EC_Inversion ()
   :  same_events_ (0)
 {
 }
@@ -50,7 +50,7 @@ EC_Inversion::parse_args (int &argc, ACE_TCHAR *argv [])
 }
 
 void
-EC_Inversion::connect_consumers (void)
+EC_Inversion::connect_consumers ()
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers ();
@@ -84,7 +84,7 @@ EC_Inversion::connect_consumers (void)
 }
 
 void
-EC_Inversion::connect_suppliers (void)
+EC_Inversion::connect_suppliers ()
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     this->event_channel_->for_suppliers ();
@@ -117,7 +117,7 @@ EC_Inversion::connect_suppliers (void)
 }
 
 void
-EC_Inversion::activate_tasks (void)
+EC_Inversion::activate_tasks ()
 {
   int priority;
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index 03c07d71439..e9e101f1c3e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -26,7 +26,7 @@ class EC_Inversion : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Inversion (void);
+  EC_Inversion ();
 
   // = The EC_Driver methods
   /**
@@ -42,11 +42,11 @@ public:
    * other consumer receives events from a set of low priority
    * suppliers.
    */
-  virtual void connect_consumers (void);
-  virtual void connect_suppliers (void);
+  virtual void connect_consumers ();
+  virtual void connect_suppliers ();
 
   /// Activate the suppliers at different priorities
-  virtual void activate_tasks (void);
+  virtual void activate_tasks ();
 
 private:
   /// If set then both low priority and high priority suppliers
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 0ea6cd2f969..f3644488f24 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -280,7 +280,7 @@ EC_Latency_Consumer::EC_Latency_Consumer (ACE_Sample_History *history,
 }
 
 int
-EC_Latency_Consumer::done (void)
+EC_Latency_Consumer::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_, -1);
   return this->remaining_messages_ <= 0;
@@ -306,18 +306,18 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-EC_Latency_Consumer::disconnect_push_consumer (void)
+EC_Latency_Consumer::disconnect_push_consumer ()
 {
 }
 
 // ****************************************************************
 
-EC_Latency_Supplier::EC_Latency_Supplier (void)
+EC_Latency_Supplier::EC_Latency_Supplier ()
 {
 }
 
 void
-EC_Latency_Supplier::disconnect_push_supplier (void)
+EC_Latency_Supplier::disconnect_push_supplier ()
 {
 }
 
@@ -331,14 +331,14 @@ Task::Task (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
 }
 
 int
-Task::done (void)
+Task::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1);
   return this->remaining_messages_ == 0;
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 47f32d3a180..dd5cdb86b0a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -33,10 +33,10 @@ public:
                        int message_count);
 
   /// Return 1 when all the messages have been received
-  int done (void);
+  int done ();
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Roundtrip delays are recorded here
@@ -55,9 +55,9 @@ class EC_Latency_Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  EC_Latency_Supplier (void);
+  EC_Latency_Supplier ();
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 };
 
 // ****************************************************************
@@ -71,10 +71,10 @@ public:
         int iterations);
 
   /// Return 1 when all the messages have been sent
-  int done (void);
+  int done ();
 
   /// Run the experiment
-  int svc (void);
+  int svc ();
 
 private:
   /// The consumer
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 780e75ac9f1..dc5377b5c6a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -13,7 +13,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Throughput::EC_Throughput (void)
+EC_Throughput::EC_Throughput ()
 {
 }
 
@@ -32,7 +32,7 @@ EC_Throughput::print_args () const
 }
 
 void
-EC_Throughput::print_usage (void)
+EC_Throughput::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
@@ -43,13 +43,13 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_Throughput::execute_test (void)
+EC_Throughput::execute_test ()
 {
   this->EC_Driver::execute_test ();
 }
 
 void
-EC_Throughput::dump_results (void)
+EC_Throughput::dump_results ()
 {
   this->EC_Driver::dump_results ();
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index 1b414749d8b..72d06bc50ca 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -26,22 +26,22 @@ class EC_Throughput : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Throughput (void);
+  EC_Throughput ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable throughputions
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// set the throughpution flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
 private:
 };
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index b6b70325e93..550942be7a5 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -45,7 +45,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   try
     {
@@ -124,7 +124,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
index c5cca80be8c..5c0dfe9f43c 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
@@ -36,13 +36,13 @@ public:
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   CORBA::ULong event_count () const;
 private:
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 2180da5fc08..845db3d1e08 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -30,7 +30,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   // Disconnect from the EC
   try
@@ -55,7 +55,7 @@ Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb)
 }
 
 void
-Supplier::perform_push (void)
+Supplier::perform_push ()
 {
   try
     {
@@ -89,7 +89,7 @@ Supplier::perform_push (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
index ff0ce11b4c0..8142f79ce21 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
@@ -37,15 +37,15 @@ public:
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event
-  void perform_push (void);
+  void perform_push ();
 
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   void insert_into_any (CORBA::Any& any, Components::EventBase* vb);
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 4872289a5a3..56df011d037 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -53,7 +53,7 @@ EC_Consumer::connected () const
 }
 
 void
-EC_Consumer::disconnect (void)
+EC_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -65,7 +65,7 @@ EC_Consumer::disconnect (void)
 }
 
 void
-EC_Consumer::shutdown (void)
+EC_Consumer::shutdown ()
 {
   if (!this->is_active_)
     return;
@@ -137,7 +137,7 @@ EC_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-EC_Consumer::disconnect_push_consumer (void)
+EC_Consumer::disconnect_push_consumer ()
 {
   this->driver_->consumer_disconnect (this->cookie_);
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index d8dd29aba14..7a6beedcf3b 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -61,10 +61,10 @@ public:
 
   /// The application can invoke this method to disconnect from the EC
   /// and deactivate this class.
-  void disconnect (void);
+  void disconnect ();
 
   /// The application is shutting down, deactivate the consumer.
-  void shutdown (void);
+  void shutdown ();
 
   /// Accumulate our statistics to the totals.
   void accumulate (ACE_Throughput_Stats& throughput) const;
@@ -78,7 +78,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// The main driver for the test.
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index 939f3218210..e68c91f2a2a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -28,7 +28,7 @@ EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-EC_Counting_Consumer::disconnect (void)
+EC_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -40,7 +40,7 @@ EC_Counting_Consumer::disconnect (void)
 }
 
 void
-EC_Counting_Consumer::deactivate (void)
+EC_Counting_Consumer::deactivate ()
 {
   PortableServer::POA_var consumer_poa =
     this->_default_POA ();
@@ -94,7 +94,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-EC_Counting_Consumer::disconnect_push_consumer (void)
+EC_Counting_Consumer::disconnect_push_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 91cbe460445..afbe9007f13 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -36,8 +36,8 @@ public:
   /// Simple connect/disconnect methods..
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
-  void disconnect (void);
-  void deactivate (void);
+  void disconnect ();
+  void deactivate ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
@@ -47,7 +47,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 52ea5d4d378..05f6d5d4556 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "ace/OS_NS_unistd.h"
 
-EC_Counting_Supplier::EC_Counting_Supplier (void)
+EC_Counting_Supplier::EC_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0),
      consumer_adapter_ (this),
@@ -38,7 +38,7 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
 }
 
 void
-EC_Counting_Supplier::deactivate (void)
+EC_Counting_Supplier::deactivate ()
 {
   this->supplier_proxy_->disconnect_push_supplier ();
 
@@ -87,7 +87,7 @@ EC_Counting_Supplier::connect (
 }
 
 void
-EC_Counting_Supplier::disconnect (void)
+EC_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -121,12 +121,12 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&)
 }
 
 void
-EC_Counting_Supplier::disconnect_push_consumer (void)
+EC_Counting_Supplier::disconnect_push_consumer ()
 {
 }
 
 void
-EC_Counting_Supplier::disconnect_push_supplier (void)
+EC_Counting_Supplier::disconnect_push_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
@@ -158,20 +158,20 @@ EC_Counting_Supplier_Task::svc ()
 }
 
 void
-EC_Counting_Supplier_Task::stop (void)
+EC_Counting_Supplier_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-EC_Counting_Supplier_Task::push_count (void)
+EC_Counting_Supplier_Task::push_count ()
 {
   return this->push_count_;
 }
 
 void
-EC_Counting_Supplier_Task::run (void)
+EC_Counting_Supplier_Task::run ()
 {
   this->event_.length (1);
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index 8104a801765..28c733a1173 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -32,7 +32,7 @@ class EC_Test_Export EC_Counting_Supplier : public POA_RtecEventComm::PushSuppli
 {
 public:
   /// Constructor
-  EC_Counting_Supplier (void);
+  EC_Counting_Supplier ();
 
   // = The RtecEventComm::PushSupplier methods
 
@@ -44,7 +44,7 @@ public:
    */
   void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                  int period);
-  void deactivate (void);
+  void deactivate ();
 
   /// Simple connect/disconnect methods..
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
@@ -54,14 +54,14 @@ public:
                 int event_type);
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 const RtecEventChannelAdmin::SupplierQOS &qos);
-  void disconnect (void);
+  void disconnect ();
 
   /// The Consumer side methods.
   void push (const RtecEventComm::EventSet& events);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;
@@ -93,13 +93,13 @@ public:
   EC_Counting_Supplier_Task (EC_Counting_Supplier *supplier);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong push_count (void);
+  void stop ();
+  CORBA::ULong push_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The supplier we are turning into an active object
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 086662e4d48..1cd92c02a78 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -25,7 +25,7 @@
 #endif /* __ACE_INLINE__ */
 
 
-EC_Driver::EC_Driver (void)
+EC_Driver::EC_Driver ()
   :  n_consumers_ (1),
      consumers_ (0),
      n_suppliers_ (1),
@@ -51,7 +51,7 @@ EC_Driver::EC_Driver (void)
   TAO_EC_Default_Factory::init_svcs ();
 }
 
-EC_Driver::~EC_Driver (void)
+EC_Driver::~EC_Driver ()
 {
 }
 
@@ -123,7 +123,7 @@ EC_Driver::run_init (int &argc, ACE_TCHAR* argv[])
 }
 
 void
-EC_Driver::run_cleanup (void)
+EC_Driver::run_cleanup ()
 {
   this->disconnect_clients ();
 
@@ -214,7 +214,7 @@ EC_Driver::print_args () const
 }
 
 int
-EC_Driver::move_to_rt_class (void)
+EC_Driver::move_to_rt_class ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -248,7 +248,7 @@ EC_Driver::move_to_rt_class (void)
 }
 
 void
-EC_Driver::initialize_ec_impl (void)
+EC_Driver::initialize_ec_impl ()
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
@@ -263,7 +263,7 @@ EC_Driver::initialize_ec_impl (void)
 
 #if !defined(EC_DISABLE_REMOTE_EC)
 void
-EC_Driver::obtain_remote_ec (void)
+EC_Driver::obtain_remote_ec ()
 {
   CosNaming::NamingContext_var naming_context =
     this->get_naming_context ();
@@ -280,7 +280,7 @@ EC_Driver::obtain_remote_ec (void)
 }
 
 CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (void)
+EC_Driver::get_naming_context ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -295,7 +295,7 @@ EC_Driver::get_naming_context (void)
 #endif
 
 void
-EC_Driver::initialize_new_ec (void)
+EC_Driver::initialize_new_ec ()
 {
   TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
                                         this->root_poa_.in ());
@@ -313,7 +313,7 @@ EC_Driver::initialize_new_ec (void)
 }
 
 void
-EC_Driver::deactivate_ec (void)
+EC_Driver::deactivate_ec ()
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
@@ -334,13 +334,13 @@ EC_Driver::deactivate_ec (void)
 }
 
 void
-EC_Driver::destroy_ec (void)
+EC_Driver::destroy_ec ()
 {
   this->event_channel_->destroy ();
 }
 
 int
-EC_Driver::allocate_consumers (void)
+EC_Driver::allocate_consumers ()
 {
   ACE_NEW_RETURN (this->consumers_,
                   EC_Consumer*[this->n_consumers_],
@@ -352,7 +352,7 @@ EC_Driver::allocate_consumers (void)
 }
 
 int
-EC_Driver::allocate_suppliers (void)
+EC_Driver::allocate_suppliers ()
 {
   ACE_NEW_RETURN (this->suppliers_,
                   EC_Supplier*[this->n_suppliers_],
@@ -378,7 +378,7 @@ EC_Driver::allocate_supplier (int i)
 }
 
 void
-EC_Driver::connect_clients (void)
+EC_Driver::connect_clients ()
 {
   this->connect_consumers ();
 
@@ -386,7 +386,7 @@ EC_Driver::connect_clients (void)
 }
 
 void
-EC_Driver::disconnect_clients (void)
+EC_Driver::disconnect_clients ()
 {
   this->disconnect_suppliers ();
 
@@ -394,7 +394,7 @@ EC_Driver::disconnect_clients (void)
 }
 
 void
-EC_Driver::shutdown_clients (void)
+EC_Driver::shutdown_clients ()
 {
   this->shutdown_suppliers ();
 
@@ -402,7 +402,7 @@ EC_Driver::shutdown_clients (void)
 }
 
 void
-EC_Driver::connect_consumers (void)
+EC_Driver::connect_consumers ()
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers ();
@@ -454,7 +454,7 @@ EC_Driver::build_consumer_qos (
 }
 
 void
-EC_Driver::connect_suppliers (void)
+EC_Driver::connect_suppliers ()
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     this->event_channel_->for_suppliers ();
@@ -508,7 +508,7 @@ EC_Driver::build_supplier_qos (
 }
 
 void
-EC_Driver::execute_test (void)
+EC_Driver::execute_test ()
 {
   if (this->allocate_tasks () == -1)
     return;
@@ -529,7 +529,7 @@ EC_Driver::execute_test (void)
 }
 
 int
-EC_Driver::allocate_tasks (void)
+EC_Driver::allocate_tasks ()
 {
   if (this->tasks_ != 0)
     return 0;
@@ -559,7 +559,7 @@ EC_Driver::allocate_task (int i)
 }
 
 void
-EC_Driver::activate_tasks (void)
+EC_Driver::activate_tasks ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -585,7 +585,7 @@ EC_Driver::activate_tasks (void)
 }
 
 void
-EC_Driver::disconnect_suppliers (void)
+EC_Driver::disconnect_suppliers ()
 {
   if (this->suppliers_ == 0)
     return;
@@ -598,7 +598,7 @@ EC_Driver::disconnect_suppliers (void)
 }
 
 void
-EC_Driver::disconnect_consumers (void)
+EC_Driver::disconnect_consumers ()
 {
   if (this->consumers_ == 0)
     return;
@@ -611,7 +611,7 @@ EC_Driver::disconnect_consumers (void)
 }
 
 void
-EC_Driver::shutdown_suppliers (void)
+EC_Driver::shutdown_suppliers ()
 {
   if (this->suppliers_ == 0)
     return;
@@ -624,7 +624,7 @@ EC_Driver::shutdown_suppliers (void)
 }
 
 void
-EC_Driver::shutdown_consumers (void)
+EC_Driver::shutdown_consumers ()
 {
   if (this->consumers_ == 0)
     return;
@@ -637,7 +637,7 @@ EC_Driver::shutdown_consumers (void)
 }
 
 void
-EC_Driver::dump_results (void)
+EC_Driver::dump_results ()
 {
   ACE_Throughput_Stats throughput;
   ACE_High_Res_Timer::global_scale_factor_type gsf =
@@ -845,7 +845,7 @@ EC_Driver::parse_args (int &argc, ACE_TCHAR *argv [])
 }
 
 void
-EC_Driver::print_usage (void)
+EC_Driver::print_usage ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "EC_Driver Usage:\n"
@@ -878,7 +878,7 @@ EC_Driver::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Driver::cleanup_tasks (void)
+EC_Driver::cleanup_tasks ()
 {
   if (this->tasks_ != 0)
     {
@@ -893,7 +893,7 @@ EC_Driver::cleanup_tasks (void)
 }
 
 void
-EC_Driver::cleanup_suppliers (void)
+EC_Driver::cleanup_suppliers ()
 {
   if (this->suppliers_ != 0)
     {
@@ -908,7 +908,7 @@ EC_Driver::cleanup_suppliers (void)
 }
 
 void
-EC_Driver::cleanup_consumers (void)
+EC_Driver::cleanup_consumers ()
 {
   if (this->consumers_ != 0)
     {
@@ -923,7 +923,7 @@ EC_Driver::cleanup_consumers (void)
 }
 
 void
-EC_Driver::cleanup_ec (void)
+EC_Driver::cleanup_ec ()
 {
   delete this->ec_impl_;
 #if !defined(EC_DISABLE_OLD_EC)
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index cfbf9e1d21b..f577bce079f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -51,10 +51,10 @@ class EC_Test_Export EC_Driver
 {
 public:
   /// Constructor
-  EC_Driver (void);
+  EC_Driver ();
 
   /// Destructor
-  virtual ~EC_Driver (void);
+  virtual ~EC_Driver ();
 
   /// Flag to indicate in the test should be verbose.
   int verbose () const;
@@ -66,7 +66,7 @@ public:
   virtual void run_init (int& argc, ACE_TCHAR* argv[]);
 
   /// The cleanup section
-  virtual void run_cleanup (void);
+  virtual void run_cleanup ();
 
   /// Initialize the ORB and obtain the RootPOA object
   virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]);
@@ -75,33 +75,33 @@ public:
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
 
   /// Print the usage method
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// Print out the arguments
   virtual void print_args () const;
 
   /// Run the test in the real-time class, return -1 on error.
-  virtual int move_to_rt_class (void);
+  virtual int move_to_rt_class ();
 
   /// Construct the EC and its helper objects, also activates the EC in
   /// the RootPOA.
-  virtual void initialize_ec_impl (void);
+  virtual void initialize_ec_impl ();
 
   /// By default connect the consumers and then the suppliers, other
   /// orders should work too.
-  virtual void connect_clients (void);
+  virtual void connect_clients ();
 
   /// By default disconnect the suppliers and then the consumers, other
   /// orders should work too.
-  virtual void disconnect_clients (void);
+  virtual void disconnect_clients ();
 
   /// By default deactivate the suppliers and then the consumers, other
   /// orders should work too.
-  virtual void shutdown_clients (void);
+  virtual void shutdown_clients ();
 
   /// Connect all the consumers, by default it lets each consumer
   /// connect itself.
-  virtual void connect_consumers (void);
+  virtual void connect_consumers ();
 
   /// Connect consumer number <i> using the consumer_admin provided.
   virtual void connect_consumer (
@@ -116,7 +116,7 @@ public:
 
   /// Connect all the suppliers, by default it lets each supplier
   /// connect itself.
-  virtual void connect_suppliers (void);
+  virtual void connect_suppliers ();
 
   /// Connect supplier number <i> using the supplier_admin provided.
   virtual void connect_supplier (
@@ -130,38 +130,38 @@ public:
       int& shutdown_event_type);
 
   /// Execute the test, by default simply call activate_suppliers()
-  virtual void execute_test (void);
+  virtual void execute_test ();
 
   /**
    * Dump the results, i.e. invoke dump_results on all the suppliers
    * and consumers, collect the latency and throughput results for
    * each and print the totals too.
    */
-  virtual void dump_results (void);
+  virtual void dump_results ();
 
   /// Disconnect all the consumers.
-  virtual void disconnect_consumers (void);
+  virtual void disconnect_consumers ();
 
   /// Disconnect all the suppliers.
-  virtual void disconnect_suppliers (void);
+  virtual void disconnect_suppliers ();
 
   /// Deactivate all the consumers.
-  virtual void shutdown_consumers (void);
+  virtual void shutdown_consumers ();
 
   /// Deactivate all the suppliers.
-  virtual void shutdown_suppliers (void);
+  virtual void shutdown_suppliers ();
 
   /// Call EC->destroy
-  virtual void destroy_ec (void);
+  virtual void destroy_ec ();
 
   /// De-activate the EC (and its helper classes).
-  virtual void deactivate_ec (void);
+  virtual void deactivate_ec ();
 
   /// Cleanup the resources
-  virtual void cleanup_ec (void);
-  virtual void cleanup_tasks (void);
-  virtual void cleanup_consumers (void);
-  virtual void cleanup_suppliers (void);
+  virtual void cleanup_ec ();
+  virtual void cleanup_tasks ();
+  virtual void cleanup_consumers ();
+  virtual void cleanup_suppliers ();
 
   /// Allow modifications of the default EC attributes
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
@@ -187,30 +187,30 @@ public:
 
 #if !defined(EC_DISABLE_REMOTE_EC)
   /// Obtain the EC from the Naming service
-  virtual void obtain_remote_ec (void);
+  virtual void obtain_remote_ec ();
 
   virtual CosNaming::NamingContext_ptr
-       get_naming_context (void);
+       get_naming_context ();
 #endif
 
   /// Initialize the EC using the new implementation
-  virtual void initialize_new_ec (void);
+  virtual void initialize_new_ec ();
 
   /// Allocate the suppliers and the consumers
-  virtual int allocate_consumers (void);
-  virtual int allocate_suppliers (void);
+  virtual int allocate_consumers ();
+  virtual int allocate_suppliers ();
 
   /// Allocate one consumer or supplier
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
   /// Allocate one task for supplier number <i>
-  virtual int allocate_tasks (void);
+  virtual int allocate_tasks ();
   virtual ACE_Task_Base* allocate_task (int i);
 
   /// Activate all the tasks, by default runs each supplier on its
   /// own thread.
-  virtual void activate_tasks (void);
+  virtual void activate_tasks ();
 
 protected:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index a2e74436ef0..ffce96cff06 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -129,7 +129,7 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
 }
 
 void
-EC_Supplier::disconnect (void)
+EC_Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -141,7 +141,7 @@ EC_Supplier::disconnect (void)
 }
 
 void
-EC_Supplier::shutdown (void)
+EC_Supplier::shutdown ()
 {
   if (!this->is_active_)
     return;
@@ -157,7 +157,7 @@ EC_Supplier::shutdown (void)
 }
 
 void
-EC_Supplier::disconnect_push_supplier (void)
+EC_Supplier::disconnect_push_supplier ()
 {
   this->driver_->supplier_disconnect (this->cookie_);
   this->consumer_proxy_ =
@@ -202,7 +202,7 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
 }
 
 int
-EC_Supplier_Task::svc (void)
+EC_Supplier_Task::svc ()
 {
   // Initialize a time value to pace the test
   ACE_Time_Value tv (0, this->burst_pause_);
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 9db3874b338..c7fbce015ee 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -61,7 +61,7 @@ public:
                    const RtecEventComm::Event& event);
 
   /// Send a shutdown event.
-  void send_shutdown (void);
+  void send_shutdown ();
 
   /// Connect using a <supplier_admin> and publications (<qos>)
   /// computed by the user
@@ -76,10 +76,10 @@ public:
         int shutdown_event_type);
 
   /// Disconnect from the EC, also deactivates the object
-  void disconnect (void);
+  void disconnect ();
 
   /// Disconnect from the EC, also deactivates the object
-  void shutdown (void);
+  void shutdown ();
 
   /// Dump the results...
   virtual void dump_results (
@@ -94,7 +94,7 @@ public:
                    RtecEventComm::Event& event);
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   /// Class we forward to.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index bfee692bb08..a1b93d3b052 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -23,7 +23,7 @@ public:
 
   ////////////
   // execution
-  int run (void);
+  int run ();
 
   /////////////////
   // implementation
@@ -38,7 +38,7 @@ private:
     );
 
 
-  int next_replica (void);
+  int next_replica ();
 
   ////////////////////
   // forbidden methods
@@ -488,7 +488,7 @@ int FTClientMain::pass (
   return result;
 }
 
-int FTClientMain::next_replica (void)
+int FTClientMain::next_replica ()
 {
   int result = 0;
   if (this->replica_pos_ < this->replica_iors_.size())
@@ -518,7 +518,7 @@ int FTClientMain::next_replica (void)
 }
 
 
-int FTClientMain::run (void)
+int FTClientMain::run ()
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 60150e30990..f20db9c3880 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -171,7 +171,7 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb)
   return result;
 }
 
-int FTAPP::FT_Creator::run (void)
+int FTAPP::FT_Creator::run ()
 {
   int result = 0;
   size_t typeCount = this->create_roles_.size();
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 91241cb64c4..4e0c729ca97 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -44,7 +44,7 @@ namespace FTAPP
 
     ////////////
     // execution
-    int run (void);
+    int run ();
 
     ////////////
     // shut down
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 02e9480704c..72a0a959298 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -497,7 +497,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb)
   return result;
 }
 
-int FT_ReplicaFactory_i::fini (void)
+int FT_ReplicaFactory_i::fini ()
 {
   if (this->ior_output_file_ != 0)
   {
@@ -702,13 +702,13 @@ void FT_ReplicaFactory_i::delete_object (
   METHOD_RETURN(FT_ReplicaFactory_i::delete_object);
 }
 
-CORBA::Boolean FT_ReplicaFactory_i::is_alive (void)
+CORBA::Boolean FT_ReplicaFactory_i::is_alive ()
 {
   METHOD_RETURN(FT_ReplicaFactory_i::is_alive)
     true;
 }
 
-void FT_ReplicaFactory_i::shutdown (void)
+void FT_ReplicaFactory_i::shutdown ()
 {
   METHOD_ENTRY(FT_FaultDetectorFactory_i::shutdown);
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 174083fbcfe..c08d2e9e12c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -78,7 +78,7 @@ public:
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (void);
+  int fini ();
 
   int idle(int & result);
 
@@ -103,7 +103,7 @@ public:
   // CORBA interface
   // See IDL for documentation
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /////////////////////////////////////////
   // CORBA interface GenericFactory methods
@@ -120,7 +120,7 @@ public:
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
   /////////////////////////
   // Implementation methods
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 67ad778a036..7634a395f13 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -175,7 +175,7 @@ unsigned long FT_TestReplica_i::factory_id()const
   return this->factory_id_;
 }
 
-::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (void)
+::PortableServer::POA_ptr FT_TestReplica_i::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -231,14 +231,14 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb, const ACE_TCHAR* file_persiste
   return 0;
 }
 
-void FT_TestReplica_i::_remove_ref (void)
+void FT_TestReplica_i::_remove_ref ()
 {
   //////////////////////////////////////////////////
   // WARNING: The following call invokes fini then deletes this object
   this->factory_->remove_replica(this->factory_id_, this);
 }
 
-int FT_TestReplica_i::fini (void)
+int FT_TestReplica_i::fini ()
 {
   return 0;
 }
@@ -246,7 +246,7 @@ int FT_TestReplica_i::fini (void)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  PullMonitorable interface
-CORBA::Boolean FT_TestReplica_i::is_alive (void)
+CORBA::Boolean FT_TestReplica_i::is_alive ()
 {
   KEVORKIAN_RETURN(DURING_IS_ALIVE, is_alive, 0)
   ACE_ERROR ((LM_ERROR,
@@ -262,7 +262,7 @@ CORBA::Boolean FT_TestReplica_i::is_alive (void)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Updateable interface
-FT::State * FT_TestReplica_i::get_update (void)
+FT::State * FT_TestReplica_i::get_update ()
 {
   KEVORKIAN_RETURN(DURING_GET_UPDATE, get_update, 0)
   long counter = load();
@@ -286,7 +286,7 @@ void FT_TestReplica_i::set_update (const FT::State & s)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Checkpointable interface
-::FT::State * FT_TestReplica_i::get_state (void)
+::FT::State * FT_TestReplica_i::get_state ()
 {
 #if defined(FT_TEST_LACKS_STATE)
   throw FT::NoStateAvailable ();
@@ -346,14 +346,14 @@ CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta)
   return counter;
 }
 
-CORBA::Long FT_TestReplica_i::get (void)
+CORBA::Long FT_TestReplica_i::get ()
 {
   KEVORKIAN_DURING_RETURN(get, 0)
   long counter = load ();
   return counter;
 }
 
-CORBA::Long FT_TestReplica_i::counter (void)
+CORBA::Long FT_TestReplica_i::counter ()
 {
   KEVORKIAN_DURING_RETURN([get]counter, 0)
   long counter = load ();
@@ -376,7 +376,7 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when)
   KEVORKIAN(RIGHT_NOW, die)
 }
 
-void FT_TestReplica_i::shutdown (void)
+void FT_TestReplica_i::shutdown ()
 {
   ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n",
                    name_.c_str(), this->factory_->location(), this->factory_id_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index f32830750e2..380de17d08c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -66,7 +66,7 @@ public:
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (void);
+  int fini ();
 
   /**
    * idle time activity.
@@ -87,9 +87,9 @@ public:
 
   //////////////////////////////////////////
   // Override CORBA servant virtual methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
-  virtual void _remove_ref (void);
+  virtual void _remove_ref ();
 
 private:
   ///////////////////////////
@@ -98,29 +98,29 @@ private:
 
   virtual CORBA::Long increment (CORBA::Long delta);
 
-  virtual CORBA::Long get (void);
+  virtual CORBA::Long get ();
 
-  virtual CORBA::Long counter (void);
+  virtual CORBA::Long counter ();
 
   virtual void counter (CORBA::Long counter);
 
   virtual void die (FT_TEST::TestReplica::Bane when);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   ///////////////////////////
   // override PullMonitorable
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
   ///////////////////////////
   // override Updatable
 
-  virtual ::FT::State * get_update (void);
+  virtual ::FT::State * get_update ();
 
   virtual void set_update (const FT::State & s);
 
-  virtual ::FT::State * get_state (void);
+  virtual ::FT::State * get_state ();
 
   virtual void set_state (const FT::State & s);
 
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 546c0361c90..fe314e70a88 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -340,7 +340,7 @@ const char * ReplicationManagerFaultConsumerAdapter::identity () const
 /**
  * Clean house for process shut down.
  */
-int ReplicationManagerFaultConsumerAdapter::fini (void)
+int ReplicationManagerFaultConsumerAdapter::fini ()
 {
   // Delegate to the FT_FaultConsumer.
   return this->p_fault_consumer_->fini ();
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index f398412eb02..5d1aa2aa3ec 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -58,7 +58,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  int fini (void);
+  int fini ();
 
 
   size_t notifications() const;
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 249072b8085..066d40b3fa3 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -24,7 +24,7 @@ int StubBatchConsumer::parse_args (int argc, ACE_TCHAR * argv[])
 }
 
 
-::PortableServer::POA_ptr StubBatchConsumer::_default_POA (void)
+::PortableServer::POA_ptr StubBatchConsumer::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -100,7 +100,7 @@ const char * StubBatchConsumer::identity () const
 /**
  * Clean house for process shut down.
  */
-void StubBatchConsumer::fini (void)
+void StubBatchConsumer::fini ()
 {
   this->notifier_->disconnect_consumer(this->consumer_id_);
 }
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index 0c7debe7178..3745856fce7 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -36,7 +36,7 @@ public:
    */
   virtual ~StubBatchConsumer ();
 
-  ::PortableServer::POA_ptr _default_POA (void);
+  ::PortableServer::POA_ptr _default_POA ();
   ::PortableServer::ObjectId objectId()const;
 
   /**
@@ -64,7 +64,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  void fini (void);
+  void fini ();
 
 
 public:
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 5541c294eaa..63dee650a97 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -244,7 +244,7 @@ const char * StubFaultAnalyzer::identity () const
 /**
  * Clean house for process shut down.
  */
-int StubFaultAnalyzer::fini (void)
+int StubFaultAnalyzer::fini ()
 {
   this->faultConsumer_.fini();
   this->batchConsumer_.fini();
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 2fafcdbbc7b..3a923c5698e 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -64,7 +64,7 @@ public:
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (void);
+  int fini ();
 
   /////////////////
   // Implementation
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 079559f73ee..6410929038d 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -14,7 +14,7 @@ StubFaultConsumer::~StubFaultConsumer ()
 {
 }
 
-::PortableServer::POA_ptr StubFaultConsumer::_default_POA (void)
+::PortableServer::POA_ptr StubFaultConsumer::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -215,7 +215,7 @@ const char * StubFaultConsumer::identity () const
 /**
  * Clean house for process shut down.
  */
-int StubFaultConsumer::fini (void)
+int StubFaultConsumer::fini ()
 {
   this->notifier_->disconnect_consumer(this->consumer_id_);
   return 0;
@@ -284,7 +284,7 @@ void StubFaultConsumer::offer_change (
   ));
 }
 
-void StubFaultConsumer::disconnect_structured_push_consumer(void)
+void StubFaultConsumer::disconnect_structured_push_consumer()
 {
   ACE_ERROR ((LM_ERROR,
     "StubFaultConsumer:disconnect_structured_push_consumer interpreted as quit request.\n"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 4fe4d38f9b8..4ca9fcc8b1a 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -38,7 +38,7 @@ public:
   virtual ~StubFaultConsumer ();
 
 
-  ::PortableServer::POA_ptr _default_POA (void);
+  ::PortableServer::POA_ptr _default_POA ();
   ::PortableServer::ObjectId objectId()const;
 
   /**
@@ -66,7 +66,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  int fini (void);
+  int fini ();
 
 
   size_t notifications() const;
@@ -83,7 +83,7 @@ public:
         const CosNotification::EventTypeSeq & removed
       );
 
-   virtual void disconnect_structured_push_consumer(void);
+   virtual void disconnect_structured_push_consumer();
 
   ////////////////////
   // Forbidden methods
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index ef170af39cf..f7eb7b0c131 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -19,7 +19,7 @@ StubFaultNotifier::~StubFaultNotifier ()
 }
 
 
-::PortableServer::POA_ptr StubFaultNotifier::_default_POA (void)
+::PortableServer::POA_ptr StubFaultNotifier::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -104,7 +104,7 @@ int StubFaultNotifier::parse_args (int argc, ACE_TCHAR * argv[])
 /**
  * Prepare to exit.
  */
-int StubFaultNotifier::fini (void)
+int StubFaultNotifier::fini ()
 {
   if(this->ns_name_.length () != 0)
   {
@@ -324,7 +324,7 @@ const ACE_TCHAR * StubFaultNotifier::identity () const
 /**
  * Clean house for process shut down.
  */
-void StubFaultNotifier::shutdown_i (void)
+void StubFaultNotifier::shutdown_i ()
 {
   this->orb_->shutdown (false);
 }
@@ -409,7 +409,7 @@ void StubFaultNotifier::disconnect_consumer (
   throw CORBA::NO_IMPLEMENT();
 }
 
-CORBA::Boolean StubFaultNotifier::is_alive (void)
+CORBA::Boolean StubFaultNotifier::is_alive ()
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index c1ded566c7f..04ed9cdc8d8 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -51,7 +51,7 @@ public:
   /**
    * Prepare to exit.
    */
-  int fini (void);
+  int fini ();
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -66,7 +66,7 @@ public:
   int idle(int &result);
 
   // override virtuals
-::PortableServer::POA_ptr _default_POA (void);
+::PortableServer::POA_ptr _default_POA ();
 
   PortableServer::ObjectId objectId()const;
 
@@ -74,7 +74,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  void shutdown_i (void);
+  void shutdown_i ();
 
   ////////////////////////////////
   // CORBA interface FaultNotifier
@@ -108,7 +108,7 @@ public:
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
   /////////////////
   // Implementation
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
index e1d7fa6888f..70f4f233719 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
@@ -13,13 +13,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -56,7 +56,7 @@ Basic::remove_member (void)
 
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
index 81a4eb6052f..2513de6544c 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
@@ -24,11 +24,11 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
   const char* object_group_name_;
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index 06e69c84b12..cc9e81f2434 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -32,19 +32,19 @@ LB_server::destroy (void)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 FT_Naming::NamingManager_ptr
-LB_server::naming_manager (void)
+LB_server::naming_manager ()
 {
   return this->naming_manager_.in ();
 }
@@ -94,7 +94,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
index be73d008cc6..5b5ac84259c 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
@@ -39,10 +39,10 @@ public:
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys NamingManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the NamingManager Interface.
   int init (int argc, ACE_TCHAR **argv);
@@ -63,13 +63,13 @@ public:
   TAO_Naming_Client& name_svc ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  FT_Naming::NamingManager_ptr naming_manager (void);
+  FT_Naming::NamingManager_ptr naming_manager ();
 
 private:
     int parse_args (int, ACE_TCHAR **);
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index dffc347a8ba..de1c62ad434 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -37,7 +37,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
   // Constructor.
 
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
   // Destructor.
 
   // = Interface implementation accessor methods.
@@ -45,7 +45,7 @@ public:
   void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void);
+  CORBA::Short id ();
   // Gets id.
 
 private:
@@ -57,12 +57,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
index 4efc517a981..0ce11d8abb5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
@@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
index 1270f07d131..d96026330f0 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
@@ -14,13 +14,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -53,7 +53,7 @@ Basic::remove_member (void)
 
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
index cb4984a2b90..4ee1db473a8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
@@ -24,11 +24,11 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
   const char* object_group_name_;
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index a05c3ae676d..ed8a69d0724 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -32,19 +32,19 @@ LB_server::destroy (void)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 FT_Naming::NamingManager_ptr
-LB_server::naming_manager (void)
+LB_server::naming_manager ()
 {
   return this->naming_manager_.in ();
 }
@@ -93,7 +93,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -145,7 +145,7 @@ LB_server::start_orb_and_poa (void)
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h
index 125072fcc40..046cf5c9d8d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h
@@ -39,16 +39,16 @@ public:
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys NamingManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the NamingManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
+  int create_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
@@ -57,13 +57,13 @@ public:
   TAO_Naming_Client& name_svc ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  FT_Naming::NamingManager_ptr naming_manager (void);
+  FT_Naming::NamingManager_ptr naming_manager ();
 
 private:
     int parse_args (int, ACE_TCHAR **);
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 036456550b7..0807eb0c6c5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -27,7 +27,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
   // Constructor.
 
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
   // Destructor.
 
   // = Interface implementation accessor methods.
@@ -35,7 +35,7 @@ public:
   void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void);
+  CORBA::Short id ();
   // Gets id.
 
 private:
@@ -47,12 +47,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
index 1270f07d131..d96026330f0 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
@@ -14,13 +14,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -53,7 +53,7 @@ Basic::remove_member (void)
 
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h
index 61554fac305..85c41d3a84f 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h
@@ -26,11 +26,11 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
   const char* object_group_name_;
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
index ca0b3a3b68e..cb19e6133e2 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -30,19 +30,19 @@ LB_server::destroy (void)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 FT_Naming::NamingManager_ptr
-LB_server::naming_manager (void)
+LB_server::naming_manager ()
 {
   return this->naming_manager_.in ();
 }
@@ -91,7 +91,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -143,7 +143,7 @@ LB_server::start_orb_and_poa (void)
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h
index 125072fcc40..046cf5c9d8d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h
@@ -39,16 +39,16 @@ public:
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys NamingManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the NamingManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
+  int create_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
@@ -57,13 +57,13 @@ public:
   TAO_Naming_Client& name_svc ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  FT_Naming::NamingManager_ptr naming_manager (void);
+  FT_Naming::NamingManager_ptr naming_manager ();
 
 private:
     int parse_args (int, ACE_TCHAR **);
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
index b589a527aaf..f6090ac3d13 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
@@ -31,7 +31,7 @@ public:
     return 0;
   }
 
-  int svc (void)
+  int svc ()
   {
     for (int g = 0, i = 0; i < 100; i++)
       {
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index ab461eda26e..4472202635c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 
 #include "Server_Request_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
   : server_interceptor_ ()
 {
 }
@@ -37,7 +37,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
index 725f58fbc41..6bec1a8ad31 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
@@ -43,7 +43,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -51,7 +51,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 2ad6b91f3b9..0d0b4d96e00 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -8,7 +8,7 @@
 
 static const CORBA::ULong expected_version = 5;
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
   , forward_request_thrown_ (false)
 {
@@ -16,7 +16,7 @@ Server_Request_Interceptor::Server_Request_Interceptor (void)
   this->obj_[1] = CORBA::Object::_nil ();
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
@@ -55,13 +55,13 @@ Server_Request_Interceptor::forward_references (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   CORBA::release (this->obj_[0]);
   CORBA::release (this->obj_[1]);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index 403a2cba25a..050308b2b5b 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -39,10 +39,10 @@ class Server_Request_Interceptor
 {
 public:
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
@@ -62,9 +62,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
index abfc96d7ae0..d4e4dd92a2c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
@@ -27,13 +27,13 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The number assigned to this object.
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index fcd636e7b95..1507c02fe2a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -28,7 +28,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
 
   /// Initialize the ORB etc.
-  void init (void);
+  void init ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index a042e02b820..edf57e5b4f4 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -113,7 +113,7 @@ Manager::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Manager::make_merged_iors (void)
+Manager::make_merged_iors ()
 {
   // First  server
   this->object_primary_ =
@@ -146,7 +146,7 @@ Manager::make_merged_iors (void)
 }
 
 int
-Manager::set_properties (void)
+Manager::set_properties ()
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -188,7 +188,7 @@ Manager::set_properties (void)
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   try
     {
@@ -205,7 +205,7 @@ Manager::run (void)
 }
 
 int
-Manager::write_to_file (void)
+Manager::write_to_file ()
 {
   //
   CORBA::String_var iorref =
@@ -227,7 +227,7 @@ Manager::write_to_file (void)
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return this->orb_.in ();
 }
@@ -241,7 +241,7 @@ void
 run_test (Simple_Server_ptr server);
 
 void
-Client_i::init (void)
+Client_i::init ()
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index 3b63ccdb070..23097145d5f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -30,19 +30,19 @@ public:
   // Initialize the ORB, POA etc.
 
   /// Merges the different IORS
-  int make_merged_iors (void);
+  int make_merged_iors ();
 
   /// Sets the properties for the profiles
-  int set_properties (void);
+  int set_properties ();
 
   /// Run the  ORB event loop..
-  int run (void);
+  int run ();
 
   /// Write the merged IOR to a file
-  int write_to_file (void);
+  int write_to_file ();
 
   /// Return the pointer to the copy of our ORB
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 private:
   CORBA::Object_var object_primary_;
   CORBA::Object_var object_secondary_;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index d401dee65a5..0fb9f72b9fb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 void
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Print out from process id (%P) hosting the servant\n")));
@@ -25,7 +25,7 @@ Simple_Server_i::remote_call (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index c916e886919..56901f7b06d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -27,12 +27,12 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  void remote_call (void);
+  void remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index ae7c9760e53..341da48a700 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -25,7 +25,7 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event)
 
 
 void
-PushConsumer_impl::disconnect_push_consumer (void)
+PushConsumer_impl::disconnect_push_consumer ()
 {
   PortableServer::Current_var current =
     resolve_init<PortableServer::Current>(orb_.in(), "POACurrent");
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 0bcf5bc7894..62cb9c47e68 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -8,7 +8,7 @@
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 
 int
-PushSupplier_impl::ReactorTask::svc (void)
+PushSupplier_impl::ReactorTask::svc ()
 {
   ACE_DEBUG((LM_DEBUG, "Reactor Thread started\n"));
   ACE_Reactor reactor (new ACE_Select_Reactor) ;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 14ec5f69e5d..96b34e5cb61 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
@@ -35,7 +35,7 @@
 
 ACE_Test_Output *ACE_Test_Output::instance_ = 0;
 
-ACE_Test_Output::ACE_Test_Output (void)
+ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-ACE_Test_Output::~ACE_Test_Output (void)
+ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -154,7 +154,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();
@@ -186,19 +186,19 @@ ACE_Test_Output::instance ()
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::dll_name (void)
+ACE_Test_Output::dll_name ()
 {
   return ACE_TEXT ("Test_Output");
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::name (void)
+ACE_Test_Output::name ()
 {
   return ACE_TEXT ("ACE_Test_Output");
 }
 
 void
-ACE_Test_Output::close_singleton (void)
+ACE_Test_Output::close_singleton ()
 {
   delete ACE_Test_Output::instance_;
   ACE_Test_Output::instance_ = 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index b10ab7bc453..408b93022a5 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -47,14 +47,14 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index 68eca82c1d7..4e4947176dc 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -31,9 +31,9 @@ public:
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index c824b918e68..35c4f4213e6 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -134,7 +134,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -268,7 +268,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 1f516996caa..99fb12bc762 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -118,7 +118,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 14ec5f69e5d..96b34e5cb61 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
@@ -35,7 +35,7 @@
 
 ACE_Test_Output *ACE_Test_Output::instance_ = 0;
 
-ACE_Test_Output::ACE_Test_Output (void)
+ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-ACE_Test_Output::~ACE_Test_Output (void)
+ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -154,7 +154,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();
@@ -186,19 +186,19 @@ ACE_Test_Output::instance ()
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::dll_name (void)
+ACE_Test_Output::dll_name ()
 {
   return ACE_TEXT ("Test_Output");
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::name (void)
+ACE_Test_Output::name ()
 {
   return ACE_TEXT ("ACE_Test_Output");
 }
 
 void
-ACE_Test_Output::close_singleton (void)
+ACE_Test_Output::close_singleton ()
 {
   delete ACE_Test_Output::instance_;
   ACE_Test_Output::instance_ = 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index 59accd8e387..4d25836c6c1 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -6,7 +6,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 1c26209df03..3bf577a904a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -11,14 +11,14 @@
 
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
 }
 
 void
-Callback_i::callback_method (void)
+Callback_i::callback_method ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
@@ -48,7 +48,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (void)
+Simple_Server_i::call_client ()
 {
   if (this->flag_)
     {
@@ -78,7 +78,7 @@ Simple_Server_i::call_client (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index f7a40ffbf10..8444d669abe 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -28,10 +28,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
@@ -56,9 +56,9 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
-  int call_client (void);
+  int call_client ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index 731abb310fe..0583dea775e 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -7,14 +7,14 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG, "in get_string\n"));
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
   ACE_DEBUG ((LM_DEBUG,"in shutdown\n"));
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index 2d7cfb2e5e0..09da0fd735c 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -19,9 +19,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
index 14ec5f69e5d..96b34e5cb61 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
@@ -35,7 +35,7 @@
 
 ACE_Test_Output *ACE_Test_Output::instance_ = 0;
 
-ACE_Test_Output::ACE_Test_Output (void)
+ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-ACE_Test_Output::~ACE_Test_Output (void)
+ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -154,7 +154,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();
@@ -186,19 +186,19 @@ ACE_Test_Output::instance ()
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::dll_name (void)
+ACE_Test_Output::dll_name ()
 {
   return ACE_TEXT ("Test_Output");
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::name (void)
+ACE_Test_Output::name ()
 {
   return ACE_TEXT ("ACE_Test_Output");
 }
 
 void
-ACE_Test_Output::close_singleton (void)
+ACE_Test_Output::close_singleton ()
 {
   delete ACE_Test_Output::instance_;
   ACE_Test_Output::instance_ = 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index d44559b8963..010fff62047 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -150,15 +150,15 @@ size_t const ACE_MAX_THREADS = 4;
 class ACE_Test_Output
 {
 public:
-  ACE_Test_Output (void);
-  ~ACE_Test_Output (void);
-  static ACE_Test_Output *instance (void);
+  ACE_Test_Output ();
+  ~ACE_Test_Output ();
+  static ACE_Test_Output *instance ();
   int set_output (const ACE_TCHAR *filename, int append = 0);
-  OFSTREAM *output_file (void);
-  void close (void);
-  const ACE_TCHAR *dll_name (void);
-  const ACE_TCHAR *name (void);
-  static void close_singleton (void);
+  OFSTREAM *output_file ();
+  void close ();
+  const ACE_TCHAR *dll_name ();
+  const ACE_TCHAR *name ();
+  static void close_singleton ();
 
 private:
   static ACE_Test_Output *instance_;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index 364b5a4c409..c0b21e9e150 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -1,12 +1,12 @@
 #include "MCast_Server_i.h"
 
-MCast_Server_i::MCast_Server_i (void)
+MCast_Server_i::MCast_Server_i ()
 {
   //Constructor.
 }
 
 CORBA::Boolean
-MCast_Server_i::connect_server (void)
+MCast_Server_i::connect_server ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index 231b7154fee..a0f009f4ea3 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -9,7 +9,7 @@ public:
 
   // Simple method just to see that the client contacted the
   // server. If does contact, a '0' is returned.
-  CORBA::Boolean connect_server (void);
+  CORBA::Boolean connect_server ();
 };
 
 #endif /* MCAST_SERVER_I_H */
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index c8a5cdb19f3..61976741c9a 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -2,12 +2,12 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
-ior_mcast_Client_i::ior_mcast_Client_i (void)
+ior_mcast_Client_i::ior_mcast_Client_i ()
 {
   // Constructor
 }
 
-ior_mcast_Client_i::~ior_mcast_Client_i (void)
+ior_mcast_Client_i::~ior_mcast_Client_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 129dd3d0354..53eb659812e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -16,10 +16,10 @@ class ior_mcast_Client_i
 
  public:
   // = COnstructor and destructor.
-  ior_mcast_Client_i (void);
-  ~ior_mcast_Client_i (void);
+  ior_mcast_Client_i ();
+  ~ior_mcast_Client_i ();
 
-  int run (void);
+  int run ();
   // Execute the client example code.
 
   int init (int& argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index fe851c004e9..96e0f2cda8a 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -10,7 +10,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : argc_ (0),
     argv_ (0),
     orb_ (),
@@ -20,7 +20,7 @@ Server_i::Server_i (void)
 {
 }
 
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
   delete this->ior_multicast_;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index b7e381a6189..09f58c7b721 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -14,8 +14,8 @@ class Server_i
 
 public:
   // = Constructor and destructor.
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int &argc, ACE_TCHAR **argv);
   // Initialize the server multicast.
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
index 6ef8f1f9542..d6c91c8e1a2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
@@ -9,20 +9,20 @@ Test_i::Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate(orb))
 }
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return 1;
 }
 
 void
-Test_i::terminate (void)
+Test_i::terminate ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received terminate and going to exit\n"));
   exit (0);
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown and going to exit\n"));
   orb_->shutdown ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
index 65826facc02..558200f8429 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
@@ -13,11 +13,11 @@ class  Test_i : public virtual POA_Test
 {
 public:
   Test_i (CORBA::ORB_ptr orb);
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
-  virtual void terminate (void);
+  virtual void terminate ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
index 45a56ca1902..d07865512f6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
@@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base
 {
 public:
   explicit ORB_Runner (CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) {}
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
@@ -49,7 +49,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs (void)
+activatePOAs ()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
index 7ac20a171bc..126f3aa8207 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
@@ -5,16 +5,16 @@ bug_689_regression_i::bug_689_regression_i (CORBA::ORB_ptr orb)
 {
 }
 
-bug_689_regression_i::~bug_689_regression_i (void)
+bug_689_regression_i::~bug_689_regression_i ()
 {
 }
 
 void
-bug_689_regression_i::shutdown (void)
+bug_689_regression_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
-void bug_689_regression_i::noop (void)
+void bug_689_regression_i::noop ()
 {
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
index 700e4bac6d3..a03bbf4ae0c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
@@ -7,11 +7,11 @@ class bug_689_regression_i: public POA_bug_689_regression
 {
 public:
   bug_689_regression_i (CORBA::ORB_ptr orb);
-  ~bug_689_regression_i (void);
+  ~bug_689_regression_i ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void noop (void);
+  virtual void noop ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
index 82931fecd4a..01466a89e1a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
@@ -21,14 +21,14 @@ public:
   {
   }
 
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ++n_;
     return n_;
   }
 };
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : server_name_()
   , second_name_()
 {
@@ -157,7 +157,7 @@ Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
index 8f1b13af35b..52f0b223f14 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
@@ -11,12 +11,12 @@
 class Server_i
 {
 public:
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int argc, ACE_TCHAR **argv);
 
-  int run (void);
+  int run ();
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
index 3fa4c48d90d..f745ab49a69 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
@@ -17,7 +17,7 @@ PortableInterceptor::Current_var pic;
 PortableInterceptor::SlotId slot_id;
 const IOP::ServiceId service_id = 0xdeadbeef;
 
-int get_offset (void)
+int get_offset ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, ofs_lock, 0);
   int r = ofs;
@@ -33,7 +33,7 @@ public:
   Worker (Messenger_ptr m)
     : messenger(Messenger::_duplicate (m)) {}
 
-  int svc (void)
+  int svc ()
   {
     int offset = get_offset ();
     CORBA::String_var message = CORBA::string_dup( "Hello!" );
@@ -74,12 +74,12 @@ class Client_Req_Int
     public virtual ::CORBA::LocalObject
 {
 public:
-  virtual char * name (void)
+  virtual char * name ()
   {
     return CORBA::string_dup ("Client_Req_Int");
   }
 
-  virtual void destroy (void)
+  virtual void destroy ()
   {
   }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
index c1a7320f7d7..016356a7212 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
@@ -18,7 +18,7 @@ Test_i::Test_i (Terminator &terminator)
 }
 
 // Implementation skeleton destructor
-Test_i::~Test_i (void)
+Test_i::~Test_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
index c84ce4087c6..95366a3b870 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
@@ -19,7 +19,7 @@ public:
   Test_i (Terminator &terminator);
 
   //Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
index d8074e356af..0f72129c222 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
@@ -12,7 +12,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index 147819b1617..60d7cf51eb5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -18,7 +18,7 @@ class Client_Task : public ACE_Task_Base
       caught_object_not_exist_ (false)
     {}
 
-    virtual int svc (void)
+    virtual int svc ()
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       ACE_Time_Value elapsed;
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
index 6a76a9bc053..90f4fe3953e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
@@ -2,37 +2,37 @@
 #include "ace/OS_NS_time.h"
 
 // Implementation skeleton constructor
-Test_Dummy_i::Test_Dummy_i (void)
+Test_Dummy_i::Test_Dummy_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Dummy_i::~Test_Dummy_i (void)
+Test_Dummy_i::~Test_Dummy_i ()
 {
 }
 
-char * Test_Dummy_i::getMessage (void)
+char * Test_Dummy_i::getMessage ()
 {
    // Add your implementation here
    return CORBA::string_dup("Test::Dummy---->Hello World");
 }
 
-Test_Time_i::Test_Time_i (void)
+Test_Time_i::Test_Time_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Time_i::~Test_Time_i (void)
+Test_Time_i::~Test_Time_i ()
 {
 }
 
-::CORBA::Long Test_Time_i::current_time (void)
+::CORBA::Long Test_Time_i::current_time ()
 {
    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n"));
    return CORBA::Long (ACE_OS::time (0));
 }
 
-void Test_Time_i::shutdown (void)
+void Test_Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%C\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index 536c7fe81a8..96ac6c0c134 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -12,12 +12,12 @@ class  Test_Dummy_i
 {
 public:
   // Constructor
-  Test_Dummy_i (void);
+  Test_Dummy_i ();
 
   // Destructor
-  virtual ~Test_Dummy_i (void);
+  virtual ~Test_Dummy_i ();
 
-  virtual  char * getMessage (void);
+  virtual  char * getMessage ();
 };
 
 class  Test_Time_i
@@ -25,14 +25,14 @@ class  Test_Time_i
 {
 public:
   // Constructor
-  Test_Time_i (void);
+  Test_Time_i ();
 
   // Destructor
-  virtual ~Test_Time_i (void);
+  virtual ~Test_Time_i ();
 
-  virtual ::CORBA::Long current_time (void);
+  virtual ::CORBA::Long current_time ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 #endif /* IMR_RECONNECTSERVER_H  */
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
index adc92c4336a..e07dd513d64 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
@@ -2,37 +2,37 @@
 #include "ace/OS_NS_time.h"
 
 // Implementation skeleton constructor
-Test_Dummy_i::Test_Dummy_i (void)
+Test_Dummy_i::Test_Dummy_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Dummy_i::~Test_Dummy_i (void)
+Test_Dummy_i::~Test_Dummy_i ()
 {
 }
 
-char * Test_Dummy_i::getMessage (void)
+char * Test_Dummy_i::getMessage ()
 {
    // Add your implementation here
    return CORBA::string_dup("Test::Dummy---->Hello World");
 }
 
-Test_Time_i::Test_Time_i (void)
+Test_Time_i::Test_Time_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Time_i::~Test_Time_i (void)
+Test_Time_i::~Test_Time_i ()
 {
 }
 
-::CORBA::Long Test_Time_i::current_time (void)
+::CORBA::Long Test_Time_i::current_time ()
 {
    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n"));
    return CORBA::Long (ACE_OS::time (0));
 }
 
-void Test_Time_i::shutdown (void)
+void Test_Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
index 53cef409396..30f78bed6e1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
@@ -13,12 +13,12 @@ class  Test_Dummy_i
 {
 public:
   // Constructor
-  Test_Dummy_i (void);
+  Test_Dummy_i ();
 
   // Destructor
-  virtual ~Test_Dummy_i (void);
+  virtual ~Test_Dummy_i ();
 
-  virtual  char * getMessage (void);
+  virtual  char * getMessage ();
 };
 
 class  Test_Time_i
@@ -26,14 +26,14 @@ class  Test_Time_i
 {
 public:
   // Constructor
-  Test_Time_i (void);
+  Test_Time_i ();
 
   // Destructor
-  virtual ~Test_Time_i (void);
+  virtual ~Test_Time_i ();
 
-  virtual ::CORBA::Long current_time (void);
+  virtual ::CORBA::Long current_time ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
index cbbdf490f3e..0dd19725ef2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
@@ -21,7 +21,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator)
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -47,7 +47,7 @@ Messenger_i::abort (CORBA::Short delay_secs)
 }
 
 void
-Messenger_i::shutdown (void)
+Messenger_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
index b9735f7c344..a27199fc3a3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
@@ -19,7 +19,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
@@ -28,7 +28,7 @@ public:
 
   virtual void abort (CORBA::Short delay_secs);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 1fb635fa185..e9af2b8fcab 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -6,7 +6,7 @@
 
 
 // Constructor.
-Airplane_Client_i::Airplane_Client_i (void)
+Airplane_Client_i::Airplane_Client_i ()
   : argc_ (0),
     argv_ (0),
     server_key_ (ACE::strnew (ACE_TEXT("key0"))),
@@ -19,7 +19,7 @@ Airplane_Client_i::Airplane_Client_i (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Airplane_Client_i::parse_args (void)
+Airplane_Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:k:"));
   int c;
@@ -87,7 +87,7 @@ Airplane_Client_i::run ()
   return this->get_planes (this->loop_count_);
 }
 
-Airplane_Client_i::~Airplane_Client_i (void)
+Airplane_Client_i::~Airplane_Client_i ()
 {
   // Free resources
   CORBA::release (this->server_);
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
index 38262d362fd..7978e2c9329 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
@@ -29,8 +29,8 @@ class Airplane_Client_i
 {
 public:
   // = Constructor and destructor.
-  Airplane_Client_i (void);
-  ~Airplane_Client_i (void);
+  Airplane_Client_i ();
+  ~Airplane_Client_i ();
 
   /// Execute client example code.
   int run ();
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Ask the Paper Airplane Server for <count> planes.
   int get_planes (size_t count);
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 5a258383764..a624bc710de 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -13,7 +13,7 @@ Airplane_i::Airplane_i ()
 
 // Destructor
 
-Airplane_i::~Airplane_i (void)
+Airplane_i::~Airplane_i ()
 {
   // Nothing
 }
@@ -22,7 +22,7 @@ Airplane_i::~Airplane_i (void)
 // Returns a random plane and page number
 
 char *
-Airplane_i::get_plane (void)
+Airplane_i::get_plane ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 7856da64539..aaa7b985bda 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -42,10 +42,10 @@ public:
   Airplane_i ();
 
   /// Destructor
-  ~Airplane_i (void);
+  ~Airplane_i ();
 
   /// Returns a random plane.
-  virtual char *get_plane (void);
+  virtual char *get_plane ();
 };
 
 #endif /* AIRPLANE_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 30041bb9188..7b76fea438c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -14,7 +14,7 @@
 // The server name of the Aiprlane Server
 const char SERVER_NAME[] = "airplane_server";
 
-Airplane_Server_i::Airplane_Server_i (void)
+Airplane_Server_i::Airplane_Server_i ()
   : argc_ (0),
     argv_ (0),
     orb_ (),
@@ -30,7 +30,7 @@ Airplane_Server_i::Airplane_Server_i (void)
 }
 
 int
-Airplane_Server_i::parse_args (void)
+Airplane_Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:s:p:"));
   int c;
@@ -186,7 +186,7 @@ Airplane_Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Airplane_Server_i::run (void)
+Airplane_Server_i::run ()
 {
   try
     {
@@ -213,7 +213,7 @@ Airplane_Server_i::run (void)
   return 0;
 }
 
-Airplane_Server_i::~Airplane_Server_i (void)
+Airplane_Server_i::~Airplane_Server_i ()
 {
   delete this->server_impl_;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index d3c15ad3e94..d0bca514509 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -28,20 +28,20 @@ class Airplane_Server_i
 {
 public:
   /// Default constructor
-  Airplane_Server_i (void);
+  Airplane_Server_i ();
 
   /// Destructor
-  ~Airplane_Server_i (void);
+  ~Airplane_Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Number of command line arguments.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
index dd57ca7633d..d2b1849e3ac 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
@@ -15,13 +15,13 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::arm (void)
+Test_i::arm ()
 {
   this->armed_ = true;
 }
 
 void
-Test_i::trigger (void)
+Test_i::trigger ()
 {
   if (this->armed_)
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
index 4012e77da02..bc8e00c029a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
@@ -18,9 +18,9 @@ public:
   //Destructor
   virtual ~Test_i ();
 
-  virtual void arm (void);
+  virtual void arm ();
 
-  virtual void trigger (void);
+  virtual void trigger ();
 
   int exit_code () const;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
index 9112930c37a..64238368882 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
@@ -78,7 +78,7 @@ set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& to)
 }
 
 void
-do_restart_test (void)
+do_restart_test ()
 {
   CORBA::Object_var obj = orb->string_to_object (ior);
   ACE_ASSERT (!CORBA::is_nil(obj.in ()));
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
index f21f9e4d9af..b8b27e8c9a6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
@@ -26,7 +26,7 @@ Test_i::~Test_i ()
 }
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return this->server_num_;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
index c5ba93916d3..c106fa0e3e0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
@@ -23,7 +23,7 @@ public:
   //Destructor
   virtual ~Test_i ();
 
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
 private:
   void reset (PortableServer::POAManager_var &mgr, bool pause);
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
index d460ac4f087..e58eb515e65 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
@@ -47,7 +47,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
index a8f4c8691e3..f80fc476126 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
@@ -3,13 +3,13 @@
 #include "Test_i.h"
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return 1;
 }
 
 void
-Test_i::terminate (void)
+Test_i::terminate ()
 {
   exit (0);
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
index 984bc38669f..b5ae6dc04cf 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
@@ -12,9 +12,9 @@
 class  Test_i : public virtual POA_Test
 {
 public:
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
-  virtual void terminate (void);
+  virtual void terminate ();
 };
 
 #endif /* TEST_I_H_ */
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
index 293ae2579d8..9c2027df62c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
@@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base
 {
 public:
   ORB_Runner (CORBA::ORB_var orb) : orb_(orb) {}
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
@@ -51,7 +51,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs (void)
+activatePOAs ()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
index 72c61382265..4a44f3048b1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
@@ -4,7 +4,7 @@
 #include "Test_i.h"
 
 CORBA::Long
-Test_i::server_pid (void)
+Test_i::server_pid ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P) server pid called\n"));
   return ACE_OS::getpid ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
index 77af1927e0d..58cc9f0a2ec 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
@@ -12,7 +12,7 @@
 class  Test_i : public virtual POA_Test
 {
 public:
-  virtual CORBA::Long server_pid (void);
+  virtual CORBA::Long server_pid ();
 };
 
 #endif /* TEST_I_H_ */
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
index 68068af2900..dc946f2142c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
@@ -40,7 +40,7 @@ createPOAs (ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
index 7269ac7ff9a..35ca8593ce2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-do_test (void)
+do_test ()
 {
   CORBA::Object_var obj = orb->string_to_object (ior);
   Test_var test = Test::_narrow( obj.in () );
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
index 460050bc9ec..ccd4fe70e9b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
@@ -3,7 +3,7 @@
 #include "test_i.h"
 #include "ace/Log_Msg.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
 {
 }
 
@@ -12,7 +12,7 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::contact (void)
+Test_i::contact ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Server contacted\n")));
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
index fdf55c85fd1..725882cf677 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
@@ -13,12 +13,12 @@ class  Test_i : public virtual POA_Test
 {
 public:
   //Constructor
-  Test_i (void);
+  Test_i ();
 
   //Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
-  virtual void contact (void);
+  virtual void contact ();
 
 private:
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index b755dbd223c..600d36516af 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -6,7 +6,7 @@
 
 
 // Constructor.
-Nestea_Client_i::Nestea_Client_i (void)
+Nestea_Client_i::Nestea_Client_i ()
   : argc_ (0)
   , argv_ (0)
   , server_key_ (ACE::strnew (ACE_TEXT("key0")))
@@ -19,7 +19,7 @@ Nestea_Client_i::Nestea_Client_i (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Nestea_Client_i::parse_args (void)
+Nestea_Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dsn:k:"));
   int c;
@@ -83,7 +83,7 @@ Nestea_Client_i::run ()
   return 0;
 }
 
-Nestea_Client_i::~Nestea_Client_i (void)
+Nestea_Client_i::~Nestea_Client_i ()
 {
   // Free resources
   CORBA::release (this->server_);
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
index 31c39f7fa7e..589ce0e3290 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
@@ -29,8 +29,8 @@ class Nestea_Client_i
 {
 public:
   // = Constructor and destructor.
-  Nestea_Client_i (void);
-  ~Nestea_Client_i (void);
+  Nestea_Client_i ();
+  ~Nestea_Client_i ();
 
   /// Execute client example code.
   int run ();
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index bfc07642af8..f2e7dddaf24 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -22,7 +22,7 @@ Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename)
 }
 
 
-Nestea_i::~Nestea_i (void)
+Nestea_i::~Nestea_i ()
 {
   delete [] this->data_filename_;
 }
@@ -62,7 +62,7 @@ Nestea_i::crush (CORBA::Long cans)
 // Returns the number of cans in the bookshelf.
 
 CORBA::Long
-Nestea_i::bookshelf_size (void)
+Nestea_i::bookshelf_size ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n"));
@@ -73,7 +73,7 @@ Nestea_i::bookshelf_size (void)
 // Returns comments about your collection.
 
 char *
-Nestea_i::get_praise (void)
+Nestea_i::get_praise ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n"));
@@ -91,7 +91,7 @@ Nestea_i::get_praise (void)
 }
 
 void
-Nestea_i::shutdown (void)
+Nestea_i::shutdown ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::shutdown\n"));
@@ -102,7 +102,7 @@ Nestea_i::shutdown (void)
 // Saves bookshelf data to a file.
 
 int
-Nestea_i::save_data (void)
+Nestea_i::save_data ()
 {
   ACE_FILE_IO file;
   ACE_FILE_Connector connector;
@@ -128,7 +128,7 @@ Nestea_i::save_data (void)
 // Loads bookshelf data from a file.
 
 int
-Nestea_i::load_data (void)
+Nestea_i::load_data ()
 {
   ACE_FILE_IO file;
   ACE_FILE_Connector connector;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 3d3dcb1cad5..2c713a6e7d3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -39,7 +39,7 @@ public:
   Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename = ACE_TEXT("nestea.dat"));
 
   /// Destructor
-  virtual ~Nestea_i (void);
+  virtual ~Nestea_i ();
 
   /// Add <cans> number of cans to the bookshelf.
   virtual void drink (CORBA::Long cans);
@@ -48,18 +48,18 @@ public:
   virtual void crush (CORBA::Long cans);
 
   /// Returns the number of cans in the bookshelf.
-  virtual CORBA::Long bookshelf_size (void);
+  virtual CORBA::Long bookshelf_size ();
 
   /// Returns comments about your collection.
-  virtual char *get_praise (void);
+  virtual char *get_praise ();
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 private:
   /// Saves bookshelf data to a file.
-  int save_data (void);
+  int save_data ();
 
   /// Loads bookshelf data from a file.
-  int load_data (void);
+  int load_data ();
 
   /// The name of the file to store the data in.
   ACE_TCHAR *data_filename_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 5499a7b070d..e53975115f0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -31,13 +31,13 @@ Nestea_Server_i::Nestea_Server_i (const char * /*filename*/)
   // Nothing
 }
 
-Nestea_Server_i::~Nestea_Server_i (void)
+Nestea_Server_i::~Nestea_Server_i ()
 {
   delete this->server_impl_;
 }
 
 int
-Nestea_Server_i::parse_args (void)
+Nestea_Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:"));
   int c;
@@ -192,7 +192,7 @@ Nestea_Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Nestea_Server_i::run (void)
+Nestea_Server_i::run ()
 {
   int status = 0;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index 523234cfb51..6101c21333a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -32,17 +32,17 @@ public:
   Nestea_Server_i (const char *filename = "nestea.dat");
 
   /// Destructor
-  ~Nestea_Server_i (void);
+  ~Nestea_Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Number of command line arguments.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
index 069f2f15399..ee6d0e6ea32 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
@@ -3,7 +3,7 @@
 #include "Test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
   : count_ (0)
 {
 }
@@ -13,14 +13,14 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::foo (void)
+Test_i::foo ()
 {
   ACE_DEBUG ((LM_DEBUG,"foo called\n"));
   ++this->count_;
 }
 
 CORBA::Short
-Test_i::get_call_count (void)
+Test_i::get_call_count ()
 {
   CORBA::Short r = this->count_;
   this->count_ = 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
index 0745ee56fd7..bb117cfc247 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
@@ -15,14 +15,14 @@ class  Test_i : public virtual POA_Test
 {
 public:
   //Constructor
-  Test_i (void);
+  Test_i ();
 
   //Destructor
   virtual ~Test_i ();
 
-  virtual void foo (void);
+  virtual void foo ();
 
-  virtual CORBA::Short get_call_count (void);
+  virtual CORBA::Short get_call_count ();
 
 private:
   CORBA::Short count_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
index 954d2d8c587..e62303e7d49 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
@@ -37,7 +37,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 283eaaf36c0..d8031c07815 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -11,7 +11,7 @@ Ping_Death_Request_Interceptor::Ping_Death_Request_Interceptor (int *counter)
 {
 }
 
-Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor (void)
+Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor ()
 {
 }
 
@@ -22,13 +22,13 @@ Ping_Death_Request_Interceptor::set_poa (PortableServer::POA_ptr poa)
 }
 
 char *
-Ping_Death_Request_Interceptor::name (void)
+Ping_Death_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Ping_Death_Request_Interceptor::destroy (void)
+Ping_Death_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
index 913e58f89c1..9b1644338b2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
@@ -31,9 +31,9 @@ public:
   void set_poa (PortableServer::POA_ptr poa);
 
   // Canonical name of the interceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index e2b30ccbff4..619b9f46068 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -21,7 +21,7 @@ public:
   }
   virtual ~test_i () {
   }
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ++n_;
     CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
@@ -38,7 +38,7 @@ public:
 // The server name of the Aiprlane Server
 static const char DEFAULT_SERVER_NAME[] = "TestObject";
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
 : server_name_(DEFAULT_SERVER_NAME)
 , count_(1)
 {
@@ -163,7 +163,7 @@ Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 1fbf4d27f2b..e7c6e2f8793 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -10,12 +10,12 @@
 class Server_i
 {
 public:
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int argc, ACE_TCHAR **argv);
 
-  int run (void);
+  int run ();
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index dfc404651af..c524f06b15c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -2,7 +2,7 @@
 #include "ifr_dii_client.h"
 #include "ace/Get_Opt.h"
 
-IFR_DII_Client::IFR_DII_Client (void)
+IFR_DII_Client::IFR_DII_Client ()
   : namespace_name (CORBA::string_dup ("warehouse")),
     interface_name (CORBA::string_dup ("inventory")),
     op_name (CORBA::string_dup ("getCDinfo")),
@@ -12,7 +12,7 @@ IFR_DII_Client::IFR_DII_Client (void)
 {
 }
 
-IFR_DII_Client::~IFR_DII_Client (void)
+IFR_DII_Client::~IFR_DII_Client ()
 {
 }
 
@@ -45,7 +45,7 @@ IFR_DII_Client::init (int argc,
 }
 
 int
-IFR_DII_Client::run (void)
+IFR_DII_Client::run ()
 {
   int result = 0;
 
@@ -110,7 +110,7 @@ IFR_DII_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-IFR_DII_Client::find_interface_def (void)
+IFR_DII_Client::find_interface_def ()
 {
   this->target_def_ =
     this->target_->_get_interface ();
@@ -126,7 +126,7 @@ IFR_DII_Client::find_interface_def (void)
 }
 
 int
-IFR_DII_Client::lookup_interface_def (void)
+IFR_DII_Client::lookup_interface_def ()
 {
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("InterfaceRepository");
@@ -197,7 +197,7 @@ IFR_DII_Client::lookup_interface_def (void)
 }
 
 void
-IFR_DII_Client::get_operation_def (void)
+IFR_DII_Client::get_operation_def ()
 {
   // What operation(s) does this interface contain?
   CORBA::ContainedSeq_var operations =
@@ -224,7 +224,7 @@ IFR_DII_Client::get_operation_def (void)
 }
 
 void
-IFR_DII_Client::create_dii_request (void)
+IFR_DII_Client::create_dii_request ()
 {
   this->req_ = this->target_->_request (this->op_name.in ());
 
@@ -289,7 +289,7 @@ IFR_DII_Client::create_dii_request (void)
 }
 
 void
-IFR_DII_Client::invoke_and_display (void)
+IFR_DII_Client::invoke_and_display ()
 {
   this->req_->invoke ();
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index 1431163ea66..818a82772f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -13,14 +13,14 @@
 class IFR_DII_Client
 {
 public:
-  IFR_DII_Client (void);
-  ~IFR_DII_Client (void);
+  IFR_DII_Client ();
+  ~IFR_DII_Client ();
 
   int init (int argc,
             ACE_TCHAR *argv[]);
   // Initialize the client.
 
-  int run (void);
+  int run ();
   // Run the client.
 
 private:
@@ -28,20 +28,20 @@ private:
                   ACE_TCHAR *argv[]);
   // Process the command line arguments.
 
-  int find_interface_def (void);
+  int find_interface_def ();
   // Query the object reference to get its InterfaceDef in the IFR.
 
-  int lookup_interface_def (void);
+  int lookup_interface_def ();
   // Look up the InterfaceDef by name in the IFR.
 
-  void get_operation_def (void);
+  void get_operation_def ();
   // Find the desired operation in the interface definition.
 
-  void create_dii_request (void);
+  void create_dii_request ();
   // Query the interface definition to get the info needed
   // to construct a CORBA::Request.
 
-  void invoke_and_display (void);
+  void invoke_and_display ();
   // Do the invocation and display the results.
 
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
index d32c97df594..88641ac4c85 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
@@ -29,12 +29,12 @@
 
 
 // Implementation skeleton constructor
-Test_interfaceOne_i::Test_interfaceOne_i (void)
+Test_interfaceOne_i::Test_interfaceOne_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_interfaceOne_i::~Test_interfaceOne_i (void)
+Test_interfaceOne_i::~Test_interfaceOne_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
index 84cfb593ad6..47e30ff6a5b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
@@ -15,10 +15,10 @@ class  Test_interfaceOne_i
 {
 public:
   // Constructor
-  Test_interfaceOne_i (void);
+  Test_interfaceOne_i ();
 
   // Destructor
-  virtual ~Test_interfaceOne_i (void);
+  virtual ~Test_interfaceOne_i ();
 
   virtual void getstruct (::Test::structOne_out tester);
 };
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 7de7b2026d0..9aa4b4cd794 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -241,12 +241,12 @@ const char *HOME_FINDER_EXCEP_NAMES[][1] =
     {"whups"}
   };
 
-IDL3_Client::IDL3_Client (void)
+IDL3_Client::IDL3_Client ()
   : debug_ (false)
 {
 }
 
-IDL3_Client::~IDL3_Client (void)
+IDL3_Client::~IDL3_Client ()
 {
 }
 
@@ -285,7 +285,7 @@ IDL3_Client::init (int argc,
 }
 
 int
-IDL3_Client::run (void)
+IDL3_Client::run ()
 {
   int status = this->component_test ();
 
@@ -345,7 +345,7 @@ IDL3_Client::parse_args (int argc,
 }
 
 int
-IDL3_Client::component_test (void)
+IDL3_Client::component_test ()
 {
   CORBA::Contained_var result =
     this->repo_->lookup_id (COMPONENT_ID);
@@ -461,7 +461,7 @@ IDL3_Client::component_test (void)
 }
 
 int
-IDL3_Client::home_test (void)
+IDL3_Client::home_test ()
 {
   CORBA::Contained_var result =
     this->repo_->lookup_id (HOME_ID);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 01a16d4b4ac..8b460c190de 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -28,25 +28,25 @@ class IDL3_Client
 {
 public:
   /// Constructor
-  IDL3_Client (void);
+  IDL3_Client ();
 
   /// Destructor
-  ~IDL3_Client (void);
+  ~IDL3_Client ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 
 private:
   /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
-  int component_test (void);
-  int home_test (void);
+  int component_test ();
+  int home_test ();
 
   // Also tests eventtype.
   int valuetype_test (const char *repo_id,
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
index fa074920bd1..11686ef9ded 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
@@ -10,20 +10,20 @@ GoodDay::GoodDay (CORBA::ORB_ptr orb)
 }
 
 char *
-GoodDay::get_string (void)
+GoodDay::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-GoodDay::shutdown (void)
+GoodDay::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 ::Test::GoodDay::RoughWeek *
-GoodDay::this_week (void)
+GoodDay::this_week ()
 {
   // Not actually used.
   return 0;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
index 0425c501516..35bb1c981f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
@@ -18,11 +18,11 @@ public:
   GoodDay (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual ::Test::GoodDay::RoughWeek * this_week (void);
+  virtual ::Test::GoodDay::RoughWeek * this_week ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index f518158d272..d5ed2f7df0d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -7,7 +7,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-Admin_Client::Admin_Client (void)
+Admin_Client::Admin_Client ()
   : debug_ (0),
     all_tests_ (1),
     which_test_ (0),
@@ -27,7 +27,7 @@ Admin_Client::Admin_Client (void)
   this->test_array_[10] = &Admin_Client::module_test;
 }
 
-Admin_Client::~Admin_Client (void)
+Admin_Client::~Admin_Client ()
 {
 }
 
@@ -93,7 +93,7 @@ Admin_Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Admin_Client::run (void)
+Admin_Client::run ()
 {
   try
     {
@@ -178,7 +178,7 @@ Admin_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Admin_Client::array_test (void)
+Admin_Client::array_test ()
 {
   if (this->debug_)
     {
@@ -310,7 +310,7 @@ Admin_Client::array_test (void)
 }
 
 void
-Admin_Client::enum_test (void)
+Admin_Client::enum_test ()
 {
   if (this->debug_)
     {
@@ -577,7 +577,7 @@ Admin_Client::enum_test (void)
 }
 
 void
-Admin_Client::alias_test (void)
+Admin_Client::alias_test ()
 {
   if (this->debug_)
     {
@@ -819,7 +819,7 @@ Admin_Client::alias_test (void)
 }
 
 void
-Admin_Client::native_test (void)
+Admin_Client::native_test ()
 {
   if (this->debug_)
     {
@@ -894,7 +894,7 @@ Admin_Client::native_test (void)
 }
 
 void
-Admin_Client::struct_test (void)
+Admin_Client::struct_test ()
 {
   if (this->debug_)
     {
@@ -1289,7 +1289,7 @@ Admin_Client::struct_test (void)
 }
 
 void
-Admin_Client::union_test (void)
+Admin_Client::union_test ()
 {
   if (this->debug_)
     {
@@ -1493,7 +1493,7 @@ Admin_Client::union_test (void)
 }
 
 void
-Admin_Client::exception_test (void)
+Admin_Client::exception_test ()
 {
   if (this->debug_)
     {
@@ -1937,7 +1937,7 @@ Admin_Client::exception_test (void)
 }
 
 void
-Admin_Client::constant_test (void)
+Admin_Client::constant_test ()
 {
   if (this->debug_)
     {
@@ -2117,7 +2117,7 @@ Admin_Client::constant_test (void)
 }
 
 void
-Admin_Client::interface_test (void)
+Admin_Client::interface_test ()
 {
   if (this->debug_)
     {
@@ -2535,7 +2535,7 @@ Admin_Client::interface_test (void)
 }
 
 void
-Admin_Client::move_test (void)
+Admin_Client::move_test ()
 {
   if (this->debug_)
     {
@@ -2916,7 +2916,7 @@ Admin_Client::move_test (void)
 }
 
 void
-Admin_Client::module_test (void)
+Admin_Client::module_test ()
 {
   if (this->debug_)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index d482201fe22..0e55e5a76a4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -33,38 +33,38 @@ class Admin_Client
 {
 public:
   /// Constructor
-  Admin_Client (void);
+  Admin_Client ();
 
   /// Destructor
-  ~Admin_Client (void);
+  ~Admin_Client ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 
 private:
   /// The various IFR tests.
-  void array_test (void);
-  void enum_test (void);
-  void alias_test (void);
-  void native_test (void);
-  void struct_test (void);
-  void union_test (void);
-  void exception_test (void);
-  void constant_test (void);
-  void interface_test (void);
-  void move_test (void);
-  void module_test (void);
+  void array_test ();
+  void enum_test ();
+  void alias_test ();
+  void native_test ();
+  void struct_test ();
+  void union_test ();
+  void exception_test ();
+  void constant_test ();
+  void interface_test ();
+  void move_test ();
+  void module_test ();
 
   /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
   /// Array of pointers to the test functions.
-  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void);
+  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])();
 
   /// Array of test names used in selection of one test.
   static const char *test_names_[];
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index b9353a4913c..bbe381aecc4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -8,14 +8,14 @@
 
 const CORBA::ULong DEFAULT_NUMCALLS = 20000;
 
-Latency_Query_Client::Latency_Query_Client (void)
+Latency_Query_Client::Latency_Query_Client ()
   : debug_ (false),
     do_dump_history_ (0),
     iterations_ (DEFAULT_NUMCALLS)
 {
 }
 
-Latency_Query_Client::~Latency_Query_Client (void)
+Latency_Query_Client::~Latency_Query_Client ()
 {
 }
 
@@ -74,7 +74,7 @@ Latency_Query_Client::init (int argc,
 }
 
 int
-Latency_Query_Client::run (void)
+Latency_Query_Client::run ()
 {
 //  CORBA::DefinitionKind dk;
   CORBA::AttributeMode am;
@@ -184,7 +184,7 @@ Latency_Query_Client::parse_args (int argc,
 }
 
 int
-Latency_Query_Client::populate_ifr (void)
+Latency_Query_Client::populate_ifr ()
 {
   CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0");
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index 9debce05530..26eb07c7b76 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -28,24 +28,24 @@ class Latency_Query_Client
 {
 public:
   /// Constructor
-  Latency_Query_Client (void);
+  Latency_Query_Client ();
 
   /// Destructor
-  ~Latency_Query_Client (void);
+  ~Latency_Query_Client ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 private:
   /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
   /// Put in something to query about.
-  int populate_ifr (void);
+  int populate_ifr ();
 
 private:
   /// Toggle debugging output.
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index d954dbd5a98..7c97cfe3fe3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -3,13 +3,13 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-Ptest::Ptest (void)
+Ptest::Ptest ()
   : debug_ (0),
     query_ (0)
 {
 }
 
-Ptest::~Ptest (void)
+Ptest::~Ptest ()
 {
 }
 
@@ -58,7 +58,7 @@ Ptest::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Ptest::shutdown (void)
+Ptest::shutdown ()
 {
   try
     {
@@ -77,7 +77,7 @@ Ptest::shutdown (void)
 }
 
 int
-Ptest::run (void)
+Ptest::run ()
 {
   try
     {
@@ -130,7 +130,7 @@ Ptest::parse_args (int argc,
 }
 
 void
-Ptest::populate (void)
+Ptest::populate ()
 {
   if (this->debug_)
     {
@@ -170,7 +170,7 @@ Ptest::populate (void)
 }
 
 int
-Ptest::query (void)
+Ptest::query ()
 {
   if (this->debug_)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index 5f6c61df0fb..fbc3a0ce3b3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -33,25 +33,25 @@ class Ptest
 {
 public:
   /// Constructor
-  Ptest (void);
+  Ptest ();
 
   /// Destructor
-  ~Ptest (void);
+  ~Ptest ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 
   /// Cleanup
-  int shutdown (void);
+  int shutdown ();
 
 private:
   /// The two IFR tests.
-  void populate (void);
-  int query (void);
+  void populate ();
+  int query ();
 
   /// Process the command line arguments.
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index adc5d7eab45..275395b5360 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -22,11 +22,11 @@
 #include "ace/streams.h"
 
 // Constructor
-NContextExt_Client_i::NContextExt_Client_i (void)
+NContextExt_Client_i::NContextExt_Client_i ()
 {
 }
 
-NContextExt_Client_i::~NContextExt_Client_i (void)
+NContextExt_Client_i::~NContextExt_Client_i ()
 {
 }
 
@@ -34,7 +34,7 @@ NContextExt_Client_i::~NContextExt_Client_i (void)
 // Parses the command line arguments and returns an
 // error status
 int
-NContextExt_Client_i::parse_args (void)
+NContextExt_Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dvs"));
   int c;
@@ -138,7 +138,7 @@ NContextExt_Client_i::get_name ()
 }
 
 int
-NContextExt_Client_i::run (void)
+NContextExt_Client_i::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 02f2196c4a5..fa55980befd 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -28,18 +28,18 @@ class NContextExt_Client_i
 {
  public:
   // = COnstructor and destructor.
-  NContextExt_Client_i (void);
-  ~NContextExt_Client_i (void);
+  NContextExt_Client_i ();
+  ~NContextExt_Client_i ();
 
   /// Execute the client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR *argv[]);
 
  private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /**
    * Prints the values of the original name, strigified name and
@@ -55,7 +55,7 @@ class NContextExt_Client_i
                      CORBA::String_var url_string);
 
   /// Generates a random name
-  char * get_name (void);
+  char * get_name ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index ea50ccb7ab0..51994b7550a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -13,13 +13,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -50,7 +50,7 @@ Basic::remove_member (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index 105a8bcc551..a374f5f1219 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -24,11 +24,11 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index 56445e5a102..0c789aa539d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -32,19 +32,19 @@ LB_server::destroy (void)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 CosLoadBalancing::LoadManager_ptr
-LB_server::load_manager (void)
+LB_server::load_manager ()
 {
   return this->lm_.in ();
 }
@@ -93,7 +93,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -136,7 +136,7 @@ LB_server::start_orb_and_poa (void)
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
index f7a77cfc2d5..d32275ff80b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
@@ -37,28 +37,28 @@ public:
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the LoadManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
+  int create_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  CosLoadBalancing::LoadManager_ptr load_manager (void);
+  CosLoadBalancing::LoadManager_ptr load_manager ();
 
 private:
     int parse_args (int, ACE_TCHAR **);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index c0e4eea6316..51da18217a0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -25,7 +25,7 @@ Basic::Basic (CORBA::Object_ptr object_group,
 
 /// Default _non_existent: always returns false.
 CORBA::Boolean
-Basic::_non_existent (void)
+Basic::_non_existent ()
 {
   if (pong_delay > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T Basic::_non_existent server %d sleep %d seconds ... \n",
@@ -40,13 +40,13 @@ Basic::_non_existent (void)
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -77,13 +77,13 @@ Basic::remove_member (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Basic::exit (void)
+Basic::exit ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Basic::exit  server %d exit \n",
                       this->server_id_));
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
index 0d239e82e8f..178eb26eb27 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
@@ -27,15 +27,15 @@ public:
          int server_id);
 
   /// Default _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (void);
+  virtual CORBA::Boolean _non_existent ();
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
-  virtual void exit (void);
+  virtual void exit ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index 1734d796f93..79c354dcaab 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
@@ -18,7 +18,7 @@ LB_server::LB_server (int& argc, ACE_TCHAR **& argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -39,19 +39,19 @@ LB_server::destroy (void)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 CosLoadBalancing::LoadManager_ptr
-LB_server::load_manager (void)
+LB_server::load_manager ()
 {
   return this->lm_.in ();
 }
@@ -75,7 +75,7 @@ LB_server::write_ior_to_file (const char *ior)
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -118,7 +118,7 @@ LB_server::start_orb_and_poa (void)
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
@@ -158,7 +158,7 @@ LB_server::create_object_group (void)
 
 
 int
-LB_server::get_object_group (void)
+LB_server::get_object_group ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h
index 8449b9b62f2..af53a1ad918 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h
@@ -36,29 +36,29 @@ public:
   LB_server (int& argc, ACE_TCHAR **& argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the LoadManager Interface.
   //int init (int& argc, ACE_TCHAR **& argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
-  int get_object_group (void);
+  int create_object_group ();
+  int get_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  CosLoadBalancing::LoadManager_ptr load_manager (void);
+  CosLoadBalancing::LoadManager_ptr load_manager ();
 
 private:
   /// Load Manager
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index 5a9c2c5027b..97764011a8b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -21,13 +21,13 @@ LB_Factory_Server::LB_Factory_Server (int argc, ACE_TCHAR ** argv)
 }
 
 CORBA::ORB_ptr
-LB_Factory_Server::orb (void)
+LB_Factory_Server::orb ()
 {
   return this->orb_.in ();
 }
 
 int
-LB_Factory_Server::run (void)
+LB_Factory_Server::run ()
 {
   try
     {
@@ -48,7 +48,7 @@ LB_Factory_Server::run (void)
 
 
 int
-LB_Factory_Server::destroy (void)
+LB_Factory_Server::destroy ()
 {
   try
     {
@@ -123,7 +123,7 @@ LB_Factory_Server::parse_args (int& argc, ACE_TCHAR **& argv)
 }
 
 int
-LB_Factory_Server::init (void)
+LB_Factory_Server::init ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h
index 4e93acb9ec7..c7219b39212 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h
@@ -32,18 +32,18 @@ public:
   LB_Factory_Server (int argc, ACE_TCHAR ** argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   int parse_args (int& argc, ACE_TCHAR **& argv);
 
   /// start the ORB.
-  int init (void);
+  int init ();
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
   /// Create the Object Group using the Load Manager Reference.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 53262b5b65e..2f09a265b7d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -22,13 +22,13 @@ LB_server::LB_server (int argc, ACE_TCHAR ** argv)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 int
-LB_server::run (void)
+LB_server::run ()
 {
   try
     {
@@ -49,7 +49,7 @@ LB_server::run (void)
 
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -123,7 +123,7 @@ LB_server::parse_args (int& argc, ACE_TCHAR **& argv)
 }
 
 int
-LB_server::init (void)
+LB_server::init ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h
index b2223eab9e9..90cf96be1d7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h
@@ -32,18 +32,18 @@ public:
   LB_server (int argc, ACE_TCHAR ** argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   int parse_args (int& argc, ACE_TCHAR **& argv);
 
   /// start the ORB.
-  int init (void);
+  int init ();
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
   /// Create the Object Group using the Load Manager Reference.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
index b5ce33978ac..b598ec18fe5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
@@ -14,7 +14,7 @@ Simple::Simple (int server_id)
 
 /// Default _non_existent: always returns false.
 CORBA::Boolean
-Simple::_non_existent (void)
+Simple::_non_existent ()
 {
   if (pong_delay > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T Simple::_non_existent server %d sleep %d seconds ... \n",
@@ -29,7 +29,7 @@ Simple::_non_existent (void)
 }
 
 char *
-Simple::get_string (void)
+Simple::get_string ()
 {
   switch (this->server_id_)
   {
@@ -49,7 +49,7 @@ Simple::get_string (void)
 }
 
 void
-Simple::exit (void)
+Simple::exit ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Simple::exit  server %d exit \n",
                       this->server_id_));
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
index e97dfbec054..1af11ebbaaf 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
@@ -18,11 +18,11 @@ public:
   /// Constructor
 
   /// Default _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (void);
+  virtual CORBA::Boolean _non_existent ();
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void exit (void);
+  virtual void exit ();
 
 private:
   int server_id_;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 135e228f1ef..b7b1dbf445d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -3,7 +3,7 @@
 
 #include "TestC.h"
 
-Factory::Factory (void)
+Factory::Factory ()
 {
    this->fcid_ = 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 0d226e1e2b5..f02fb0a9ce8 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -16,7 +16,7 @@ class Factory
 {
 public:
   /// Constructor
-  Factory (void);
+  Factory ();
   /// creates a Test::Simple servant reference.
   /// This reference is then passed as a FactoryInfos property
   /// when the LoadManager creates the object group.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index 56cc9b4a95f..da30715eae6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -13,13 +13,13 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 int
-LB_server::run (void)
+LB_server::run ()
 {
   try
     {
@@ -39,7 +39,7 @@ LB_server::run (void)
 
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -103,7 +103,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
index daab36a02e1..adc888a32b7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
@@ -34,19 +34,19 @@ public:
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Create the Object Group using the Load Manager Reference.
   int create_object_group (const char *loc_1, const char *loc_2);
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
   int write_ior_to_file (const char *);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index 50d02c2d857..a6d08240431 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -1,11 +1,11 @@
 #include "Simple.h"
 
-Simple::Simple (void)
+Simple::Simple ()
 {
 }
 
 char *
-Simple::get_string (void)
+Simple::get_string ()
 {
   return CORBA::string_dup ("TAO Load Balancing Works!");
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
index 018f734ebe2..764af2787b1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
@@ -13,10 +13,10 @@ class Simple
   : public virtual POA_Test::Simple
 {
 public:
-  Simple (void);
+  Simple ();
   /// Constructor
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index 17c16dba3cd..b6694a46317 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -15,19 +15,19 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 CORBA::Short
-Basic::number (void)
+Basic::number ()
 {
   return this->number_;
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -58,7 +58,7 @@ Basic::remove_member (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index 361c5a9e9c3..84035597727 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -23,13 +23,13 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index 59db1435e5e..3e3ec866d9f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -34,31 +34,31 @@ LB_server::destroy (void)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::get_basic_object_group (void)
+LB_server::get_basic_object_group ()
 {
   return this->basic_object_group_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::get_simple_object_group (void)
+LB_server::get_simple_object_group ()
 {
   return this->simple_object_group_.in ();
 }
 
 CosLoadBalancing::LoadManager_ptr
-LB_server::load_manager (void)
+LB_server::load_manager ()
 {
   return this->lm_.in ();
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -101,7 +101,7 @@ LB_server::start_orb_and_poa (void)
 }
 
 int
-LB_server::create_basic_object_group (void)
+LB_server::create_basic_object_group ()
 {
   try
     {
@@ -138,7 +138,7 @@ LB_server::create_basic_object_group (void)
 }
 
 int
-LB_server::create_simple_object_group (void)
+LB_server::create_simple_object_group ()
 {
   try
     {
@@ -175,7 +175,7 @@ LB_server::create_simple_object_group (void)
 }
 
 int
-LB_server::remove_basic_member (void)
+LB_server::remove_basic_member ()
 {
   try
     {
@@ -201,7 +201,7 @@ LB_server::remove_basic_member (void)
 }
 
 int
-LB_server::remove_simple_member (void)
+LB_server::remove_simple_member ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
index ada83c1af24..3d1b6ff8831 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
@@ -37,25 +37,25 @@ public:
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the LoadManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the basic Object Group using the Load Manager Reference.
-  int create_basic_object_group (void);
+  int create_basic_object_group ();
 
   /// Create the simple Object Group using the Load Manager Reference.
-  int create_simple_object_group (void);
+  int create_simple_object_group ();
 
   /// remove the basic member from the object group
-  int remove_basic_member (void);
+  int remove_basic_member ();
 
   /// remove the simple member from the object group
-  int remove_simple_member (void);
+  int remove_simple_member ();
 
   /// register the basic servants with the object group.
   int register_basic_servant (Basic *servant, const char *loc);
@@ -64,16 +64,16 @@ public:
   int register_simple_servant (Simple *servant, const char *loc);
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr get_basic_object_group (void);
+  CORBA::Object_ptr get_basic_object_group ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr get_simple_object_group (void);
+  CORBA::Object_ptr get_simple_object_group ();
 
   /// for servants to get the reference for object_group.
-  CosLoadBalancing::LoadManager_ptr load_manager (void);
+  CosLoadBalancing::LoadManager_ptr load_manager ();
 
 private:
   /// Load Manager
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 8de7c1e58d5..5b769625289 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -15,19 +15,19 @@ Simple::Simple (CORBA::Object_ptr object_group,
 }
 
 CORBA::Short
-Simple::number (void)
+Simple::number ()
 {
   return this->number_;
 }
 
 char *
-Simple::get_string (void)
+Simple::get_string ()
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Simple::remove_member (void)
+Simple::remove_member ()
 {
   try
     {
@@ -58,7 +58,7 @@ Simple::remove_member (void)
 }
 
 void
-Simple::shutdown (void)
+Simple::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index 42a1e609843..e993d5aaf49 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -25,13 +25,13 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index de1ef2e5ce5..371e7cdc3e9 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -11,12 +11,12 @@
 const char* BasicLog_Test::basic_log_factory_name_= "BasicLogFactory";
 const char* BasicLog_Test::naming_service_name_ = "NameService";
 
-BasicLog_Test::BasicLog_Test(void)
+BasicLog_Test::BasicLog_Test()
   : argc_ (0), argv_(0), logServiceIor_ (0)
 {
 }
 
-BasicLog_Test::~BasicLog_Test (void)
+BasicLog_Test::~BasicLog_Test ()
 {
   this->destroy_log ();
 }
@@ -58,7 +58,7 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-BasicLog_Test::init_factory (void)
+BasicLog_Test::init_factory ()
 {
   // Assumpting INS for finding LogServie
 
@@ -350,7 +350,7 @@ BasicLog_Test::test_adminState()
 
 
 int
-BasicLog_Test::test_logSize (void)
+BasicLog_Test::test_logSize ()
 {
   try
     {
@@ -499,7 +499,7 @@ BasicLog_Test::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-BasicLog_Test::resolve_naming_service (void)
+BasicLog_Test::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (naming_service_name_);
@@ -513,7 +513,7 @@ BasicLog_Test::resolve_naming_service (void)
 }
 
 void
-BasicLog_Test::resolve_basic_factory (void)
+BasicLog_Test::resolve_basic_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -545,7 +545,7 @@ BasicLog_Test::destroy_log()
 }
 
 int
-BasicLog_Test::test_log_destroy (void)
+BasicLog_Test::test_log_destroy ()
 {
   ACE_DEBUG ((LM_ERROR, "Testing destroy log\n"));
   this->basicLog_->destroy ();
@@ -576,7 +576,7 @@ BasicLog_Test::test_log_destroy (void)
 }
 
 int
-BasicLog_Test::test_week_mask (void)
+BasicLog_Test::test_week_mask ()
 {
   DsLogAdmin::WeekMask masks;
   masks.length (1);
@@ -637,7 +637,7 @@ return 0;
 }
 
 int
-BasicLog_Test::test_capacity_alarm_threshold (void)
+BasicLog_Test::test_capacity_alarm_threshold ()
 {
   //basicLog_->set_log_full_action(DsLogAdmin::halt);
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index 9765e04e5d6..b3988e5bb1a 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -27,10 +27,10 @@ class BasicLog_Test
   enum
   { MAX_LOG_SIZE = 8192 };
 
-  BasicLog_Test(void);
+  BasicLog_Test();
   // constructor
 
-  ~BasicLog_Test(void);
+  ~BasicLog_Test();
   // destructor
 
   int init(int argc, ACE_TCHAR *argv[]);
@@ -105,7 +105,7 @@ private:
   BasicLog_Test& operator=(const BasicLog_Test&);
 
   int
-    init_factory (void);
+    init_factory ();
 
   int
     parse_args(int argc, ACE_TCHAR *argv[]);
@@ -115,11 +115,11 @@ private:
   // writes enough records to fill the log. Default write enough to fill log. Hopefully, not infinite.
 
   void
-    resolve_basic_factory (void);
+    resolve_basic_factory ();
   // resolve log factory
 
   void
-    resolve_naming_service (void);
+    resolve_naming_service ();
   // resolve nameing service
 
   void
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
index 85d1014ec3e..bdccf156346 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
@@ -12,7 +12,7 @@ UIPMC_Object_Impl::UIPMC_Object_Impl (CORBA::ULong payload,
 {
 }
 
-UIPMC_Object_Impl::~UIPMC_Object_Impl (void)
+UIPMC_Object_Impl::~UIPMC_Object_Impl ()
 {
   if (this->received_.current_size () == 0)
     {
@@ -100,13 +100,13 @@ Hello_Impl::Hello_Impl (CORBA::ORB_ptr orb,
 }
 
 Test::UIPMC_Object_ptr
-Hello_Impl::get_object (void)
+Hello_Impl::get_object ()
 {
   return Test::UIPMC_Object::_duplicate (this->obj_.in ());
 }
 
 void
-Hello_Impl::shutdown (void)
+Hello_Impl::shutdown ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
index 68dc7ab118a..89d2eebfb04 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
@@ -13,7 +13,7 @@ class UIPMC_Object_Impl : public virtual POA_Test::UIPMC_Object
 public:
   UIPMC_Object_Impl (CORBA::ULong payload, CORBA::ULong clients, CORBA::ULong calls);
 
-  ~UIPMC_Object_Impl (void);
+  ~UIPMC_Object_Impl ();
 
   // The skeleton methods
   virtual void process (Test::Octets const &payload);
@@ -39,9 +39,9 @@ public:
   Hello_Impl (CORBA::ORB_ptr orb, Test::UIPMC_Object_ptr obj);
 
   // The skeleton methods
-  virtual Test::UIPMC_Object_ptr get_object (void);
+  virtual Test::UIPMC_Object_ptr get_object ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
index 4a97333f149..d7f46225d09 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
@@ -94,7 +94,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
index 49cfc29a1ef..513604224ca 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
@@ -71,7 +71,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 8d15f0c9314..4a5f894ec02 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -48,7 +48,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload)
 }
 
 void
-McastHello::shutdown (void)
+McastHello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index 45c93518e93..e16c30e1430 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -17,7 +17,7 @@ public:
   // = The skeleton methods
   virtual void send_forty_two (CORBA::Long forty_two);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
index 2ef95fa4f05..3d39cb5e541 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
@@ -49,7 +49,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload)
 }
 
 void
-McastHello::shutdown (void)
+McastHello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
index 45c93518e93..e16c30e1430 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
@@ -17,7 +17,7 @@ public:
   // = The skeleton methods
   virtual void send_forty_two (CORBA::Long forty_two);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
index 2e60841de9b..fd6cac0709f 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
@@ -49,7 +49,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload)
 }
 
 void
-McastHello::shutdown (void)
+McastHello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
index 45c93518e93..e16c30e1430 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
@@ -17,7 +17,7 @@ public:
   // = The skeleton methods
   virtual void send_forty_two (CORBA::Long forty_two);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index a57ff18c887..e7126e43696 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -6,7 +6,7 @@
 
 /***************************************************************************/
 
-AdminProperties_Task::AdminProperties_Task (void)
+AdminProperties_Task::AdminProperties_Task ()
   : supplier_ (0)
   , client_ (0)
 {
@@ -26,7 +26,7 @@ AdminProperties_Task::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-AdminProperties_Task::svc (void)
+AdminProperties_Task::svc ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -120,7 +120,7 @@ AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotifica
 
 /***************************************************************************/
 
-AdminProperties::AdminProperties (void)
+AdminProperties::AdminProperties ()
   : max_queue_length_ (10),
     max_consumers_ (3),
     max_suppliers_ (3),
@@ -134,7 +134,7 @@ AdminProperties::AdminProperties (void)
 {
 }
 
-AdminProperties::~AdminProperties (void)
+AdminProperties::~AdminProperties ()
 {
 }
 
@@ -255,7 +255,7 @@ AdminProperties::create_channel(bool reject)
 }
 
 void
-AdminProperties::run_test (void)
+AdminProperties::run_test ()
 {
   bool reject = true;
   this->create_channel(reject);
@@ -343,7 +343,7 @@ AdminProperties::test_max_queue_length (bool reject)
 }
 
 void
-AdminProperties::test_max_clients (void)
+AdminProperties::test_max_clients ()
 {
   this->create_suppliers ();
 
@@ -360,7 +360,7 @@ AdminProperties::test_max_clients (void)
 }
 
 void
-AdminProperties::create_suppliers (void)
+AdminProperties::create_suppliers ()
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -396,7 +396,7 @@ AdminProperties::create_suppliers (void)
 }
 
 void
-AdminProperties::create_consumers (void)
+AdminProperties::create_consumers ()
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 576b48e80ba..43f27debf0e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -49,7 +49,7 @@ class AdminProperties_Task : public ACE_Task_Base
 {
 public:
   /// Constructor.
-  AdminProperties_Task (void);
+  AdminProperties_Task ();
 
   /// Init this object.
   void init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client);
@@ -86,23 +86,23 @@ class AdminProperties : public Notify_Test_Client
   friend class AdminProperties_Task;
 
 public:
-  AdminProperties (void);
-  ~AdminProperties (void);
+  AdminProperties ();
+  ~AdminProperties ();
 
   int parse_args (int argc, ACE_TCHAR *argv[]) ;
 
   // Initialization.
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
 private:
-  void create_suppliers (void);
-  void create_consumers (void);
+  void create_suppliers ();
+  void create_consumers ();
   void create_channel(bool reject);
 
   /// Test MaxSuppliers and MaxConsumers
-  void test_max_clients (void);
+  void test_max_clients ();
 
   /// Test MaxQueueLength properties
   void test_max_queue_length (bool reject);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index f5390872c18..746340a1671 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -37,7 +37,7 @@ CD_IMPLEMENT_ENTITY(SequencePushSupplier)
 
 //*****************************************************************************************************
 
-ConnectDisconnect::ConnectDisconnect (void)
+ConnectDisconnect::ConnectDisconnect ()
   :any_consumer_ (0),
    structured_consumer_ (0),
    sequence_consumer_ (0),
@@ -62,7 +62,7 @@ ConnectDisconnect::~ConnectDisconnect ()
 }
 
 void
-ConnectDisconnect::on_entity_destroyed (void)
+ConnectDisconnect::on_entity_destroyed ()
 {
   this->result_count_++;
 
@@ -177,7 +177,7 @@ ConnectDisconnect::parse_args(int argc, ACE_TCHAR *argv[])
 }
 
 void
-ConnectDisconnect::create_EC (void)
+ConnectDisconnect::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -189,7 +189,7 @@ ConnectDisconnect::create_EC (void)
 }
 
 void
-ConnectDisconnect::run_test (void)
+ConnectDisconnect::run_test ()
 {
   for (int iterations = 0; iterations < count_; ++iterations)
     {
@@ -273,13 +273,13 @@ ConnectDisconnect::run_test (void)
 }
 
 void
-ConnectDisconnect::end_test (void)
+ConnectDisconnect::end_test ()
 {
   consumer_done( 0 );
 }
 
 int
-ConnectDisconnect::check_results (void)
+ConnectDisconnect::check_results ()
 {
   ACE_DEBUG ((LM_DEBUG, "result_count_ = %d", this->result_count_.value ()));
   ACE_DEBUG ((LM_DEBUG, " expected_count_ = %d\n", this->expected_count_));
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index e06d200aac4..a681455b6ff 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -63,11 +63,11 @@ class ConnectDisconnect : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  ConnectDisconnect (void);
+  ConnectDisconnect ();
   virtual ~ConnectDisconnect ();
 
   /// Keeps track of how many objects were destroyed.
-  void on_entity_destroyed (void);
+  void on_entity_destroyed ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
@@ -77,17 +77,17 @@ public:
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// Check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index a4471ffefbb..7885ea0f7f2 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -36,17 +36,17 @@ Event_StructuredPushSupplier::Event_StructuredPushSupplier (
 {
 }
 
-Event_StructuredPushSupplier::~Event_StructuredPushSupplier (void)
+Event_StructuredPushSupplier::~Event_StructuredPushSupplier ()
 {
 }
 
 /***************************************************************************/
-Events::Events (void)
+Events::Events ()
   : use_default_admin_ (0), event_count_ (5)
 {
 }
 
-Events::~Events (void)
+Events::~Events ()
 {
 }
 
@@ -159,7 +159,7 @@ Events::parse_args (int argc,
 }
 
 void
-Events::create_EC (void)
+Events::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -190,7 +190,7 @@ Events::create_EC (void)
 }
 
 void
-Events::on_event_received (void)
+Events::on_event_received ()
 {
   ++this->result_count_;
 
@@ -206,7 +206,7 @@ Events::on_event_received (void)
 }
 
 void
-Events::run_test (void)
+Events::run_test ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -257,13 +257,13 @@ Events::run_test (void)
 }
 
 void
-Events::end_test (void)
+Events::end_test ()
 {
   consumer_done( 0 );
 }
 
 int
-Events::check_results (void)
+Events::check_results ()
 {
   // Destroy the channel.
   this->ec_->destroy ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index 3710f290e09..7c00500116c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -49,7 +49,7 @@ public:
   Event_StructuredPushSupplier (Events * test_client);
 
   /// Destructor.
-  virtual ~Event_StructuredPushSupplier (void);
+  virtual ~Event_StructuredPushSupplier ();
 
 protected:
   Events* test_client_;
@@ -61,8 +61,8 @@ class Events : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  Events (void);
-  virtual ~Events (void);
+  Events ();
+  virtual ~Events ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
@@ -72,20 +72,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Called when an event is received.
-  void on_event_received (void);
+  void on_event_received ();
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
index 7d2504daf97..82617521dc8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
@@ -5,12 +5,12 @@
 #include "orbsvcs/CosNotifyFilterExtC.h"
 
 
-ExtendedFilter::ExtendedFilter (void)
+ExtendedFilter::ExtendedFilter ()
   : event_count_ (5)
 {
 }
 
-ExtendedFilter::~ExtendedFilter (void)
+ExtendedFilter::~ExtendedFilter ()
 {
 }
 
@@ -45,7 +45,7 @@ ExtendedFilter::init (int argc, ACE_TCHAR* argv [])
 }
 
 void
-ExtendedFilter::run_test (void)
+ExtendedFilter::run_test ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n"));
@@ -216,7 +216,7 @@ ExtendedFilter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 
 
 void
-ExtendedFilter::create_EC (void)
+ExtendedFilter::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id, id2;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h
index 05339ce6467..52551e9aa90 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h
@@ -27,19 +27,19 @@ class ExtendedFilter : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  ExtendedFilter (void);
-  virtual ~ExtendedFilter (void);
+  ExtendedFilter ();
+  virtual ~ExtendedFilter ();
 
   /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Run some tests to check the filters.
   void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index e10e796bc8f..4b5bc4bcdb2 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -4,12 +4,12 @@
 #include "Filter.h"
 
 
-Filter::Filter (void)
+Filter::Filter ()
   : event_count_ (5)
 {
 }
 
-Filter::~Filter (void)
+Filter::~Filter ()
 {
 }
 
@@ -44,7 +44,7 @@ Filter::init (int argc, ACE_TCHAR* argv [])
 }
 
 void
-Filter::run_test (void)
+Filter::run_test ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n"));
@@ -170,7 +170,7 @@ Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 
 
 void
-Filter::create_EC (void)
+Filter::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index 2948da0f785..64cf8ba3e83 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -28,19 +28,19 @@ class Filter : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Filter (void);
-  virtual ~Filter (void);
+  Filter ();
+  virtual ~Filter ();
 
   /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Run some tests to check the filters.
   void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 7eded75b6ef..1aa20040659 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "IdAssignment.h"
 
-IdAssignment::IdAssignment (void)
+IdAssignment::IdAssignment ()
   : iter_ (3),
     ec_count_ (3),
     consumer_admin_count_ (3),
@@ -13,7 +13,7 @@ IdAssignment::IdAssignment (void)
 {
 }
 
-IdAssignment::~IdAssignment (void)
+IdAssignment::~IdAssignment ()
 {
 }
 
@@ -110,7 +110,7 @@ IdAssignment::init (int argc,
 }
 
 CosNotifyChannelAdmin::ChannelID
-IdAssignment::create_ec (void)
+IdAssignment::create_ec ()
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -364,7 +364,7 @@ IdAssignment::destroy_supplier_admin (
 }
 
 void
-IdAssignment::run_test(void)
+IdAssignment::run_test()
 {
   CosNotifyChannelAdmin::ChannelID* ec_id = 0;
   ACE_NEW (ec_id,
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 329d4d2388c..4f55c09ecce 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -18,17 +18,17 @@
 class IdAssignment
 {
 public:
-  IdAssignment (void);
-  ~IdAssignment (void);
+  IdAssignment ();
+  ~IdAssignment ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
   void init (int argc,
              ACE_TCHAR *argv[]);
-  void run_test (void);
+  void run_test ();
 
 private:
-  CosNotifyChannelAdmin::ChannelID create_ec (void);
+  CosNotifyChannelAdmin::ChannelID create_ec ();
   void destroy_ec (CosNotifyChannelAdmin::ChannelID id);
 
   CosNotifyChannelAdmin::AdminID create_supplier_admin (
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 246a7d81f20..35efeb81fee 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -7,12 +7,12 @@
 
 #include "LifeCycle.h"
 
-LifeCycle::LifeCycle (void)
+LifeCycle::LifeCycle ()
   : count_ (10)
 {
 }
 
-LifeCycle::~LifeCycle (void)
+LifeCycle::~LifeCycle ()
 {
 }
 
@@ -93,7 +93,7 @@ LifeCycle::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-LifeCycle::run_test(void)
+LifeCycle::run_test()
 {
   for (int i = 0; i < this->count_; ++i)
     {
@@ -112,7 +112,7 @@ LifeCycle::run_test(void)
 }
 
 void
-LifeCycle::create_ec (void)
+LifeCycle::create_ec ()
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -134,7 +134,7 @@ LifeCycle::create_ec (void)
 }
 
 void
-LifeCycle::create_supplier_admin (void)
+LifeCycle::create_supplier_admin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
@@ -156,7 +156,7 @@ LifeCycle::create_supplier_admin (void)
 }
 
 void
-LifeCycle::create_consumer_admin (void)
+LifeCycle::create_consumer_admin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
@@ -177,7 +177,7 @@ LifeCycle::create_consumer_admin (void)
 }
 
 void
-LifeCycle::destroy_supplier_admin (void)
+LifeCycle::destroy_supplier_admin ()
 {
   this->supplier_admin_->destroy ();
 
@@ -187,7 +187,7 @@ LifeCycle::destroy_supplier_admin (void)
 }
 
 void
-LifeCycle::destroy_consumer_admin (void)
+LifeCycle::destroy_consumer_admin ()
 {
   this->consumer_admin_->destroy ();
 
@@ -197,7 +197,7 @@ LifeCycle::destroy_consumer_admin (void)
 }
 
 void
-LifeCycle::destroy_ec (void)
+LifeCycle::destroy_ec ()
 {
   this->ec_->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
index 6f036393c1f..1b3e1272dc4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
@@ -16,22 +16,22 @@
 class LifeCycle
 {
 public:
-  LifeCycle (void);
-  ~LifeCycle (void);
+  LifeCycle ();
+  ~LifeCycle ();
 
   void init (int argc,
              ACE_TCHAR *argv[]);
-  void run_test (void);
+  void run_test ();
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
 private:
-   void create_ec (void);
-   void create_supplier_admin (void);
-   void create_consumer_admin (void);
-   void destroy_ec (void);
-   void destroy_supplier_admin (void);
-   void destroy_consumer_admin (void);
+   void create_ec ();
+   void create_supplier_admin ();
+   void create_consumer_admin ();
+   void destroy_ec ();
+   void destroy_supplier_admin ();
+   void destroy_consumer_admin ();
 
    CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
    CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index f772230f01b..c44e33bd117 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -50,7 +50,7 @@ MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::
 
 /***************************************************************************/
 
-MultiTypes::MultiTypes (void)
+MultiTypes::MultiTypes ()
   :any_consumer_ (0),
    structured_consumer_ (0),
    sequence_consumer_ (0),
@@ -197,7 +197,7 @@ MultiTypes::parse_args(int, ACE_TCHAR **)
 }
 
 void
-MultiTypes::create_EC (void)
+MultiTypes::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -209,7 +209,7 @@ MultiTypes::create_EC (void)
 }
 
 void
-MultiTypes::run_test (void)
+MultiTypes::run_test ()
 {
   // Send an Any, all consumers should receive it.
   CORBA::Any any;
@@ -309,13 +309,13 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer)
 }
 
 void
-MultiTypes::end_test (void)
+MultiTypes::end_test ()
 {
   consumer_done( 0 );
 }
 
 int
-MultiTypes::check_results (void)
+MultiTypes::check_results ()
 {
   // Destroy the channel.
   this->ec_->destroy ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 2ab66ed4b94..42bf14f16ec 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -79,7 +79,7 @@ class MultiTypes : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  MultiTypes (void);
+  MultiTypes ();
   virtual ~MultiTypes ();
 
   void on_received_event (MultiTypes_PushConsumer* consumer);
@@ -94,20 +94,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// Check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   // Wait to receive events.
   void wait_for_all_consumers (int expected_count_per_consumer);
 
   /// Create EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 942d4dcdaf3..95c018b7b91 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -36,19 +36,19 @@ SequencePushSupplier::SequencePushSupplier (
 {
 }
 
-SequencePushSupplier::~SequencePushSupplier (void)
+SequencePushSupplier::~SequencePushSupplier ()
 {
 }
 
 /***************************************************************************/
-Sequence::Sequence (void)
+Sequence::Sequence ()
   : event_count_ (15), supplier_batch_size_ (5), consumer_batch_size_ (3),
     pacing_ (2), order_policy_ (CosNotification::PriorityOrder), events_received_ (0),
     consumer_delay_ (1)
 {
 }
 
-Sequence::~Sequence (void)
+Sequence::~Sequence ()
 {
 }
 
@@ -188,7 +188,7 @@ Sequence::parse_args (int argc,
 }
 
 void
-Sequence::create_EC (void)
+Sequence::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -199,7 +199,7 @@ Sequence::create_EC (void)
 }
 
 void
-Sequence::on_event_received (void)
+Sequence::on_event_received ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
@@ -213,7 +213,7 @@ Sequence::on_event_received (void)
 }
 
 void
-Sequence::run_test (void)
+Sequence::run_test ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -292,13 +292,13 @@ Sequence::run_test (void)
 }
 
 void
-Sequence::end_test (void)
+Sequence::end_test ()
 {
   consumer_done( 0 );
 }
 
 int
-Sequence::check_results (void)
+Sequence::check_results ()
 {
   // Destroy the channel.
   this->ec_->destroy ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index ebff1041c48..564cce98dba 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -47,7 +47,7 @@ public:
   SequencePushSupplier (Sequence * test_client);
 
   /// Destructor.
-  virtual ~SequencePushSupplier (void);
+  virtual ~SequencePushSupplier ();
 
 protected:
   Sequence* test_client_;
@@ -59,8 +59,8 @@ class Sequence : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  Sequence (void);
-  virtual ~Sequence (void);
+  Sequence ();
+  virtual ~Sequence ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
@@ -70,20 +70,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Called when an event is received.
-  void on_event_received (void);
+  void on_event_received ();
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Number of events to send
   int event_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index add5a5317b6..eae8c77fbb8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -32,18 +32,18 @@ Event_AnyPushSupplier::Event_AnyPushSupplier (Simple_Test* test_client)
 {
 }
 
-Event_AnyPushSupplier::~Event_AnyPushSupplier (void)
+Event_AnyPushSupplier::~Event_AnyPushSupplier ()
 {
 }
 
 //***************************************************************************
 
-Simple_Test::Simple_Test (void)
+Simple_Test::Simple_Test ()
   : event_count_ (5)
 {
 }
 
-Simple_Test::~Simple_Test (void)
+Simple_Test::~Simple_Test ()
 {
 }
 
@@ -135,7 +135,7 @@ Simple_Test::parse_args (int argc,
 }
 
 void
-Simple_Test::create_EC (void)
+Simple_Test::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -147,7 +147,7 @@ Simple_Test::create_EC (void)
 }
 
 void
-Simple_Test::on_event_received (void)
+Simple_Test::on_event_received ()
 {
   ++this->result_count_;
 
@@ -163,7 +163,7 @@ Simple_Test::on_event_received (void)
 }
 
 void
-Simple_Test::run_test (void)
+Simple_Test::run_test ()
 {
   CORBA::Any data;
 
@@ -176,13 +176,13 @@ Simple_Test::run_test (void)
 }
 
 void
-Simple_Test::end_test (void)
+Simple_Test::end_test ()
 {
   consumer_done( 0 );
 }
 
 int
-Simple_Test::check_results (void)
+Simple_Test::check_results ()
 {
   // Destroy the channel
   this->ec_->destroy ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index ad78485c81d..0a63e19b23b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -50,7 +50,7 @@ public:
   Event_AnyPushSupplier (Simple_Test * test_client);
 
   /// Destructor.
-  virtual ~Event_AnyPushSupplier (void);
+  virtual ~Event_AnyPushSupplier ();
 
 protected:
   Simple_Test* test_client_;
@@ -62,8 +62,8 @@ class Simple_Test : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Simple_Test (void);
-  virtual ~Simple_Test (void);
+  Simple_Test ();
+  virtual ~Simple_Test ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
@@ -73,20 +73,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Called when an event is received.
-  void on_event_received (void);
+  void on_event_received ();
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 612deae2d2f..cbe9439b9b7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -44,7 +44,7 @@ Updates_StructuredPushSupplier::subscription_change (
 
 /***************************************************************************/
 
-Updates::Updates (void)
+Updates::Updates ()
   : added_count_ (0), removed_count_ (0)
 {
 }
@@ -96,7 +96,7 @@ Updates::init (int argc,
 }
 
 void
-Updates::create_EC (void)
+Updates::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -161,7 +161,7 @@ Updates::wait_for_updates (int expected_added, int expected_removed)
 }
 
 void
-Updates::reset_counts (void)
+Updates::reset_counts ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
   this->added_count_ = 0;
@@ -169,7 +169,7 @@ Updates::reset_counts (void)
 }
 
 void
-Updates::run_test (void)
+Updates::run_test ()
 {
   this->test_subscription_change ();
 
@@ -182,7 +182,7 @@ Updates::run_test (void)
 }
 
 void
-Updates::test_subscription_change (void)
+Updates::test_subscription_change ()
 {
   {
     // reset counts.
@@ -300,7 +300,7 @@ Updates::test_subscription_change (void)
 }
 
 void
-Updates::test_offer_change (void)
+Updates::test_offer_change ()
 {
   {
     // reset counts.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index a75cf37d52f..821a4b5453c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -66,14 +66,14 @@ class Updates : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Updates (void);
+  Updates ();
   virtual ~Updates ();
 
   /// initialization.
   int init (int argc, ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// print_event_types
   void print_event_types (const CosNotification::EventTypeSeq &types);
@@ -86,19 +86,19 @@ public:
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Helper to add types.
   void add_type (CosNotification::EventTypeSeq& type_seq, const char* type);
 
   // test subscription_change
-  void test_subscription_change (void);
+  void test_subscription_change ();
 
   // test offer_change
-  void test_offer_change (void);
+  void test_offer_change ();
 
   /// Reset the counts.
-  void reset_counts (void);
+  void reset_counts ();
 
   /// Lock to serialize internal state.
   TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 775a6705faf..80642923154 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 30bc187985d..78d30d45a73 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -37,12 +37,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index 6a7051d8fe1..6c6fe50abf2 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
index 704b8e90969..de467fb135a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
@@ -39,12 +39,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
index 67fcbe3c0f5..83261e62705 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
@@ -85,7 +85,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
 
 int
-DllOrb::fini (void)
+DllOrb::fini ()
 {
   try
   {
@@ -127,7 +127,7 @@ DllOrb::fini (void)
   return 0;
 }
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
index a4900e8b420..5689963e201 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
@@ -12,8 +12,8 @@
 class bug_3252_Export DllOrb: public ACE_Task_Base
 {
 public:
-  DllOrb (void);
-  virtual ~DllOrb (void);
+  DllOrb ();
+  virtual ~DllOrb ();
 
   CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); }
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index f4a34751c7e..20465eccd26 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -51,12 +51,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 804b17a6b9e..2b91c8ab7e8 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -42,12 +42,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
index 2224260849d..8bcdf19c2e8 100644
--- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -38,7 +38,7 @@ public:
 private:
   void brain_dump (const char * context);
   void stat_dump (const char * statName);
-  void consumer_stats_check (void);
+  void consumer_stats_check ();
 private:
   ACE_CString base_;
   CosNotification::NotificationServiceMonitorControl_var nsm_;
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 911bb91a96d..da526b3a038 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -104,7 +104,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 }
 
 static void
-disconnect_consumers (void)
+disconnect_consumers ()
 {
   for (unsigned int i = 0; i < consumer_count; i++)
   {
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 24b80db3734..02e67aa9e60 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -39,12 +39,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -169,7 +169,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 }
 
 static void
-disconnect_suppliers (void)
+disconnect_suppliers ()
 {
   for (unsigned int i = 0; i < supplier_count; ++i)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 5e27ddae75e..305da5fe9b7 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -29,12 +29,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index 5819d40c438..f1e9fae8521 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -28,12 +28,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
index 34b575fe3b8..afb7e2e08ad 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
@@ -20,7 +20,7 @@ int EVENTS_EXPECTED_TO_RECEIVE = 9*4;  // 2 consumers get the same events from 2
 
 ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0;
 
-FilterClient::FilterClient (void)
+FilterClient::FilterClient ()
   :consumer_1 (0),
   consumer_2 (0),
   supplier_1 (0),
@@ -213,7 +213,7 @@ FilterClient::run_consumer ()
 }
 
 void
-FilterClient::done (void)
+FilterClient::done ()
 {
   this->done_ = 1;
 }
@@ -609,7 +609,7 @@ Filter_StructuredPushConsumer::Filter_StructuredPushConsumer (FilterClient* filt
 {
 }
 
-Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
+Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index 14947118533..ea18634280e 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -38,7 +38,7 @@ class FilterClient
 {
  public:
   /// Constructor
-  FilterClient (void);
+  FilterClient ();
 
   /// Destructor
   ~FilterClient ();
@@ -52,7 +52,7 @@ class FilterClient
   void run_consumer ();
 
   /// Consumer calls done, We're done.
-  void done (void);
+  void done ();
 
  protected:
   int parse_args (int argc,
@@ -191,7 +191,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~Filter_StructuredPushConsumer (void);
+  virtual ~Filter_StructuredPushConsumer ();
 
   // = NotifyPublish method
     virtual void offer_change (
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index 1fc535fc299..13f19d81ebe 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -4,7 +4,7 @@
 #include "../lib/LookupManager.h"
 #include "RT_Priority_Mapping.h"
 
-TAO_Notify_Tests_RT_Application_Command::TAO_Notify_Tests_RT_Application_Command (void)
+TAO_Notify_Tests_RT_Application_Command::TAO_Notify_Tests_RT_Application_Command ()
 {
 }
 
@@ -13,7 +13,7 @@ TAO_Notify_Tests_RT_Application_Command::~TAO_Notify_Tests_RT_Application_Comman
 }
 
 void
-TAO_Notify_Tests_RT_Application_Command::handle_init (void)
+TAO_Notify_Tests_RT_Application_Command::handle_init ()
 {
   // Call the Base class.
   TAO_Notify_Tests_Application_Command::handle_init ();
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
index eaa28d78de7..41a0e128742 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
@@ -26,12 +26,12 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Application_Command : public
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_Application_Command (void);
+  TAO_Notify_Tests_RT_Application_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_Application_Command ();
 
-  virtual void handle_init (void);
+  virtual void handle_init ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 9672f19024d..c314ac0cb78 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -5,7 +5,7 @@
 #include "../lib/LookupManager.h"
 #include "../lib/Name.h"
 
-TAO_Notify_Tests_RT_POA_Command::TAO_Notify_Tests_RT_POA_Command (void)
+TAO_Notify_Tests_RT_POA_Command::TAO_Notify_Tests_RT_POA_Command ()
   :priority_model_ (RTCORBA::CLIENT_PROPAGATED)
   , server_priority_ (0)
   , thread_pool_static_threads_ (0)
@@ -18,13 +18,13 @@ TAO_Notify_Tests_RT_POA_Command::~TAO_Notify_Tests_RT_POA_Command ()
 }
 
 const char*
-TAO_Notify_Tests_RT_POA_Command::get_name (void)
+TAO_Notify_Tests_RT_POA_Command::get_name ()
 {
   return TAO_Notify_Tests_RT_POA_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_RT_POA_Command::name (void)
+TAO_Notify_Tests_RT_POA_Command::name ()
 {
   return TAO_Notify_Tests_Name::poa_command;
 }
@@ -174,7 +174,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_RT_POA_Command::execute_i (void)
+TAO_Notify_Tests_RT_POA_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index 19188d711f6..110c1cbf2c6 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -30,7 +30,7 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_POA_Command : public TAO_Not
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_POA_Command (void);
+  TAO_Notify_Tests_RT_POA_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_POA_Command ();
@@ -40,11 +40,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Get the command name.
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
   /// Create the POA with the params parsed.
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index 4545dc048f5..05512d1b4d5 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -3,7 +3,7 @@
 
 #include "../lib/LookupManager.h"
 
-TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (void)
+TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
index a8e7f5f2b2a..552a017a100 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
@@ -27,7 +27,7 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Priority_Mapping : public TA
 {
 public:
   /// The destructor
-  virtual ~TAO_Notify_Tests_RT_Priority_Mapping (void);
+  virtual ~TAO_Notify_Tests_RT_Priority_Mapping ();
 
   /// Init the Mapping manager.
   void init (CORBA::ORB_ptr orb);
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index b6583729658..4ac6284aa81 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -679,7 +679,7 @@ ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
 }
 
 CORBA::Boolean
-ReconnectionCallback_i::is_alive (void)
+ReconnectionCallback_i::is_alive ()
 {
   return true;
 }
@@ -694,7 +694,7 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
 
 
 void
-ReconnectionCallback_i::fini (void)
+ReconnectionCallback_i::fini ()
 {
   if (this->id_is_valid_)
   {
@@ -1108,7 +1108,7 @@ Consumer_Main::reconnect (
 
 
 int
-Consumer_Main::resolve_naming_service (void)
+Consumer_Main::resolve_naming_service ()
 {
   // ignore redundant calls
   if (CORBA::is_nil (this->naming_context_.in ()))
@@ -1124,7 +1124,7 @@ Consumer_Main::resolve_naming_service (void)
 }
 
 int
-Consumer_Main::find_notify_factory (void)
+Consumer_Main::find_notify_factory ()
 {
   int status = this->resolve_naming_service ();
   if (status)
@@ -1143,7 +1143,7 @@ Consumer_Main::find_notify_factory (void)
 }
 
 int
-Consumer_Main::resolve_notify_factory (void)
+Consumer_Main::resolve_notify_factory ()
 {
   CORBA::Object_var factory_obj =
     this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
@@ -1155,7 +1155,7 @@ Consumer_Main::resolve_notify_factory (void)
 }
 
 void
-Consumer_Main::init_event_channel (void)
+Consumer_Main::init_event_channel ()
 {
   bool ok = false;
   if (this->reconnecting_)
@@ -1275,7 +1275,7 @@ Consumer_Main::init_event_channel (void)
 CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
 
 void
-Consumer_Main::init_consumer_admin (void)
+Consumer_Main::init_consumer_admin ()
 {
   bool ok = false;
   if (this->reconnecting_)
@@ -1388,7 +1388,7 @@ Consumer_Main::init_consumer_admin (void)
   }
 }
 void
-Consumer_Main::init_structured_proxy_supplier (void)
+Consumer_Main::init_structured_proxy_supplier ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1478,7 +1478,7 @@ Consumer_Main::init_structured_proxy_supplier (void)
 }
 
 void
-Consumer_Main::init_sequence_proxy_supplier (void)
+Consumer_Main::init_sequence_proxy_supplier ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1580,7 +1580,7 @@ Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy)
 }
 
 void
-Consumer_Main::init_any_proxy_supplier (void)
+Consumer_Main::init_any_proxy_supplier ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1676,7 +1676,7 @@ Consumer_Main::init_any_proxy_supplier (void)
   this->any_push_consumer_.set_connected(true);
 }
 
-int Consumer_Main::fini (void)
+int Consumer_Main::fini ()
 {
   this->reconnection_callback_.fini ();
 
@@ -1711,7 +1711,7 @@ int Consumer_Main::fini (void)
 }
 
 
-int Consumer_Main::run (void)
+int Consumer_Main::run ()
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 46491df04be..39589a2c2fc 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -139,13 +139,13 @@ public:
     PortableServer::POA_ptr poa,
     CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
-  void fini (void);
+  void fini ();
 
   size_t reconnect_count () const;
 
   virtual void reconnect (CORBA::Object_ptr reconnection);
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
 private:
   Consumer_Main & consumer_main_;
@@ -165,8 +165,8 @@ class Consumer_Main
   int parse_single_arg (int argc, ACE_TCHAR *argv[]);
 
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  int fini (void);
+  int run ();
+  int fini ();
   void usage (FILE * log) const;
 
   void reconnect (
@@ -174,19 +174,19 @@ class Consumer_Main
 
  private:
   /// Find naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// Resolve the Notify factory from the Naming service.
-  int find_notify_factory (void);
+  int find_notify_factory ();
 
   /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
-  int resolve_notify_factory (void);
+  int resolve_notify_factory ();
 
-  void init_event_channel (void);
-  void init_consumer_admin (void);
-  void init_structured_proxy_supplier (void);
-  void init_sequence_proxy_supplier (void);
-  void init_any_proxy_supplier (void);
+  void init_event_channel ();
+  void init_consumer_admin ();
+  void init_structured_proxy_supplier ();
+  void init_sequence_proxy_supplier ();
+  void init_any_proxy_supplier ();
 
   void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy);
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index c94aaef6509..1e58c719da2 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -118,7 +118,7 @@ ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
 }
 
 CORBA::Boolean
-ReconnectionCallback_i::is_alive (void)
+ReconnectionCallback_i::is_alive ()
 {
   return true;
 }
@@ -132,7 +132,7 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
 
 
 void
-ReconnectionCallback_i::fini (void)
+ReconnectionCallback_i::fini ()
 {
   if (this->id_is_valid_)
   {
@@ -502,7 +502,7 @@ Supplier_Main::reconnect (
 
 
 int
-Supplier_Main::resolve_naming_service (void)
+Supplier_Main::resolve_naming_service ()
 {
   // ignore redundant calls
   if (CORBA::is_nil (this->naming_context_.in ()))
@@ -518,7 +518,7 @@ Supplier_Main::resolve_naming_service (void)
 }
 
 int
-Supplier_Main::find_notify_factory (void)
+Supplier_Main::find_notify_factory ()
 {
   int status = this->resolve_naming_service ();
   if (status)
@@ -537,7 +537,7 @@ Supplier_Main::find_notify_factory (void)
 }
 
 int
-Supplier_Main::resolve_notify_factory (void)
+Supplier_Main::resolve_notify_factory ()
 {
   CORBA::Object_var factory_obj =
     this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
@@ -549,7 +549,7 @@ Supplier_Main::resolve_notify_factory (void)
 }
 
 void
-Supplier_Main::init_event_channel (void)
+Supplier_Main::init_event_channel ()
 {
   bool ok = false;
   if (this->reconnecting_)
@@ -669,7 +669,7 @@ Supplier_Main::init_event_channel (void)
 CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
 
 void
-Supplier_Main::init_supplier_admin (void)
+Supplier_Main::init_supplier_admin ()
 {
   bool ok = false;
   if (this->reconnecting_ && this->sa_id_ != default_admin_id)
@@ -734,7 +734,7 @@ Supplier_Main::init_supplier_admin (void)
 }
 
 void
-Supplier_Main::init_structured_proxy_consumer (void)
+Supplier_Main::init_structured_proxy_consumer ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -810,7 +810,7 @@ Supplier_Main::init_structured_proxy_consumer (void)
 }
 
 void
-Supplier_Main::init_sequence_proxy_consumer (void)
+Supplier_Main::init_sequence_proxy_consumer ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -886,7 +886,7 @@ Supplier_Main::init_sequence_proxy_consumer (void)
 }
 
 void
-Supplier_Main::init_any_proxy_consumer (void)
+Supplier_Main::init_any_proxy_consumer ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -961,7 +961,7 @@ Supplier_Main::init_any_proxy_consumer (void)
     any_push_supplier_ref_.in ());
 }
 
-int Supplier_Main::fini (void)
+int Supplier_Main::fini ()
 {
   if (this->disconnect_on_exit_)
   {
@@ -1012,7 +1012,7 @@ int Supplier_Main::fini (void)
   return 0;
 }
 
-void Supplier_Main::send_structured_event (void)
+void Supplier_Main::send_structured_event ()
 {
  CosNotification::StructuredEvent event;
 
@@ -1058,7 +1058,7 @@ void Supplier_Main::send_structured_event (void)
   this->structured_proxy_push_consumer_->push_structured_event (event);
 }
 
-void Supplier_Main::send_sequence_event (void)
+void Supplier_Main::send_sequence_event ()
 {
  CosNotification::EventBatch event_batch(1);
  event_batch.length (1);
@@ -1106,7 +1106,7 @@ void Supplier_Main::send_sequence_event (void)
   this->sequence_proxy_push_consumer_->push_structured_events (event_batch);
 }
 
-void Supplier_Main::send_any_event (void)
+void Supplier_Main::send_any_event ()
 {
   CORBA::Any event;
   event <<= CORBA::ULong (this->serial_number_);
@@ -1122,7 +1122,7 @@ void Supplier_Main::send_any_event (void)
   this->any_proxy_push_consumer_->push (event);
 }
 
-int Supplier_Main::run (void)
+int Supplier_Main::run ()
 {
   int result = 0;
   bool paused = false;
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index fa0a3988c89..c1d529325e8 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -26,7 +26,7 @@ class StructuredPushSupplier_i : public virtual POA_CosNotifyComm::StructuredPus
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed);
 
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
 };
 
 class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSupplier
@@ -35,7 +35,7 @@ class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSup
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed);
 
-  virtual void disconnect_sequence_push_supplier (void);
+  virtual void disconnect_sequence_push_supplier ();
 };
 
 class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier
@@ -44,7 +44,7 @@ class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 };
 
 class ReconnectionCallback_i : public virtual POA_NotifyExt::ReconnectionCallback
@@ -58,13 +58,13 @@ public:
     PortableServer::POA_ptr poa,
     CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
-  void fini (void);
+  void fini ();
 
   size_t reconnect_count () const;
 
   virtual void reconnect (CORBA::Object_ptr reconnection);
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
 private:
   Supplier_Main & supplier_main_;
@@ -84,8 +84,8 @@ class Supplier_Main
   int parse_single_arg (int argc, ACE_TCHAR *argv[]);
 
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  int fini (void);
+  int run ();
+  int fini ();
   void usage (FILE * log) const;
 
   void reconnect (
@@ -93,24 +93,24 @@ class Supplier_Main
 
  private:
   /// Find naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// Resolve the Notify factory from the Naming service.
-  int find_notify_factory (void);
+  int find_notify_factory ();
 
   /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
-  int resolve_notify_factory (void);
+  int resolve_notify_factory ();
 
-  void init_event_channel (void);
-  void init_supplier_admin (void);
-  void init_structured_proxy_consumer (void);
-  void init_sequence_proxy_consumer (void);
-  void init_any_proxy_consumer (void);
+  void init_event_channel ();
+  void init_supplier_admin ();
+  void init_structured_proxy_consumer ();
+  void init_sequence_proxy_consumer ();
+  void init_any_proxy_consumer ();
 
   /// send events.
-  void send_structured_event (void);
-  void send_sequence_event (void);
-  void send_any_event (void);
+  void send_structured_event ();
+  void send_sequence_event ();
+  void send_any_event ();
 
   void save_ids();
   bool load_ids();
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 574b52a02dd..e4a5a526401 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index fd89827869b..1c243044ec6 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -40,12 +40,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index a954f64c908..c7dd4fc303b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -29,12 +29,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index c3099b60ae0..551a8146bd2 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -30,12 +30,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index d0866878b38..483a288dcf5 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -5,7 +5,7 @@
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/PortableServer/Root_POA.h"
 
-TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void)
+TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter ()
   : expected_pool_id_ (0)
     , expected_lane_id_ (0)
 {
@@ -16,7 +16,7 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter ()
 }
 
 char*
-TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void)
+TAO_Notify_Tests_RT_Test_Filter::constraint_grammar ()
 {
   return CORBA::string_dup ("ETCL");
 }
@@ -82,18 +82,18 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void)
+TAO_Notify_Tests_RT_Test_Filter::get_all_constraints ()
 {
   return 0;
 }
 
 void
-TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void)
+TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints ()
 {
 }
 
 void
-TAO_Notify_Tests_RT_Test_Filter::destroy (void)
+TAO_Notify_Tests_RT_Test_Filter::destroy ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -229,7 +229,7 @@ TAO_Notify_Tests_RT_Test_Filter::detach_callback (
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void)
+TAO_Notify_Tests_RT_Test_Filter::get_callbacks ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index dba718ad1d0..20a45a7890b 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -32,13 +32,13 @@ class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_Filter
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_Test_Filter (void);
+  TAO_Notify_Tests_RT_Test_Filter ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_Test_Filter ();
 
 protected:
-  virtual char * constraint_grammar (void);
+  virtual char * constraint_grammar ();
 
   virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
@@ -47,11 +47,11 @@ protected:
 
   virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void);
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints ();
 
-  virtual void remove_all_constraints (void);
+  virtual void remove_all_constraints ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual CORBA::Boolean match (const CORBA::Any & filterable_data);
 
@@ -63,7 +63,7 @@ protected:
 
   virtual void detach_callback (CosNotifyFilter::CallbackID callback);
 
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ();
 
 protected:
   /// Lock to serialize access to data members.
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index b5299870f68..56f8f4899d0 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_string.h"
 
-TAO_Notify_Tests_RT_Test_FilterFactory::TAO_Notify_Tests_RT_Test_FilterFactory (void)
+TAO_Notify_Tests_RT_Test_FilterFactory::TAO_Notify_Tests_RT_Test_FilterFactory ()
 {
 }
 
@@ -28,7 +28,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_ptr filter_p
 }
 
 void
-TAO_Notify_Tests_RT_Test_FilterFactory::destroy (void)
+TAO_Notify_Tests_RT_Test_FilterFactory::destroy ()
 {
   if (CORBA::is_nil(this->filter_poa_.in ()))
     return;
@@ -96,7 +96,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::get_filter (const TAO_Notify_Object::ID&
 }
 
 void
-TAO_Notify_Tests_RT_Test_FilterFactory::release (void)
+TAO_Notify_Tests_RT_Test_FilterFactory::release ()
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index 67545801b90..84f14e864ef 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -34,7 +34,7 @@ class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_FilterFactory
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_Test_FilterFactory (void);
+  TAO_Notify_Tests_RT_Test_FilterFactory ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_Test_FilterFactory ();
@@ -42,7 +42,7 @@ public:
   ///= TAO_Notify_Tests_FilterFactory methods.
 
   virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_ptr filter_poa);
-  virtual void destroy (void);
+  virtual void destroy ();
 
   ///= CosNotifyFilter::FilterFactory methods
 
@@ -57,7 +57,7 @@ public:
 
 protected:
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   /// The POA in which to activate the Filters.
   PortableServer::POA_var filter_poa_;
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
index fc060a2ffbd..5a8e6fe258d 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
@@ -32,12 +32,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index b8c8f6c45bb..be12aa0b2b0 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -22,7 +22,7 @@
 class TestSupplier
 : public POA_CosNotifyComm::StructuredPushSupplier
 {
-  virtual void disconnect_structured_push_supplier(void)
+  virtual void disconnect_structured_push_supplier()
   {
   }
 
@@ -35,7 +35,7 @@ class TestSupplier
 class TestConsumer
 : public POA_CosNotifyComm::StructuredPushConsumer
 {
-  virtual void disconnect_structured_push_consumer(void)
+  virtual void disconnect_structured_push_consumer()
   {
   }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 4f92d781e16..164aa7a40cd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -6,7 +6,7 @@
 #include "Name.h"
 #include "ace/Barrier.h"
 
-TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager (void)
+TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager ()
   : barrier_ (0)
   , active_suppliers_ (0)
   , active_consumers_ (0)
@@ -67,7 +67,7 @@ TAO_Notify_Tests_Activation_Manager::done (TAO_Notify_Tests_Periodic_Consumer* /
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::wait_for_completion (void)
+TAO_Notify_Tests_Activation_Manager::wait_for_completion ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -76,13 +76,13 @@ TAO_Notify_Tests_Activation_Manager::wait_for_completion (void)
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::supplier_count (void)
+TAO_Notify_Tests_Activation_Manager::supplier_count ()
 {
   return ACE_Utils::truncate_cast<int> (this->supplier_map_.current_size ());
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::consumer_count (void)
+TAO_Notify_Tests_Activation_Manager::consumer_count ()
 {
   return ACE_Utils::truncate_cast<int> (this->consumer_map_.current_size ());
 }
@@ -144,7 +144,7 @@ TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::activate_suppliers (void)
+TAO_Notify_Tests_Activation_Manager::activate_suppliers ()
 {
   TAO_Notify_Tests_PeriodicSupplier_Iterator iter(this->supplier_map_);
 
@@ -218,7 +218,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::write_ior (void)
+TAO_Notify_Tests_Activation_Manager::write_ior ()
 {
   PortableServer::ServantBase_var servant_var (this);
 
@@ -242,7 +242,7 @@ TAO_Notify_Tests_Activation_Manager::write_ior (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void)
+TAO_Notify_Tests_Activation_Manager::wait_for_start_signal ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -251,7 +251,7 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::start (void)
+TAO_Notify_Tests_Activation_Manager::start ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -261,7 +261,7 @@ TAO_Notify_Tests_Activation_Manager::start (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::signal_peer (void)
+TAO_Notify_Tests_Activation_Manager::signal_peer ()
 {
   CORBA::ORB_var orb;
   LOOKUP_MANAGER->resolve (orb);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index ad1133a038a..65010114bbf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -44,13 +44,13 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Activation_Manager : public TAO_No
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Activation_Manager (void);
+  TAO_Notify_Tests_Activation_Manager ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Activation_Manager ();
 
   /// Interface impl.
-  virtual void start (void);
+  virtual void start ();
 
   /// Register Supplier
   void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name);
@@ -64,16 +64,16 @@ public:
   void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name);
 
   // Activate the tasks for each supplier.
-  int activate_suppliers (void);
+  int activate_suppliers ();
 
   // Supplier Count
-  int supplier_count (void);
+  int supplier_count ();
 
   // Consumer Count
-  int consumer_count (void);
+  int consumer_count ();
 
   /// Wait till active suppliers and consumers are done.
-  void wait_for_completion (void);
+  void wait_for_completion ();
 
   /// TAO_Notify_Tests_Task_Callback methods
   virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier);
@@ -88,9 +88,9 @@ public:
   // Returns 1 if the file could be opened for read.
   int ior_input_file (const ACE_TCHAR *file_name);
 
-  void write_ior (void);
-  void wait_for_start_signal (void);
-  void signal_peer (void);
+  void write_ior ();
+  void wait_for_start_signal ();
+  void signal_peer ();
 
 protected:
   /// Lock to serialize internal state.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 071e9000daf..8e462cdb5a2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -8,7 +8,7 @@
 #include "Driver_Base.h"
 #include "Priority_Mapping.h"
 
-TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void)
+TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command ()
   : dump_samples_ (0)
 {
 }
@@ -18,13 +18,13 @@ TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command ()
 }
 
 const char*
-TAO_Notify_Tests_Application_Command::get_name (void)
+TAO_Notify_Tests_Application_Command::get_name ()
 {
   return TAO_Notify_Tests_Application_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Application_Command::name (void)
+TAO_Notify_Tests_Application_Command::name ()
 {
   return TAO_Notify_Tests_Name::application_command;
 }
@@ -89,7 +89,7 @@ TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_init (void)
+TAO_Notify_Tests_Application_Command::handle_init ()
 {
   /// Fetch the root poa.
   PortableServer::POA_var root_poa;
@@ -107,7 +107,7 @@ TAO_Notify_Tests_Application_Command::handle_init (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void)
+TAO_Notify_Tests_Application_Command::handle_wait_for_completion ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t) Waiting for suppliers and consumers to finish...\n"));
 
@@ -118,7 +118,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_shutdown (void)
+TAO_Notify_Tests_Application_Command::handle_shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Shutting down the Application...\n"));
 
@@ -129,7 +129,7 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_dump_stats (void)
+TAO_Notify_Tests_Application_Command::handle_dump_stats ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Dumpimg stats...\n"));
 
@@ -140,7 +140,7 @@ TAO_Notify_Tests_Application_Command::handle_dump_stats (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_run (void)
+TAO_Notify_Tests_Application_Command::handle_run ()
 {
   // Run the Consumers
 
@@ -156,7 +156,7 @@ TAO_Notify_Tests_Application_Command::handle_run (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_signal_peer (void)
+TAO_Notify_Tests_Application_Command::handle_signal_peer ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
@@ -165,7 +165,7 @@ TAO_Notify_Tests_Application_Command::handle_signal_peer (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_wait_to_start (void)
+TAO_Notify_Tests_Application_Command::handle_wait_to_start ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
@@ -176,7 +176,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_to_start (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::execute_i (void)
+TAO_Notify_Tests_Application_Command::execute_i ()
 {
   if (this->command_ == INIT)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index 7304c92558e..1f7ecaefee3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -29,7 +29,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Application_Command : public TAO_N
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Application_Command (void);
+  TAO_Notify_Tests_Application_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Application_Command ();
@@ -38,11 +38,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Get the command name.
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
 #ifdef HPUX_11
@@ -65,13 +65,13 @@ protected:
   int dump_samples_;
 
   ///= Handlers
-  virtual void handle_init (void);
-  void handle_run (void);
-  void handle_wait_for_completion (void);
-  void handle_shutdown (void);
-  void handle_dump_stats (void);
-  void handle_signal_peer (void);
-  void handle_wait_to_start (void);
+  virtual void handle_init ();
+  void handle_run ();
+  void handle_wait_for_completion ();
+  void handle_shutdown ();
+  void handle_dump_stats ();
+  void handle_signal_peer ();
+  void handle_wait_to_start ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 4b7de8fcb56..c90be14789c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -6,7 +6,7 @@
 #include "ace/Log_Msg.h"
 
 
-TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void)
+TAO_Notify_Tests_Command::TAO_Notify_Tests_Command ()
   :next_ (0), command_ (INVALID)
 {
 }
@@ -28,7 +28,7 @@ TAO_Notify_Tests_Command::next (TAO_Notify_Tests_Command* command)
 }
 
 void
-TAO_Notify_Tests_Command::execute (void)
+TAO_Notify_Tests_Command::execute ()
 {
   if (this->command_ == INVALID)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 7321fa1a190..a338e2a9587 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -36,7 +36,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command
   friend class TAO_Notify_Tests_Command_Builder;
 public:
   /// Constructor
-  TAO_Notify_Tests_Command (void);
+  TAO_Notify_Tests_Command ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Command ();
@@ -51,7 +51,7 @@ public:
   virtual const char* get_name (void)= 0;
 
   ///= Each derived type must also implement the following signature:
-  // static const char* name (void);
+  // static const char* name ();
 
 protected:
   /// Next command after this one.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index 9b76abd6578..1f5f3629983 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -6,7 +6,7 @@
 #include "Name.h"
 
 
-TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void)
+TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder ()
   : start_command_ (0),
     last_command_ (0)
 {
@@ -57,7 +57,7 @@ TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Notify_Tests_Command_Builder::fini (void)
+TAO_Notify_Tests_Command_Builder::fini ()
 {
         return 0;
 }
@@ -72,7 +72,7 @@ TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, T
 }
 
 void
-TAO_Notify_Tests_Command_Builder::execute (void)
+TAO_Notify_Tests_Command_Builder::execute ()
 {
   if (this->start_command_)
     this->start_command_->execute ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index b9e7c2e70c3..2d391ce2495 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -2,7 +2,7 @@
 #include "Command_Factory.h"
 
 
-TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void)
+TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
index 8a9238ac437..9e3af149a3a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
@@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Factory
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Command_Factory (void);
+  TAO_Notify_Tests_Command_Factory ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Command_Factory ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index f4b2ebdf7b7..ba80b5e4382 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -10,7 +10,7 @@
 #include "Name.h"
 
 template <class COMMAND>
-TAO_Notify_Tests_Command_Factory_T<COMMAND>::TAO_Notify_Tests_Command_Factory_T (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::TAO_Notify_Tests_Command_Factory_T ()
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG, "Creating command factory for %s\n", COMMAND::name()));
@@ -36,13 +36,13 @@ TAO_Notify_Tests_Command_Factory_T<COMMAND>::init (int /*argc*/, ACE_TCHAR/*argv
 }
 
 template <class COMMAND> int
-TAO_Notify_Tests_Command_Factory_T<COMMAND>::fini (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::fini ()
 {
   return 0;
 }
 
 template <class COMMAND> TAO_Notify_Tests_Command*
-TAO_Notify_Tests_Command_Factory_T<COMMAND>::create (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::create ()
 {
   return new COMMAND ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
index 6c2c7fd18e0..4cc0689e70c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -34,7 +34,7 @@ class TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Facto
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Command_Factory_T (void);
+  TAO_Notify_Tests_Command_Factory_T ();
 
   /// Destructor
   ~TAO_Notify_Tests_Command_Factory_T ();
@@ -44,7 +44,7 @@ public:
   virtual int fini ();
 
   /// Create the <COMMAND> command.
-  TAO_Notify_Tests_Command* create (void);
+  TAO_Notify_Tests_Command* create ();
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index 7aa1dac3b08..2e8163b495d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -5,7 +5,7 @@
 #include "Name.h"
 #include "Options_Parser.h"
 
-TAO_Notify_Tests_ConsumerAdmin_Command::TAO_Notify_Tests_ConsumerAdmin_Command (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::TAO_Notify_Tests_ConsumerAdmin_Command ()
   :ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
@@ -15,19 +15,19 @@ TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command
 }
 
 const char*
-TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::get_name ()
 {
   return TAO_Notify_Tests_ConsumerAdmin_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_ConsumerAdmin_Command::name (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::name ()
 {
   return TAO_Notify_Tests_Name::consumer_admin_command;
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_create ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -43,7 +43,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void)
 
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions ()
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
@@ -69,7 +69,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos ()
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
@@ -79,7 +79,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_status ()
 {
   //@@ TODO:
 }
@@ -144,7 +144,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index 221c3eceafb..7b9a8b7cf82 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ConsumerAdmin_Command  : public TA
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_ConsumerAdmin_Command (void);
+  TAO_Notify_Tests_ConsumerAdmin_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_ConsumerAdmin_Command ();
@@ -37,11 +37,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
   /// = Data Members
@@ -74,10 +74,10 @@ protected:
   CosNotification::EventTypeSeq removed_;
 
   /// = Handlers
-  void handle_create (void);
-  void handle_subscriptions (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_subscriptions ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index ab4ea2c7edf..b9ef48ef248 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -5,7 +5,7 @@
 
 
 template <class Consumer_Traits>
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T ()
 {
 }
 
@@ -15,7 +15,7 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::~TAO_Notify_Tests_Consumer_T ()
 }
 
 template <class Consumer_Traits> typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier (void)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier ()
 {
   return this->get_proxy ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 76a8e27df7f..e9cedf5d4db 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -50,13 +50,13 @@ class TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Tra
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Consumer_T (void);
+  TAO_Notify_Tests_Consumer_T ();
 
   /// Destructor
   ~TAO_Notify_Tests_Consumer_T ();
 
   /// For backward compatibility. use <get_proxy> instead.
-  Proxy_Traits_PTR get_proxy_supplier (void);
+  Proxy_Traits_PTR get_proxy_supplier ();
 
   /// Send subscription_change
   virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 4c356f12e5d..5dec5dda194 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -3,7 +3,7 @@
 
 #include "LookupManager.h"
 
-TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer (void)
+TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer ()
 {
 }
 
@@ -12,7 +12,7 @@ TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer ()
 }
 
 void
-TAO_Notify_Tests_Direct_Consumer::connect (void)
+TAO_Notify_Tests_Direct_Consumer::connect ()
 {
   // Get the POA
   PortableServer::POA_var poa;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
index 23817fc250b..c6e06c0eacf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -26,13 +26,13 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Consumer : public TAO_Notif
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Direct_Consumer (void);
+  TAO_Notify_Tests_Direct_Consumer ();
 
   /// Destructor
   ~TAO_Notify_Tests_Direct_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index d45f244a88b..2751578c16e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -17,7 +17,7 @@ TAO_Notify_Tests_Direct_Supplier::~TAO_Notify_Tests_Direct_Supplier ()
 }
 
 void
-TAO_Notify_Tests_Direct_Supplier::connect (void)
+TAO_Notify_Tests_Direct_Supplier::connect ()
 {
   // Get the POA
   PortableServer::POA_var poa;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index b06ea5f9afc..695c9357a91 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -32,7 +32,7 @@ public:
   ~TAO_Notify_Tests_Direct_Supplier ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 
   // Send one event. Bypass sending to the Notify and send directly to taget consumer.
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 32d9d5675a8..faf2586eb94 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -72,7 +72,7 @@ TAO_Notify_Tests_Worker::command_builder (TAO_Notify_Tests_Command_Builder* cmd_
 }
 
 int
-TAO_Notify_Tests_Worker::svc (void)
+TAO_Notify_Tests_Worker::svc ()
 {
 #if 0
   ACE_hthread_t current;
@@ -107,7 +107,7 @@ TAO_Notify_Tests_Worker::svc (void)
 
 /*****************************************************************/
 
-TAO_Notify_Tests_ORB_Run_Worker::TAO_Notify_Tests_ORB_Run_Worker (void)
+TAO_Notify_Tests_ORB_Run_Worker::TAO_Notify_Tests_ORB_Run_Worker ()
 {
 }
 
@@ -124,7 +124,7 @@ TAO_Notify_Tests_ORB_Run_Worker::run_period (ACE_Time_Value run_period)
 }
 
 int
-TAO_Notify_Tests_ORB_Run_Worker::svc (void)
+TAO_Notify_Tests_ORB_Run_Worker::svc ()
 {
 #if 0
   // ACE_Thread::getprio() fails on systems that do not support thread
@@ -160,7 +160,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
 
 /*****************************************************************/
 
-TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver (void)
+TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver ()
   :cmd_builder_ (0), activation_manager_ (0), run_period_ (0,0), skip_priority_levels_check_ (0)
 {
   this->activation_manager_ = new TAO_Notify_Tests_Activation_Manager ();
@@ -260,7 +260,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_Tests_Driver::run (void)
+TAO_Notify_Tests_Driver::run ()
 {
   // Task activation flags.
   long flags =
@@ -308,7 +308,7 @@ TAO_Notify_Tests_Driver::run (void)
 }
 
 void
-TAO_Notify_Tests_Driver::shutdown (void)
+TAO_Notify_Tests_Driver::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index babb998dd5a..a5401c3cfe5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -33,7 +33,7 @@ class TAO_Notify_Tests_Activation_Manager;
 class TAO_Notify_Tests_Worker : public ACE_Task_Base
 {
 public:
-  TAO_Notify_Tests_Worker (void);
+  TAO_Notify_Tests_Worker ();
   // ctor
 
   /// Set the command builder.
@@ -42,7 +42,7 @@ public:
   virtual int svc ();
   // The thread entry point.
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The command builder
@@ -58,7 +58,7 @@ private:
 class TAO_Notify_Tests_ORB_Run_Worker : public ACE_Task_Base
 {
 public:
-  TAO_Notify_Tests_ORB_Run_Worker (void);
+  TAO_Notify_Tests_ORB_Run_Worker ();
   // ctor
 
   void orb (CORBA::ORB_ptr orb);
@@ -87,7 +87,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver : public TAO_Notify_Tests_D
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Driver (void);
+  TAO_Notify_Tests_Driver ();
 
   /// Destructor
   ~TAO_Notify_Tests_Driver ();
@@ -96,10 +96,10 @@ public:
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Execute the commands.
-  void run (void);
+  void run ();
 
   /// Shutdown
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
   /// Parse command line parameters.
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 7e23a78a5bb..68d4ad61f5e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -7,7 +7,7 @@
 #include "Options_Parser.h"
 #include "orbsvcs/Notify/Service.h"
 
-TAO_Notify_Tests_EventChannel_Command::TAO_Notify_Tests_EventChannel_Command (void)
+TAO_Notify_Tests_EventChannel_Command::TAO_Notify_Tests_EventChannel_Command ()
   : collocated_ (0)
 {
 }
@@ -17,13 +17,13 @@ TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command ()
 }
 
 const char*
-TAO_Notify_Tests_EventChannel_Command::get_name (void)
+TAO_Notify_Tests_EventChannel_Command::get_name ()
 {
   return TAO_Notify_Tests_EventChannel_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_EventChannel_Command::name (void)
+TAO_Notify_Tests_EventChannel_Command::name ()
 {
   return TAO_Notify_Tests_Name::event_channel_command;
 }
@@ -84,7 +84,7 @@ TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void)
+TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf ()
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
@@ -123,7 +123,7 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_create (void)
+TAO_Notify_Tests_EventChannel_Command::handle_create ()
 {
   if (this->collocated_ == 1)
     {
@@ -147,7 +147,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_destroy (void)
+TAO_Notify_Tests_EventChannel_Command::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ()));
   CosNotifyChannelAdmin::EventChannel_var ec;
@@ -157,7 +157,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_destroy (void)
   ec->destroy ();
 }
 void
-TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void)
+TAO_Notify_Tests_EventChannel_Command::handle_set_qos ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -167,13 +167,13 @@ TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_status (void)
+TAO_Notify_Tests_EventChannel_Command::handle_status ()
 {
   //@@ TODO: Implement
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::execute_i (void)
+TAO_Notify_Tests_EventChannel_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 3ffc40f87d4..aa45aef7489 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -32,7 +32,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_EventChannel_Command : public TAO_
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_EventChannel_Command (void);
+  TAO_Notify_Tests_EventChannel_Command ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_EventChannel_Command ();
@@ -41,11 +41,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
   ///= Data Members
@@ -76,13 +76,13 @@ protected:
   CORBA::Boolean collocated_;
 
   /// Helper method to create a collocated ECF.
-  void create_collocated_ecf (void);
+  void create_collocated_ecf ();
 
   /// = Handlers
-  void handle_create (void);
-  void handle_destroy (void);
-  void handle_set_qos (void);
-  void handle_status (void);
+  void handle_create ();
+  void handle_destroy ();
+  void handle_set_qos ();
+  void handle_status ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 64a1003095c..9932b190831 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -5,7 +5,7 @@
 #include "LookupManager.h"
 #include "Name.h"
 
-TAO_Notify_Tests_Filter_Command::TAO_Notify_Tests_Filter_Command (void)
+TAO_Notify_Tests_Filter_Command::TAO_Notify_Tests_Filter_Command ()
 {
 }
 
@@ -14,13 +14,13 @@ TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command ()
 }
 
 const char*
-TAO_Notify_Tests_Filter_Command::get_name (void)
+TAO_Notify_Tests_Filter_Command::get_name ()
 {
   return TAO_Notify_Tests_Filter_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Filter_Command::name (void)
+TAO_Notify_Tests_Filter_Command::name ()
 {
   return TAO_Notify_Tests_Name::filter_command;
 }
@@ -95,7 +95,7 @@ TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void)
+TAO_Notify_Tests_Filter_Command::handle_create_filter_factory ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -108,7 +108,7 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_create_filter (void)
+TAO_Notify_Tests_Filter_Command::handle_create_filter ()
 {
   CosNotifyFilter::FilterFactory_var ff;
 
@@ -121,7 +121,7 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
+TAO_Notify_Tests_Filter_Command::handle_add_constraint ()
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -138,7 +138,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_add_filter (void)
+TAO_Notify_Tests_Filter_Command::handle_add_filter ()
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -152,7 +152,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_filter (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void)
+TAO_Notify_Tests_Filter_Command::handle_destroy_filter ()
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -162,7 +162,7 @@ TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::execute_i (void)
+TAO_Notify_Tests_Filter_Command::execute_i ()
 {
   if (this->command_ == CREATE_FACTORY)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 5b774ff10bd..f679a6682b4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Filter_Command : public TAO_Notify
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Filter_Command (void);
+  TAO_Notify_Tests_Filter_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Filter_Command ();
@@ -37,11 +37,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
 #ifdef HPUX_11
@@ -66,11 +66,11 @@ protected:
   ACE_CString constraint_;
 
   ///= Handlers
-  void handle_create_filter_factory (void);
-  void handle_create_filter (void);
-  void handle_add_constraint (void);
-  void handle_add_filter (void);
-  void handle_destroy_filter (void);
+  void handle_create_filter_factory ();
+  void handle_create_filter ();
+  void handle_add_constraint ();
+  void handle_add_filter ();
+  void handle_destroy_filter ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index d2cbf162200..c06c2834a62 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -4,7 +4,7 @@
 
 #include "Name.h"
 
-TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager (void)
+TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager ()
   : app_ (0)
     , activation_manager_ (0)
     , priority_mapping_ (0)
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index 6b1db928a77..44fe125c79e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -36,7 +36,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_LookupManager
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_LookupManager (void);
+  TAO_Notify_Tests_LookupManager ();
 
   /// Destructor
   ~TAO_Notify_Tests_LookupManager ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index 4851b4e8013..5b4e67bf58e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -2,7 +2,7 @@
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
 
-Notify_Test_Client::Notify_Test_Client (void)
+Notify_Test_Client::Notify_Test_Client ()
 : num_clients_( 0 )
 , done_( false )
 {
@@ -77,7 +77,7 @@ Notify_Test_Client::init_ORB (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Notify_Test_Client::resolve_naming_service (void)
+Notify_Test_Client::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -91,7 +91,7 @@ Notify_Test_Client::resolve_naming_service (void)
 }
 
 void
-Notify_Test_Client::resolve_Notify_factory (void)
+Notify_Test_Client::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -105,7 +105,7 @@ Notify_Test_Client::resolve_Notify_factory (void)
 }
 
 int
-Notify_Test_Client::ORB_run (void)
+Notify_Test_Client::ORB_run ()
 {
   while (! is_done())
   {
@@ -156,26 +156,26 @@ Notify_Test_Client::is_done () const
 }
 
 CORBA::ORB_ptr
-Notify_Test_Client::orb (void)
+Notify_Test_Client::orb ()
 {
   return this->orb_.in ();
 }
 
 
 PortableServer::POA_ptr
-Notify_Test_Client::root_poa (void)
+Notify_Test_Client::root_poa ()
 {
   return this->root_poa_.in ();
 }
 
 CosNaming::NamingContext_ptr
-Notify_Test_Client::naming_context (void)
+Notify_Test_Client::naming_context ()
 {
   return this->naming_context_.in ();
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-Notify_Test_Client::notify_factory (void)
+Notify_Test_Client::notify_factory ()
 {
   return this->notify_factory_.in ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 93f28c2c2c1..5a8e6b551e1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -32,7 +32,7 @@ class TAO_Notify_Tests_Peer;
 class TAO_NOTIFY_TEST_Export Notify_Test_Client
 {
 public:
-  Notify_Test_Client (void);
+  Notify_Test_Client ();
   virtual ~Notify_Test_Client ();
 
   /// starts the orb and resolves the notify factory via a naming service.
@@ -42,7 +42,7 @@ public:
   virtual int parse_args (int argc, ACE_TCHAR* argv[]);
 
   /// Call ORB::run to accept requests.
-  int ORB_run (void);
+  int ORB_run ();
   int ORB_run (ACE_Time_Value& tv);
 
   /// How many clients will call consumer_done.
@@ -55,16 +55,16 @@ public:
   bool is_done () const;
 
   /// Access the ORB.  This class retains ownership.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Access the Root POA.  This class retains ownership.
-  PortableServer::POA_ptr root_poa (void);
+  PortableServer::POA_ptr root_poa ();
 
   /// Access the Naming Context.  This class retains ownership.
-  CosNaming::NamingContext_ptr naming_context (void);
+  CosNaming::NamingContext_ptr naming_context ();
 
   /// Access the Notify Factory.  This class retains ownership.
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory ();
 
   /// Create an Event Channel.  Ownership is passed to the caller.
   CosNotifyChannelAdmin::EventChannel_ptr create_event_channel (
@@ -77,10 +77,10 @@ protected:
                 ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   // = Data Members
   /// Reference to the root poa.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 1f5f98fb996..88d48237464 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -3,7 +3,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void)
+TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 655b44e80cf..ecc83844eb0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -27,7 +27,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Options_Parser
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Options_Parser (void);
+  TAO_Notify_Tests_Options_Parser ();
 
   /// Destructor
   ~TAO_Notify_Tests_Options_Parser ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index fce46f2b1f9..b8ce5e420d6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -9,7 +9,7 @@
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void)
+TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer ()
   : poa_name_ (TAO_Notify_Tests_Name::root_poa)
   , ifgop_ (CosNotifyChannelAdmin::OR_OP)
 {
@@ -75,7 +75,7 @@ TAO_Notify_Tests_Peer::set_name (ACE_CString& name)
 }
 
 const ACE_CString&
-TAO_Notify_Tests_Peer::get_name (void)
+TAO_Notify_Tests_Peer::get_name ()
 {
   return this->name_;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index 35e8c0c23c7..0583742a62f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -29,7 +29,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Peer
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Peer (void);
+  TAO_Notify_Tests_Peer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Peer ();
@@ -45,7 +45,7 @@ public:
 
   // Accessor to set/get our name.
   void set_name (ACE_CString& name);
-  const ACE_CString& get_name (void);
+  const ACE_CString& get_name ();
 
 protected:
   /// My name.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 1e65754e8f5..a6d350b7010 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -10,7 +10,7 @@
 #include "orbsvcs/NotifyExtC.h"
 
 template <class Peer_Traits>
-TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T ()
   : proxy_id_ (0)
 {
 }
@@ -22,14 +22,14 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::~TAO_Notify_Tests_Peer_T ()
 
 template <class Peer_Traits>
 typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy ()
 {
   return proxy_.in ();
 }
 
 template <class Peer_Traits>
 typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
-TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::activate ()
 {
   return this->_this ();
 }
@@ -76,7 +76,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr)
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect ()
 {
   // Get the POA
   PortableServer::POA_var poa;
@@ -118,7 +118,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::status ()
 {
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   try
@@ -158,7 +158,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
@@ -195,7 +195,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index e74225f343b..36e0412a554 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -41,7 +41,7 @@ class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Peer_T (void);
+  TAO_Notify_Tests_Peer_T ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Peer_T ();
@@ -55,29 +55,29 @@ public:
   void connect (Admin_Traits_PTR admin_ptr);
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 
   // Disconnect from the Peer.
-  void disconnect (void);
+  void disconnect ();
 
   /// Set Qos
   void set_qos (CosNotification::QoSProperties& qos);
 
   /// Dump status
-  void status (void);
+  void status ();
 
   // Accessor for <proxy_>.
-  Proxy_Traits_PTR get_proxy (void);
+  Proxy_Traits_PTR get_proxy ();
 
   /// Deactivate the object.
-  void deactivate (void);
+  void deactivate ();
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 protected:
   /// Activate this object in the default POA.
-  virtual Peer_Traits_PTR activate (void);
+  virtual Peer_Traits_PTR activate ();
 
   ///= To be implemented by specializations.
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index b479801e745..87615780943 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -13,7 +13,7 @@
 
 int WARMUP_COUNT = 10;
 
-TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer (void)
+TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer ()
   : count_ (-2)
   , warmup_countdown_ (WARMUP_COUNT)
   , max_count_ (-1)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 2dec98e86d7..423b38510a5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -34,7 +34,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer : public TAO_Not
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Consumer (void);
+  TAO_Notify_Tests_Periodic_Consumer ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Consumer ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index fabecb84dc7..fec946fe400 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -8,7 +8,7 @@
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command ()
 {
 }
 
@@ -17,13 +17,13 @@ TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::get_name ()
 {
   return TAO_Notify_Tests_Periodic_Consumer_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Consumer_Command::name (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::name ()
 {
   return TAO_Notify_Tests_Name::periodic_consumer_command;
 }
@@ -140,7 +140,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 TAO_Notify_Tests_Periodic_Consumer*
-TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::consumer ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
 
@@ -160,13 +160,13 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos ()
 {
   this->consumer ()->set_qos (this->qos_);
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_create ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
@@ -179,7 +179,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
@@ -189,7 +189,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
@@ -199,7 +199,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
   if (consumer == 0)
@@ -209,7 +209,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_status ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
@@ -220,7 +220,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index fab2d15add8..12778f61a6e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -30,7 +30,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer_Command : public
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Consumer_Command (void);
+  TAO_Notify_Tests_Periodic_Consumer_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Consumer_Command ();
@@ -39,11 +39,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
   ///= Data Members
@@ -75,15 +75,15 @@ protected:
 
   ///= Methods
   // Retreive the consumer.
-  TAO_Notify_Tests_Periodic_Consumer* consumer (void);
+  TAO_Notify_Tests_Periodic_Consumer* consumer ();
 
   ///= Handlers
-  void handle_create (void);
-  void handle_subscriptions (void);
-  void handle_disconnect (void);
-  void handle_deactivate (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_subscriptions ();
+  void handle_disconnect ();
+  void handle_deactivate ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 6fb6b4f1306..7819c118b08 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -13,7 +13,7 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void)
+TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier ()
   : barrier_ (0),
     priority_ (0),
     period_ (0),
@@ -172,7 +172,7 @@ TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
+TAO_Notify_Tests_Periodic_Supplier::send_warmup_events ()
 {
   int WARMUP_COUNT = 10;
 
@@ -183,7 +183,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
+TAO_Notify_Tests_Periodic_Supplier::send_prologue ()
 {
   // populate event.
   // send the base time and max count.
@@ -208,7 +208,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
+TAO_Notify_Tests_Periodic_Supplier::handle_svc ()
 {
   this->send_prologue ();
 
@@ -291,7 +291,7 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
 }
 
 int
-TAO_Notify_Tests_Periodic_Supplier::svc (void)
+TAO_Notify_Tests_Periodic_Supplier::svc ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n"));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index f8d3ee9a8c4..f1a56c220d8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -33,7 +33,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier : public TAO_Not
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Supplier (void);
+  TAO_Notify_Tests_Periodic_Supplier ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Supplier ();
@@ -54,17 +54,17 @@ public:
   void dump_stats (ACE_TCHAR* msg, int dump_samples);
 
   /// Get the name of the proxy
-  const char* proxy_name (void);
+  const char* proxy_name ();
 
 protected:
   /// svc method.
-  void handle_svc (void);
+  void handle_svc ();
 
   /// Send a few events before the actual measurements.
-  void send_warmup_events (void);
+  void send_warmup_events ();
 
   /// Send Prologue
-  void send_prologue (void);
+  void send_prologue ();
 
   /// All tasks synch at this barrier.
   ACE_Barrier* barrier_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 893ec715baa..e198d73f345 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -7,7 +7,7 @@
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command ()
 {
 }
 
@@ -16,13 +16,13 @@ TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::get_name ()
 {
   return TAO_Notify_Tests_Periodic_Supplier_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Supplier_Command::name (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::name ()
 {
   return TAO_Notify_Tests_Name::periodic_supplier_command;
 }
@@ -130,7 +130,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 TAO_Notify_Tests_Periodic_Supplier*
-TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::supplier ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
@@ -147,7 +147,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_create ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
@@ -159,7 +159,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
@@ -169,7 +169,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier= this->supplier ();
   if (supplier == 0)
@@ -179,7 +179,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
@@ -189,7 +189,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_status ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
@@ -200,7 +200,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
@@ -211,7 +211,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 7f91d2ecff8..e0d01d2559d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -30,7 +30,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier_Command : public
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Supplier_Command (void);
+  TAO_Notify_Tests_Periodic_Supplier_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Supplier_Command ();
@@ -39,11 +39,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
 #ifdef HPUX_11
@@ -74,15 +74,15 @@ protected:
 
   ///= Methods
   // Retreive the suppliers.
-  TAO_Notify_Tests_Periodic_Supplier* supplier (void);
+  TAO_Notify_Tests_Periodic_Supplier* supplier ();
 
   ///= Handlers
-  void handle_create (void);
-  void handle_offers (void);
-  void handle_disconnect (void);
-  void handle_deactivate (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_offers ();
+  void handle_disconnect ();
+  void handle_deactivate ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 5b65827eef4..6a663b6b6a9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -1,7 +1,7 @@
 #include "Priority_Mapping.h"
 
 
-TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void)
+TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
index 2af5dd5c60b..f06f83f368e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
@@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_Notify_Tests_Priority_Mapping (void);
+  virtual ~TAO_Notify_Tests_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (CORBA::Short corba_priority,
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 21b198b5164..d0a5f3ad66e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -5,14 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void)
+TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits ()
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_PushConsumer::TAO_Notify_Tests_PushConsumer (void)
+TAO_Notify_Tests_PushConsumer::TAO_Notify_Tests_PushConsumer ()
 {
 }
 
@@ -27,14 +27,14 @@ TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee
 }
 
 void
-TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void)
+TAO_Notify_Tests_PushConsumer::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
   this->proxy_->disconnect_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void)
+TAO_Notify_Tests_PushConsumer::disconnect_push_consumer ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 27f11806aa7..d547df8b1cb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer_Traits
 {
 public:
-  TAO_Notify_Tests_PushConsumer_Traits (void);
+  TAO_Notify_Tests_PushConsumer_Traits ();
 
   typedef CosNotifyComm::PushConsumer INTERFACE;
   typedef CosNotifyComm::PushConsumer_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer : public TAO_Notify_T
 
 public:
   /// Constructor
-  TAO_Notify_Tests_PushConsumer (void);
+  TAO_Notify_Tests_PushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_PushConsumer ();
@@ -72,10 +72,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = PushConsumer methods
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Default does nothing.
   void push (const CORBA::Any & data);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index c06dc8c17a7..caaf7bbe6d3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -5,14 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void)
+TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits ()
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_PushSupplier::TAO_Notify_Tests_PushSupplier (void)
+TAO_Notify_Tests_PushSupplier::TAO_Notify_Tests_PushSupplier ()
 {
 }
 
@@ -35,14 +35,14 @@ TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee
 }
 
 void
-TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void)
+TAO_Notify_Tests_PushSupplier::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
   this->proxy_->disconnect_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void)
+TAO_Notify_Tests_PushSupplier::disconnect_push_supplier ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index a0889463f96..d87ee30deb0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier_Traits
 {
 public:
-  TAO_Notify_Tests_PushSupplier_Traits (void);
+  TAO_Notify_Tests_PushSupplier_Traits ();
 
   typedef CosNotifyComm::PushSupplier INTERFACE;
   typedef CosNotifyComm::PushSupplier_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier : public TAO_Notify_T
 
 public:
   /// Constructor
-  TAO_Notify_Tests_PushSupplier (void);
+  TAO_Notify_Tests_PushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_PushSupplier ();
@@ -75,10 +75,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = PushSupplier method
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 5341b868cdc..7e7aed692d5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -13,7 +13,7 @@ TAO_Notify_Tests_Relay_Consumer::~TAO_Notify_Tests_Relay_Consumer ()
 }
 
 void
-TAO_Notify_Tests_Relay_Consumer::connect (void)
+TAO_Notify_Tests_Relay_Consumer::connect ()
 {
   TAO_Notify_Tests_Direct_Consumer::connect ();
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index e41b059d7cc..012f0d7d19b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -32,7 +32,7 @@ public:
   ~TAO_Notify_Tests_Relay_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 
   void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
                               );
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 69f1580fac4..78c0ffbe9a1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -5,14 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void)
+TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits ()
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_SequencePushConsumer::TAO_Notify_Tests_SequencePushConsumer (void)
+TAO_Notify_Tests_SequencePushConsumer::TAO_Notify_Tests_SequencePushConsumer ()
 {
 }
 
@@ -27,14 +27,14 @@ TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
   this->proxy_->disconnect_sequence_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 6bb54ea72d0..3398d342583 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer_Traits
 {
 public:
-  TAO_Notify_Tests_SequencePushConsumer_Traits (void);
+  TAO_Notify_Tests_SequencePushConsumer_Traits ();
 
   typedef CosNotifyComm::SequencePushConsumer INTERFACE;
   typedef CosNotifyComm::SequencePushConsumer_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer : public TAO_
 
 public:
   /// Constructor
-  TAO_Notify_Tests_SequencePushConsumer (void);
+  TAO_Notify_Tests_SequencePushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_SequencePushConsumer ();
@@ -72,10 +72,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = SequencePushConsumer methods
-  virtual void disconnect_sequence_push_consumer (void);
+  virtual void disconnect_sequence_push_consumer ();
 
  /// Default does nothing.
   virtual void push_structured_events (
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 7898a9101fb..6c3b5ce66d0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -5,14 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void)
+TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits ()
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_SequencePushSupplier::TAO_Notify_Tests_SequencePushSupplier (void)
+TAO_Notify_Tests_SequencePushSupplier::TAO_Notify_Tests_SequencePushSupplier ()
 {
 }
 
@@ -36,14 +36,14 @@ TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
   this->proxy_->disconnect_sequence_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index d047bcf2f02..57d4e540967 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier_Traits
 {
 public:
-  TAO_Notify_Tests_SequencePushSupplier_Traits (void);
+  TAO_Notify_Tests_SequencePushSupplier_Traits ();
 
   typedef CosNotifyComm::SequencePushSupplier INTERFACE;
   typedef CosNotifyComm::SequencePushSupplier_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier : public TAO_
 
 public:
   /// Constructor
-  TAO_Notify_Tests_SequencePushSupplier (void);
+  TAO_Notify_Tests_SequencePushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_SequencePushSupplier ();
@@ -75,10 +75,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = SequencePushSupplier method
-  virtual void disconnect_sequence_push_supplier (void);
+  virtual void disconnect_sequence_push_supplier ();
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index 9ef61bfdd45..f05dad97be8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -1,7 +1,7 @@
 #include "StructuredEvent.h"
 
 
-TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void)
+TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent ()
 {
 }
 
@@ -41,7 +41,7 @@ TAO_Notify_Tests_StructuredEvent::type (const char* domain, const char* type)
 }
 
 const char*
-TAO_Notify_Tests_StructuredEvent::type (void)
+TAO_Notify_Tests_StructuredEvent::type ()
 {
   return event_.header.fixed_header.event_type.type_name;
 }
@@ -79,7 +79,7 @@ TAO_Notify_Tests_StructuredEvent::payload (CORBA::Any& value)
 }
 
 CosNotification::StructuredEvent&
-TAO_Notify_Tests_StructuredEvent::event (void)
+TAO_Notify_Tests_StructuredEvent::event ()
 {
   return this->event_;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index e7216cff97e..605b84bfb95 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredEvent
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_StructuredEvent (void);
+  TAO_Notify_Tests_StructuredEvent ();
   TAO_Notify_Tests_StructuredEvent (const char* name);
   TAO_Notify_Tests_StructuredEvent (const char* domain, const char* type);
   TAO_Notify_Tests_StructuredEvent (const char* name, const char* domain, const char* type);
@@ -37,7 +37,7 @@ public:
   void name (const char* name);
   void type (const char* domain, const char* type);
 
-  const char* type (void);
+  const char* type ();
 
   /// add <name,value> to optional header sequence.
   void opt_header (const char* name, CORBA::Any& value);
@@ -52,7 +52,7 @@ public:
   void payload (CORBA::Any& value);
 
   /// access the underlying event.
-  CosNotification::StructuredEvent& event (void);
+  CosNotification::StructuredEvent& event ();
 
 private:
   CosNotification::StructuredEvent event_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index acd8e77f3d1..1de6725538b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -5,14 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void)
+TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits ()
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_StructuredPushConsumer::TAO_Notify_Tests_StructuredPushConsumer (void)
+TAO_Notify_Tests_StructuredPushConsumer::TAO_Notify_Tests_StructuredPushConsumer ()
 {
 }
 
@@ -27,14 +27,14 @@ TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR prox
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
   this->proxy_->disconnect_structured_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 3701c977647..76a878d02ae 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer_Traits
 {
 public:
-  TAO_Notify_Tests_StructuredPushConsumer_Traits (void);
+  TAO_Notify_Tests_StructuredPushConsumer_Traits ();
 
   typedef CosNotifyComm::StructuredPushConsumer INTERFACE;
   typedef CosNotifyComm::StructuredPushConsumer_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer : public TA
 
 public:
   /// Constructor
-  TAO_Notify_Tests_StructuredPushConsumer (void);
+  TAO_Notify_Tests_StructuredPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_StructuredPushConsumer ();
@@ -72,10 +72,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = StructuredPushConsumer methods
-  virtual void disconnect_structured_push_consumer (void);
+  virtual void disconnect_structured_push_consumer ();
 
  /// Default does nothing.
   virtual void push_structured_event (
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index 02d9fae6808..609a65e2798 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -5,14 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void)
+TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits ()
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_StructuredPushSupplier::TAO_Notify_Tests_StructuredPushSupplier (void)
+TAO_Notify_Tests_StructuredPushSupplier::TAO_Notify_Tests_StructuredPushSupplier ()
 {
 }
 
@@ -37,14 +37,14 @@ TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR prox
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
   this->proxy_->disconnect_structured_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index 72a1bf22d23..906df4ed279 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier_Traits
 {
 public:
-  TAO_Notify_Tests_StructuredPushSupplier_Traits (void);
+  TAO_Notify_Tests_StructuredPushSupplier_Traits ();
 
   typedef CosNotifyComm::StructuredPushSupplier INTERFACE;
   typedef CosNotifyComm::StructuredPushSupplier_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier : public TA
 
 public:
   /// Constructor
-  TAO_Notify_Tests_StructuredPushSupplier (void);
+  TAO_Notify_Tests_StructuredPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_StructuredPushSupplier ();
@@ -75,10 +75,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index b3b91fae728..80ba61097f1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -5,7 +5,7 @@
 #include "Name.h"
 #include "Options_Parser.h"
 
-TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command (void)
+TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command ()
 : ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
@@ -15,13 +15,13 @@ TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command
 }
 
 const char*
-TAO_Notify_Tests_SupplierAdmin_Command::get_name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::get_name ()
 {
   return TAO_Notify_Tests_SupplierAdmin_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_SupplierAdmin_Command::name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::name ()
 {
   return TAO_Notify_Tests_Name::supplier_admin_command;
 }
@@ -87,7 +87,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_create ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -102,7 +102,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_offers ()
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -128,12 +128,12 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_status (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_status ()
 {
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos ()
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -143,7 +143,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::execute_i (void)
+TAO_Notify_Tests_SupplierAdmin_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index 5652a2d05c8..e7b13a30048 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SupplierAdmin_Command : public TAO
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_SupplierAdmin_Command (void);
+  TAO_Notify_Tests_SupplierAdmin_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_SupplierAdmin_Command ();
@@ -37,11 +37,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
 #ifdef HPUX_11
@@ -73,10 +73,10 @@ protected:
   CosNotification::EventTypeSeq removed_;
 
   /// = Handlers
-  void handle_create (void);
-  void handle_offers (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_offers ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 75e2ce86f1b..170fa2a4ab7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -5,7 +5,7 @@
 
 
 template <class Supplier_Traits>
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T ()
 {
 }
 
@@ -15,7 +15,7 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::~TAO_Notify_Tests_Supplier_T ()
 }
 
 template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer (void)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer ()
 {
   return this->get_proxy ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index 8b9e22292c8..43d4e6310b2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -50,13 +50,13 @@ class TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Tra
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Supplier_T (void);
+  TAO_Notify_Tests_Supplier_T ();
 
   /// Destructor
   ~TAO_Notify_Tests_Supplier_T ();
 
   /// For backward compatibility. use <get_proxy> instead.
-  Proxy_Traits_PTR get_proxy_consumer (void);
+  Proxy_Traits_PTR get_proxy_consumer ();
 
   /// Send offer change.
   void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
index 89e9ca09e88..63780e8d631 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
@@ -1,5 +1,5 @@
 #include "Task_Callback.h"
 
-TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback (void)
+TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback ()
 {
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
index fa25715f91d..5961ff0407e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
@@ -26,7 +26,7 @@ class TAO_Notify_Tests_Periodic_Consumer;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Task_Callback
 {
 public:
-  virtual ~TAO_Notify_Tests_Task_Callback (void);
+  virtual ~TAO_Notify_Tests_Task_Callback ();
   virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier) = 0;
   virtual void done (TAO_Notify_Tests_Periodic_Consumer* consumer) = 0;
 };
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index 89ee2135cd5..98efa2bd726 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -9,12 +9,12 @@
 ACE_High_Res_Timer::global_scale_factor_type Task_Stats::gsf_ =
   ACE_High_Res_Timer::global_scale_factor ();
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
 
-Task_Stats::Task_Stats (void)
+Task_Stats::Task_Stats ()
   : base_time_(0),
     end_time_ (0),
     max_samples_ (0),
@@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->time_inv_;
   delete[] this->time_exec_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index 90c1e76fec5..15c70bfd8c3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -26,7 +26,7 @@
 class TAO_NOTIFY_TEST_Export Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -41,10 +41,10 @@ class TAO_NOTIFY_TEST_Export Task_Stats
 {
  public:
   /// Constructor
-  Task_Stats (void);
+  Task_Stats ();
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Useful Global Scale Factor
   static ACE_High_Res_Timer::global_scale_factor_type gsf_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 92a936634e6..476f7066653 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index c140fa781cf..13944655096 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -37,12 +37,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 910eae6827d..433ee9953a7 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -61,7 +61,7 @@ RedGreen_Test::parse_args (int argc,
   return 0;
 }
 
-RedGreen_Test::RedGreen_Test (void)
+RedGreen_Test::RedGreen_Test ()
   : burst_size_ (10),
     nthreads_ (2)
 {
@@ -117,7 +117,7 @@ RedGreen_Test::init (int argc,
 }
 
 void
-RedGreen_Test::run (void)
+RedGreen_Test::run ()
 {
   try
   {
@@ -142,7 +142,7 @@ RedGreen_Test::run (void)
 }
 
 void
-RedGreen_Test::done (void)
+RedGreen_Test::done ()
 {
   dump_results ();
   worker_.done ();
@@ -181,7 +181,7 @@ RedGreen_Test::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-RedGreen_Test::resolve_naming_service (void)
+RedGreen_Test::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -197,7 +197,7 @@ RedGreen_Test::resolve_naming_service (void)
 }
 
 void
-RedGreen_Test::resolve_Notify_factory (void)
+RedGreen_Test::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -213,7 +213,7 @@ RedGreen_Test::resolve_Notify_factory (void)
 }
 
 void
-RedGreen_Test::create_EC (void)
+RedGreen_Test::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -225,7 +225,7 @@ RedGreen_Test::create_EC (void)
 }
 
 void
-RedGreen_Test::create_supplieradmin (void)
+RedGreen_Test::create_supplieradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -237,7 +237,7 @@ RedGreen_Test::create_supplieradmin (void)
 }
 
 void
-RedGreen_Test::create_consumeradmin (void)
+RedGreen_Test::create_consumeradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -249,7 +249,7 @@ RedGreen_Test::create_consumeradmin (void)
 }
 
 void
-RedGreen_Test::create_consumers (void)
+RedGreen_Test::create_consumers ()
 {
   ACE_NEW (this->normal_consumer_,
            RedGreen_Test_StructuredPushConsumer (this));
@@ -261,7 +261,7 @@ RedGreen_Test::create_consumers (void)
 }
 
 void
-RedGreen_Test::create_suppliers (void)
+RedGreen_Test::create_suppliers ()
 {
   ACE_NEW (this->supplier_,
            RedGreen_Test_StructuredPushSupplier ());
@@ -269,7 +269,7 @@ RedGreen_Test::create_suppliers (void)
 }
 
 void
-RedGreen_Test::send_events (void)
+RedGreen_Test::send_events ()
 {
   // Setup the Consumer 1 to receive
   //event_type : "DOMAIN_GREEN", "DOMAIN_GREEN".
@@ -337,7 +337,7 @@ RedGreen_Test::send_events (void)
 
 
 void
-RedGreen_Test::dump_results (void)
+RedGreen_Test::dump_results ()
 {
   ACE_Throughput_Stats throughput;
   ACE_High_Res_Timer::global_scale_factor_type gsf =
@@ -437,7 +437,7 @@ RedGreen_Test_StructuredPushConsumer::connect (
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::disconnect (void)
+RedGreen_Test_StructuredPushConsumer::disconnect ()
 {
   this->proxy_supplier_->
     disconnect_structured_push_supplier ();
@@ -505,7 +505,7 @@ RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (
 }
 
 CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr
-RedGreen_Test_StructuredPushConsumer::get_proxy_supplier (void)
+RedGreen_Test_StructuredPushConsumer::get_proxy_supplier ()
 {
   return this->proxy_supplier_.in ();
 }
@@ -587,7 +587,7 @@ RedGreen_Test_StructuredPushSupplier::connect (
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect (void)
+RedGreen_Test_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -637,7 +637,7 @@ RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
 
 //*****************************************************************
 
-Worker::Worker (void)
+Worker::Worker ()
 {
 }
 
@@ -648,13 +648,13 @@ Worker::orb (CORBA::ORB_ptr orb)
 }
 
 void
-Worker::done (void)
+Worker::done ()
 {
   consumer_is_done = true;
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 1fcdeaa6a64..44f32fc0028 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -42,7 +42,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   /// Constructor.
-  Worker (void);
+  Worker ();
 
   void orb (CORBA::ORB_ptr orb);
 
@@ -50,7 +50,7 @@ public:
   virtual int svc ();
 
   // Shutdown ORB
-  void done (void);
+  void done ();
 
 private:
   /// The orb
@@ -68,25 +68,25 @@ class RedGreen_Test
 {
  public:
   // = Initialization
-  RedGreen_Test (void);
+  RedGreen_Test ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
-  void dump_results (void);
+  void dump_results ();
 
   /// Initialize the Client.
   void init (int argc,
              ACE_TCHAR *argv []);
 
   /// Run the demo.
-  void run (void);
+  void run ();
 
   /// Called when all events we are waiting for have occurred.
-  void done (void);
+  void done ();
 
   /// Destroy from the EC
-  void destroy_ec (void);
+  void destroy_ec ();
 
   int burst_size_;
   Worker worker_;
@@ -98,28 +98,28 @@ class RedGreen_Test
                  ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   /// Create an EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// Create the Supplier Admin.
-  void create_supplieradmin(void);
+  void create_supplieradmin();
 
   /// Create the Consumer Admin.
-  void create_consumeradmin (void);
+  void create_consumeradmin ();
 
   /// Create and initialize the consumers.
-  void create_consumers (void);
+  void create_consumers ();
 
   /// create and initialize the suppliers.
-  void create_suppliers (void);
+  void create_suppliers ();
 
   /// send the events.
-  void send_events (void);
+  void send_events ();
 
   // = Data Members.
   /// Reference to the root poa.
@@ -177,10 +177,10 @@ public:
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the supplier.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
   /// Accessor for the Proxy that we're connected to.
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
+  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier ();
 
   /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
@@ -210,7 +210,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~RedGreen_Test_StructuredPushConsumer (void);
+  virtual ~RedGreen_Test_StructuredPushConsumer ();
 
   // = NotifyPublish method
   virtual void offer_change (
@@ -247,14 +247,14 @@ class RedGreen_Test_StructuredPushSupplier
   //
 public:
   /// Constructor.
-  RedGreen_Test_StructuredPushSupplier (void);
+  RedGreen_Test_StructuredPushSupplier ();
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   virtual void send_event (CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index d1aa014c192..7b7ea8fbf23 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -115,7 +115,7 @@ Throughput_StructuredPushSupplier::dump_stats (
 }
 
 int
-Throughput_StructuredPushSupplier::svc (void)
+Throughput_StructuredPushSupplier::svc ()
 {
   // Initialize a time value to pace the test.
   ACE_Time_Value tv (0, test_client_->burst_pause_);
@@ -179,7 +179,7 @@ Throughput_StructuredPushSupplier::svc (void)
 }
 
 /***************************************************************************/
-Notify_Throughput::Notify_Throughput (void)
+Notify_Throughput::Notify_Throughput ()
   : collocated_ec_ (0),
     burst_count_ (1),
     burst_pause_ (10000),
@@ -388,7 +388,7 @@ Notify_Throughput::parse_args(int argc, ACE_TCHAR *argv[])
 }
 
 void
-Notify_Throughput::create_EC (void)
+Notify_Throughput::create_EC ()
 {
   if (this->collocated_ec_ == 1)
     {
@@ -438,7 +438,7 @@ else
 }
 
 void
-Notify_Throughput::run_test (void)
+Notify_Throughput::run_test ()
 {
   ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ,"
               "burst_count_ %d, "
@@ -491,7 +491,7 @@ Notify_Throughput::run_test (void)
 }
 
 void
-Notify_Throughput::peer_done (void)
+Notify_Throughput::peer_done ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, lock_);
 
@@ -503,7 +503,7 @@ Notify_Throughput::peer_done (void)
 }
 
 void
-Notify_Throughput::dump_results (void)
+Notify_Throughput::dump_results ()
 {
   ACE_Throughput_Stats throughput;
   ACE_High_Res_Timer::global_scale_factor_type gsf =
@@ -575,7 +575,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Worker::Worker (void)
+Worker::Worker ()
 :done_ (0)
 {
 }
@@ -587,7 +587,7 @@ Worker::orb (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(5);
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 3608ad848c4..041cee324e2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -36,7 +36,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   /// ctor
-  Worker (void);
+  Worker ();
 
   void orb (CORBA::ORB_ptr orb);
 
@@ -131,7 +131,7 @@ class Notify_Throughput : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Notify_Throughput (void);
+  Notify_Throughput ();
   virtual ~Notify_Throughput ();
 
   int parse_args(int argc, ACE_TCHAR *argv[]) ;
@@ -140,18 +140,18 @@ public:
   int init (int argc, ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// Peers call this when done.
-  void peer_done (void);
+  void peer_done ();
 
   /// check if we got the expected results.
-  void dump_results (void);
+  void dump_results ();
 
   Worker worker_;
 protected:
   /// Create participants.
-  void create_EC (void);
+  void create_EC ();
 
   /// is the ec collocated.
   CORBA::Boolean collocated_ec_;
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 9641e4f164f..b67966b3f46 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -14,7 +14,7 @@
 #include "tao/debug.h"
 
 
-  Client::Client (void)
+  Client::Client ()
 {
 }
 
@@ -52,7 +52,7 @@ Client::init (int argc,
 // Testing the methods of the property service.
 
 int
-Client::property_tester (void)
+Client::property_tester ()
 {
   // = Testing PropertySet & Iterators.
 
@@ -103,7 +103,7 @@ Client::property_tester (void)
 // Testing define_property.
 
 int
-Client::test_define_property (void)
+Client::test_define_property ()
 {
   CORBA::Any anyval;
 
@@ -159,7 +159,7 @@ Client::test_define_property (void)
 // Testing get_all_property_names of the PropertySet.
 
 int
-Client::test_get_all_property_names (void)
+Client::test_get_all_property_names ()
 {
   // Get the size.
   CORBA::ULong num_of_properties =
@@ -233,7 +233,7 @@ Client::test_get_all_property_names (void)
 // properties.
 
 int
-Client::test_get_properties (void)
+Client::test_get_properties ()
 {
   // Get float_property, string_property and no_property. If return
   // value is false and type is tc_void then that name is not there in
@@ -322,7 +322,7 @@ Client::test_get_properties (void)
 // Testing, get_number_of_properties.
 
 int
-Client::test_get_number_of_properties (void)
+Client::test_get_number_of_properties ()
 {
   CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties ();
 
@@ -366,7 +366,7 @@ Client::test_delete_property (const char *property_name)
 // properties.
 
 int
-Client::test_delete_properties (void)
+Client::test_delete_properties ()
 {
   CosPropertyService::PropertyNames prop_names;
   prop_names.length (3);
@@ -383,7 +383,7 @@ Client::test_delete_properties (void)
 // float in the property set.
 
 int
-Client::test_define_properties (void)
+Client::test_define_properties ()
 {
   CosPropertyService::Properties nproperties;
   nproperties.length (4);
@@ -429,7 +429,7 @@ Client::test_define_properties (void)
 // Test get_all_properties.
 
 int
-Client::test_get_all_properties (void)
+Client::test_get_all_properties ()
 {
   // Get the number of current properties.
   CORBA::ULong num_of_properties =
@@ -563,7 +563,7 @@ Client::test_get_all_properties (void)
 // Testing define property with mode.
 // Defines char, short, long and float properties with different modes.
 int
-Client::test_define_property_with_mode (void)
+Client::test_define_property_with_mode ()
 {
   CORBA::Any anyval;
 
@@ -620,7 +620,7 @@ Client::test_define_property_with_mode (void)
 }
 
 int
-Client::test_get_property_value (void)
+Client::test_get_property_value ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 18c81e93438..2bcb7e48f87 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -38,17 +38,17 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Initialize the ORB etc, and bind the MMDevices.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the client.  This will call StreamCtrl::bind_devs.
-  int run (void);
+  int run ();
 
   /// Testing  the property service methods.
-  int property_tester (void);
+  int property_tester ();
 
 protected:
   /// Bind to the remote MMDevice.
@@ -58,34 +58,34 @@ protected:
   // = Property Testing.
 
   /// Testing the define property method.
-  int test_define_property (void);
+  int test_define_property ();
 
   /// Testing the number of properties, currently in the Property Set.
-  int test_get_number_of_properties (void);
+  int test_get_number_of_properties ();
 
   ///Testing get_all_property_names.
-  int test_get_all_property_names (void);
+  int test_get_all_property_names ();
 
   /// Testing get_property_value.
-  int test_get_property_value (void);
+  int test_get_property_value ();
 
   ///Testing get_properties.  Give the names and get their properties.
-  int test_get_properties (void);
+  int test_get_properties ();
 
   /// Testing get_all_properties.
-  int test_get_all_properties (void);
+  int test_get_all_properties ();
 
   /// Testing delete_property.
   int test_delete_property (const char *property_name);
 
   /// Testing delete_properties.
-  int test_delete_properties (void);
+  int test_delete_properties ();
 
   /// Defining a sequence of properties.
-  int test_define_properties (void);
+  int test_define_properties ();
 
   /// Defines properties with various modes.
-  int test_define_property_with_mode (void);
+  int test_define_property_with_mode ();
 
   /// The ORB manager, handles ORB initialization etc.
   TAO_ORB_Manager manager_;
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 3dec33abd9a..cfa6d7e40bd 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -31,36 +31,36 @@ public:
   // He has to instantiate TAO_NamesIterator class using the instance
   // of TAO_PropertySet.
 
-  TAO_PropertySet_Tester (void);
+  TAO_PropertySet_Tester ();
   // Constructor.
 
-  ~TAO_PropertySet_Tester (void);
+  ~TAO_PropertySet_Tester ();
   // Destructor.
 
-  int test_define_property (void);
+  int test_define_property ();
   // Defines a char,a short, a long, a float and a string property.
 
-  int test_get_number_of_properties (void);
+  int test_get_number_of_properties ();
   // Gets the number of properties currently defined in the PropertySet.
 
   int test_delete_property (const char *property_name);
   // Delete a given property.
 
-  int test_is_property_defined (void);
+  int test_is_property_defined ();
   // Check the following properties are defined or
   // no. "char_property", "short_property" and a "string_property".
 
-  int test_get_property_value (void);
+  int test_get_property_value ();
   // Get the "float_property" and "string_property" and print them
   // out.
 
-  int test_delete_properties (void);
+  int test_delete_properties ();
   // Delete char, short,long, and string properties.
 
-  int test_delete_all_properties (void);
+  int test_delete_all_properties ();
   // Delete all the properties.
 
-  int test_define_properties (void);
+  int test_define_properties ();
   // Define a sequence of properties. a char, a short, a long, a float
   // and a string.
 
@@ -82,14 +82,14 @@ public:
   TAO_PropertyNamesIterator_Tester (TAO_PropertySet_Tester &propertyset_tester);
   // Constructor. To make names iterator from the property set object.
 
-  ~TAO_PropertyNamesIterator_Tester (void);
+  ~TAO_PropertyNamesIterator_Tester ();
   // Destructor.
 
-  int test_next_one (void);
+  int test_next_one ();
   // Test next one method. Iterate thru all the names in the
   // PropertySet and print them out.
 
-  int test_reset (void);
+  int test_reset ();
   // Test the reset method.
 
   int test_next_n (size_t n);
@@ -101,18 +101,18 @@ private:
 
 
 // Constructor.
-TAO_PropertySet_Tester::TAO_PropertySet_Tester (void)
+TAO_PropertySet_Tester::TAO_PropertySet_Tester ()
 {
 }
 
 // Destructor.
-TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
+TAO_PropertySet_Tester::~TAO_PropertySet_Tester ()
 {
 }
 
 // Defines a char, a short, a long, a float and a string.
 int
-TAO_PropertySet_Tester::test_define_property (void)
+TAO_PropertySet_Tester::test_define_property ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property\n"));
@@ -185,7 +185,7 @@ TAO_PropertySet_Tester::test_define_property (void)
 
 // Testing, get_number_of_properties.
 int
-TAO_PropertySet_Tester::test_get_number_of_properties (void)
+TAO_PropertySet_Tester::test_get_number_of_properties ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Main : Number of props : %d\n",
@@ -208,7 +208,7 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name)
 // Gets the value of "short_property" and "string_property".
 
 int
-TAO_PropertySet_Tester::test_get_property_value (void)
+TAO_PropertySet_Tester::test_get_property_value ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking get_property_value\n"));
@@ -246,7 +246,7 @@ TAO_PropertySet_Tester::test_get_property_value (void)
 // "string_property" and "char_property".
 
 int
-TAO_PropertySet_Tester::test_is_property_defined (void)
+TAO_PropertySet_Tester::test_is_property_defined ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking is_property_defined ()\n"));
@@ -276,7 +276,7 @@ TAO_PropertySet_Tester::test_is_property_defined (void)
 // PropertySet.  Deleting char, short, long, float and string
 // properties.
 int
-TAO_PropertySet_Tester::test_delete_properties (void)
+TAO_PropertySet_Tester::test_delete_properties ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties == Deleting a sequence of Properties\n"));
@@ -298,7 +298,7 @@ TAO_PropertySet_Tester::test_delete_properties (void)
 // Defines a sequnce of properties containing, char, short, long,
 // float and string property in the property set.
 int
-TAO_PropertySet_Tester::test_define_properties (void)
+TAO_PropertySet_Tester::test_define_properties ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_properties == Defining sequence of properties\n"));
@@ -353,7 +353,7 @@ TAO_PropertySet_Tester::test_define_properties (void)
 
 // Delete all the properties.
 int
-TAO_PropertySet_Tester::test_delete_all_properties (void)
+TAO_PropertySet_Tester::test_delete_all_properties ()
 {
   // Deleting all the properties
   ACE_DEBUG ((LM_DEBUG,
@@ -375,14 +375,14 @@ TAO_PropertyNamesIterator_Tester::TAO_PropertyNamesIterator_Tester (TAO_Property
 }
 
 // Destructor.
-TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
+TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester ()
 {
 }
 
 // Test next one method. Iterate thru all the names in the
 // PropertySet and print them out.
 int
-TAO_PropertyNamesIterator_Tester::test_next_one (void)
+TAO_PropertyNamesIterator_Tester::test_next_one ()
 {
   CORBA::String_var strvar;
   ACE_DEBUG ((LM_DEBUG,
@@ -399,7 +399,7 @@ TAO_PropertyNamesIterator_Tester::test_next_one (void)
 
 // Reset the names iterator.
 int
-TAO_PropertyNamesIterator_Tester::test_reset (void)
+TAO_PropertyNamesIterator_Tester::test_reset ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Resetting (reset ()) the NamesIterator."));
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index f583e10c785..959933e9d5c 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -27,7 +27,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
   // Constructor.
 
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
   // Destructor.
 
   // = Interface implementation accessor methods.
@@ -35,7 +35,7 @@ public:
   void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void);
+  CORBA::Short id ();
   // Gets id.
 
 private:
@@ -47,12 +47,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 21be335d766..b2e4d80e1d8 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -10,7 +10,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 6d40115b9ea..d1e7215d8ee 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -11,7 +11,7 @@
 
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
@@ -48,7 +48,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (void)
+Simple_Server_i::call_client ()
 {
   size_t pre_call_connections =
     this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
@@ -86,7 +86,7 @@ Simple_Server_i::call_client (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
index f7a40ffbf10..8444d669abe 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -28,10 +28,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
@@ -56,9 +56,9 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
-  int call_client (void);
+  int call_client ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
index c2e101e5072..c9bce7f4a55 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
@@ -11,7 +11,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (void)
+Foo_i::baz ()
 {
   // Make sure that logging will occur.
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
@@ -30,7 +30,7 @@ Foo_i::baz (void)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
index d8b35af56e5..37311e46ef9 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
@@ -24,9 +24,9 @@ public:
          SecurityLevel3::SecurityCurrent_ptr current);
 
   /// Test method.
-  virtual void baz (void);
+  virtual void baz ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Reference to the ORB.
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
index 2aea77e7ca2..6a2b9729e2c 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
index f1b2d8da72f..754f82a4803 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   int result_;
 private:
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
index 613fff71ac8..55b31a10e62 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
@@ -10,7 +10,7 @@ Messenger_i::Messenger_i (CORBA::ORB_var orb)
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -56,7 +56,7 @@ Messenger_i::call_message (const char * user_name)
 }
 
 void
-Messenger_i::shutdown (void)
+Messenger_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
index cdd6cad484a..0172d33db30 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
@@ -17,7 +17,7 @@ public:
   Messenger_i (CORBA::ORB_var orb);
 
   // Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message ( const char * user_name,
                                         const char * subject,
@@ -25,7 +25,7 @@ public:
 
   virtual CORBA::Boolean call_message (const char * user_name);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index a78901c9e85..eea1bb60430 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -6,7 +6,7 @@ client_i::client_i (server_ptr s)
 {
 }
 
-client_i::~client_i (void)
+client_i::~client_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index 6cbcbb68d82..1966178c441 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -27,7 +27,7 @@ class client_i
 {
 public:
   client_i (server_ptr s);
-  virtual ~client_i (void);
+  virtual ~client_i ();
 
   virtual void test_reply (const char *msg);
 
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index 8084f520be6..8483de6b74d 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -6,7 +6,7 @@ server_i::server_i (CORBA::ORB_ptr orb)
 {
 }
 
-server_i::~server_i (void)
+server_i::~server_i ()
 {
 }
 
@@ -23,7 +23,7 @@ server_i::test_request (const char *msg)
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 5d674c48ca3..759001a23a5 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -25,13 +25,13 @@ class server_i
 {
 public:
   server_i (CORBA::ORB_ptr orb);
-  virtual ~server_i (void);
+  virtual ~server_i ();
 
   virtual void set_client (client_ptr c);
 
   virtual void test_request (const char *msg);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 6f2713ef5f3..7cfc74c06c0 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -24,7 +24,7 @@ Simple_Server_i::send_line (const char *)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
index fb2e86350c9..3391e218fca 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   void send_line (const char *line);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
index 64c5acf73df..4f1b86398cc 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
index f0e94c59e2a..cf414bdc1bd 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
index 900e505506a..751dc660f08 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
@@ -1,6 +1,6 @@
 #include "Receiver_i.h"
 
-Receiver_i::Receiver_i (void)
+Receiver_i::Receiver_i ()
   :  message_count_ (0)
   ,  byte_count_ (0)
 {
@@ -16,7 +16,7 @@ Receiver_i::receive_payload (const Receiver::Payload &payload)
 }
 
 CORBA::Long
-Receiver_i::get_event_count (void)
+Receiver_i::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
index 8f426fb3106..ea27d75337e 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
@@ -13,11 +13,11 @@ class Receiver_i
 {
 public:
   /// Constructor
-  Receiver_i (void);
+  Receiver_i ();
 
 
   /// Get the number of events that have been received, local method
-  CORBA::Long get_event_count (void);
+  CORBA::Long get_event_count ();
 
   // = The skeleton methods
   virtual void receive_payload (const Receiver::Payload &payload);
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
index 00b43a9ed7d..262880457aa 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
@@ -19,7 +19,7 @@ Sender_i::Sender_i (CORBA::ULong no_clients,
     this->payload_[j] = (j % 256);
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
   delete []this->receivers_;
 }
@@ -49,7 +49,7 @@ Sender_i::receiver_object (Receiver_ptr recv)
 
 
 void
-Sender_i::send_message (void)
+Sender_i::send_message ()
 {
   // NOTE:No synchronization with purpose. Synchrnozing this is
   // going to spoil the whole purpose of this test.
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
index a57494d613d..e19766d6b8e 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
@@ -20,13 +20,13 @@ public:
   Sender_i (CORBA::ULong no_clients,
             ACE_Manual_Event &event);
 
-  virtual ~Sender_i (void);
+  virtual ~Sender_i ();
 
   // = The skeleton methods
   virtual CORBA::Long receiver_object (Receiver *recv);
 
   /// Public method defined locally
-  void send_message (void);
+  void send_message ();
 
 private:
   /// Synchronizing acces to this class
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
index e6b3d3e6fcc..48b6835359c 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
@@ -20,7 +20,7 @@ Server_Task::Server_Task (Sender_i *sender,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Wait for the Event\n"));
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
index 3a34b55d44c..71c65b4a4c2 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
@@ -30,7 +30,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// The sender object
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index d44c009f95d..de55515f5c6 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -9,7 +9,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (void)
+Client_Worker::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -32,7 +32,7 @@ Client_Worker::validate_connection (void)
 }
 
 int
-Client_Worker::svc (void)
+Client_Worker::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
index 011ef349b52..c153997ffa4 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
@@ -39,7 +39,7 @@ public:
 
 private:
   /// Validate the connection
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The server.
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index 0d3f42a283f..1405bed4ce4 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -6,7 +6,7 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Worker::svc (void)
+Server_Worker::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 41dad39c610..06520b66af1 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -11,13 +11,13 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Simple_Server_i::ping (void)
+Simple_Server_i::ping ()
 {
   return;
 }
 
 void
-Simple_Server_i::validate_protocol (void)
+Simple_Server_i::validate_protocol ()
 {
   if (this->validated_ == NOT_VALIDATED)
     {
@@ -74,7 +74,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index ac63e1363ff..7688de68c5f 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -27,13 +27,13 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   // = The Simple_Server methods.
-  void ping (void);
+  void ping ();
 
-  void validate_protocol (void);
+  void validate_protocol ();
 
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 8dc48e6da45..0d613916741 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (void)
+Client_Worker::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -34,7 +34,7 @@ Client_Worker::validate_connection (void)
 }
 
 int
-Client_Worker::svc (void)
+Client_Worker::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index 58dae974023..b8bc8551311 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -41,7 +41,7 @@ public:
 
 private:
   /// Validate the connection
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The server.
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index 0d3f42a283f..1405bed4ce4 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -6,7 +6,7 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Worker::svc (void)
+Server_Worker::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index b7fb970ade2..19cc9236609 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -16,7 +16,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index e86c3d80b96..a35a606020f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
index 55c5b3d403c..f55e54e6e20 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
@@ -8,7 +8,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,"SUCCESS: server received expected shutdown\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
index 9dc19ba4a7c..a3617e357de 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
@@ -21,7 +21,7 @@ public:
   /// Constructor.
   Foo_i (CORBA::ORB_ptr);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Reference to the ORB.
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index 26c904715f2..53a6e121397 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -10,7 +10,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (void)
+Foo_i::baz ()
 {
   SecurityLevel3::ClientCredentials_var credentials =
     this->current_->client_credentials ();
@@ -26,7 +26,7 @@ Foo_i::baz (void)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 186ec8f7df6..954e3d9456e 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -24,9 +24,9 @@ public:
          SecurityLevel3::SecurityCurrent_ptr current);
 
   /// Test method.
-  virtual void baz (void);
+  virtual void baz ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Reference to the ORB.
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index 7adcf51ace6..07ae135debb 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -10,7 +10,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (void)
+Foo_i::baz ()
 {
   if (this->current_.in() == 0)
     {
@@ -49,7 +49,7 @@ Foo_i::baz (void)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
index 39b242a8ce8..5abe3a68709 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
@@ -24,9 +24,9 @@ public:
          SecurityLevel3::SecurityCurrent_ptr);
 
   /// Test method.
-  virtual void baz (void);
+  virtual void baz ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Reference to the ORB.
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
index ed4ef394a2f..586ce510a09 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
index cee6e0f4872..32f6b0c7f83 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
@@ -14,10 +14,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index a41ad93f439..c5e27f4d2d0 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -70,7 +70,7 @@ CosNaming_Client::CosNaming_Client ()
 
 // Parses the command line arguments and returns an error status.
 int
-CosNaming_Client::parse_args (void)
+CosNaming_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:"));
   int c;
@@ -171,7 +171,7 @@ CosNaming_Client::parse_args (void)
 // Execute client example code.
 
 int
-CosNaming_Client::run (void)
+CosNaming_Client::run ()
 {
   this->activate();
   int rv = test_->execute (naming_client_);
@@ -183,7 +183,7 @@ CosNaming_Client::run (void)
   return rv;
 }
 
-CosNaming_Client::~CosNaming_Client (void)
+CosNaming_Client::~CosNaming_Client ()
 {
   delete test_;
 }
@@ -242,7 +242,7 @@ MT_Test::MT_Test (CORBA::ORB_ptr orb,
 }
 
 int
-MT_Test::svc (void)
+MT_Test::svc ()
 {
   // Obtain object reference to the Naming Service (create new stub.)
 
@@ -964,7 +964,7 @@ Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_Begin::~Persistent_Test_Begin (void)
+Persistent_Test_Begin::~Persistent_Test_Begin ()
 {
 }
 
@@ -1015,7 +1015,7 @@ Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_End::~Persistent_Test_End (void)
+Persistent_Test_End::~Persistent_Test_End ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index 46cdc01bc6c..427cf0b3473 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -225,7 +225,7 @@ public:
                          FILE * ior_output_file);
 
   /// Destructor.
-  virtual ~Persistent_Test_Begin (void);
+  virtual ~Persistent_Test_Begin ();
 
   /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
@@ -259,7 +259,7 @@ public:
                        const ACE_TCHAR * ior);
 
   /// Destructor.
-  virtual ~Persistent_Test_End (void);
+  virtual ~Persistent_Test_End ();
 
   /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
@@ -289,15 +289,15 @@ class CosNaming_Client : public ACE_Task_Base
 {
 public:
   /// Constructor.
-  CosNaming_Client (void);
+  CosNaming_Client ();
 
   /// Destructor.
-  ~CosNaming_Client (void);
+  ~CosNaming_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
-  int svc (void);
+  int svc ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
@@ -311,7 +311,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index b0929b688a6..0b8e258dbcf 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -29,7 +29,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
 
   /// Destructor.
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
 
   // = Interface implementation accessor methods.
 
@@ -37,7 +37,7 @@ public:
   void id (CORBA::Short id);
 
   /// Gets id.
-  CORBA::Short id (void);
+  CORBA::Short id ();
 
 private:
   short id_;
@@ -48,12 +48,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
@@ -66,7 +66,7 @@ My_Test_Object::id (CORBA::Short id)
 
 // Constructor.
 
-CosNaming_Client::CosNaming_Client (void)
+CosNaming_Client::CosNaming_Client ()
   : argc_ (0),
     argv_ (0),
     test_ (0)
@@ -76,7 +76,7 @@ CosNaming_Client::CosNaming_Client (void)
 // Parses the command line arguments and returns an error status.
 
 int
-CosNaming_Client::parse_args (void)
+CosNaming_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:l"));
   int c;
@@ -188,12 +188,12 @@ CosNaming_Client::parse_args (void)
 // Execute client example code.
 
 int
-CosNaming_Client::run (void)
+CosNaming_Client::run ()
 {
   return test_->execute (naming_client_);
 }
 
-CosNaming_Client::~CosNaming_Client (void)
+CosNaming_Client::~CosNaming_Client ()
 {
   delete test_;
 }
@@ -233,7 +233,7 @@ Naming_Test::Naming_Test (PortableServer::POA_ptr poa)
 {
 }
 
-Naming_Test::~Naming_Test (void)
+Naming_Test::~Naming_Test ()
 {
 }
 
@@ -248,7 +248,7 @@ MT_Test::MT_Test (CORBA::ORB_ptr orb,
 }
 
 int
-MT_Test::svc (void)
+MT_Test::svc ()
 {
   // Obtain object reference to the Naming Service (create new stub.)
 
@@ -1048,7 +1048,7 @@ Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_Begin::~Persistent_Test_Begin (void)
+Persistent_Test_Begin::~Persistent_Test_Begin ()
 {
 }
 
@@ -1101,7 +1101,7 @@ Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_End::~Persistent_Test_End (void)
+Persistent_Test_End::~Persistent_Test_End ()
 {
 }
 
@@ -1161,7 +1161,7 @@ Persistent_List_Test::Persistent_List_Test (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_List_Test::~Persistent_List_Test (void)
+Persistent_List_Test::~Persistent_List_Test ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index e3c0c431e8c..2c186d1f129 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -33,7 +33,7 @@ class Naming_Test
 public:
   /// Execute the test code.  <root_context> is the context to assume
   /// as the root for all tests operations.
-  virtual ~Naming_Test (void);
+  virtual ~Naming_Test ();
   virtual int execute (TAO_Naming_Client &root_context) = 0;
 
 protected:
@@ -238,7 +238,7 @@ public:
                          FILE * ior_output_file);
 
   /// Destructor.
-  virtual ~Persistent_Test_Begin (void);
+  virtual ~Persistent_Test_Begin ();
 
   /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
@@ -273,7 +273,7 @@ public:
                        const ACE_TCHAR * ior);
 
   /// Destructor.
-  virtual ~Persistent_Test_End (void);
+  virtual ~Persistent_Test_End ();
 
   /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
@@ -304,7 +304,7 @@ public:
                         PortableServer::POA_ptr poa);
 
   /// Destructor.
-  virtual ~Persistent_List_Test (void);
+  virtual ~Persistent_List_Test ();
 
   /// Execute the persistent test (part 3).
   virtual int execute (TAO_Naming_Client &root_context);
@@ -330,13 +330,13 @@ class CosNaming_Client
 {
 public:
   /// Constructor.
-  CosNaming_Client (void);
+  CosNaming_Client ();
 
   /// Destructor.
-  ~CosNaming_Client (void);
+  ~CosNaming_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
@@ -350,7 +350,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 0fc088ab8d4..c3123193415 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -12,7 +12,7 @@
 
 // Constructor.
 
-Client_i::Client_i (void)
+Client_i::Client_i ()
   : ior_ (0),
     loop_count_ (10),
     shutdown_ (0),
@@ -25,7 +25,7 @@ Client_i::Client_i (void)
 // given server.
 
 void
-Client_i::test_for_secure_universal_time (void)
+Client_i::test_for_secure_universal_time ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
@@ -47,7 +47,7 @@ Client_i::test_for_secure_universal_time (void)
 // from the clerk_ and prints out the various attributes of the UTO.
 
 void
-Client_i::test_for_universal_time (void)
+Client_i::test_for_universal_time ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
@@ -76,7 +76,7 @@ Client_i::test_for_universal_time (void)
 }
 
 void
-Client_i::test_for_new_universal_time (void)
+Client_i::test_for_new_universal_time ()
 {
   TimeBase::TimeT time = 999999999;
   TimeBase::InaccuracyT inaccuracy = 9999;
@@ -108,7 +108,7 @@ Client_i::test_for_new_universal_time (void)
 }
 
 void
-Client_i::test_for_uto_from_utc (void)
+Client_i::test_for_uto_from_utc ()
 {
   TimeBase::UtcT utc_struct;
 
@@ -145,7 +145,7 @@ Client_i::test_for_uto_from_utc (void)
 }
 
 void
-Client_i::test_for_new_interval (void)
+Client_i::test_for_new_interval ()
 {
   TimeBase::TimeT lower = 666666666;
   TimeBase::TimeT upper = 999999999;
@@ -204,7 +204,7 @@ Client_i::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-Client_i::parse_args (void)
+Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:f:xk:"));
   int c;
@@ -256,7 +256,7 @@ Client_i::parse_args (void)
 // Execute client example code.
 
 int
-Client_i::run (void)
+Client_i::run ()
 {
   // Retrieves the current universal time.
   test_for_universal_time ();
@@ -278,13 +278,13 @@ Client_i::run (void)
   return 0;
 }
 
-Client_i::~Client_i (void)
+Client_i::~Client_i ()
 {
   ACE_OS::free (this->ior_);
 }
 
 int
-Client_i::obtain_initial_references (void)
+Client_i::obtain_initial_references ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h
index 5c062491e9a..8f318302101 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.h
+++ b/TAO/orbsvcs/tests/Time/Client_i.h
@@ -28,13 +28,13 @@ class Client_i
 {
 public:
   /// Constructor.
-  Client_i (void);
+  Client_i ();
 
   /// Destructor.
-  ~Client_i (void);
+  ~Client_i ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -44,29 +44,29 @@ public:
    * <secure_universal_time> has not been currently implemented in the
    * given server.
    */
-  void test_for_secure_universal_time (void);
+  void test_for_secure_universal_time ();
 
   /// Tests if the server returns a valid time.
-  void test_for_universal_time (void);
+  void test_for_universal_time ();
 
   /// Tests if the server returns a new UTO filled with the given time.
-  void test_for_new_universal_time (void);
+  void test_for_new_universal_time ();
 
   /// Tests if the returned UTO has the same value as the given UTC.
-  void test_for_uto_from_utc (void);
+  void test_for_uto_from_utc ();
 
   /// Tests if a new TIO is created according to the given bounds.
-  void test_for_new_interval (void);
+  void test_for_new_interval ();
 
 private:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// To initialize the naming service and get a clerk IOR.
-   int obtain_initial_references (void);
+   int obtain_initial_references ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 08a54f19bf8..a708aa96047 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -15,7 +15,7 @@ TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
   this->admin_ = lookup_if->admin_if ();
 }
 
-TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
+TAO_Offer_Exporter::~TAO_Offer_Exporter ()
 {
   while (! this->clean_up_.is_empty ())
     {
@@ -26,7 +26,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 }
 
 void
-TAO_Offer_Exporter::export_offers (void)
+TAO_Offer_Exporter::export_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting offers.\n"));
 
@@ -88,7 +88,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg)
 }
 
 void
-TAO_Offer_Exporter::export_offers_to_all (void)
+TAO_Offer_Exporter::export_offers_to_all ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting to all.\n"));
 
@@ -152,7 +152,7 @@ TAO_Offer_Exporter::export_offers_to_all (void)
 
 
 void
-TAO_Offer_Exporter::withdraw_offers (void)
+TAO_Offer_Exporter::withdraw_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n"));
 
@@ -179,7 +179,7 @@ TAO_Offer_Exporter::withdraw_offers (void)
 }
 
 void
-TAO_Offer_Exporter::describe_offers (void)
+TAO_Offer_Exporter::describe_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n"));
 
@@ -218,7 +218,7 @@ TAO_Offer_Exporter::describe_offers (void)
 }
 
 void
-TAO_Offer_Exporter::modify_offers (void)
+TAO_Offer_Exporter::modify_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n"));
 
@@ -257,7 +257,7 @@ TAO_Offer_Exporter::modify_offers (void)
 
 void
 TAO_Offer_Exporter::
-withdraw_offers_using_constraints (void)
+withdraw_offers_using_constraints ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing with constraint.\n"));
 
@@ -289,7 +289,7 @@ withdraw_offers_using_constraints (void)
 }
 
 CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (void)
+TAO_Offer_Exporter::grab_offerids ()
 {
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n"));
@@ -350,7 +350,7 @@ TAO_Offer_Exporter::grab_offerids (void)
 }
 
 void
-TAO_Offer_Exporter::create_offers (void)
+TAO_Offer_Exporter::create_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Creating offers.\n"));
   const int QUEUE_SIZE = 4;
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 30e4de33131..9a9e3cbfe26 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -24,31 +24,31 @@ public:
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose);
 
-  ~TAO_Offer_Exporter (void);
+  ~TAO_Offer_Exporter ();
 
-  void export_offers (void);
+  void export_offers ();
   // Export a number of offers to the Trading Service.
 
-  void export_offers_to_all (void);
+  void export_offers_to_all ();
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
 
-  void withdraw_offers (void);
+  void withdraw_offers ();
   // Withdraw all exported offers.
 
-  void describe_offers (void);
+  void describe_offers ();
   // Describe all the offers registered with the bootstrapped trader.
 
-  void modify_offers (void);
+  void modify_offers ();
   // Remove some properties and change some properties in each offer.
 
-  void withdraw_offers_using_constraints (void);
+  void withdraw_offers_using_constraints ();
   // Withdraw a number of offers based on a constraint string.
 
 private:
-  CosTrading::OfferIdSeq* grab_offerids (void);
+  CosTrading::OfferIdSeq* grab_offerids ();
 
-  void create_offers (void);
+  void create_offers ();
   // Fill in each of the offer structures.
 
   void export_to (CosTrading::Register_ptr reg);
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 7998cef2b78..a9c4bfc2d5d 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -8,7 +8,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Offer_Importer::perform_queries (void)
+TAO_Offer_Importer::perform_queries ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Federated Query.\n"));
 
@@ -22,7 +22,7 @@ TAO_Offer_Importer::perform_queries (void)
 }
 
 void
-TAO_Offer_Importer::perform_directed_queries (void)
+TAO_Offer_Importer::perform_directed_queries ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Directed Query.\n"));
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 2e7c7ac76cd..4ed8ff13c35 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -30,10 +30,10 @@ public:
   TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose = 1);
 
-  void perform_queries (void);
+  void perform_queries ();
   // Barrage the bootstrapped-to trader with queries.
 
-  void perform_directed_queries (void);
+  void perform_directed_queries ();
   // Direct a query to a trader two graph edges distant from the
   // bootstrapped-to trader.
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 2ddafeff55d..464f0968b60 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -16,7 +16,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
   this->create_types ();
 }
 
-TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void)
+TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter ()
 {
   try
   {
@@ -28,7 +28,7 @@ TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void)
 }
 
 void
-TAO_Service_Type_Exporter::remove_all_types (void)
+TAO_Service_Type_Exporter::remove_all_types ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::removing all"
               " types from the Repository.\n"));
@@ -57,7 +57,7 @@ TAO_Service_Type_Exporter::remove_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types (void)
+TAO_Service_Type_Exporter::add_all_types ()
 
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
@@ -66,7 +66,7 @@ TAO_Service_Type_Exporter::add_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types_to_all (void)
+TAO_Service_Type_Exporter::add_all_types_to_all ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "add all types to all repositories.\n"));
@@ -163,7 +163,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
 }
 
 void
-TAO_Service_Type_Exporter::list_all_types (void)
+TAO_Service_Type_Exporter::list_all_types ()
 {
   try
     {
@@ -202,7 +202,7 @@ TAO_Service_Type_Exporter::list_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::describe_all_types (void)
+TAO_Service_Type_Exporter::describe_all_types ()
 {
   try
     {
@@ -229,7 +229,7 @@ TAO_Service_Type_Exporter::describe_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::fully_describe_all_types (void)
+TAO_Service_Type_Exporter::fully_describe_all_types ()
 {
   try
     {
@@ -287,7 +287,7 @@ dump_typestruct (const char* type_name,
 }
 
 void
-TAO_Service_Type_Exporter::create_types (void)
+TAO_Service_Type_Exporter::create_types ()
 {
   TT_Info::Remote_Output ro;
   this->type_structs_[TT_Info::REMOTE_IO].props.length (6);
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index b522791e59f..bd8d235c3f7 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -23,33 +23,33 @@ public:
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                              CORBA::Boolean verbose);
 
-  ~TAO_Service_Type_Exporter (void);
+  ~TAO_Service_Type_Exporter ();
 
-  void remove_all_types (void);
+  void remove_all_types ();
   // Remove all service types from the trading service instance.
 
-  void add_all_types (void);
+  void add_all_types ();
   // Add all the generated service types to the trading service instance.
 
-  void add_all_types_to_all (void);
+  void add_all_types_to_all ();
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
 
-  void list_all_types (void);
+  void list_all_types ();
   // List all the service types registered with the trading service
   // instance.
 
-  void describe_all_types (void);
+  void describe_all_types ();
   // Describe all the service types registered with the trading
   // service instance.
 
-  void fully_describe_all_types (void);
+  void fully_describe_all_types ();
   // Same as describe_all_types, but fully describe lists the
   // properties of all service types the described service type
   // inherits from.
 
 private:
-  void create_types (void);
+  void create_types ();
   // Generate the service type description structures.
 
   void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos);
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 5ddbcae8a1f..0116a2c0e17 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -33,7 +33,7 @@ public:
   public:
     Remote_Output (void) {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -45,7 +45,7 @@ public:
   public:
     Printer (void) {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -57,7 +57,7 @@ public:
   public:
     Plotter (void) {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -69,7 +69,7 @@ public:
   public:
     File_System (void) {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -81,7 +81,7 @@ public:
   public:
     PostScript_Printer (void) {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 7b553031a5c..1153350b624 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -18,17 +18,17 @@
 #include "ace/SString.h"
 
 // Constructor
-IOR_corbaname_Client_i::IOR_corbaname_Client_i (void)
+IOR_corbaname_Client_i::IOR_corbaname_Client_i ()
 {
 }
 
 // Destructor
-IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void)
+IOR_corbaname_Client_i::~IOR_corbaname_Client_i ()
 {
 }
 
 int
-IOR_corbaname_Client_i::run (void)
+IOR_corbaname_Client_i::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 6cbfc28dc7d..59ecec46e84 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -28,11 +28,11 @@ class IOR_corbaname_Client_i
 {
  public:
   // = Constructor and destructor.
-  IOR_corbaname_Client_i (void);
-  ~IOR_corbaname_Client_i (void);
+  IOR_corbaname_Client_i ();
+  ~IOR_corbaname_Client_i ();
 
   /// Execute the client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR **argv);
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index 3934b8461a8..6892ef8166d 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -1,13 +1,13 @@
 
 #include "status_i.h"
 
-corbaname_Status_i::corbaname_Status_i (void)
+corbaname_Status_i::corbaname_Status_i ()
 {
   // Constructor
 }
 
 CORBA::Boolean
-corbaname_Status_i::print_status (void)
+corbaname_Status_i::print_status ()
 {
   // If the client makes a succesful request, return a true value
   // indicating that it has successfully reached the server.
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index 1ca8ba13f7c..d4f54fa9f87 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -6,9 +6,9 @@
 
 class corbaname_Status_i : public POA_corbaname::Status {
 public:
-  corbaname_Status_i (void);
+  corbaname_Status_i ();
 
-  CORBA::Boolean print_status (void);
+  CORBA::Boolean print_status ();
 };
 
 #endif /* STATUS_I_H */
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
index 54a67ee5c7d..9fb6d6cf573 100644
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
@@ -9,7 +9,7 @@ class Literal_Visitor: public TAO_Constraint_Visitor
 {
 public:
   Literal_Visitor (Literal_Interpreter<T>* interp);
-  virtual ~Literal_Visitor (void);
+  virtual ~Literal_Visitor ();
 
   virtual int visit_constraint (TAO_Unary_Constraint*);
 
@@ -55,7 +55,7 @@ Literal_Visitor<T>::Literal_Visitor (Literal_Interpreter<T>* interp)
 }
 
 template<class T>
-Literal_Visitor<T>::~Literal_Visitor (void)
+Literal_Visitor<T>::~Literal_Visitor ()
 {
 }
 
@@ -76,8 +76,8 @@ template<class T>
 class Literal_Interpreter: public TAO_Interpreter
 {
 public:
-  Literal_Interpreter (void);
-  virtual ~Literal_Interpreter (void);
+  Literal_Interpreter ();
+  virtual ~Literal_Interpreter ();
 
   bool test (const char* str,
              T expected);
@@ -91,12 +91,12 @@ private:
 };
 
 template<class T>
-Literal_Interpreter<T>::Literal_Interpreter (void)
+Literal_Interpreter<T>::Literal_Interpreter ()
 {
 }
 
 template<class T>
-Literal_Interpreter<T>::~Literal_Interpreter (void)
+Literal_Interpreter<T>::~Literal_Interpreter ()
 {
 }
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index 10a1933687a..b751465096f 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -51,7 +51,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo obj ref.
   Foo_var foo = RefHelper<Foo>::string_to_ref(this->orb_.in(),
@@ -63,7 +63,7 @@ ClientApp::client_setup(void)
 
 
 int
-ClientApp::run_engine(void)
+ClientApp::run_engine()
 {
   bool result = this->engine_->execute(this->num_loops_);
   return result ? 0 : -1;
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
index 75c8e5a09ee..2fbb239cde0 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
@@ -25,8 +25,8 @@ protected:
 private:
   // These are all called, in order, by the run_i() method.
   int init(int argc, ACE_TCHAR* argv[]);
-  void client_setup(void);
-  int  run_engine(void);
+  void client_setup();
+  int  run_engine();
   void cleanup();
 
   // Helper methods used by the methods above.
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index 6e4d03dd842..489fb1d558a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -107,7 +107,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -115,7 +115,7 @@ ServerApp::poa_setup(void)
 
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -132,7 +132,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -165,7 +165,7 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -175,7 +175,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -188,7 +188,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
index 455ace71f21..075a5b5a3b4 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
@@ -28,13 +28,13 @@ protected:
 private:
   // These are all called, in order, by the run_i() method.
   int init(int argc, ACE_TCHAR* argv[]);
-  void poa_setup(void);
-  void csd_setup(void);
-  void servant_setup(void);
+  void poa_setup();
+  void csd_setup();
+  void servant_setup();
   void collocated_setup();
-  void poa_activate(void);
-  void run_collocated_clients(void);
-  void run_orb_event_loop(void);
+  void poa_activate();
+  void run_collocated_clients();
+  void run_orb_event_loop();
   bool check_results();
   void cleanup();
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
index 0e2dd6c9749..5594914a6cb 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
@@ -16,7 +16,7 @@ OrbRunner::~OrbRunner()
 
 
 void
-OrbRunner::run(void)
+OrbRunner::run()
 {
   ACE_ASSERT(this->num_orb_threads_ > 0);
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index 5aa94864344..5d32033e6bd 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -17,7 +17,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   this->op_count_[0]++;
 }
@@ -48,7 +48,7 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   this->op_count_[4]++;
   throw FooException();
@@ -56,7 +56,7 @@ Foo_i::op5(void)
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index 1b65a61007c..6aac17c5a51 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -12,7 +12,7 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
     Foo_i();
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -20,9 +20,9 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
     void gather_stats(Foo_Statistics& stats);
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index 6c8b0a5a997..2a6f4ba31e2 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_time.h"
 
 int
-Callback_i::done (void)
+Callback_i::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->remaining_samples_ == 0;
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index e646e2e3416..4b519cc5468 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -12,10 +12,10 @@ public:
   Callback_i (int expected_samples);
 
   /// Return 1 when all the samples have been received
-  int done (void);
+  int done ();
 
   /// Get access to the history
-  ACE_Sample_History &sample_history (void);
+  ACE_Sample_History &sample_history ();
 
   /// Implement the CORBA methods
   //@{
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 7751da4e5b8..de5cd14c3dd 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -21,7 +21,7 @@ Server_i::request (Test::TimeStamp time_stamp,
 }
 
 void
-Server_i::shutdown (void)
+Server_i::shutdown ()
 {
   this->done_ = 1;
 }
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 06948665fc2..2c67802f8f4 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -8,10 +8,10 @@ class Server_i : public POA_Test::Server
 {
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Return 1 when the shutdown method has been invoked.
-  int done (void);
+  int done ();
 
   /// Implement the CORBA methods
   //@{
@@ -20,7 +20,7 @@ public:
   void request (Test::TimeStamp,
                 const Test::Payload &);
 
-  void shutdown (void);
+  void shutdown ();
 
   //@}
 
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 069c566552f..87e5d3a9e8b 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -28,10 +28,10 @@ public:
   Task (Test::Server_ptr server, int iterations);
 
   /// Return 1 when all the messages have been sent
-  int done (void);
+  int done ();
 
   /// Run the experiment
-  int svc (void);
+  int svc ();
 
 private:
   /// The consumer
@@ -232,14 +232,14 @@ Task::Task (Test::Server_ptr server,
 }
 
 int
-Task::done (void)
+Task::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1);
   return this->remaining_messages_ == 0;
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   Test::Payload payload(1024); payload.length(1024);
   try
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 1e1c519b9d9..cc37438aab2 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -50,23 +50,23 @@ class DII_Cubit_Client
 public:
   // = Constructor and destructor.
   /// Constructor.
-  DII_Cubit_Client (void);
+  DII_Cubit_Client ();
 
   /// Destructor.
-  ~DII_Cubit_Client (void);
+  ~DII_Cubit_Client ();
 
   /// Initialize the ORB and gets the Cubit objref.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// Gets objref through naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Function to read the cubit factory IOR from a file.
   int read_ior (ACE_TCHAR *filename);
@@ -77,25 +77,25 @@ private:
 
   // = DII versions of Cubit operations:
 
-  void cube_short_dii (void);
-  void cube_long_dii (void);
-  void cube_octet_dii (void);
-  void cube_union_dii (void);
-  void cube_struct_dii (void);
+  void cube_short_dii ();
+  void cube_long_dii ();
+  void cube_octet_dii ();
+  void cube_union_dii ();
+  void cube_struct_dii ();
   void cube_octet_seq_dii (int length);
   void cube_long_seq_dii (int length);
 
   // = Wrappers for cubing small and large sequences w/o args:
 
   /// Wrapper for the mixin call, just to be neat.
-  void cube_small_long_seq (void);
-  void cube_large_long_seq (void);
-  void cube_small_octet_seq (void);
-  void cube_large_octet_seq (void);
-  void cube_mixin (void);
+  void cube_small_long_seq ();
+  void cube_large_long_seq ();
+  void cube_small_octet_seq ();
+  void cube_large_octet_seq ();
+  void cube_mixin ();
 
   /// Array of pointers to the operation functions.
-  void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])(void);
+  void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])();
 
   /// Array of labels for passing to print_stats.
   static const char *stats_messages_[];
@@ -138,7 +138,7 @@ private:
 };
 
 // Constructor
-DII_Cubit_Client::DII_Cubit_Client (void)
+DII_Cubit_Client::DII_Cubit_Client ()
   : loop_count_ (DEFAULT_LOOP_COUNT),
     shutdown_ (0),
     orb_var_ (0),
@@ -162,7 +162,7 @@ DII_Cubit_Client::DII_Cubit_Client (void)
 }
 
 // Destructor
-DII_Cubit_Client::~DII_Cubit_Client (void)
+DII_Cubit_Client::~DII_Cubit_Client ()
 {
 }
 
@@ -243,7 +243,7 @@ DII_Cubit_Client::init (int argc, ACE_TCHAR **argv)
 // Sort out the args in the command line.
 
 int
-DII_Cubit_Client::parse_args (void)
+DII_Cubit_Client::parse_args ()
 {
   ACE_Get_Opt opts (argc_, argv_, ACE_TEXT("dn:i:f:x"));
   int c;
@@ -356,7 +356,7 @@ DII_Cubit_Client::print_stats (const char *call_name,
 }
 
 void
-DII_Cubit_Client::cube_short_dii (void)
+DII_Cubit_Client::cube_short_dii ()
 {
   try
     {
@@ -395,7 +395,7 @@ DII_Cubit_Client::cube_short_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_long_dii (void)
+DII_Cubit_Client::cube_long_dii ()
 {
   try
     {
@@ -435,7 +435,7 @@ DII_Cubit_Client::cube_long_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_octet_dii (void)
+DII_Cubit_Client::cube_octet_dii ()
 {
   try
     {
@@ -478,7 +478,7 @@ DII_Cubit_Client::cube_octet_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_union_dii (void)
+DII_Cubit_Client::cube_union_dii ()
 {
   try
     {
@@ -528,7 +528,7 @@ DII_Cubit_Client::cube_union_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_struct_dii (void)
+DII_Cubit_Client::cube_struct_dii ()
 {
   try
     {
@@ -691,31 +691,31 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
 // through in run ().
 
 void
-DII_Cubit_Client::cube_small_long_seq (void)
+DII_Cubit_Client::cube_small_long_seq ()
 {
   this->cube_long_seq_dii (SMALL_LONG_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_large_long_seq (void)
+DII_Cubit_Client::cube_large_long_seq ()
 {
   this->cube_long_seq_dii (LARGE_LONG_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_small_octet_seq (void)
+DII_Cubit_Client::cube_small_octet_seq ()
 {
   this->cube_octet_seq_dii (SMALL_OCTET_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_large_octet_seq (void)
+DII_Cubit_Client::cube_large_octet_seq ()
 {
   this->cube_octet_seq_dii (LARGE_OCTET_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_mixin (void)
+DII_Cubit_Client::cube_mixin ()
 {
   this->cube_short_dii ();
   this->cube_octet_dii ();
@@ -723,7 +723,7 @@ DII_Cubit_Client::cube_mixin (void)
 }
 
 int
-DII_Cubit_Client::run (void)
+DII_Cubit_Client::run ()
 {
   // loop counter.
   CORBA::ULong i;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 04e8bd1fd79..68f35ad1147 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -208,7 +208,7 @@ Cubit_Client::read_ior (const ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-Cubit_Client::parse_args (void)
+Cubit_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("b:t:z:ovdn:f:k:xsq"));
   int c = 0;
@@ -383,7 +383,7 @@ Cubit_Client::check_enabled (u_int mask) const
 // Exercise the union.  Cube a union.
 
 void
-Cubit_Client::cube_union (void)
+Cubit_Client::cube_union ()
 {
   try
     {
@@ -1562,7 +1562,7 @@ Cubit_Client::shutdown_server (int do_shutdown)
   return 0;
 }
 
-Cubit_Client::~Cubit_Client (void)
+Cubit_Client::~Cubit_Client ()
 {
   // Free resources and close the IOR files.
   if (this->cubit_factory_ior_file_)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 2ba154c271c..54bcff3eae4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -43,7 +43,7 @@ public:
   // = Constructor and destructor.
   Cubit_Client (int shutdown = 0);
 
-  ~Cubit_Client (void);
+  ~Cubit_Client ();
 
   /// Execute client example code.
   int run ();
@@ -61,7 +61,7 @@ private:
   int read_ior (const ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Obtain the bit mask representation of the specified test
   u_int opt_to_mask (const ACE_TCHAR *opt);
@@ -80,7 +80,7 @@ private:
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
 
   /// Exercise the union.  Cube a union.
-  void cube_union (void);
+  void cube_union ();
 
   /// calculate the cube from a struct.
   void cube_struct (int i);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index b52869dc434..236066ddb28 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -3,7 +3,7 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-Cubit_Server::Cubit_Server (void)
+Cubit_Server::Cubit_Server ()
   : ior_output_file_ (0),
     orb_manager_ (),
     factory_impl_ (0),
@@ -14,7 +14,7 @@ Cubit_Server::Cubit_Server (void)
 }
 
 int
-Cubit_Server::parse_args (void)
+Cubit_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:"));
   int c;
@@ -100,7 +100,7 @@ Cubit_Server::init (int argc,
 }
 
 int
-Cubit_Server::run (void)
+Cubit_Server::run ()
 {
   if (this->orb_manager_.run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -109,7 +109,7 @@ Cubit_Server::run (void)
   return 0;
 }
 
-Cubit_Server::~Cubit_Server (void)
+Cubit_Server::~Cubit_Server ()
 {
   delete this->factory_impl_;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 8aa6e7ec341..eabf76a991c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -39,21 +39,21 @@ class Cubit_Server
 {
 public:
   /// Default constructor
-  Cubit_Server (void);
+  Cubit_Server ();
 
   /// Destructor
-  ~Cubit_Server (void);
+  ~Cubit_Server ();
 
   /// Initialize the Cubit_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the cubit factory IOR.
   FILE* ior_output_file_;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 3236d8087c4..84176f01398 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -115,12 +115,12 @@ Cubit_Factory_i::Cubit_Factory_i (CORBA::ORB_ptr orb)
 
 // Destructor
 
-Cubit_Factory_i::~Cubit_Factory_i (void)
+Cubit_Factory_i::~Cubit_Factory_i ()
 {
 }
 
 Cubit_ptr
-Cubit_Factory_i::make_cubit (void)
+Cubit_Factory_i::make_cubit ()
 {
   return my_cubit_._this ();
 }
@@ -140,12 +140,12 @@ Cubit_i::Cubit_i (CORBA::ORB_ptr orb)
 
 // Destructor
 
-Cubit_i::~Cubit_i (void)
+Cubit_i::~Cubit_i ()
 {
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (void)
+Cubit_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -157,13 +157,13 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
 }
 
 void
-Cubit_i::cube_oneway (void)
+Cubit_i::cube_oneway ()
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
-Cubit_i::cube_void (void)
+Cubit_i::cube_void ()
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
 }
@@ -407,7 +407,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any)
 
 // Shutdown.
 
-void Cubit_i::shutdown (void)
+void Cubit_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%C\n",
@@ -418,7 +418,7 @@ void Cubit_i::shutdown (void)
 
 
 void
-Cubit_i::ping (void)
+Cubit_i::ping ()
 {
   // do nothing
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 09a3d31852d..bf400140179 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -32,16 +32,16 @@ public:
   Cubit_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~Cubit_i (void);
+  ~Cubit_i ();
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Test a oneway call.
-  virtual void cube_oneway (void);
+  virtual void cube_oneway ();
 
   /// Test a twoway call.
-  virtual void cube_void (void);
+  virtual void cube_void ();
 
   /// Cube an octet
   virtual CORBA::Octet cube_octet (CORBA::Octet o);
@@ -81,11 +81,11 @@ public:
   virtual CORBA::Any * cube_any_struct (const CORBA::Any & any);
 
   /// Shutdown routine.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 
   /// A ping. Please see the idl file for details.
-  virtual void ping (void);
+  virtual void ping ();
 
 
   /// Set default poa.
@@ -112,10 +112,10 @@ public:
   Cubit_Factory_i (CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~Cubit_Factory_i (void);
+  ~Cubit_Factory_i ();
 
   /// Make a cubit object.
-  virtual Cubit_ptr make_cubit (void);
+  virtual Cubit_ptr make_cubit ();
 
   void set_default_poa (PortableServer::POA_ptr poa);
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 6e0750d7838..b8be38daee3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -4,7 +4,7 @@
 #include "tao/TAO_Internal.h"
 #include "ace/Barrier.h"
 
-Cubit_Task::Cubit_Task (void)
+Cubit_Task::Cubit_Task ()
 {
   // No-op.
 }
@@ -26,7 +26,7 @@ Cubit_Task::Cubit_Task (const ACE_TCHAR *args,
 }
 
 int
-Cubit_Task::svc (void)
+Cubit_Task::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -97,7 +97,7 @@ Cubit_Task::svc (void)
 }
 
 int
-Cubit_Task::initialize_orb (void)
+Cubit_Task::initialize_orb ()
 {
   try
     {
@@ -154,7 +154,7 @@ Cubit_Task::get_servant_ior (u_int index)
 }
 
 int
-Cubit_Task::create_servants (void)
+Cubit_Task::create_servants ()
 {
   try
     {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 72e6a106a17..a30ac90de96 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -48,14 +48,14 @@ public:
 
 protected:
   /// No-op constructor.
-  Cubit_Task (void);
+  Cubit_Task ();
 
 private:
   /// Initialize the ORB, and POA.
-  int initialize_orb (void);
+  int initialize_orb ();
 
   /// Create the servants.
-  int create_servants (void);
+  int create_servants ();
 
   /// All cubit objects will have this as prefix to its key.
   const char *key_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 2a7be3a0ac0..9c2afdb429c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/Null_Mutex.h"
 
-Globals::Globals (void)
+Globals::Globals ()
   : thr_create_flags (0),
     default_priority (0),
     ior_file (0),
@@ -73,7 +73,7 @@ Globals::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Globals::sched_fifo_init (void)
+Globals::sched_fifo_init ()
 {
 #if defined (ACE_HAS_THREADS)
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
@@ -115,18 +115,18 @@ Globals::sched_fifo_init (void)
 #endif /* ACE_HAS_THREADS */
 }
 
-MT_Priority::MT_Priority (void)
+MT_Priority::MT_Priority ()
   : num_priorities_ (0),
     grain_ (0)
 {
 }
 
-MT_Priority::~MT_Priority (void)
+MT_Priority::~MT_Priority ()
 {
 }
 
 ACE_Sched_Priority
-MT_Priority::get_high_priority (void)
+MT_Priority::get_high_priority ()
 {
   ACE_Sched_Priority high_priority;
 
@@ -208,13 +208,13 @@ MT_Priority::get_low_priority (u_int num_low_priority,
 }
 
 u_int
-MT_Priority::number_of_priorities (void)
+MT_Priority::number_of_priorities ()
 {
   return this->num_priorities_;
 }
 
 u_int
-MT_Priority::grain (void)
+MT_Priority::grain ()
 {
   return this->grain_;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index 1bb88cacb2f..3f116926ccd 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -104,7 +104,7 @@ class Globals
 {
 public:
   /// default constructor.
-  Globals (void);
+  Globals ();
 
   /// parse the arguments.
   int parse_args (int argc, ACE_TCHAR **argv);
@@ -115,7 +115,7 @@ public:
    * for other failure.  As a side effect, sets thr_create_flags
    * appropriately.
    */
-  static int sched_fifo_init (void);
+  static int sched_fifo_init ();
 
   /// Thread creation flags.  Must call sched_fifo_init () before
   /// accessing.
@@ -175,13 +175,13 @@ class MT_Priority
 {
 public:
   /// constructor.
-  MT_Priority (void);
+  MT_Priority ();
 
   /// Destructor.
-  virtual ~MT_Priority (void);
+  virtual ~MT_Priority ();
 
   /// Sets the priority of the high priority thread.
-  virtual ACE_Sched_Priority get_high_priority (void);
+  virtual ACE_Sched_Priority get_high_priority ();
 
   /// Sets the priority to be used for the low priority thread.
   virtual ACE_Sched_Priority get_low_priority
@@ -190,10 +190,10 @@ public:
      u_int use_multiple_priority);
 
   /// Accessor for num_priorities_.
-  u_int number_of_priorities (void);
+  u_int number_of_priorities ();
 
   /// Accessor for grain_.
-  u_int grain (void);
+  u_int grain ();
 
 protected:
   /// Number of priorities used.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 8d6474f51ca..27bf5ed9d23 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -17,7 +17,7 @@ ACE_round (ACE_timer_t t)
   return static_cast<ACE_UINT32> (t);
 }
 
-Task_State::Task_State (void)
+Task_State::Task_State ()
   : barrier_ (0),
     key_ ("Cubit"),
     loop_count_ (1000),
@@ -230,7 +230,7 @@ Task_State::parse_args (int argc,ACE_TCHAR *argv[])
   return 0;
 }
 
-Task_State::~Task_State (void)
+Task_State::~Task_State ()
 {
   int i;
 
@@ -274,7 +274,7 @@ Client::Client (ACE_Thread_Manager *thread_manager,
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   delete this->my_jitter_array_;
   delete this->timer_;
@@ -305,14 +305,14 @@ Client::put_latency (JITTER_ARRAY *jitter,
 
 // Returns the latency in usecs.
 ACE_timer_t
-Client::get_high_priority_latency (void)
+Client::get_high_priority_latency ()
 {
   return (ACE_timer_t) this->ts_->latency_ [0];
 }
 
 // Returns the latency in usecs.
 ACE_timer_t
-Client::get_low_priority_latency (void)
+Client::get_low_priority_latency ()
 {
   if (this->ts_->thread_count_ == 1)
     return 0;
@@ -336,7 +336,7 @@ Client::get_latency (u_int thread_id)
 
 // Returns the jitter in usecs.
 ACE_timer_t
-Client::get_high_priority_jitter (void)
+Client::get_high_priority_jitter ()
 {
   ACE_timer_t jitter = 0.0;
   ACE_timer_t average = get_high_priority_latency ();
@@ -384,7 +384,7 @@ Client::get_high_priority_jitter (void)
 // Returns the jitter in usecs.
 
 ACE_timer_t
-Client::get_low_priority_jitter (void)
+Client::get_low_priority_jitter ()
 {
   if (this->ts_->thread_count_ == 1)
     return 0;
@@ -484,7 +484,7 @@ Client::get_jitter (u_int id)
 }
 
 void
-Client::find_frequency (void)
+Client::find_frequency ()
 {
     if (this->ts_->thread_per_rate_ == 0)
       {
@@ -546,7 +546,7 @@ Client::find_frequency (void)
 }
 
 CORBA::ORB_ptr
-Client::init_orb (void)
+Client::init_orb ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "I'm thread %t\n"));
@@ -653,7 +653,7 @@ Client::get_cubit (CORBA::ORB_ptr orb)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
@@ -723,7 +723,7 @@ Client::svc (void)
 }
 
 int
-Client::cube_octet (void)
+Client::cube_octet ()
 {
   try
     {
@@ -764,7 +764,7 @@ Client::cube_octet (void)
 }
 
 int
-Client::cube_short (void)
+Client::cube_short ()
 {
   try
     {
@@ -797,7 +797,7 @@ Client::cube_short (void)
 }
 
 int
-Client::cube_long (void)
+Client::cube_long ()
 {
   try
     {
@@ -830,7 +830,7 @@ Client::cube_long (void)
 }
 
 int
-Client::cube_struct (void)
+Client::cube_struct ()
 {
   try
     {
@@ -869,7 +869,7 @@ Client::cube_struct (void)
 }
 
 int
-Client::make_request (void)
+Client::make_request ()
 {
   int result;
 
@@ -920,7 +920,7 @@ Client::make_request (void)
 }
 
 void
-Client::print_stats (void)
+Client::print_stats ()
 {
   // Perform latency stats only if we are not running the utilization
   // tests.
@@ -978,7 +978,7 @@ Client::calc_delta (ACE_timer_t real_time,
 }
 
 int
-Client::do_test (void)
+Client::do_test ()
 {
   ACE_timer_t delta = 0;
   u_int low_priority_client_count = this->ts_->thread_count_ - 1;
@@ -1065,7 +1065,7 @@ Client::do_test (void)
 }
 
 int
-Client::run_tests (void)
+Client::run_tests ()
 {
   int result;
   ACE_NEW_RETURN (this->my_jitter_array_,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 17f2d06f537..76e13e676d6 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -99,13 +99,13 @@ class Task_State
 {
 public:
   /// Constructor.
-  Task_State (void);
+  Task_State ();
 
   /// parses the arguments with the provided argc and argv.
   int parse_args (int argc,ACE_TCHAR **argv);
 
   /// Destructor
-  ~Task_State (void);
+  ~Task_State ();
 
   /// Barrier for the multiple clients to synchronize after binding to
   /// the servants.
@@ -249,24 +249,24 @@ public:
           u_int id);
 
   /// destructor.
-  ~Client (void);
+  ~Client ();
 
   /// The thread function.
   virtual int svc ();
 
   /// Returns the latency of the high priority thread in usecs.
-  ACE_timer_t get_high_priority_latency (void);
+  ACE_timer_t get_high_priority_latency ();
 
   /// Returns the average latency found for the low
   /// priority threads in usecs.
-  ACE_timer_t get_low_priority_latency (void);
+  ACE_timer_t get_low_priority_latency ();
 
   /// Returns the high priority jitter in usecs.
-  ACE_timer_t get_high_priority_jitter (void);
+  ACE_timer_t get_high_priority_jitter ();
 
   /// Returns the jitter for all the low priority
   /// thread request in usecs.
-  ACE_timer_t get_low_priority_jitter (void);
+  ACE_timer_t get_low_priority_jitter ();
 
   /// gets the average latency for that thread.
   ACE_timer_t get_latency (u_int thread_id);
@@ -280,37 +280,37 @@ public:
 
 private:
   /// initialize the ORB.
-  CORBA::ORB_ptr init_orb (void);
+  CORBA::ORB_ptr init_orb ();
 
   /// reads the cubit ior from a file.
-  void read_ior (void);
+  void read_ior ();
 
   /// gets the cubit object.
   int get_cubit (CORBA::ORB_ptr orb);
 
   /// Run the various tests.
-  int run_tests (void);
+  int run_tests ();
 
   /// make a CORBA request depending on the datatype.
-  int make_request (void);
+  int make_request ();
 
   /// makes the corba requests.
-  int do_test (void);
+  int do_test ();
 
   /// call cube_octet method on the cubit object.
-  int cube_octet (void);
+  int cube_octet ();
 
   /// call cube short on the cubit object.
-  int cube_short (void);
+  int cube_short ();
 
   /// call cube long on the cubit object.
-  int cube_long (void);
+  int cube_long ();
 
   /// call cube struct on the cubit object.
-  int cube_struct (void);
+  int cube_struct ();
 
   /// prints the latency stats.
-  void print_stats (void);
+  void print_stats ();
 
   /// Records the latencies in the <Task_State>.
   void put_latency (JITTER_ARRAY *jitter,
@@ -323,7 +323,7 @@ private:
 
   /// determines the frequency at which to make calls depending on the
   /// id of the thread.
-  void find_frequency (void);
+  void find_frequency ();
 
   /// calculate the delta value.
   ACE_timer_t calc_delta (ACE_timer_t real_time,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
index cbe8462a77f..2cfd6cb1774 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
@@ -7,20 +7,20 @@ MT_Cubit_Timer::MT_Cubit_Timer (u_int granularity)
 }
 
 void
-MT_Cubit_Timer::start (void)
+MT_Cubit_Timer::start ()
 {
   this->timer_.start ();
 }
 
 void
-MT_Cubit_Timer::stop (void)
+MT_Cubit_Timer::stop ()
 {
   this->timer_.stop ();
   this->timer_.elapsed_time (this->delta_);
 }
 
 ACE_timer_t
-MT_Cubit_Timer::get_elapsed (void)
+MT_Cubit_Timer::get_elapsed ()
 {
   ACE_timer_t real_time;
   // Store the time in usecs.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
index f84b7499f28..c467380dd64 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
@@ -32,10 +32,10 @@ class MT_Cubit_Timer
 public:
   MT_Cubit_Timer (u_int granularity);
 
-  void start (void);
-  void stop (void);
+  void start ();
+  void stop ();
 
-  ACE_timer_t get_elapsed (void);
+  ACE_timer_t get_elapsed ();
 
 private:
   /// timer.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
index f7e1ae4fc4c..237040b451e 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
@@ -12,7 +12,7 @@ Util_Thread::Util_Thread (Task_State *ts,
 }
 
 int
-Util_Thread::svc (void)
+Util_Thread::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -47,7 +47,7 @@ Util_Thread::svc (void)
 }
 
 u_long
-Util_Thread::get_number_of_computations (void)
+Util_Thread::get_number_of_computations ()
 {
   return this->number_of_computations_;
 }
@@ -56,7 +56,7 @@ Util_Thread::get_number_of_computations (void)
 // separate function to get it's execution time.
 
 void
-Util_Thread::computation (void)
+Util_Thread::computation ()
 {
   // This is the number that the Util_Thread uses to check for
   // primality.
@@ -74,7 +74,7 @@ Util_Thread::computation (void)
 // And you thought your life was boring... :-)
 
 int
-Util_Thread::run_computations (void)
+Util_Thread::run_computations ()
 {
   while (this->done_ == 0)
     {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
index e71393dd7a8..83d50f26cb8 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
@@ -32,17 +32,17 @@ public:
   virtual int svc ();
 
   /// Gets the number of computations the thread was able to perform.
-  u_long get_number_of_computations (void);
+  u_long get_number_of_computations ();
 
   /// this is the actual "computation" being performed.
-  void computation (void);
+  void computation ();
 
   /// Indicates whether we're done.
   int done_;
 
 private:
   /// Run the computations.
-  int run_computations (void);
+  int run_computations ();
 
   /// This stores the number of computations performed
   /// by the Util_Thread so far
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 3438baa7d6c..9beeba0cbbc 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -62,7 +62,7 @@ switchHook (WIND_TCB *pOldTcb,    // pointer to old task's WIND_TCB.
 
 // Constructor.
 
-Client_i::Client_i (void)
+Client_i::Client_i ()
   : high_priority_client_ (0),
     low_priority_client_ (0),
     util_thread_ (0),
@@ -80,7 +80,7 @@ Client_i::Client_i (void)
 
 // Destructor.
 
-Client_i::~Client_i (void)
+Client_i::~Client_i ()
 {
   delete this->high_priority_client_;
   if (this->low_priority_client_ != 0)
@@ -130,7 +130,7 @@ Client_i::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Client_i::run (void)
+Client_i::run ()
 {
   if (this->ts_->thread_per_rate_ == 0)
     {
@@ -148,7 +148,7 @@ Client_i::run (void)
 
 #if defined (ACE_HAS_VXTHREADS)
 void
-Client_i::output_taskinfo (void)
+Client_i::output_taskinfo ()
 {
   FILE *file_handle = ACE_OS::fopen ("taskinfo.txt", "w");
 
@@ -175,7 +175,7 @@ Client_i::output_taskinfo (void)
 #endif /* ACE_HAS_VXTHREADS */
 
 void
-Client_i::get_context_switches (void)
+Client_i::get_context_switches ()
 {
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
 
@@ -202,7 +202,7 @@ Client_i::get_context_switches (void)
 }
 
 void
-Client_i::output_latency (void)
+Client_i::output_latency ()
 {
   FILE *latency_file_handle = 0;
   char latency_file[BUFSIZ];
@@ -260,7 +260,7 @@ Client_i::output_latency (void)
 // when there are not enough different priorities for all threads.
 
 void
-Client_i::init_low_priority (void)
+Client_i::init_low_priority ()
 {
   ACE_Sched_Priority prev_priority = this->high_priority_;
   if (this->ts_->use_multiple_priority_ == 1)
@@ -280,7 +280,7 @@ Client_i::init_low_priority (void)
 }
 
 void
-Client_i::calc_util_time (void)
+Client_i::calc_util_time ()
 {
   MT_Cubit_Timer timer (ACE_ONE_SECOND_IN_MSECS);
   // Time the utilization thread' "computation" to get % IdleCPU at the
@@ -298,7 +298,7 @@ Client_i::calc_util_time (void)
 }
 
 int
-Client_i::activate_high_client (void)
+Client_i::activate_high_client ()
 {
   ACE_NEW_RETURN (this->high_priority_client_,
                   Client (&this->client_thread_manager_,
@@ -345,7 +345,7 @@ Client_i::activate_high_client (void)
 }
 
 int
-Client_i::activate_low_client (void)
+Client_i::activate_low_client ()
 {
   ACE_NEW_RETURN (this->low_priority_client_,
                   Client *[this->ts_->thread_count_],
@@ -431,7 +431,7 @@ Client_i::activate_low_client (void)
 }
 
 int
-Client_i::activate_util_thread (void)
+Client_i::activate_util_thread ()
 {
   ACE_NEW_RETURN (this->util_thread_,
                   Util_Thread (this->ts_,
@@ -467,7 +467,7 @@ Client_i::activate_util_thread (void)
 }
 
 void
-Client_i:: print_context_stats (void)
+Client_i:: print_context_stats ()
 {
   if (this->ts_->context_switch_test_ == 1)
     {
@@ -503,7 +503,7 @@ Client_i:: print_context_stats (void)
 }
 
 void
-Client_i::print_latency_stats (void)
+Client_i::print_latency_stats ()
 {
   // If running the utilization test, don't report latency nor jitter.
   if (this->ts_->use_utilization_test_ == 0)
@@ -535,7 +535,7 @@ Client_i::print_latency_stats (void)
 }
 
 void
-Client_i::print_util_stats (void)
+Client_i::print_util_stats ()
 {
  if (this->ts_->use_utilization_test_ == 1)
     {
@@ -555,7 +555,7 @@ Client_i::print_util_stats (void)
 }
 
 void
-Client_i::print_priority_inversion_stats (void)
+Client_i::print_priority_inversion_stats ()
 {
   this->print_context_stats ();
   this->print_latency_stats ();
@@ -563,7 +563,7 @@ Client_i::print_priority_inversion_stats (void)
 }
 
 int
-Client_i::start_servant (void)
+Client_i::start_servant ()
 {
   ACE_TCHAR high_thread_args[BUFSIZ];
 
@@ -614,7 +614,7 @@ Client_i::start_servant (void)
 }
 
 int
-Client_i::do_priority_inversion_test (void)
+Client_i::do_priority_inversion_test ()
 {
   this->timer_.start ();
 #if defined (ACE_HAS_VXTHREADS)
@@ -695,7 +695,7 @@ Client_i::do_priority_inversion_test (void)
 }
 
 int
-Client_i::do_thread_per_rate_test (void)
+Client_i::do_thread_per_rate_test ()
 {
   Client CB_20Hz_client (&this->client_thread_manager_,
                          this->ts_,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
index 803bf32ee8c..2f98eb697ee 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
@@ -29,7 +29,7 @@
 
 #if defined (VME_DRIVER)
 #include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
+extern "C" STATUS vmeDrv ();
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* defined (VME_DRIVER) */
 
@@ -42,65 +42,65 @@ class Client_i : public virtual MT_Priority
 {
 public:
   ///constructor.
-  Client_i (void);
+  Client_i ();
 
   /// destructor.
-  virtual ~Client_i (void);
+  virtual ~Client_i ();
 
   /// Initialize the state of <Client_i>.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the tests.
-  void run (void);
+  void run ();
 
   /// Performs the priority inversion test.
-  int do_priority_inversion_test (void);
+  int do_priority_inversion_test ();
 
   /// Performs the test with 4 threads each sending requests at rates
   /// of 20, 10, 5, and 1Hz.
-  int do_thread_per_rate_test (void);
+  int do_thread_per_rate_test ();
 
   /// Starts the client utilization thread.
-  int start_servant (void);
+  int start_servant ();
 
   /// output the latency results for the requests.
-  void output_latency (void);
+  void output_latency ();
 
 #if defined (VXWORKS)
   /// Outputs the details of this task to a file taskinfo.txt.
-  void output_taskinfo (void);
+  void output_taskinfo ();
 #endif /* VXWORKS */
 
 private:
   /// Sets the priority to be used for the low priority clients.
-  void init_low_priority (void);
+  void init_low_priority ();
 
   /// Calculate the time for one util computation.
-  void calc_util_time (void);
+  void calc_util_time ();
 
   /// Activates the high priority client.
-  int activate_high_client (void);
+  int activate_high_client ();
 
   /// Activates the low priority client.
-  int activate_low_client (void);
+  int activate_low_client ();
 
   /// Activates the utilization thread.
-  int activate_util_thread (void);
+  int activate_util_thread ();
 
   /// Prints the results of the tests.
-  void print_priority_inversion_stats (void);
+  void print_priority_inversion_stats ();
 
   /// Prints the context switch results.
-  void print_context_stats (void);
+  void print_context_stats ();
 
   /// Prints the utilization test results.
-  void print_util_stats (void);
+  void print_util_stats ();
 
   /// Prints the latency and jitter results.
-  void print_latency_stats (void);
+  void print_latency_stats ();
 
   /// gets the number of context switches.
-  void get_context_switches (void);
+  void get_context_switches ();
 
   /// Pointer to the high priority client object.
   Client *high_priority_client_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 1359acd6f0b..058233d853a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -9,7 +9,7 @@ Cubit_i::Cubit_i (CORBA::ORB_ptr orb,
 {
 }
 
-Cubit_i::~Cubit_i (void)
+Cubit_i::~Cubit_i ()
 {
 }
 
@@ -44,12 +44,12 @@ Cubit_i::cube_struct (const Cubit::Many &values)
 }
 
 void
-Cubit_i::noop (void)
+Cubit_i::noop ()
 {
   // does nothing.
 }
 
-void Cubit_i::shutdown (void)
+void Cubit_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) Calling orb ()->shutdown ()\n"));
@@ -57,7 +57,7 @@ void Cubit_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (void)
+Cubit_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index 7aa2c1ca806..561d3fcbefd 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -26,7 +26,7 @@ class Cubit_i : public POA_Cubit
 public:
   Cubit_i (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa);
-  ~Cubit_i (void);
+  ~Cubit_i ();
 
   virtual CORBA::Octet cube_octet (CORBA::Octet o);
 
@@ -36,13 +36,13 @@ public:
 
   virtual Cubit::Many cube_struct (const Cubit::Many &values);
 
-  virtual void noop (void);
+  virtual void noop ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// The default POA
   virtual PortableServer::POA_ptr
-      _default_POA (void);
+      _default_POA ();
 
 protected:
   /// Keep a pointer to the ORB so we can shut it down.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 5651bbfe937..8d4dbe3b5aa 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -32,7 +32,7 @@
 # include "quantify.h"
 #endif /* ACE_HAS_QUANTIFY */
 
-Server::Server (void)
+Server::Server ()
   :argc_ (0),
    argv_ (0),
    cubits_ (0),
@@ -64,7 +64,7 @@ Server::init (int argc, ACE_TCHAR **argv)
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   STOP_QUANTIFY;
   CLEAR_QUANTIFY;
@@ -83,7 +83,7 @@ Server::run (void)
 }
 
 void
-Server::prelim_args_process (void)
+Server::prelim_args_process ()
 {
   int i;
 
@@ -97,7 +97,7 @@ Server::prelim_args_process (void)
 }
 
 void
-Server::init_low_priority (void)
+Server::init_low_priority ()
 {
   ACE_Sched_Priority prev_priority = this->high_priority_;
 
@@ -122,7 +122,7 @@ Server::init_low_priority (void)
 // Write the ior's to a file so the client can read them.
 
 int
-Server::write_iors (void)
+Server::write_iors ()
 {
   u_int j;
 
@@ -168,7 +168,7 @@ Server::write_iors (void)
 }
 
 int
-Server::activate_high_servant (void)
+Server::activate_high_servant ()
 {
   ACE_TCHAR orbendpoint[BUFSIZ];
 
@@ -220,7 +220,7 @@ Server::activate_high_servant (void)
 }
 
 int
-Server::activate_low_servants (void)
+Server::activate_low_servants ()
 {
   if (static_cast<int> (this->num_low_priority_) > 0)
     {
@@ -323,7 +323,7 @@ Server::activate_low_servants (void)
 }
 
 int
-Server::start_servants (void)
+Server::start_servants ()
 {
   // Do the preliminary argument processing for options -p and -h.
   this->prelim_args_process ();
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
index 7effcbdfd9e..5ec5040b098 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -43,7 +43,7 @@
 
 #if defined (VME_DRIVER)
 #include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
+extern "C" STATUS vmeDrv ();
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* VME_DRIVER */
 
@@ -60,32 +60,32 @@ class Server
 {
 public:
   /// Default constructor.
-  Server (void);
+  Server ();
 
   /// Initialize the server state.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run method.
-  int run (void);
+  int run ();
 
 private:
   /// Start the high and low priority servants.
-  int start_servants (void);
+  int start_servants ();
 
   /// Preliminary argument processing code.
-  void prelim_args_process (void);
+  void prelim_args_process ();
 
   /// sets the priority to be used for the low priority servants.
-  void init_low_priority (void);
+  void init_low_priority ();
 
   /// Writes the iors of the servants to a file
-  int write_iors (void);
+  int write_iors ();
 
   /// Activates the high priority servant.
-  int activate_high_servant (void);
+  int activate_high_servant ();
 
   /// Activates the low priority servants.
-  int activate_low_servants (void);
+  int activate_low_servants ();
 
   /// Number of arguments for the servant.
   int argc_;
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index a7b12e089c8..b09c855071e 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -43,7 +43,7 @@ Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder)
 }
 
 void
-Roundtrip_Handler::shutdown (void)
+Roundtrip_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index b7f3332e45a..40891eaa46e 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -24,7 +24,7 @@ public:
   virtual void test_method (Test::Timestamp send_time);
   virtual void test_method_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
index 2431feb42a7..51288cdde31 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
@@ -6,7 +6,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
index 716791e92cf..c1a307c708d 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
@@ -17,7 +17,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr reference,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.h b/TAO/performance-tests/Latency/Collocation/Client_Task.h
index d78367ea0c5..23e9d4cbe33 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const int niterations;
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
index 6382128d071..73c68ef3284 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
@@ -13,7 +13,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
index 4ab05dd7b3b..2f40fe495b7 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
@@ -18,7 +18,7 @@ Server_Task::get_reference ()
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index b3168d869ec..9c766855f4c 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -43,7 +43,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
index 5848a4a8771..5ffe18e12ac 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -26,7 +26,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index b3168d869ec..9c766855f4c 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -43,7 +43,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 5848a4a8771..5ffe18e12ac 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -26,7 +26,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
index 38ef68443e6..1aa09af027f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
@@ -6,7 +6,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
index cefeecab98f..2b15d910c2f 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -23,7 +23,7 @@ Memory_Growth::send_objref (const Test::PayLoad & /*p*/
 }
 
 void
-Memory_Growth::shutdown (void)
+Memory_Growth::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index 4c2f7924601..5a91cbc158d 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -20,7 +20,7 @@ public:
   // = The skeleton methods
   virtual void send_objref (const Test::PayLoad &p);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
index a3658526edd..4ddc0c94992 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
@@ -6,13 +6,13 @@ Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
 }
 
 void
-Memory_Growth::ping (void)
+Memory_Growth::ping ()
 {
   return;
 }
 
 void
-Memory_Growth::shutdown (void)
+Memory_Growth::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
index 5da0a251fe1..3753dfbcaf1 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
@@ -19,9 +19,9 @@ public:
   Memory_Growth (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 954962e5c3a..2914991822a 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-set_rt_scheduling (void)
+set_rt_scheduling ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp
index cf9e8bbdebc..9df67df4938 100644
--- a/TAO/performance-tests/POA/Demux/demux_stats.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp
@@ -18,7 +18,7 @@ public:
   /// Calculates the average latency and Standard deviation.
   /// Expects the input data in my_results.dat.
   int
-  calculate_avg_latency (void);
+  calculate_avg_latency ();
 
   /// parses args.
   int
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 9eea75d6280..f76ede02eed 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -14,7 +14,7 @@
 #include "ace/OS_NS_string.h"
 
 // Constructor
-Demux_Test_Client::Demux_Test_Client (void)
+Demux_Test_Client::Demux_Test_Client ()
   : argc_ (0),
     argv_ (0),
     is_ (Demux_Test_Client::LINEAR),
@@ -31,7 +31,7 @@ Demux_Test_Client::Demux_Test_Client (void)
 }
 
 // destructor
-Demux_Test_Client::~Demux_Test_Client (void)
+Demux_Test_Client::~Demux_Test_Client ()
 {
 }
 
@@ -122,7 +122,7 @@ Demux_Test_Client::init (int argc, ACE_TCHAR *argv [])
 
 // parse command line arguments (if any).
 int
-Demux_Test_Client::parse_args (void)
+Demux_Test_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:m:n:o:p:i:s:"));
   int c;
@@ -234,7 +234,7 @@ Demux_Test_Client::parse_args (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Client::run (void)
+Demux_Test_Client::run ()
 {
   // open a temporary results file
   if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -301,7 +301,7 @@ Demux_Test_Client::run (void)
 }
 
 int
-Demux_Test_Client::run_linear_test (void)
+Demux_Test_Client::run_linear_test ()
 {
   CORBA::ULong j, k, l, m;
   ACE_hrtime_t start, end;
@@ -327,7 +327,7 @@ Demux_Test_Client::run_linear_test (void)
 }
 
 int
-Demux_Test_Client::run_random_test (void)
+Demux_Test_Client::run_random_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Random test\n"));
@@ -335,7 +335,7 @@ Demux_Test_Client::run_random_test (void)
 }
 
 int
-Demux_Test_Client::run_best_test (void)
+Demux_Test_Client::run_best_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Best Test\n"));
@@ -343,7 +343,7 @@ Demux_Test_Client::run_best_test (void)
 }
 
 int
-Demux_Test_Client::run_worst_test (void)
+Demux_Test_Client::run_worst_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Worst test\n"));
@@ -351,7 +351,7 @@ Demux_Test_Client::run_worst_test (void)
 }
 
 int
-Demux_Test_Client::print_results (void)
+Demux_Test_Client::print_results ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "******** "));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index 1943d47556d..17ec654b5df 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -40,38 +40,38 @@ public:
   };
 
   /// CTOR
-  Demux_Test_Client (void);
+  Demux_Test_Client ();
 
   /// DTOR
-  ~Demux_Test_Client (void);
+  ~Demux_Test_Client ();
 
   /// initialize the client test bed
   int init (int argc, ACE_TCHAR *argv []);
 
   /// run the tests
-  int run (void);
+  int run ();
 
 private:
   /// parse command line arguments
-  int parse_args (void);
+  int parse_args ();
 
   /// initialize the operation database
-  int init_operation_db (void);
+  int init_operation_db ();
 
   /// run linear strategy
-  int run_linear_test (void);
+  int run_linear_test ();
 
   /// run random strategy
-  int run_random_test (void);
+  int run_random_test ();
 
   /// run best strategy (w.r.t to linear)
-  int run_best_test (void);
+  int run_best_test ();
 
   /// run worst strategy (w.r.t to linear)
-  int run_worst_test (void);
+  int run_worst_test ();
 
   /// print results
-  int print_results (void);
+  int print_results ();
 
   /// number of command line arguments
   int argc_;
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index eb44ad3b68a..114c236a6bf 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -4,18 +4,18 @@
 #include "tao/ORB_Core.h"
 
 // ctor
-Demux_Test_i::Demux_Test_i (void)
+Demux_Test_i::Demux_Test_i ()
 {}
 
 // dtor
-Demux_Test_i::~Demux_Test_i (void)
+Demux_Test_i::~Demux_Test_i ()
 {}
 
-void Demux_Test_i::M302 (void)
+void Demux_Test_i::M302 ()
 {
 }
 
-void Demux_Test_i::shutdown (void)
+void Demux_Test_i::shutdown ()
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
 }
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index 7bc57c5ab5f..d2f80bb455f 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -8,7 +8,7 @@
 class Demux_Test_i : public POA_Demux_Test
 {
 public:
-  Demux_Test_i (void);
+  Demux_Test_i ();
   //ctor.
 
   Demux_Test_i (PortableServer::POA_ptr poa)
@@ -17,7 +17,7 @@ public:
     };
   // ctor
 
-  ~Demux_Test_i (void);
+  ~Demux_Test_i ();
   // dtor
 
   // Return the Default POA of this Servant
@@ -26,9 +26,9 @@ public:
       return PortableServer::POA::_duplicate (this->poa_.in ());
     };
 
-  virtual void M302 (void);
+  virtual void M302 ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 2d189d83ab7..b05872f9bb6 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -13,7 +13,7 @@
 #include "ace/OS_NS_string.h"
 
 // Constructor
-Demux_Test_Server::Demux_Test_Server (void)
+Demux_Test_Server::Demux_Test_Server ()
   : argc_ (0),
     argv_ (0),
     num_POAs_ (1),
@@ -27,7 +27,7 @@ Demux_Test_Server::Demux_Test_Server (void)
 }
 
 // destructor
-Demux_Test_Server::~Demux_Test_Server (void)
+Demux_Test_Server::~Demux_Test_Server ()
 {
   ACE_OS::fclose (this->poa_fp_);
 }
@@ -320,7 +320,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
 
 // parse command line arguments (if any).
 int
-Demux_Test_Server::parse_args (void)
+Demux_Test_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:o:p:ut"));
   int c;
@@ -393,7 +393,7 @@ Demux_Test_Server::parse_args (void)
 
 // grab a reference to the naming service so that we can register with it.
 int
-Demux_Test_Server::init_naming_service (void)
+Demux_Test_Server::init_naming_service ()
 {
   // Initialize the naming services
   if (this->my_name_client_.init (this->orb_.in ()) == -1)
@@ -408,7 +408,7 @@ Demux_Test_Server::init_naming_service (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Server::run (void)
+Demux_Test_Server::run ()
 {
   try
     {
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index a6fd3f11c62..b27a3e87a2b 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -28,26 +28,26 @@ class Demux_Test_Server
 {
 public:
   /// ctor
-  Demux_Test_Server (void);
+  Demux_Test_Server ();
 
   /// dtor
-  ~Demux_Test_Server (void);
+  ~Demux_Test_Server ();
 
   /// Execute client code.
-  int run (void);
+  int run ();
 
   /// Initialize the communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Calculates the statistics by reading different data values from results.dat.
-  int calculate_avg_latency (void);
+  int calculate_avg_latency ();
 
 private:
   /// parse command line arguments (if any)
-  int parse_args (void);
+  int parse_args ();
 
   /// initialize the naming service
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 3158372ce64..e6a1f4ab3b4 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -7,7 +7,7 @@ Factory::Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Simple_ptr
-Factory::create_simple_object (void)
+Factory::create_simple_object ()
 {
   Simple *simple_impl;
   ACE_NEW_THROW_EX (simple_impl,
@@ -20,7 +20,7 @@ Factory::create_simple_object (void)
 }
 
 void
-Factory::shutdown (void)
+Factory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index 73624c14b7e..9e50fbf7d93 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -20,9 +20,9 @@ public:
 
   // = The skeleton methods
 
-  virtual Test::Simple_ptr create_simple_object (void);
+  virtual Test::Simple_ptr create_simple_object ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a reference to the ORB
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index e3b8caf8e37..8bcaab684a2 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -1,11 +1,11 @@
 #include "Simple.h"
 
-Simple::Simple (void)
+Simple::Simple ()
 {
 }
 
 void
-Simple::destroy (void)
+Simple::destroy ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index 3279cb2ae10..5a234c4b6e9 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -16,11 +16,11 @@ class Simple
 {
 public:
   /// Constructor
-  Simple (void);
+  Simple ();
 
   // = The skeleton methods
 
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index 882a0fdb550..135955a3138 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -207,7 +207,7 @@ public:
       }
   }
 
-  ~stats (void)
+  ~stats ()
   {
     if (this->quantify_)
       {
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 7149a2ddb4c..784745f6ab9 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -103,7 +103,7 @@ PP_Test_Client::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-PP_Test_Client::parse_args (void)
+PP_Test_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("ovdn:f:k:x"));
   int c;
@@ -164,7 +164,7 @@ PP_Test_Client::parse_args (void)
 // Oneway test.
 
 void
-PP_Test_Client::send_oneway (void)
+PP_Test_Client::send_oneway ()
 {
   try
     {
@@ -183,7 +183,7 @@ PP_Test_Client::send_oneway (void)
 // Twoway test.
 
 void
-PP_Test_Client::send_void (void)
+PP_Test_Client::send_void ()
 {
   try
     {
@@ -272,7 +272,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
 }
 
 int
-PP_Test_Client::run_oneway (void)
+PP_Test_Client::run_oneway ()
 {
   try
     {
@@ -310,7 +310,7 @@ PP_Test_Client::run_oneway (void)
 }
 
 int
-PP_Test_Client::run_void (void)
+PP_Test_Client::run_void ()
 {
   try
     {
@@ -347,7 +347,7 @@ PP_Test_Client::run_void (void)
   return this->error_count_ == 0 ? 0 : 1;
 }
 
-PP_Test_Client::~PP_Test_Client (void)
+PP_Test_Client::~PP_Test_Client ()
 {
   // Free resources and close the IOR files.
   if (this->factory_ior_file_)
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.h b/TAO/performance-tests/Pluggable/PP_Test_Client.h
index 8689a013061..44fbce0e4af 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.h
@@ -40,10 +40,10 @@ public:
   /// Use <testing_collocation> to control some client's behaviors.
   PP_Test_Client (int shutdown = 0);
 
-  ~PP_Test_Client (void);
+  ~PP_Test_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   /// <collocation_test_ior> is used to pass in the ior file name.
@@ -54,19 +54,19 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Oneway operation test.
-  void send_oneway (void);
+  void send_oneway ();
 
   /// Twoway operation test.
-  void send_void (void);
+  void send_void ();
 
   /// This method runs only the send_void() test.
-  int run_void (void);
+  int run_void ();
 
   /// This method runs only the send_oneway() test.
-  int run_oneway (void);
+  int run_oneway ();
 
   /// Invoke the method with <do_shutdown> != 0 to shutdown the server.
   int shutdown_server (int do_shutdown);
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index a8121b86a85..0fc81a5e56b 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -3,13 +3,13 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-PP_Test_Server::PP_Test_Server (void)
+PP_Test_Server::PP_Test_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-PP_Test_Server::parse_args (void)
+PP_Test_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:"));
   int c;
@@ -103,7 +103,7 @@ PP_Test_Server::run ()
   return 0;
 }
 
-PP_Test_Server::~PP_Test_Server (void)
+PP_Test_Server::~PP_Test_Server ()
 {
   if (this->factory_id_.in ())
     this->orb_manager_.deactivate_under_child_poa (this->factory_id_.in ());
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index f837ce4ece9..4853aa6c304 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -37,21 +37,21 @@ class PP_Test_Server
 {
 public:
   /// Default constructor
-  PP_Test_Server (void);
+  PP_Test_Server ();
 
   /// Destructor
-  ~PP_Test_Server (void);
+  ~PP_Test_Server ();
 
   /// Initialize the server state - parsing arguments, etc.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the cubit factory IOR.
   FILE* ior_output_file_;
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index 71d7968e128..62c2cae11f3 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -60,12 +60,12 @@ Pluggable_Test_Factory_i::Pluggable_Test_Factory_i (CORBA::ORB_ptr orb)
 
 // Factory Destructor
 
-Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
+Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i ()
 {
 }
 
 Pluggable_Test_ptr
-Pluggable_Test_Factory_i::make_pluggable_test (void)
+Pluggable_Test_Factory_i::make_pluggable_test ()
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
   return my_pluggable_test_._this ();
@@ -80,14 +80,14 @@ PP_Test_i::PP_Test_i (CORBA::ORB_ptr orb)
 
 // Destructor
 
-PP_Test_i::~PP_Test_i (void)
+PP_Test_i::~PP_Test_i ()
 {
 }
 
 // Oneway send
 
 void
-PP_Test_i::send_oneway (void)
+PP_Test_i::send_oneway ()
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
 }
@@ -95,14 +95,14 @@ PP_Test_i::send_oneway (void)
 // Twoway send
 
 void
-PP_Test_i::send_void (void)
+PP_Test_i::send_void ()
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
 }
 
 // Shutdown.
 
-void PP_Test_i::shutdown (void)
+void PP_Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index f6d78fcca71..df6bc300f8d 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -29,16 +29,16 @@ public:
   PP_Test_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~PP_Test_i (void);
+  ~PP_Test_i ();
 
   /// Test a oneway call.
-  virtual void send_oneway (void);
+  virtual void send_oneway ();
 
   /// Test a twoway call.
-  virtual void send_void (void);
+  virtual void send_void ();
 
   /// Shutdown routine.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
   /// Keep a pointer to the ORB so we can shut it down.
@@ -59,10 +59,10 @@ public:
   Pluggable_Test_Factory_i (CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~Pluggable_Test_Factory_i (void);
+  ~Pluggable_Test_Factory_i ();
 
   /// Make a Pluggable Test object.
-  virtual Pluggable_Test_ptr make_pluggable_test (void);
+  virtual Pluggable_Test_ptr make_pluggable_test ();
 
 private:
   PP_Test_i my_pluggable_test_;
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index 68ba54d71a4..839d4f82d4d 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -54,7 +54,7 @@ public:
           CORBA::PolicyManager_ptr policy_manager,
           test_ptr receiver);
 
-  ~test_i (void);
+  ~test_i ();
 
   void start_test (CORBA::Long session_id,
                    const char *protocol,
@@ -62,11 +62,11 @@ public:
                    CORBA::ULong message_size,
                    CORBA::ULong iterations);
 
-  void end_test (void);
+  void end_test ();
 
-  void oneway_sync (void);
+  void oneway_sync ();
 
-  void twoway_sync (void);
+  void twoway_sync ();
 
   void oneway_method (CORBA::Long session_id,
                       CORBA::ULong iteration,
@@ -77,10 +77,10 @@ public:
                       ::test::octets &payload);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -125,7 +125,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
     this->rtorb_->create_client_protocol_policy (protocols);
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
@@ -246,7 +246,7 @@ test_i::start_test (CORBA::Long session_id,
 }
 
 void
-test_i::end_test (void)
+test_i::end_test ()
 {
   // Use IIOP to indicate end of test to server.
   this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
@@ -256,13 +256,13 @@ test_i::end_test (void)
 }
 
 void
-test_i::oneway_sync (void)
+test_i::oneway_sync ()
 {
   this->receiver_->oneway_sync ();
 }
 
 void
-test_i::twoway_sync (void)
+test_i::twoway_sync ()
 {
   this->receiver_->twoway_sync ();
 }
@@ -288,13 +288,13 @@ test_i::twoway_method (CORBA::Long &session_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->receiver_->shutdown ();
 
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 524adf15166..d8fc1790cd1 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -59,7 +59,7 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  ~test_i (void);
+  ~test_i ();
 
   void start_test (CORBA::Long session_id,
                    const char *protocol,
@@ -67,11 +67,11 @@ public:
                    CORBA::ULong message_size,
                    CORBA::ULong iterations);
 
-  void end_test (void);
+  void end_test ();
 
-  void oneway_sync (void);
+  void oneway_sync ();
 
-  void twoway_sync (void);
+  void twoway_sync ();
 
   void oneway_method (CORBA::Long session_id,
                       CORBA::ULong iteration,
@@ -82,10 +82,10 @@ public:
                       ::test::octets &payload);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -112,7 +112,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
@@ -162,7 +162,7 @@ test_i::start_test (CORBA::Long session_id,
 }
 
 void
-test_i::end_test (void)
+test_i::end_test ()
 {
   // Record end time.
   this->test_end_ =
@@ -226,12 +226,12 @@ test_i::end_test (void)
 }
 
 void
-test_i::oneway_sync (void)
+test_i::oneway_sync ()
 {
 }
 
 void
-test_i::twoway_sync (void)
+test_i::twoway_sync ()
 {
 }
 
@@ -308,13 +308,13 @@ test_i::twoway_method (CORBA::Long &session_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index 50a81ae6430..a39c1ad51bb 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -183,11 +183,11 @@ public:
           CORBA::PolicyManager_ptr policy_manager,
           test_ptr test);
 
-  void run (void);
+  void run ();
 
-  void print_stats (void);
+  void print_stats ();
 
-  void setup (void);
+  void setup ();
 
 private:
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
@@ -316,7 +316,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 void
-Worker::print_stats (void)
+Worker::print_stats ()
 {
   CORBA::ULong missed_total_deadlines =
     this->missed_start_deadlines_ + this->missed_end_deadlines_;
@@ -453,7 +453,7 @@ Worker::missed_end_deadline (CORBA::ULong invocation)
 }
 
 void
-Worker::setup (void)
+Worker::setup ()
 {
   // Make sure we have a connection to the server using the test
   // protocol.
@@ -537,7 +537,7 @@ Worker::setup (void)
 }
 
 void
-Worker::run (void)
+Worker::run ()
 {
   // Select the test protocol for these invocation.
   this->policy_manager_->set_policy_overrides (this->test_protocol_policy_,
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index 0b86c5ac4fe..b136baa8df0 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -24,7 +24,7 @@ class RTCORBA_COMMON_Export Test_i : public POA_Test
 {
 public:
   /// ctor
-  Test_i (void);
+  Test_i ();
 
   // = The Test methods.
   void test_method (CORBA::Long id);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 2dab4dd836c..5940f002126 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -21,7 +21,7 @@ class Client : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run the client threads.
   //
 public:
-  Client (void);
+  Client ();
   // ctor
 
   void set (int niterations,
@@ -213,7 +213,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Client::Client (void)
+Client::Client ()
 {
 }
 
@@ -232,7 +232,7 @@ Client::set (int niterations,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index 783d3beb11f..d1e5690f65f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -17,7 +17,7 @@ class Server : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run the server threads.
   //
 public:
-  Server (void);
+  Server ();
   // ctor
 
   void set (Test_i *server, int priority, int argc, ACE_TCHAR *argv[]);
@@ -168,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Server::Server (void)
+Server::Server ()
 {
 }
 
@@ -186,7 +186,7 @@ Server::set (Test_i *server,
 }
 
 int
-Server::svc (void)
+Server::svc ()
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 2689271ca8c..0e1c3d78eed 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -20,7 +20,7 @@ class Client : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run the client threads.
   //
 public:
-  Client (void);
+  Client ();
   // ctor
 
   void set (Test_ptr server,
@@ -230,7 +230,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Client::Client (void)
+Client::Client ()
 {
 }
 
@@ -251,7 +251,7 @@ Client::set (Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 01fcc474949..7c0184fc5d9 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -81,7 +81,7 @@ static Messaging::SyncScope sync_scope = Messaging::SYNC_WITH_TRANSPORT;
 static ACE_High_Res_Timer::global_scale_factor_type gsf = 0;
 
 static void
-print_params (void)
+print_params ()
 {
   if (test_twoway)
     {
@@ -359,7 +359,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-set_rt_mode (void)
+set_rt_mode ()
 {
   int policy = ACE_SCHED_FIFO;
   int priority =
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index bd393f055bf..b450e05b3d5 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-set_rt_mode (void)
+set_rt_mode ()
 {
   int policy = ACE_SCHED_FIFO;
   int priority =
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index 5a5bd2564f1..617e1951d63 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -33,7 +33,7 @@ public:
 
   void twoway_work_test (CORBA::ULong work);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 79167eeecfb..d49019b3a7a 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -44,7 +44,7 @@ static int count_missed_end_deadlines = 0;
 
 struct Synchronizers
 {
-  Synchronizers (void)
+  Synchronizers ()
     : worker_lock_ (),
       workers_ (1),
       workers_ready_ (0),
@@ -406,11 +406,11 @@ public:
                 RTCORBA::PriorityMapping &priority_mapping,
                 Synchronizers &synchronizers);
 
-  int svc (void);
+  int svc ();
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
-  void reset_priority (void);
+  void reset_priority ();
   void print_stats (ACE_hrtime_t test_end);
-  int setup (void);
+  int setup ();
   void missed_start_deadline (CORBA::ULong invocation);
   void missed_end_deadline (CORBA::ULong invocation);
 
@@ -461,7 +461,7 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Paced_Worker::reset_priority (void)
+Paced_Worker::reset_priority ()
 {
   if (set_priority)
     {
@@ -574,7 +574,7 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end)
 }
 
 int
-Paced_Worker::setup (void)
+Paced_Worker::setup ()
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
@@ -614,7 +614,7 @@ Paced_Worker::missed_end_deadline (CORBA::ULong invocation)
 }
 
 int
-Paced_Worker::svc (void)
+Paced_Worker::svc ()
 {
   try
     {
@@ -689,11 +689,11 @@ public:
                      RTCORBA::PriorityMapping &priority_mapping,
                      Synchronizers &synchronizers);
 
-  int svc (void);
+  int svc ();
   void print_stats (ACE_Sample_History &history,
                     ACE_hrtime_t test_end);
-  int setup (void);
-  void print_collective_stats (void);
+  int setup ();
+  void print_collective_stats ();
 
   test_var test_;
   CORBA::ULong iterations_;
@@ -764,7 +764,7 @@ Continuous_Worker::print_stats (ACE_Sample_History &history,
 }
 
 void
-Continuous_Worker::print_collective_stats (void)
+Continuous_Worker::print_collective_stats ()
 {
   if (continuous_workers > 0)
     {
@@ -794,7 +794,7 @@ Continuous_Worker::print_collective_stats (void)
 }
 
 int
-Continuous_Worker::setup (void)
+Continuous_Worker::setup ()
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
@@ -819,7 +819,7 @@ Continuous_Worker::setup (void)
 }
 
 int
-Continuous_Worker::svc (void)
+Continuous_Worker::svc ()
 {
   try
     {
@@ -866,7 +866,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -879,7 +879,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   Synchronizers synchronizers;
 
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index e30f3b816c9..25860a549bf 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -20,10 +20,10 @@ public:
                CORBA::ULong prime_number);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -53,13 +53,13 @@ test_i::method (CORBA::ULong work,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -189,7 +189,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -202,7 +202,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index 63acb1c980c..764786b08e3 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -173,7 +173,7 @@ Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *hol
 // = Other methods
 
 void
-Roundtrip_Handler::shutdown (void)
+Roundtrip_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index 15644ab0415..c914102c56c 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -47,7 +47,7 @@ public:
 
   // = Other methods
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
index 2431feb42a7..51288cdde31 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
@@ -6,7 +6,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index b2caa8cbd73..6d1d3fde83d 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *data_type,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -62,7 +62,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   Test::octet_load oc;
@@ -78,7 +78,7 @@ Client_Task::validate_connection (void)
 }
 
 void
-Client_Task::test_octet_seq (void)
+Client_Task::test_octet_seq ()
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -95,7 +95,7 @@ Client_Task::test_octet_seq (void)
 }
 
 void
-Client_Task::test_long_seq (void)
+Client_Task::test_long_seq ()
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -113,7 +113,7 @@ Client_Task::test_long_seq (void)
 
 
 void
-Client_Task::test_short_seq (void)
+Client_Task::test_short_seq ()
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -130,7 +130,7 @@ Client_Task::test_short_seq (void)
 }
 
 void
-Client_Task::test_char_seq (void)
+Client_Task::test_char_seq ()
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -147,7 +147,7 @@ Client_Task::test_char_seq (void)
 }
 
 void
-Client_Task::test_longlong_seq (void)
+Client_Task::test_longlong_seq ()
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -164,7 +164,7 @@ Client_Task::test_longlong_seq (void)
 }
 
 void
-Client_Task::test_double_seq (void)
+Client_Task::test_double_seq ()
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
index 0bd8f60bd15..531173d8acd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
@@ -28,15 +28,15 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
   /// Some performance test methods
-  void test_octet_seq (void);
-  void test_long_seq (void);
-  void test_short_seq (void);
-  void test_char_seq (void);
-  void test_longlong_seq (void);
-  void test_double_seq (void);
+  void test_octet_seq ();
+  void test_long_seq ();
+  void test_short_seq ();
+  void test_char_seq ();
+  void test_longlong_seq ();
+  void test_double_seq ();
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
index e6dcf32173c..8ac6981955a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -48,7 +48,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
index 3d41025d07c..27962ee6200 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *data_type,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -62,7 +62,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   Test::octet_load oc;
@@ -78,7 +78,7 @@ Client_Task::validate_connection (void)
 }
 
 void
-Client_Task::test_octet_seq (void)
+Client_Task::test_octet_seq ()
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -95,7 +95,7 @@ Client_Task::test_octet_seq (void)
 }
 
 void
-Client_Task::test_long_seq (void)
+Client_Task::test_long_seq ()
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -113,7 +113,7 @@ Client_Task::test_long_seq (void)
 
 
 void
-Client_Task::test_short_seq (void)
+Client_Task::test_short_seq ()
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -130,7 +130,7 @@ Client_Task::test_short_seq (void)
 }
 
 void
-Client_Task::test_char_seq (void)
+Client_Task::test_char_seq ()
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -147,7 +147,7 @@ Client_Task::test_char_seq (void)
 }
 
 void
-Client_Task::test_longlong_seq (void)
+Client_Task::test_longlong_seq ()
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -164,7 +164,7 @@ Client_Task::test_longlong_seq (void)
 }
 
 void
-Client_Task::test_double_seq (void)
+Client_Task::test_double_seq ()
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
index 0bd8f60bd15..531173d8acd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -28,15 +28,15 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
   /// Some performance test methods
-  void test_octet_seq (void);
-  void test_long_seq (void);
-  void test_short_seq (void);
-  void test_char_seq (void);
-  void test_longlong_seq (void);
-  void test_double_seq (void);
+  void test_octet_seq ();
+  void test_long_seq ();
+  void test_short_seq ();
+  void test_char_seq ();
+  void test_longlong_seq ();
+  void test_double_seq ();
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
index e6dcf32173c..8ac6981955a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
@@ -48,7 +48,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
index 38ef68443e6..1aa09af027f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
@@ -6,7 +6,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 3398bfef863..065ca312c58 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -2,7 +2,7 @@
 #include "Receiver.h"
 #include "ace/High_Res_Timer.h"
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : start_time_ (0)
   , message_count_ (0)
   , byte_count_ (0)
@@ -38,7 +38,7 @@ Receiver::receive_data (const Test::Message &the_message)
 }
 
 void
-Receiver::done (void)
+Receiver::done ()
 {
   if (this->message_count_ == 0)
     {
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index d7159953a82..f2697134c85 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -17,12 +17,12 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   // = The skeleton methods
   virtual void receive_data (const Test::Message &message);
 
-  virtual void done (void);
+  virtual void done ();
 
 private:
   /// The timestamp for the first message
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index dbff14c5c48..b67eb3418a8 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -7,7 +7,7 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Receiver_ptr
-Receiver_Factory::create_receiver (void)
+Receiver_Factory::create_receiver ()
 {
   Receiver *receiver_impl = 0;
   ACE_NEW_THROW_EX (receiver_impl,
@@ -30,7 +30,7 @@ Receiver_Factory::create_receiver (void)
 }
 
 void
-Receiver_Factory::shutdown (void)
+Receiver_Factory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index 44a023b49e0..b16cb45b13e 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -14,9 +14,9 @@ public:
   Receiver_Factory (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Receiver_ptr create_receiver (void);
+  virtual Test::Receiver_ptr create_receiver ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a reference to the ORB in order to shutdown the app
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
index 19499e7aa93..979061cfb62 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
@@ -62,7 +62,7 @@ template<typename StringType,
 void
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::tao_duplicate (void)
+                     RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -73,7 +73,7 @@ template<typename StringType,
 void
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::tao_release (void)
+                     RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index e4336d70a3a..e5f4e1faba8 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -30,7 +30,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
 }
 
 template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
+TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index 5acf9822453..75d1d23a1c3 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -38,7 +38,7 @@ namespace TAO
     Any_Array_Impl_T (_tao_destructor destructor,
                       CORBA::TypeCode_ptr,
                       T_slice * const);
-    virtual ~Any_Array_Impl_T (void);
+    virtual ~Any_Array_Impl_T ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor destructor,
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
index 8176c26aef0..80af1e45323 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
@@ -27,7 +27,7 @@ TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
 }
 
 template<typename T>
-TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
+TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
index 39136dec62d..4cf81560d31 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -54,7 +54,7 @@ TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc)
 }
 
 template<typename T>
-TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T (void)
+TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T ()
 {
 }
 
@@ -200,7 +200,7 @@ TAO::Any_Dual_Impl_T<T>::value () const
 
 template<typename T>
 void
-TAO::Any_Dual_Impl_T<T>::free_value (void)
+TAO::Any_Dual_Impl_T<T>::free_value ()
 {
   if (this->value_destructor_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
index 990a1881246..abf5d0c2ff8 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
@@ -30,7 +30,7 @@ TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
 }
 
 template<typename T>
-TAO::Any_Impl_T<T>::~Any_Impl_T (void)
+TAO::Any_Impl_T<T>::~Any_Impl_T ()
 {
 }
 
@@ -163,7 +163,7 @@ TAO::Any_Impl_T<T>::value () const
 
 template<typename T>
 void
-TAO::Any_Impl_T<T>::free_value (void)
+TAO::Any_Impl_T<T>::free_value ()
 {
   if (this->value_destructor_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
index a2cd7984afd..34e437d7961 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
@@ -28,7 +28,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
 }
 
 template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T (void)
+TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index 104275c6bf4..3813f753f3b 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -61,7 +61,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 void
 TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
-                    RefCountPolicy>::tao_duplicate (void)
+                    RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -70,7 +70,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 void
 TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
-                    RefCountPolicy>::tao_release (void)
+                    RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
index f3310d13465..1740b7b9208 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
@@ -26,14 +26,14 @@ TAO::TypeCode::Fixed<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::Fixed<RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void)
+TAO::TypeCode::Fixed<RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index 4751fd397d3..1f56532f106 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -39,14 +39,14 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_marshal (
 
 template <typename StringType, class RefCountPolicy>
 void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <typename StringType, class RefCountPolicy>
 void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release (void)
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
index 8af341e0ea8..e30afb8cc5f 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
@@ -49,14 +49,14 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_marshal (
 
 template <typename TypeCodeType, class RefCountPolicy>
 void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <typename TypeCodeType, class RefCountPolicy>
 void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_release (void)
+TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
index f1a3399c936..185c384994a 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
@@ -26,14 +26,14 @@ TAO::TypeCode::String<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::String<RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::String<RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::String<RefCountPolicy>::tao_release (void)
+TAO::TypeCode::String<RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
index 797b5469fd9..7bb02a44b62 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -87,7 +87,7 @@ void
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::tao_duplicate (void)
+                      RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -100,7 +100,7 @@ void
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::tao_release (void)
+                      RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 76bd27168bb..2524650e16e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -12,7 +12,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void)
+TAO::TypeCode::Case<StringType, TypeCodeType>::~Case ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index 0942b2988ac..7e72eb0e33f 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -83,7 +83,7 @@ void
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
+                     RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -96,7 +96,7 @@ void
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::tao_release (void)
+                     RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index 5d5fa5dbc72..559370ecb42 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -92,7 +92,7 @@ void
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
+                     RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -105,7 +105,7 @@ void
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::tao_release (void)
+                     RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index 10b75b1662a..a5f97700172 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -58,7 +58,7 @@ public:
 
 
   /// Destructor
-  virtual ~TAO_Asynch_Queued_Message (void);
+  virtual ~TAO_Asynch_Queued_Message ();
 
   /**
    * @name Implement the Template Methods from TAO_Queued_Message
@@ -71,7 +71,7 @@ public:
   /// @note No reason to believe why this would be called. But have
   /// it here for the sake of uniformity.
   virtual TAO_Queued_Message *clone (ACE_Allocator *alloc);
-  virtual void destroy (void);
+  virtual void destroy ();
   virtual bool is_expired (const ACE_Time_Value &now) const;
   virtual void copy_if_necessary (const ACE_Message_Block* chain);
   //@}
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index 8d57acb6148..364ad980a68 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -44,7 +44,7 @@ TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value (
 template<typename S_var,
          size_t BOUND,
          template <typename> class Insert_Policy>
-TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::~In_BD_String_Clonable_Argument_T (void)
+TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::~In_BD_String_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -58,7 +58,7 @@ template<typename S_var,
          size_t BOUND,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::clone (void)
+TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::clone ()
 {
   typename S_var::s_traits::char_type * clone_x =
              new typename S_var::s_traits::char_type [BOUND];
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index b7031f3623a..ac11e0957b1 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -67,9 +67,9 @@ namespace TAO
   {
   public:
     In_BD_String_Clonable_Argument_T (const typename S_var::s_traits::char_type * x);
-    virtual ~In_BD_String_Clonable_Argument_T (void);
+    virtual ~In_BD_String_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
   private:
     bool is_clone_;
   };
@@ -93,7 +93,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     typename S_var::s_traits::char_type *& x_;
@@ -117,7 +117,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     typename S_var::s_traits::char_type *& x_;
@@ -135,16 +135,16 @@ namespace TAO
   class Ret_BD_String_Argument_T : public RetArgument
   {
   public:
-    Ret_BD_String_Argument_T (void);
+    Ret_BD_String_Argument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
-    typename S_var::s_traits::char_type * excp (void);
-    typename S_var::s_traits::char_type * retn (void);
+    typename S_var::s_traits::char_type * excp ();
+    typename S_var::s_traits::char_type * retn ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
index 095223d6d2d..54836a0817a 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -36,21 +36,21 @@ class TAO_Export TAO_Base_Transport_Property
 {
 public:
   /// Default constructor
-  TAO_Base_Transport_Property (void);
+  TAO_Base_Transport_Property ();
 
   /// Constructor
   TAO_Base_Transport_Property (TAO_Endpoint *endpoint,
                                CORBA::Boolean flag = false);
 
   /// Destructor
-  virtual ~TAO_Base_Transport_Property (void);
+  virtual ~TAO_Base_Transport_Property ();
 
   /// The copy constructor.
   TAO_Base_Transport_Property (const TAO_Base_Transport_Property &rhs);
 
   /// This call allocates and copies the contents of this class and
   /// returns the pointer
-  virtual  TAO_Transport_Descriptor_Interface *duplicate (void);
+  virtual  TAO_Transport_Descriptor_Interface *duplicate ();
 
   /// Try to determine if this object is same as the @a other_prop.
   virtual CORBA::Boolean is_equivalent (
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index 2fa9990b390..fad6fe1a0c9 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -36,7 +36,7 @@ class TAO_Export TAO_BiDir_Adapter : public ACE_Service_Object
 {
 public:
   /// The virtual destructor
-  virtual ~TAO_BiDir_Adapter (void);
+  virtual ~TAO_BiDir_Adapter ();
 
   virtual void load_policy_validators (TAO_Policy_Validator &validator) = 0;
 };
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 4415f1f6d52..70c09aa62ae 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -93,7 +93,7 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
 }
 
 int
-TAO_BiDirGIOP_Loader::Initializer (void)
+TAO_BiDirGIOP_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader);
 }
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index 75aacfbc283..aa0fe3a97cc 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -47,7 +47,7 @@ TAO_BidirectionalPolicy::clone () const
 }
 
 CORBA::Policy_ptr
-TAO_BidirectionalPolicy::copy (void)
+TAO_BidirectionalPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
diff --git a/TAO/tao/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp
index cab52477446..afe698ff1ff 100644
--- a/TAO/tao/Buffer_Allocator_T.cpp
+++ b/TAO/tao/Buffer_Allocator_T.cpp
@@ -17,7 +17,7 @@ namespace TAO
 
   template <typename handler_type, typename alloc_type>
   handler_type*
-  TAO_Buffer_Allocator<handler_type, alloc_type>::allocate (void)
+  TAO_Buffer_Allocator<handler_type, alloc_type>::allocate ()
   {
     handler_type* myvalue = 0;
     ACE_NEW_MALLOC_RETURN (myvalue,
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 84741bf7299..d1239cf0555 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void)
+TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher ()
 {
 }
 
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
index e195e7fd42c..c3bd63fb687 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
@@ -31,7 +31,7 @@ class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher
   : public virtual TAO_Default_Servant_Dispatcher
 {
 public:
-  virtual ~TAO_CSD_Default_Servant_Dispatcher (void);
+  virtual ~TAO_CSD_Default_Servant_Dispatcher ();
 
   /// Factory method for creating new CSD Root POA.
   virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name,
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
index 7aabd46fdb9..3090791d1b4 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
@@ -5,18 +5,18 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CSD_Framework_Loader::TAO_CSD_Framework_Loader (void)
+TAO_CSD_Framework_Loader::TAO_CSD_Framework_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_CSD_Framework_Loader::~TAO_CSD_Framework_Loader (void)
+TAO_CSD_Framework_Loader::~TAO_CSD_Framework_Loader ()
 {
 }
 
 
 int
-TAO_CSD_Framework_Loader::static_init (void)
+TAO_CSD_Framework_Loader::static_init ()
 {
   ACE_Service_Config::process_directive (
       ace_svc_desc_TAO_CSD_Object_Adapter_Factory);
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
index 4acf7146b96..9109d576ac9 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
@@ -38,13 +38,13 @@ class TAO_CSD_FW_Export TAO_CSD_Framework_Loader : public ACE_Service_Object
 {
  public:
   /// Constructor.
-  TAO_CSD_Framework_Loader (void);
+  TAO_CSD_Framework_Loader ();
 
   /// Destructor.
-  virtual ~TAO_CSD_Framework_Loader (void);
+  virtual ~TAO_CSD_Framework_Loader ();
 
   /// Used to force the initialization of the ORB code.
-  static int static_init (void);
+  static int static_init ();
 
   /// Initialize the PI_Server loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
index 8aab6d1f13a..a792d9698a7 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
@@ -39,7 +39,7 @@ public:
                           TAO_ORB_Core &orb_core);
 
   /// Destructor
-  virtual ~TAO_CSD_Object_Adapter (void);
+  virtual ~TAO_CSD_Object_Adapter ();
 
   /// Hand the request to the Service_Dispatching_Strategy_Proxy for
   /// dispatching.
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index 973a03d0b66..440758c11c3 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory (void)
+TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
index c9ce0b518b6..094bdb498d6 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
@@ -29,7 +29,7 @@ class TAO_CSD_FW_Export TAO_CSD_Object_Adapter_Factory : public TAO_Adapter_Fact
 {
 public:
   /// Constructor
-  TAO_CSD_Object_Adapter_Factory (void);
+  TAO_CSD_Object_Adapter_Factory ();
 
   // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   // details.
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index 9729e0950ac..b5556b4441e 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -36,7 +36,7 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name,
 
 
 // Implementation skeleton destructor
-TAO_CSD_POA::~TAO_CSD_POA (void)
+TAO_CSD_POA::~TAO_CSD_POA ()
 {
   delete this->sds_proxy_;
 }
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index 08f821911df..042aa2ab8d7 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -47,7 +47,7 @@ public:
                TAO_Object_Adapter *object_adapter);
 
   /// Destructor
-  virtual ~TAO_CSD_POA (void);
+  virtual ~TAO_CSD_POA ();
 
   /// Pass the Strategy object reference to the CSD poa.
   virtual
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
index 2dfc943df14..d43751740c3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
@@ -64,7 +64,7 @@ namespace TAO
       /// until it has been cancelled.
       /// Returns true if the request has been dispatched, and returns
       /// false if the request has been cancelled.
-      bool wait(void);
+      bool wait();
 
     protected:
       /// Note that we do not override our base class implementation of
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
index 531298490e5..8caab710608 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
@@ -68,7 +68,7 @@ namespace TAO
       /// just *after* the request is dispatched by a worker thread.
       /// Returns true if the request has been dispatched, and returns
       /// false if the request has been cancelled.
-      bool wait(void);
+      bool wait();
 
     protected:
       /// Prepare this TP_Collocated_Synch_With_Server_Request object to be
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
index 72910b181eb..cac4e8d0741 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
@@ -62,7 +62,7 @@ namespace TAO
       void do_clone();
 
       /// Delegate to the FW_Server_Request_Wrapper dispatch() method.
-      void do_dispatch(void);
+      void do_dispatch();
 
       /// Delegate to the FW_Server_Request_Wrapper cancel() method.
       void do_cancel();
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
index 304d2af1198..27f2459cf3d 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
@@ -13,7 +13,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_CSD_ThreadPool::init (void)
+TAO_CSD_ThreadPool::init ()
 {
   static int initialized = 0;
   if (initialized == 1)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
index a389c9fb37c..ed1f42dd674 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
@@ -36,7 +36,7 @@ class TAO_CSD_TP_Export TAO_CSD_ThreadPool
 {
  public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static int
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index d81d2c728bb..24a528eda8a 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -32,7 +32,7 @@ TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (
 {
 }
 
-TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
+TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec ()
 {
 }
 
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 38e0722bc1c..5fb55923d43 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -76,7 +76,7 @@ protected:
    * Only allow this class to be instantiated on the heap since it is
    * reference counted.
    */
-  virtual ~TAO_CDR_Encaps_Codec (void);
+  virtual ~TAO_CDR_Encaps_Codec ();
 
   /// Verify that it is possible to encode the given data using this
   /// Codec.
diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp
index d58fcd8d6be..6491cca8fd3 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -25,7 +25,7 @@ TAO_CodecFactory_Loader::create_object (CORBA::ORB_ptr orb,  int, ACE_TCHAR *[])
 }
 
 int
-TAO_CodecFactory_Loader::Initializer (void)
+TAO_CodecFactory_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CodecFactory_Loader);
 }
diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp
index 189040fe5ff..d1dc744d38d 100644
--- a/TAO/tao/Codeset/Codeset.cpp
+++ b/TAO/tao/Codeset/Codeset.cpp
@@ -18,7 +18,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Codeset_Initializer::init (void)
+TAO_Codeset_Initializer::init ()
 {
   int result = 0;
 
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp
index 75aac37a839..4ebf2cc0c4a 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.cpp
+++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp
@@ -117,7 +117,7 @@ TAO_Codeset_Descriptor::add_translator (const ACE_TCHAR *name)
 }
 
 TAO_Codeset_Descriptor::Translator_Node *
-TAO_Codeset_Descriptor::translators (void)
+TAO_Codeset_Descriptor::translators ()
 {
   return this->trans_base_;
 }
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h
index ef859f98830..8b747700f3f 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.h
+++ b/TAO/tao/Codeset/Codeset_Descriptor.h
@@ -47,7 +47,7 @@ public:
   int num_translators () const;
 
   void add_translator (const ACE_TCHAR *name);
-  Translator_Node *translators (void);
+  Translator_Node *translators ();
 
 private:
   ACE_CDR::ULong ncs_;
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
index f3da5f2a337..a85ef8f4670 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void)
+TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory ()
 {
 }
 
@@ -26,7 +26,7 @@ TAO_Codeset_Manager_Factory::is_default () const
 
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory::create (void)
+TAO_Codeset_Manager_Factory::create ()
 {
   TAO_Codeset_Manager_i *csm = 0;
   ACE_NEW_RETURN (csm, TAO_Codeset_Manager_i, 0);
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h
index 6fc3745df46..5cc7d6ae962 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.h
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h
@@ -40,7 +40,7 @@ class TAO_Codeset_Export TAO_Codeset_Manager_Factory :
 {
 public:
   virtual ~TAO_Codeset_Manager_Factory ();
-  virtual TAO_Codeset_Manager *create(void);
+  virtual TAO_Codeset_Manager *create();
   virtual bool is_default() const;
 };
 
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h
index 39a190c393b..4a8bf88670a 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.h
+++ b/TAO/tao/Codeset/Codeset_Manager_i.h
@@ -90,8 +90,8 @@ public:
   /// codeset id matching the manager's native codeset id.
   void open(TAO_ORB_Core& core);
 
-  virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor (void);
-  virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor (void);
+  virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor ();
+  virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor ();
 
 private:
   // Compute the TCS for Char/WChar asper the CORBA Specification
diff --git a/TAO/tao/Codeset_Descriptor_Base.h b/TAO/tao/Codeset_Descriptor_Base.h
index 7f26ec50c7f..4d2e4eda074 100644
--- a/TAO/tao/Codeset_Descriptor_Base.h
+++ b/TAO/tao/Codeset_Descriptor_Base.h
@@ -34,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_Codeset_Descriptor_Base
 {
 public:
-  virtual ~TAO_Codeset_Descriptor_Base (void);
+  virtual ~TAO_Codeset_Descriptor_Base ();
 
   virtual void ncs (const ACE_TCHAR *name) = 0;
   virtual void add_translator (const ACE_TCHAR *name) = 0;
diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp
index 41c9224e922..bc2c1528d24 100644
--- a/TAO/tao/Compression/Base_Compressor.cpp
+++ b/TAO/tao/Compression/Base_Compressor.cpp
@@ -15,20 +15,20 @@ namespace TAO
   }
 
   ::Compression::CompressorFactory_ptr
-  BaseCompressor::compressor_factory (void)
+  BaseCompressor::compressor_factory ()
   {
     return ::Compression::CompressorFactory::_duplicate (
       compressor_factory_);
   }
 
   ::Compression::CompressionLevel
-  BaseCompressor::compression_level (void)
+  BaseCompressor::compression_level ()
   {
     return compression_level_;
   }
 
   ::CORBA::ULongLong
-  BaseCompressor::compressed_bytes (void)
+  BaseCompressor::compressed_bytes ()
   {
     ::CORBA::ULongLong return_value = 0;
     {
@@ -39,7 +39,7 @@ namespace TAO
   }
 
   ::CORBA::ULongLong
-  BaseCompressor::uncompressed_bytes (void)
+  BaseCompressor::uncompressed_bytes ()
   {
     ::CORBA::ULongLong return_value = 0;
     {
@@ -50,7 +50,7 @@ namespace TAO
   }
 
   ::Compression::CompressionRatio
-  BaseCompressor::compression_ratio (void)
+  BaseCompressor::compression_ratio ()
   {
     ::Compression::CompressionRatio return_value = 0;
     {
diff --git a/TAO/tao/Compression/Base_Compressor.h b/TAO/tao/Compression/Base_Compressor.h
index c2a00e9eaf3..9a5b1498f75 100644
--- a/TAO/tao/Compression/Base_Compressor.h
+++ b/TAO/tao/Compression/Base_Compressor.h
@@ -43,15 +43,15 @@ namespace TAO
     virtual void decompress (const ::Compression::Buffer &source,
                              ::Compression::Buffer &target) = 0;
 
-    virtual ::Compression::CompressorFactory_ptr compressor_factory (void);
+    virtual ::Compression::CompressorFactory_ptr compressor_factory ();
 
-    virtual ::Compression::CompressionLevel compression_level (void);
+    virtual ::Compression::CompressionLevel compression_level ();
 
-    virtual ::CORBA::ULongLong compressed_bytes (void);
+    virtual ::CORBA::ULongLong compressed_bytes ();
 
-    virtual ::CORBA::ULongLong uncompressed_bytes (void);
+    virtual ::CORBA::ULongLong uncompressed_bytes ();
 
-    virtual ::Compression::CompressionRatio compression_ratio (void);
+    virtual ::Compression::CompressionRatio compression_ratio ();
 
   protected:
     void update_stats (::CORBA::ULongLong uncompressed_bytes,
diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp
index 66a31fa1162..c53b6117471 100644
--- a/TAO/tao/Compression/Compression.cpp
+++ b/TAO/tao/Compression/Compression.cpp
@@ -16,7 +16,7 @@ TAO_Compression_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[])
 
 
 int
-TAO_Compression_Loader::Initializer (void)
+TAO_Compression_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (
     ace_svc_desc_TAO_Compression_Loader);
diff --git a/TAO/tao/Compression/Compression.h b/TAO/tao/Compression/Compression.h
index 26f80c6b8ff..ceeeae0909d 100644
--- a/TAO/tao/Compression/Compression.h
+++ b/TAO/tao/Compression/Compression.h
@@ -40,7 +40,7 @@ public:
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp
index 7fb3e396249..e28f98bc21a 100644
--- a/TAO/tao/Compression/Compression_Manager.cpp
+++ b/TAO/tao/Compression/Compression_Manager.cpp
@@ -107,7 +107,7 @@ namespace TAO
   }
 
   ::Compression::CompressorFactorySeq *
-  CompressionManager::get_factories (void)
+  CompressionManager::get_factories ()
   {
     // todo
     return 0;
diff --git a/TAO/tao/Compression/Compression_Manager.h b/TAO/tao/Compression/Compression_Manager.h
index 7c5a7e8cc3d..b0728f0e2d5 100644
--- a/TAO/tao/Compression/Compression_Manager.h
+++ b/TAO/tao/Compression/Compression_Manager.h
@@ -46,7 +46,7 @@ namespace TAO
       (::Compression::CompressorId compressor_id,
        ::Compression::CompressionLevel compression_level);
 
-    virtual ::Compression::CompressorFactorySeq *get_factories (void);
+    virtual ::Compression::CompressorFactorySeq *get_factories ();
 
   private:
     TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp
index dfbb8166fc2..e7eadb5d0ca 100644
--- a/TAO/tao/Compression/Compressor_Factory.cpp
+++ b/TAO/tao/Compression/Compressor_Factory.cpp
@@ -11,7 +11,7 @@ namespace TAO
   }
 
   ::Compression::CompressorId
-  CompressorFactory::compressor_id (void)
+  CompressorFactory::compressor_id ()
   {
     return compressor_id_;
   }
diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h
index 7204ce20366..e545cc34ec0 100644
--- a/TAO/tao/Compression/Compressor_Factory.h
+++ b/TAO/tao/Compression/Compressor_Factory.h
@@ -33,7 +33,7 @@ namespace TAO
   public:
     CompressorFactory (::Compression::CompressorId compressor_id);
 
-    virtual ::Compression::CompressorId compressor_id (void);
+    virtual ::Compression::CompressorId compressor_id ();
 
     virtual ::Compression::Compressor_ptr get_compressor
       (::Compression::CompressionLevel compression_level) = 0;
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h
index ef7b5176b11..49071b33075 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h
@@ -30,7 +30,7 @@ namespace TAO
       public ::TAO::CompressorFactory
     {
       public:
-        Bzip2_CompressorFactory (void);
+        Bzip2_CompressorFactory ();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel compression_level);
diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.h b/TAO/tao/Compression/lzo/LzoCompressor_Factory.h
index aa1e4fbeb46..ebb3db51930 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.h
+++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.h
@@ -30,7 +30,7 @@ namespace TAO
       public ::TAO::CompressorFactory
     {
       public:
-        Lzo_CompressorFactory (void);
+        Lzo_CompressorFactory ();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel compression_level);
diff --git a/TAO/tao/Compression/rle/RLECompressor_Factory.cpp b/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
index bc07307d25c..ddfb3c13ec8 100644
--- a/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
+++ b/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-RLE_CompressorFactory::RLE_CompressorFactory(void)
+RLE_CompressorFactory::RLE_CompressorFactory()
     : ::TAO::CompressorFactory(Compression::COMPRESSORID_RLE)
     , compressor_(::Compression::Compressor::_nil())
 {
diff --git a/TAO/tao/Compression/rle/RLECompressor_Factory.h b/TAO/tao/Compression/rle/RLECompressor_Factory.h
index e4b144388f7..f9bf39ff003 100644
--- a/TAO/tao/Compression/rle/RLECompressor_Factory.h
+++ b/TAO/tao/Compression/rle/RLECompressor_Factory.h
@@ -30,7 +30,7 @@ namespace TAO
         public ::TAO::CompressorFactory
     {
     public:
-        RLE_CompressorFactory(void);
+        RLE_CompressorFactory();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel = 0);
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
index 1cdd468357b..2ae221ecba2 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
@@ -34,7 +34,7 @@ namespace TAO
         const ::Compression::Compressor_var> ZlibCompressorMap;
 
   public:
-    Zlib_CompressorFactory (void);
+    Zlib_CompressorFactory ();
 
     virtual ::Compression::Compressor_ptr get_compressor (
         ::Compression::CompressionLevel compression_level);
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp
index 04fe4aa0fa4..7a77ef1f4cc 100644
--- a/TAO/tao/Condition.cpp
+++ b/TAO/tao/Condition.cpp
@@ -21,7 +21,7 @@ TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m)
 }
 
 template <class MUTEX>
-TAO_Condition<MUTEX>::TAO_Condition (void)
+TAO_Condition<MUTEX>::TAO_Condition ()
     : mutex_ (nullptr),
       delete_lock_ (false),
       cond_ (nullptr)
@@ -39,7 +39,7 @@ TAO_Condition<MUTEX>::TAO_Condition (void)
 
 
 template <class MUTEX>
-TAO_Condition<MUTEX>::~TAO_Condition (void)
+TAO_Condition<MUTEX>::~TAO_Condition ()
 {
   if (this->remove () == -1)
     TAOLIB_ERROR ((LM_ERROR,
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index eaff5c13032..bf79e292ab4 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -51,10 +51,10 @@ public:
   explicit TAO_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor
-  virtual ~TAO_Connection_Handler (void);
+  virtual ~TAO_Connection_Handler ();
 
   /// Return the underlying transport object
-  TAO_Transport *transport (void);
+  TAO_Transport *transport ();
 
   /// Set the underlying transport object
   void transport (TAO_Transport* transport);
@@ -88,7 +88,7 @@ public:
 
   /// This method is invoked from the svc () method of the Svc_Handler
   /// Object.
-  int svc_i (void);
+  int svc_i ();
 
   /// A open () hook
   /**
@@ -107,11 +107,11 @@ public:
   /// the connection handler to know that it is opening as a result of
   /// a delayed asynch connection rather than an immediate synch
   /// connection, which has no additional reference needs.
-  void connection_pending (void);
+  void connection_pending ();
 
   /// A pending connection may be canceled due to an error detected
   /// while the initiating thread is still in the Connector.
-  void cancel_pending_connection (void);
+  void cancel_pending_connection ();
 
   /// Set the Diff-Serv codepoint on outgoing packets.  Only has
   /// effect for remote protocols (e.g., IIOP); no effect for local
@@ -121,18 +121,18 @@ public:
   virtual int set_dscp_codepoint (CORBA::Long dscp_codepoint);
 
   /// Release the OS resources related to this handler.
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
 
 protected:
   /// Return our TAO_ORB_Core pointer
-  TAO_ORB_Core *orb_core (void);
+  TAO_ORB_Core *orb_core ();
 
   /// A common function called at the start of any protocol-specific
   /// open. Returns -1 on a failure (although no failure mode is
   /// currently defined).
-  int shared_open (void);
+  int shared_open ();
 
   /// Set options on the socket
   int set_socket_option (ACE_SOCK &sock, int snd_size, int rcv_size);
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index ee7777cfc10..3c947763ea1 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -52,14 +52,14 @@ class TAO_Export TAO_Default_Endpoint_Selector_Factory
 {
 public:
   /// Constructor.
-  TAO_Default_Endpoint_Selector_Factory (void);
+  TAO_Default_Endpoint_Selector_Factory ();
 
   /// Destructor.
-  virtual ~TAO_Default_Endpoint_Selector_Factory (void);
+  virtual ~TAO_Default_Endpoint_Selector_Factory ();
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 private:
   // Prevent copying/assignment.
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index 3ef57863ba0..abdf8a259e2 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -39,28 +39,28 @@ public:
   TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_Default_Thread_Lane_Resources_Manager (void);
+  ~TAO_Default_Thread_Lane_Resources_Manager ();
 
   /// Finalize resources.
-  void finalize (void);
+  void finalize ();
 
   /// Open default resources.
-  int open_default_resources (void);
+  int open_default_resources ();
 
   /// Shutdown reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Cleanup transports.
-  virtual void close_all_transports (void);
+  virtual void close_all_transports ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// @name Accessors
   // @{
-  TAO_Thread_Lane_Resources &lane_resources (void);
+  TAO_Thread_Lane_Resources &lane_resources ();
 
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
+  TAO_Thread_Lane_Resources &default_lane_resources ();
 
   // @}
 
@@ -86,7 +86,7 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory
 {
 public:
   /// Destructor.
-  virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory (void);
+  virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory ();
 
   /// Factory method.
   TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 9f2f0ba9315..20760ca02f4 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (void)
+TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , TAO::NetworkPriorityPolicy ()
@@ -58,7 +58,7 @@ TAO_Client_Network_Priority_Policy::create (const CORBA::Any &)
 }
 
 CORBA::PolicyType
-TAO_Client_Network_Priority_Policy::policy_type (void)
+TAO_Client_Network_Priority_Policy::policy_type ()
 {
   return TAO::CLIENT_NETWORK_PRIORITY_TYPE;
 }
@@ -74,7 +74,7 @@ TAO_Client_Network_Priority_Policy::clone () const
 }
 
 TAO::DiffservCodepoint
-TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (void)
+TAO_Client_Network_Priority_Policy::request_diffserv_codepoint ()
 {
   return this->request_diffserv_codepoint_;
 }
@@ -87,7 +87,7 @@ TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (
 }
 
 TAO::DiffservCodepoint
-TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (void)
+TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint ()
 {
   return this->reply_diffserv_codepoint_;
 }
@@ -100,7 +100,7 @@ TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (
 }
 
 TAO::NetworkPriorityModel
-TAO_Client_Network_Priority_Policy::network_priority_model (void)
+TAO_Client_Network_Priority_Policy::network_priority_model ()
 {
   return this->network_priority_model_;
 }
@@ -113,7 +113,7 @@ TAO_Client_Network_Priority_Policy::network_priority_model (
 }
 
 CORBA::Policy_ptr
-TAO_Client_Network_Priority_Policy::copy (void)
+TAO_Client_Network_Priority_Policy::copy ()
 {
   TAO_Client_Network_Priority_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -124,7 +124,7 @@ TAO_Client_Network_Priority_Policy::copy (void)
 }
 
 void
-TAO_Client_Network_Priority_Policy::destroy (void)
+TAO_Client_Network_Priority_Policy::destroy ()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
index 93b933ed808..876a84a93bd 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
@@ -45,7 +45,7 @@ class TAO_DiffServPolicy_Export TAO_Client_Network_Priority_Policy
 {
 public:
   /// Constructor.
-  TAO_Client_Network_Priority_Policy (void);
+  TAO_Client_Network_Priority_Policy ();
 
   /// Constructor.
   TAO_Client_Network_Priority_Policy (
@@ -60,25 +60,25 @@ public:
   /// Returns a copy of <this>.
   TAO_Client_Network_Priority_Policy *clone () const;
 
-  TAO::DiffservCodepoint request_diffserv_codepoint (void);
+  TAO::DiffservCodepoint request_diffserv_codepoint ();
 
   void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp);
 
-  TAO::DiffservCodepoint reply_diffserv_codepoint (void);
+  TAO::DiffservCodepoint reply_diffserv_codepoint ();
 
   void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp);
 
-  TAO::NetworkPriorityModel network_priority_model (void);
+  TAO::NetworkPriorityModel network_priority_model ();
 
   void network_priority_model (TAO::NetworkPriorityModel npm);
 
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
index 647f0dbfdef..d669b6ee3ed 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
@@ -9,7 +9,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_DiffServPolicy_Initializer::static_init (void)
+TAO_DiffServPolicy_Initializer::static_init ()
 {
   TAO_ORB_Core::set_network_priority_protocols_hooks (
     "DS_Network_Priority_Protocols_Hooks");
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.h b/TAO/tao/DiffServPolicy/DiffServPolicy.h
index 2aa89367bb6..d052c23a5b7 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.h
@@ -31,7 +31,7 @@ class TAO_DiffServPolicy_Export TAO_DiffServPolicy_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int static_init (void);
+  static int static_init ();
 
   /// Initialize the Diffserv loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
index 654df95ab73..442e933b3af 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-TAO_DiffServ_Network_Priority_Hook::~TAO_DiffServ_Network_Priority_Hook(void)
+TAO_DiffServ_Network_Priority_Hook::~TAO_DiffServ_Network_Priority_Hook()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
index af0b1529007..dee47f35e35 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
@@ -29,7 +29,7 @@ class TAO_DiffServPolicy_Export TAO_DiffServ_Network_Priority_Hook
   : public TAO_Network_Priority_Hook
 {
 public:
-  virtual ~TAO_DiffServ_Network_Priority_Hook(void);
+  virtual ~TAO_DiffServ_Network_Priority_Hook();
 
   /// This function is a hook, that is called from the Root_POA's
   /// constructor. It allows the POA to cache the server side network
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
index 93ac25c2918..dd1c2462632 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
@@ -12,14 +12,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DS_Network_Priority_Protocols_Hooks::
-TAO_DS_Network_Priority_Protocols_Hooks (void)
+TAO_DS_Network_Priority_Protocols_Hooks ()
   : orb_core_ (0)
 {
 }
 
 
 TAO_DS_Network_Priority_Protocols_Hooks::
-~TAO_DS_Network_Priority_Protocols_Hooks (void)
+~TAO_DS_Network_Priority_Protocols_Hooks ()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
index 8abe42e4877..363c7334dbb 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
@@ -31,10 +31,10 @@ class TAO_DiffServPolicy_Export TAO_DS_Network_Priority_Protocols_Hooks
 {
 public:
   /// Constructor
-  TAO_DS_Network_Priority_Protocols_Hooks (void);
+  TAO_DS_Network_Priority_Protocols_Hooks ();
 
   /// Destructor
-  virtual ~TAO_DS_Network_Priority_Protocols_Hooks (void);
+  virtual ~TAO_DS_Network_Priority_Protocols_Hooks ();
 
   /// Initialize the network priority protocols hooks instance.
   void init_hooks (TAO_ORB_Core *orb_core);
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index 4e156ca184a..1a67c368d19 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
+TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , TAO::NetworkPriorityPolicy ()
@@ -16,7 +16,7 @@ TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
 {
 }
 
-TAO_Server_Network_Priority_Policy::~TAO_Server_Network_Priority_Policy (void)
+TAO_Server_Network_Priority_Policy::~TAO_Server_Network_Priority_Policy ()
 {
 }
 
@@ -59,7 +59,7 @@ TAO_Server_Network_Priority_Policy::create (const CORBA::Any &)
 }
 
 CORBA::PolicyType
-TAO_Server_Network_Priority_Policy::policy_type (void)
+TAO_Server_Network_Priority_Policy::policy_type ()
 {
   return TAO::NETWORK_PRIORITY_TYPE;
 }
@@ -75,7 +75,7 @@ TAO_Server_Network_Priority_Policy::clone () const
 }
 
 TAO::DiffservCodepoint
-TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (void)
+TAO_Server_Network_Priority_Policy::request_diffserv_codepoint ()
 {
   return this->request_diffserv_codepoint_;
 }
@@ -88,7 +88,7 @@ TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (
 }
 
 TAO::DiffservCodepoint
-TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (void)
+TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint ()
 {
   return this->reply_diffserv_codepoint_;
 }
@@ -101,7 +101,7 @@ TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (
 }
 
 TAO::NetworkPriorityModel
-TAO_Server_Network_Priority_Policy::network_priority_model (void)
+TAO_Server_Network_Priority_Policy::network_priority_model ()
 {
   return this->network_priority_model_;
 }
@@ -114,7 +114,7 @@ TAO_Server_Network_Priority_Policy::network_priority_model (
 }
 
 CORBA::Policy_ptr
-TAO_Server_Network_Priority_Policy::copy (void)
+TAO_Server_Network_Priority_Policy::copy ()
 {
   TAO_Server_Network_Priority_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -125,7 +125,7 @@ TAO_Server_Network_Priority_Policy::copy (void)
 }
 
 void
-TAO_Server_Network_Priority_Policy::destroy (void)
+TAO_Server_Network_Priority_Policy::destroy ()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
index 10b54b40582..ed3d7fad55a 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
@@ -45,7 +45,7 @@ class TAO_DiffServPolicy_Export TAO_Server_Network_Priority_Policy
 {
 public:
   /// default constructor.
-  TAO_Server_Network_Priority_Policy (void);
+  TAO_Server_Network_Priority_Policy ();
 
   /// Constructor.
   TAO_Server_Network_Priority_Policy (
@@ -60,25 +60,25 @@ public:
   /// Returns a copy of <this>.
   TAO_Server_Network_Priority_Policy *clone () const;
 
-  TAO::DiffservCodepoint request_diffserv_codepoint (void);
+  TAO::DiffservCodepoint request_diffserv_codepoint ();
 
   void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp);
 
-  TAO::DiffservCodepoint reply_diffserv_codepoint (void);
+  TAO::DiffservCodepoint reply_diffserv_codepoint ();
 
   void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp);
 
-  TAO::NetworkPriorityModel network_priority_model (void);
+  TAO::NetworkPriorityModel network_priority_model ();
 
   void network_priority_model (TAO::NetworkPriorityModel npm);
 
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -93,7 +93,7 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-  virtual ~TAO_Server_Network_Priority_Policy (void);
+  virtual ~TAO_Server_Network_Priority_Policy ();
 
 private:
   /// The attributes
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 55026b9f5a8..ce049017227 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -36,7 +36,7 @@ TAO_AMH_DSI_Exception_Holder::~TAO_AMH_DSI_Exception_Holder ()
 }
 
 ::CORBA::ValueBase *
-TAO_AMH_DSI_Exception_Holder::_copy_value (void)
+TAO_AMH_DSI_Exception_Holder::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
@@ -62,7 +62,7 @@ tao_TAO_AMH_DSI_Exception_Holder_remove_ref (TAO_AMH_DSI_Exception_Holder * p)
 }
 
 
-TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (void)
+TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var ()
   : ptr_ (0)
 {
 }
@@ -92,7 +92,7 @@ TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (
   this->ptr_ = p.ptr ();
 }
 
-TAO_AMH_DSI_Exception_Holder_var::~TAO_AMH_DSI_Exception_Holder_var (void)
+TAO_AMH_DSI_Exception_Holder_var::~TAO_AMH_DSI_Exception_Holder_var ()
 {
   CORBA::remove_ref (this->ptr_);
 }
@@ -143,13 +143,13 @@ TAO_AMH_DSI_Exception_Holder_var::in () const
 }
 
 TAO_AMH_DSI_Exception_Holder *&
-TAO_AMH_DSI_Exception_Holder_var::inout (void)
+TAO_AMH_DSI_Exception_Holder_var::inout ()
 {
   return this->ptr_;
 }
 
 TAO_AMH_DSI_Exception_Holder *&
-TAO_AMH_DSI_Exception_Holder_var::out (void)
+TAO_AMH_DSI_Exception_Holder_var::out ()
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = 0;
@@ -157,7 +157,7 @@ TAO_AMH_DSI_Exception_Holder_var::out (void)
 }
 
 TAO_AMH_DSI_Exception_Holder *
-TAO_AMH_DSI_Exception_Holder_var::_retn (void)
+TAO_AMH_DSI_Exception_Holder_var::_retn ()
 {
   // yield ownership of managed obj reference
   TAO_AMH_DSI_Exception_Holder* tmp = this->ptr_;
@@ -235,7 +235,7 @@ TAO_AMH_DSI_Exception_Holder_out::ptr (void) // ptr
 }
 
 TAO_AMH_DSI_Exception_Holder *
-TAO_AMH_DSI_Exception_Holder_out::operator-> (void)
+TAO_AMH_DSI_Exception_Holder_out::operator-> ()
 {
   return this->ptr_;
 }
@@ -319,7 +319,7 @@ TAO_AMH_DSI_Response_Handler::TAO_AMH_DSI_Response_Handler (
 {
 }
 
-TAO_AMH_DSI_Response_Handler::~TAO_AMH_DSI_Response_Handler (void)
+TAO_AMH_DSI_Response_Handler::~TAO_AMH_DSI_Response_Handler ()
 {
 }
 
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
index c6b9d09b047..90a63d9de15 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
@@ -39,11 +39,11 @@ typedef TAO_AMH_DSI_Response_Handler *TAO_AMH_DSI_Response_Handler_ptr;
 class TAO_DynamicInterface_Export TAO_AMH_DSI_Response_Handler_var
 {
 public:
-  TAO_AMH_DSI_Response_Handler_var (void);
+  TAO_AMH_DSI_Response_Handler_var ();
   TAO_AMH_DSI_Response_Handler_var (TAO_AMH_DSI_Response_Handler_ptr);
   TAO_AMH_DSI_Response_Handler_var (
       const TAO_AMH_DSI_Response_Handler_var &);
-  ~TAO_AMH_DSI_Response_Handler_var (void);
+  ~TAO_AMH_DSI_Response_Handler_var ();
 
   TAO_AMH_DSI_Response_Handler_var &operator= (
       TAO_AMH_DSI_Response_Handler_ptr);
@@ -55,9 +55,9 @@ public:
   operator TAO_AMH_DSI_Response_Handler_ptr &();
 
   TAO_AMH_DSI_Response_Handler_ptr in () const;
-  TAO_AMH_DSI_Response_Handler_ptr &inout (void);
-  TAO_AMH_DSI_Response_Handler_ptr &out (void);
-  TAO_AMH_DSI_Response_Handler_ptr _retn (void);
+  TAO_AMH_DSI_Response_Handler_ptr &inout ();
+  TAO_AMH_DSI_Response_Handler_ptr &out ();
+  TAO_AMH_DSI_Response_Handler_ptr _retn ();
   TAO_AMH_DSI_Response_Handler_ptr ptr () const;
 
 private:
@@ -77,11 +77,11 @@ typedef TAO_AMH_DSI_Exception_Holder *TAO_AMH_DSI_Exception_Holder_ptr;
 class TAO_DynamicInterface_Export TAO_AMH_DSI_Exception_Holder_var
 {
 public:
-  TAO_AMH_DSI_Exception_Holder_var (void);
+  TAO_AMH_DSI_Exception_Holder_var ();
   TAO_AMH_DSI_Exception_Holder_var (TAO_AMH_DSI_Exception_Holder*);
   TAO_AMH_DSI_Exception_Holder_var (const TAO_AMH_DSI_Exception_Holder*);
   TAO_AMH_DSI_Exception_Holder_var (const TAO_AMH_DSI_Exception_Holder_var &);
-  ~TAO_AMH_DSI_Exception_Holder_var (void);
+  ~TAO_AMH_DSI_Exception_Holder_var ();
 
   TAO_AMH_DSI_Exception_Holder_var &operator= (TAO_AMH_DSI_Exception_Holder*);
   TAO_AMH_DSI_Exception_Holder_var &operator= (
@@ -92,9 +92,9 @@ public:
   operator TAO_AMH_DSI_Exception_Holder*& ();
 
   TAO_AMH_DSI_Exception_Holder* in () const;
-  TAO_AMH_DSI_Exception_Holder*& inout (void);
-  TAO_AMH_DSI_Exception_Holder*& out (void);
-  TAO_AMH_DSI_Exception_Holder* _retn (void);
+  TAO_AMH_DSI_Exception_Holder*& inout ();
+  TAO_AMH_DSI_Exception_Holder*& out ();
+  TAO_AMH_DSI_Exception_Holder* _retn ();
   TAO_AMH_DSI_Exception_Holder* ptr () const;
 
   // Hooks used by template sequence and valuetype manager classes
@@ -124,8 +124,8 @@ public:
   TAO_AMH_DSI_Exception_Holder_out &operator= (
       TAO_AMH_DSI_Exception_Holder*);
   operator TAO_AMH_DSI_Exception_Holder*& ();
-  TAO_AMH_DSI_Exception_Holder*& ptr (void);
-  TAO_AMH_DSI_Exception_Holder* operator-> (void);
+  TAO_AMH_DSI_Exception_Holder*& ptr ();
+  TAO_AMH_DSI_Exception_Holder* operator-> ();
 
 private:
   TAO_AMH_DSI_Exception_Holder* &ptr_;
@@ -144,15 +144,15 @@ public:
   typedef TAO_AMH_DSI_Exception_Holder_var _var_type;
   TAO_AMH_DSI_Exception_Holder (CORBA::Exception *ex);
 
-  virtual ~TAO_AMH_DSI_Exception_Holder (void);
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ~TAO_AMH_DSI_Exception_Holder ();
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   static TAO_AMH_DSI_Exception_Holder* _downcast ( CORBA::ValueBase* );
 
   static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &,
                                          TAO_AMH_DSI_Exception_Holder *& );
   virtual const char* _tao_obv_repository_id () const;
-  static const char* _tao_obv_static_repository_id (void);
+  static const char* _tao_obv_static_repository_id ();
 
   static void _tao_any_destructor (void *);
 
@@ -163,7 +163,7 @@ public:
   CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
 
 protected:
-  TAO_AMH_DSI_Exception_Holder (void);
+  TAO_AMH_DSI_Exception_Holder ();
   ///  *** Terrible Hack ? ***
   virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
   virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
@@ -208,7 +208,7 @@ public:
   typedef TAO_AMH_DSI_Response_Handler_var _var_type;
 
   TAO_AMH_DSI_Response_Handler (TAO_ServerRequest &sr);
-  ~TAO_AMH_DSI_Response_Handler (void);
+  ~TAO_AMH_DSI_Response_Handler ();
 
   virtual void invoke_reply (CORBA::NVList_ptr args,
                              CORBA::NamedValue_ptr result);
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index d4ac999a9d8..9a2aa9888c7 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -83,7 +83,7 @@ CORBA::ContextList::ContextList (CORBA::ULong len, char* *ctx_list)
     }
 }
 
-CORBA::ContextList::~ContextList (void)
+CORBA::ContextList::~ContextList ()
 {
   for (CORBA::ULong i = 0; i < this->count (); ++i)
     {
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 3bbc17f3bef..11ed45d34b0 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -129,19 +129,19 @@ namespace CORBA
     ContextList (CORBA::ULong len, char **ctx_list);
 
     /// Destructor.
-    ~ContextList (void);
+    ~ContextList ();
 
     /// Return the number of elements.
-    CORBA::ULong count (void);
+    CORBA::ULong count ();
 
     /// Increment the reference count.
-    ContextList_ptr _duplicate (void);
+    ContextList_ptr _duplicate ();
 
     /// Increment the reference count.
     static ContextList_ptr _duplicate (ContextList *);
 
     /// Decrement the reference count and delete if it is 0.
-    void _destroy (void);
+    void _destroy ();
 
     /// Return null pointer of this type.
     static ContextList_ptr _nil ();
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index f8aaa486cc0..3b84a8dd3bc 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -137,7 +137,7 @@ TAO_DII_Arguments_Converter_Impl::handle_corba_exception (
 // Initialization and registration of dynamic service object.
 
 int
-TAO_DII_Arguments_Converter_Impl::Initializer (void)
+TAO_DII_Arguments_Converter_Impl::Initializer ()
 {
   return ACE_Service_Config::process_directive (
     ace_svc_desc_TAO_DII_Arguments_Converter_Impl);
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
index d094f14b454..8031c022a0a 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
@@ -57,7 +57,7 @@ public:
                                        CORBA::Exception *exception);
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 65632313631..120a81d8b91 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -43,7 +43,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
   Dynamic::ParameterList *
-  DII_Invocation::arguments (void)
+  DII_Invocation::arguments ()
   {
     Dynamic::ParameterList_var safe_parameter_list;
 
@@ -162,7 +162,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
   //@NOTE: Need to figure a way to share this code
   Dynamic::ParameterList *
-  DII_Deferred_Invocation::arguments (void)
+  DII_Deferred_Invocation::arguments ()
   {
     Dynamic::ParameterList_var safe_parameter_list;
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 218dae68668..642cef4f301 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -43,7 +43,7 @@ namespace TAO
   {
   }
 
-  DII_Invocation_Adapter::~DII_Invocation_Adapter (void)
+  DII_Invocation_Adapter::~DII_Invocation_Adapter ()
   {
     delete[] ex_data_;
   }
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index 10dd960187b..c84438c6a55 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -85,7 +85,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
 }
 
 void
-TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
+TAO_DII_Deferred_Reply_Dispatcher::connection_closed ()
 {
   try
     {
@@ -133,7 +133,7 @@ TAO_DII_Asynch_Reply_Dispatcher::TAO_DII_Asynch_Reply_Dispatcher (
 {
 }
 
-TAO_DII_Asynch_Reply_Dispatcher::~TAO_DII_Asynch_Reply_Dispatcher (void)
+TAO_DII_Asynch_Reply_Dispatcher::~TAO_DII_Asynch_Reply_Dispatcher ()
 {
   // this was handed to us by the caller.
   CORBA::release(callback_);
@@ -194,7 +194,7 @@ TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply (
 }
 
 void
-TAO_DII_Asynch_Reply_Dispatcher::connection_closed (void)
+TAO_DII_Asynch_Reply_Dispatcher::connection_closed ()
 {
   try
     {
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index 0e259322511..8d17f479750 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -47,7 +47,7 @@ public:
   /// The Reply_Dispatcher methods
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
 
-  virtual void connection_closed (void);
+  virtual void connection_closed ();
 
   /// The following methods are not needed for this class..
   virtual void reply_timed_out (void)  {}
@@ -77,12 +77,12 @@ class TAO_DynamicInterface_Export TAO_DII_Asynch_Reply_Dispatcher
 public:
   TAO_DII_Asynch_Reply_Dispatcher (const Messaging::ReplyHandler_ptr callback,
                                      TAO_ORB_Core *orb_core);
-  virtual ~TAO_DII_Asynch_Reply_Dispatcher (void);
+  virtual ~TAO_DII_Asynch_Reply_Dispatcher ();
 
   /// The Reply_Dispatcher methods
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
 
-  virtual void connection_closed (void);
+  virtual void connection_closed ();
 
 private:
   /// The buffer that is used to initialise the data block
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index dace7b4b5f4..c710f5c7d8f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -6,11 +6,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl (void)
+TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl ()
 {
 }
 
-TAO_Dynamic_Adapter_Impl::~TAO_Dynamic_Adapter_Impl (void)
+TAO_Dynamic_Adapter_Impl::~TAO_Dynamic_Adapter_Impl ()
 {
 }
 
@@ -126,7 +126,7 @@ TAO_Dynamic_Adapter_Impl::create_exception_list (
 }
 
 int
-TAO_Dynamic_Adapter_Impl::Initializer (void)
+TAO_Dynamic_Adapter_Impl::Initializer ()
 {
   TAO_ORB_Core::dynamic_adapter_name ("Concrete_Dynamic_Adapter");
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Dynamic_Adapter_Impl);
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 4a91448a9f0..97cf2fcce26 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -76,7 +76,7 @@ public:
   virtual void create_exception_list (CORBA::ExceptionList_ptr &list);
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 61298d32691..e4c14c79d71 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -23,7 +23,7 @@ TAO_DynamicImplementation::_is_a (const char *logical_type_id)
 }
 
 CORBA::Object_ptr
-TAO_DynamicImplementation::_this (void)
+TAO_DynamicImplementation::_this ()
 {
   // The _this() function returns a CORBA::Object_ptr for the target
   // object. Unlike _this() for static skeletons, its return type is
@@ -43,7 +43,7 @@ TAO_DynamicImplementation::_this (void)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_DynamicImplementation::_get_interface (void)
+TAO_DynamicImplementation::_get_interface ()
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -76,7 +76,7 @@ TAO_DynamicImplementation::_downcast (const char *)
 }
 
 TAO_Stub *
-TAO_DynamicImplementation::_create_stub (void)
+TAO_DynamicImplementation::_create_stub ()
 {
   // If DynamicImplementation::_this() is invoked outside of the
   // context of a request invocation on a target object being served
@@ -173,7 +173,7 @@ TAO_DynamicImplementation::_dispatch (
 }
 
 CORBA::RepositoryId
-TAO_DynamicImplementation::get_id_from_primary_interface (void)
+TAO_DynamicImplementation::get_id_from_primary_interface ()
 {
   // If this method is called outside of the
   // context of a request invocation on a target object being served
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index ca6cd84b0c8..f9381bf0b36 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -65,10 +65,10 @@ public:
   virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
   /// Returns a CORBA::Object_ptr for the target object.
-  CORBA::Object_ptr _this (void);
+  CORBA::Object_ptr _this ();
 
   /// Query the Interface Repository for the interface definition.
-  virtual CORBA::InterfaceDef_ptr _get_interface (void);
+  virtual CORBA::InterfaceDef_ptr _get_interface ();
 
 protected:
   /// Return 0.  Should never be used.
@@ -78,7 +78,7 @@ protected:
   virtual void *_downcast (const char *repository_id);
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (void);
+  virtual TAO_Stub *_create_stub ();
 
   /// Turns around and calls invoke.
   virtual void _dispatch (
@@ -87,7 +87,7 @@ protected:
 
 private:
   /// Encapsulates code common to _is_a(), _get_interface() and _create_stub().
-  CORBA::RepositoryId get_id_from_primary_interface (void);
+  CORBA::RepositoryId get_id_from_primary_interface ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 82f57f73181..7bdd96745b1 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -18,7 +18,7 @@ CORBA::ExceptionList::ExceptionList (CORBA::ULong len,
     }
 }
 
-CORBA::ExceptionList::~ExceptionList (void)
+CORBA::ExceptionList::~ExceptionList ()
 {
   for (CORBA::ULong i = 0; i < this->count (); ++i)
     {
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index b28dcb53b9e..af721bffa29 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -60,18 +60,18 @@ namespace CORBA
     ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list);
 
     /// Destructor.
-    ~ExceptionList (void);
+    ~ExceptionList ();
 
     /// Return the number of elements.
-    CORBA::ULong count (void);
+    CORBA::ULong count ();
 
     /// Increase the reference count.
-    ExceptionList_ptr _duplicate (void);
+    ExceptionList_ptr _duplicate ();
 
     /// Increase the reference count in the spec defined manner.
     static ExceptionList_ptr _duplicate (ExceptionList *);
 
-    void _destroy (void);
+    void _destroy ();
 
     static ExceptionList_ptr _nil ();
 
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 25a4e17ce5e..b8e55c213b5 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -104,7 +104,7 @@ CORBA::Request::Request (CORBA::Object_ptr obj,
            CORBA::NamedValue);
 }
 
-CORBA::Request::~Request (void)
+CORBA::Request::~Request ()
 {
   ACE_ASSERT (refcount_ == 0);
 
@@ -123,7 +123,7 @@ CORBA::Request::~Request (void)
 // flow in some exotic situations.
 
 void
-CORBA::Request::invoke (void)
+CORBA::Request::invoke ()
 {
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -188,7 +188,7 @@ CORBA::Request::send_oneway ()
 }
 
 void
-CORBA::Request::send_deferred (void)
+CORBA::Request::send_deferred ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -296,7 +296,7 @@ CORBA::Request::_tao_reply_stub (TAO_InputCDR &_tao_in,
 #endif /* TAO_HAS_AMI */
 
 void
-CORBA::Request::get_response (void)
+CORBA::Request::get_response ()
 {
   while (!this->response_received_)
     {
@@ -310,7 +310,7 @@ CORBA::Request::get_response (void)
 }
 
 CORBA::Boolean
-CORBA::Request::poll_response (void)
+CORBA::Request::poll_response ()
 {
   CORBA::Boolean response_received = false;
 
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index e9a50696c97..6991baecde8 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -73,13 +73,13 @@ namespace CORBA
     const CORBA::Char *operation () const;
 
     /// Return the arguments for the request.
-    CORBA::NVList_ptr arguments (void);
+    CORBA::NVList_ptr arguments ();
 
     /// Return the result for the request.
-    CORBA::NamedValue_ptr result (void);
+    CORBA::NamedValue_ptr result ();
 
     /// Return the exceptions resulting from this request.
-    CORBA::ExceptionList_ptr exceptions (void);
+    CORBA::ExceptionList_ptr exceptions ();
 
     /// Accessor for the Context member.
     CORBA::Context_ptr ctx () const;
@@ -89,7 +89,7 @@ namespace CORBA
 
     /// Return a list of the request's result's contexts.  Since TAO
     /// does not implement Contexts, this will always be 0.
-    CORBA::ContextList_ptr contexts (void);
+    CORBA::ContextList_ptr contexts ();
 
     /**
      * @name Argument manipulation helper functions.
@@ -143,7 +143,7 @@ namespace CORBA
     //@{
     void send_deferred ();
     void get_response ();
-    CORBA::Boolean poll_response (void);
+    CORBA::Boolean poll_response ();
     //@}
 
     /// Callback method for deferred synchronous requests.
@@ -182,11 +182,11 @@ namespace CORBA
     void raw_user_exception (TAO_InputCDR &cdr);
 
     /// Accessor for the input stream containing the exception.
-    ACE_CString &raw_user_exception (void);
+    ACE_CString &raw_user_exception ();
 
     /// Proprietary method to check whether a response has been
     /// received.
-    CORBA::Boolean response_received (void);
+    CORBA::Boolean response_received ();
 
     // Useful for template programming.
     typedef CORBA::Request_ptr _ptr_type;
@@ -210,7 +210,7 @@ namespace CORBA
              CORBA::ORB_ptr orb,
              const CORBA::Char *op);
 
-    ~Request (void);
+    ~Request ();
 
   private:
     /// Target object.
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index c485c43d3a1..a2f01df0392 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -49,7 +49,7 @@ CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request)
   this->orb_server_request_.is_dsi ();
 }
 
-CORBA::ServerRequest::~ServerRequest (void)
+CORBA::ServerRequest::~ServerRequest ()
 {
   if (this->params_ != 0)
     {
@@ -159,7 +159,7 @@ CORBA::ServerRequest::set_exception (const CORBA::Any &value)
 // This method will be utilized by the DSI servant to marshal outgoing
 // parameters.
 void
-CORBA::ServerRequest::dsi_marshal (void)
+CORBA::ServerRequest::dsi_marshal ()
 {
   // There was a user exception, no need to marshal any parameters.
   if (this->sent_gateway_exception_)
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 80daba964d4..e55ba8d9df1 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -58,7 +58,7 @@ namespace CORBA
     ServerRequest (TAO_ServerRequest &orb_server_request);
 
     /// Destructor.
-    ~ServerRequest (void);
+    ~ServerRequest ();
 
     /// Implementation uses this to provide the ORB with the operation's
     /// parameter list ... on return, their values are available; the
@@ -89,7 +89,7 @@ namespace CORBA
     // basic CORBA Object Model.
 
     /// Marshal outgoing parameters.
-    void dsi_marshal (void);
+    void dsi_marshal ();
 
     /// Accessor for the Context member.
     CORBA::Context_ptr ctx () const;
@@ -118,7 +118,7 @@ namespace CORBA
     void _tao_reply_byte_order (int byte_order);
 
     /// Return a reference to the underlying TAO_ServerRequest object.
-    TAO_ServerRequest & _tao_server_request (void);
+    TAO_ServerRequest & _tao_server_request ();
 
     /// Returns a user exception through a TAO gateway without
     /// knowing its type.
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index c58073a777c..564db8117d0 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -12,7 +12,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::UnknownUserException::UnknownUserException (void)
+CORBA::UnknownUserException::UnknownUserException ()
   : CORBA::UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0",
                           "UnknownUserException"),
     exception_ (0)
@@ -37,13 +37,13 @@ CORBA::UnknownUserException::UnknownUserException (
            CORBA::Any (*e.exception_));
 }
 
-CORBA::UnknownUserException::~UnknownUserException (void)
+CORBA::UnknownUserException::~UnknownUserException ()
 {
   delete this->exception_;
 }
 
 CORBA::Any &
-CORBA::UnknownUserException::exception (void)
+CORBA::UnknownUserException::exception ()
 {
   return *this->exception_;
 }
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 4a2a88379a1..871efd00dc2 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -45,7 +45,7 @@ namespace CORBA
   {
   public:
     /// Constructor.
-    UnknownUserException (void);
+    UnknownUserException ();
 
     /// Constructor.
     UnknownUserException (CORBA::Any& exception);
@@ -54,10 +54,10 @@ namespace CORBA
     UnknownUserException (const UnknownUserException& e);
 
     /// Destructor.
-    virtual ~UnknownUserException (void);
+    virtual ~UnknownUserException ();
 
     /// Return the any containing the user exception.
-    CORBA::Any& exception (void);
+    CORBA::Any& exception ();
 
     /// To throw an UnknownUserException of this type.
     virtual void _raise () const;
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.cpp b/TAO/tao/Dynamic_TP/DTP_Config.cpp
index ddde096cb16..5577389cca4 100644
--- a/TAO/tao/Dynamic_TP/DTP_Config.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Config.cpp
@@ -10,17 +10,17 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DTP_Config_Registry_Installer::TAO_DTP_Config_Registry_Installer (void)
+TAO_DTP_Config_Registry_Installer::TAO_DTP_Config_Registry_Installer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_DTP_Config_Registry);
 }
 
 
-TAO_DTP_Config_Registry::TAO_DTP_Config_Registry (void)
+TAO_DTP_Config_Registry::TAO_DTP_Config_Registry ()
 {
 }
 
-TAO_DTP_Config_Registry::~TAO_DTP_Config_Registry (void)
+TAO_DTP_Config_Registry::~TAO_DTP_Config_Registry ()
 {
 }
 
@@ -53,11 +53,11 @@ TAO_DTP_Config_Registry::rebind (const ACE_CString& name,
 
 //-------------------------------------------------------------------------
 
-TAO_DTP_Config::TAO_DTP_Config (void)
+TAO_DTP_Config::TAO_DTP_Config ()
 {
 }
 
-TAO_DTP_Config::~TAO_DTP_Config (void)
+TAO_DTP_Config::~TAO_DTP_Config ()
 {
 }
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.h b/TAO/tao/Dynamic_TP/DTP_Config.h
index 1cb1cb90ead..9b9087b19f2 100644
--- a/TAO/tao/Dynamic_TP/DTP_Config.h
+++ b/TAO/tao/Dynamic_TP/DTP_Config.h
@@ -52,14 +52,14 @@ struct TAO_Dynamic_TP_Export TAO_DTP_Definition
 class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry_Installer
 {
  public:
-  TAO_DTP_Config_Registry_Installer (void);
+  TAO_DTP_Config_Registry_Installer ();
 };
 
 class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry : public ACE_Service_Object
 {
 public:
-  TAO_DTP_Config_Registry (void);
-  virtual ~TAO_DTP_Config_Registry (void);
+  TAO_DTP_Config_Registry ();
+  virtual ~TAO_DTP_Config_Registry ();
 
   virtual int init (int argc, ACE_TCHAR* []);
 
@@ -78,10 +78,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_Config : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_DTP_Config (void);
+  TAO_DTP_Config ();
 
   /// Destructor.
-  virtual ~TAO_DTP_Config (void);
+  virtual ~TAO_DTP_Config ();
 
   /// Read a definition parameter set from the supplied args.
   /// There must be a -TPName argument, which, if replicated will cause the set to be ignored, unless -TPOverwrite is also set
diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
index fd884660896..2bb8ff66e58 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
@@ -42,7 +42,7 @@ class TAO_DTP_ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-  TAO_DTP_ORBInitializer (void);
+  TAO_DTP_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
index 06f5b83a5b5..e6d46069100 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
@@ -14,12 +14,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DTP_ORB_Loader::TAO_DTP_ORB_Loader (void)
+TAO_DTP_ORB_Loader::TAO_DTP_ORB_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_DTP_ORB_Loader::~TAO_DTP_ORB_Loader (void)
+TAO_DTP_ORB_Loader::~TAO_DTP_ORB_Loader ()
 {
 }
 
diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
index 8b81afd949f..825daa1e499 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
@@ -34,10 +34,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_ORB_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_DTP_ORB_Loader (void);
+  TAO_DTP_ORB_Loader ();
 
   /// Destructor.
-  virtual ~TAO_DTP_ORB_Loader (void);
+  virtual ~TAO_DTP_ORB_Loader ();
 
   /// Initialize the DynamicTP loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
index 4f06c6d112c..408cc1f868d 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
@@ -15,11 +15,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DTP_POA_Loader::TAO_DTP_POA_Loader (void)
+TAO_DTP_POA_Loader::TAO_DTP_POA_Loader ()
 {
 }
 
-TAO_DTP_POA_Loader::~TAO_DTP_POA_Loader (void)
+TAO_DTP_POA_Loader::~TAO_DTP_POA_Loader ()
 {
 }
 
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
index a0a021149f0..99e9aa1d0ef 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
@@ -32,10 +32,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_DTP_POA_Loader (void);
+  TAO_DTP_POA_Loader ();
 
   /// Destructor.
-  virtual ~TAO_DTP_POA_Loader (void);
+  virtual ~TAO_DTP_POA_Loader ();
 
   /// Initialize the DynamicTP loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp
index 80a3bbd2dd2..99d6ca3609c 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp
@@ -269,21 +269,21 @@ TAO_DTP_Task::clear_request (TAO::CSD::TP_Request_Handle &r)
 }
 
 void
-TAO_DTP_Task::add_busy (void)
+TAO_DTP_Task::add_busy ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_);
   ++this->busy_threads_;
 }
 
 void
-TAO_DTP_Task::remove_busy (void)
+TAO_DTP_Task::remove_busy ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_);
   --this->busy_threads_;
 }
 
 void
-TAO_DTP_Task::add_active (void)
+TAO_DTP_Task::add_active ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_);
   ++this->active_count_;
@@ -303,7 +303,7 @@ TAO_DTP_Task::remove_active (bool force)
 }
 
 bool
-TAO_DTP_Task::need_active (void)
+TAO_DTP_Task::need_active ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->aw_lock_, false);
   return ((this->busy_threads_ == static_cast<unsigned long> (this->active_count_)) &&
@@ -312,14 +312,14 @@ TAO_DTP_Task::need_active (void)
 }
 
 bool
-TAO_DTP_Task::above_minimum (void)
+TAO_DTP_Task::above_minimum ()
 {
   return this->min_pool_threads_ > 0 &&
     this->active_count_ > this->min_pool_threads_;
 }
 
 int
-TAO_DTP_Task::svc (void)
+TAO_DTP_Task::svc ()
 {
   this->add_busy ();
   if (TAO_debug_level > 4)
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h
index 71c513a87da..ae858e9f443 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.h
+++ b/TAO/tao/Dynamic_TP/DTP_Task.h
@@ -124,12 +124,12 @@ private:
   /// release the request, reset the accepting flag if necessary
   void clear_request (TAO::CSD::TP_Request_Handle &r);
 
-  void add_busy (void);
-  void remove_busy (void);
-  void add_active (void);
+  void add_busy ();
+  void remove_busy ();
+  void add_active ();
   bool remove_active (bool);
-  bool need_active (void);
-  bool above_minimum (void);
+  bool need_active ();
+  bool above_minimum ();
 
   typedef TAO_SYNCH_MUTEX         LockType;
   typedef TAO_Condition<LockType> ConditionType;
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
index 4fcd243675b..500efca43f4 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
@@ -27,7 +27,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::TAO_DTP_Thread_Lane_Resources_Manager
            TAO_DTP_Thread_Pool_Manager (orb_core));
 }
 
-TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (void)
+TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager ()
 {
   // Delete the default resources.
   delete this->default_lane_resources_;
@@ -37,7 +37,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (v
 }
 
 int
-TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources (void)
+TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources ()
 {
   TAO_ORB_Parameters *params =
     this->orb_core_->orb_params ();
@@ -56,14 +56,14 @@ TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources (void)
 }
 
 void
-TAO_DTP_Thread_Lane_Resources_Manager::finalize (void)
+TAO_DTP_Thread_Lane_Resources_Manager::finalize ()
 {
   // Finalize default resources.
   this->default_lane_resources_->finalize ();
 }
 
 void
-TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor (void)
+TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->shutdown_reactor ();
@@ -71,7 +71,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor (void)
 }
 
 void
-TAO_DTP_Thread_Lane_Resources_Manager::close_all_transports (void)
+TAO_DTP_Thread_Lane_Resources_Manager::close_all_transports ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->close_all_transports ();
@@ -84,19 +84,19 @@ TAO_DTP_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofi
 }
 
 TAO_Thread_Lane_Resources &
-TAO_DTP_Thread_Lane_Resources_Manager::lane_resources (void)
+TAO_DTP_Thread_Lane_Resources_Manager::lane_resources ()
 {
     return *this->default_lane_resources_;
 }
 
 TAO_Thread_Lane_Resources &
-TAO_DTP_Thread_Lane_Resources_Manager::default_lane_resources (void)
+TAO_DTP_Thread_Lane_Resources_Manager::default_lane_resources ()
 {
   return *this->default_lane_resources_;
 }
 
 TAO_DTP_Thread_Pool_Manager &
-TAO_DTP_Thread_Lane_Resources_Manager::tp_manager (void)
+TAO_DTP_Thread_Lane_Resources_Manager::tp_manager ()
 {
   return *this->tp_manager_;
 }
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
index a0558483913..f84d06c5422 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
@@ -44,31 +44,31 @@ public:
   TAO_DTP_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_DTP_Thread_Lane_Resources_Manager (void);
+  ~TAO_DTP_Thread_Lane_Resources_Manager ();
 
   /// Finalize resources.
-  void finalize (void);
+  void finalize ();
 
   /// Open default resources.
-  int open_default_resources (void);
+  int open_default_resources ();
 
   /// Shutdown reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Certain ORB policies such as dropping replies on shutdown
   /// would need cleanup of transports to wake threads up.
-  void close_all_transports (void);
+  void close_all_transports ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// @name Accessors
   // @{
-  TAO_Thread_Lane_Resources &lane_resources (void);
+  TAO_Thread_Lane_Resources &lane_resources ();
 
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
+  TAO_Thread_Lane_Resources &default_lane_resources ();
 
-  TAO_DTP_Thread_Pool_Manager &tp_manager (void);
+  TAO_DTP_Thread_Pool_Manager &tp_manager ();
 
   // @}
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
index d60b328af5b..18627baba14 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
@@ -26,7 +26,7 @@ TAO_DTP_New_Leader_Generator::TAO_DTP_New_Leader_Generator (
 }
 
 bool
-TAO_DTP_New_Leader_Generator::no_leaders_available (void)
+TAO_DTP_New_Leader_Generator::no_leaders_available ()
 {
   return this->pool_.new_dynamic_thread ();
 }
@@ -38,7 +38,7 @@ TAO_DTP_Termination_Waiter::TAO_DTP_Termination_Waiter (TAO_DTP_Thread_Pool &p)
 }
 
 int
-TAO_DTP_Termination_Waiter::svc (void)
+TAO_DTP_Termination_Waiter::svc ()
 {
   do
     {
@@ -61,7 +61,7 @@ TAO_DTP_Thread_Pool_Threads::TAO_DTP_Thread_Pool_Threads (TAO_DTP_Thread_Pool &p
 }
 
 int
-TAO_DTP_Thread_Pool_Threads::svc (void)
+TAO_DTP_Thread_Pool_Threads::svc ()
 {
   if (TAO_debug_level > 7)
     {
@@ -169,7 +169,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core)
 }
 
 bool
-TAO_DTP_Thread_Pool::above_minimum (void)
+TAO_DTP_Thread_Pool::above_minimum ()
 {
   return this->definition_.min_threads_ > 0 &&
     (int)this->active_count_ > this->definition_.min_threads_;
@@ -187,7 +187,7 @@ TAO_DTP_Thread_Pool::current_threads () const
 }
 
 void
-TAO_DTP_Thread_Pool::add_active (void)
+TAO_DTP_Thread_Pool::add_active ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
   ++this->active_count_;
@@ -206,7 +206,7 @@ TAO_DTP_Thread_Pool::remove_active (bool force)
 }
 
 int
-TAO_DTP_Thread_Pool::create_initial_threads (void)
+TAO_DTP_Thread_Pool::create_initial_threads ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
@@ -236,7 +236,7 @@ TAO_DTP_Thread_Pool::create_initial_threads (void)
 }
 
 bool
-TAO_DTP_Thread_Pool::new_dynamic_thread (void)
+TAO_DTP_Thread_Pool::new_dynamic_thread ()
 {
   // Note that we are checking this condition below without the lock
   // held.
@@ -393,17 +393,17 @@ TAO_DTP_Thread_Pool::TAO_DTP_Thread_Pool (TAO_DTP_Thread_Pool_Manager &manager,
 }
 
 void
-TAO_DTP_Thread_Pool::open (void)
+TAO_DTP_Thread_Pool::open ()
 {
   // Nothing to do for now
 }
 
-TAO_DTP_Thread_Pool::~TAO_DTP_Thread_Pool (void)
+TAO_DTP_Thread_Pool::~TAO_DTP_Thread_Pool ()
 {
 }
 
 void
-TAO_DTP_Thread_Pool::shutting_down (void)
+TAO_DTP_Thread_Pool::shutting_down ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              mon,
@@ -416,7 +416,7 @@ TAO_DTP_Thread_Pool::shutting_down (void)
 
 
 void
-TAO_DTP_Thread_Pool::wait (void)
+TAO_DTP_Thread_Pool::wait ()
 {
   this->waiter_.wait ();
 }
@@ -440,7 +440,7 @@ TAO_DTP_Thread_Pool_Manager::TAO_DTP_Thread_Pool_Manager (TAO_ORB_Core &orb_core
 {
 }
 
-TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager (void)
+TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager ()
 {
   // Delete all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -451,7 +451,7 @@ TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager (void)
 
 
 void
-TAO_DTP_Thread_Pool_Manager::wait (void)
+TAO_DTP_Thread_Pool_Manager::wait ()
 {
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
        iterator != this->thread_pools_.end ();
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
index fc7d32d2ff0..9dbc121e046 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
@@ -53,7 +53,7 @@ public:
 
   /// Leader/Follower class uses this method to notify the system that
   /// we are out of leaders.
-  bool no_leaders_available (void);
+  bool no_leaders_available ();
 
 private:
   /// Pool associated with this leader generator.
@@ -75,7 +75,7 @@ public:
   TAO_DTP_Thread_Pool_Threads (TAO_DTP_Thread_Pool &pool);
 
   /// Method executed when a thread is spawned.
-  int svc (void);
+  int svc ();
 
   /// Accessor to the pool to which this thread belongs to.
   TAO_DTP_Thread_Pool &pool () const;
@@ -102,7 +102,7 @@ public:
   TAO_DTP_Termination_Waiter (TAO_DTP_Thread_Pool &pool);
 
   /// Method executed when a thread is spawned.
-  int svc (void);
+  int svc ();
 
 protected:
   /// Pool to which this thread belongs to.
@@ -129,19 +129,19 @@ public:
                        TAO_DTP_Definition &definition);
 
   /// Destructor.
-  ~TAO_DTP_Thread_Pool (void);
+  ~TAO_DTP_Thread_Pool ();
 
   /// Open the pool.
-  void open (void);
+  void open ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Mark this thread pool that we are shutting down.
-  void shutting_down (void);
+  void shutting_down ();
 
   /// Create the initial threads - only called once.
-  int create_initial_threads (void);
+  int create_initial_threads ();
 
   /// Called by the TAO_DTP_New_Leader_Generator to request a new dynamic
   /// thread.
@@ -152,11 +152,11 @@ public:
    * @retval true A new thread is created
    * @retval false No thread could be created
    */
-  bool new_dynamic_thread (void);
+  bool new_dynamic_thread ();
 
   /// Called by the run loop to determine if to expire a thread or not
   /// when the dynamic timeout is reached.
-  bool above_minimum (void);
+  bool above_minimum ();
 
   /// @name Accessors
   // @{
@@ -166,7 +166,7 @@ public:
   TAO_DTP_Thread_Pool_Manager &manager () const;
   CORBA::ULong id () const;
   CORBA::ULong current_threads () const;
-  void add_active (void);
+  void add_active ();
   bool remove_active (bool force);
 
   // @}
@@ -217,10 +217,10 @@ public:
   TAO_DTP_Thread_Pool_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_DTP_Thread_Pool_Manager (void);
+  ~TAO_DTP_Thread_Pool_Manager ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Create a threadpool without lanes.
   CORBA::ULong create_threadpool (TAO_DTP_Definition &def);
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
index 2b7092ae0f2..d3be0e91089 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
@@ -137,7 +137,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
     }
 }
 
-TAO_ETCL_Literal_Constraint::~TAO_ETCL_Literal_Constraint (void)
+TAO_ETCL_Literal_Constraint::~TAO_ETCL_Literal_Constraint ()
 {
   if (this->any_ != 0)
     {
@@ -411,7 +411,7 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs)
 }
 
 TAO_ETCL_Literal_Constraint
-TAO_ETCL_Literal_Constraint::operator- (void)
+TAO_ETCL_Literal_Constraint::operator- ()
 {
   switch (this->type_)
   {
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.h b/TAO/tao/ETCL/TAO_ETCL_Constraint.h
index 7187aa54804..ed9fd2e5be3 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.h
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.h
@@ -40,7 +40,7 @@ class TAO_ETCL_Export TAO_ETCL_Literal_Constraint
   : public ETCL_Literal_Constraint
 {
 public:
-  TAO_ETCL_Literal_Constraint (void);
+  TAO_ETCL_Literal_Constraint ();
 
   // = Constructors for each of the various types of literals.
 
@@ -56,7 +56,7 @@ public:
   TAO_ETCL_Literal_Constraint (const ETCL_Literal_Constraint *lit);
 
   /// Destructor.
-  virtual ~TAO_ETCL_Literal_Constraint(void);
+  virtual ~TAO_ETCL_Literal_Constraint();
 
   /// Assignment operator.
   void operator= (const TAO_ETCL_Literal_Constraint& co);
@@ -87,7 +87,7 @@ public:
 
   // Unary minus.
   TAO_ETCL_Literal_Constraint
-  operator- (void);
+  operator- ();
 
   /// Ensure both operands are of the same simple numeric type.
   virtual Literal_Type
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index 8084ab4a572..5ad9d3b3198 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -11,7 +11,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_EndpointPolicy_Initializer::static_init (void)
+TAO_EndpointPolicy_Initializer::static_init ()
 {
   ACE_Service_Config::process_directive  (ace_svc_desc_TAO_EndpointPolicy_Initializer);
   return 0;
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.h b/TAO/tao/EndpointPolicy/EndpointPolicy.h
index 3bbc84610a9..54d628e2243 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.h
@@ -30,7 +30,7 @@ class TAO_EndpointPolicy_Export TAO_EndpointPolicy_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int static_init (void);
+  static int static_init ();
 
   /// Initialize the Endpoint Policy loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index a245b774cb1..726e96d31d3 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -23,7 +23,7 @@ TAO_EndpointPolicy_i::~TAO_EndpointPolicy_i ()
 
 
 CORBA::PolicyType
-TAO_EndpointPolicy_i::policy_type (void)
+TAO_EndpointPolicy_i::policy_type ()
 {
   return EndpointPolicy::ENDPOINT_POLICY_TYPE;
 }
@@ -39,7 +39,7 @@ TAO_EndpointPolicy_i::clone () const
 }
 
 EndpointPolicy::EndpointList *
-TAO_EndpointPolicy_i::value (void)
+TAO_EndpointPolicy_i::value ()
 {
   EndpointPolicy::EndpointList* list = 0;
   ACE_NEW_RETURN (list,
@@ -50,7 +50,7 @@ TAO_EndpointPolicy_i::value (void)
 }
 
 CORBA::Policy_ptr
-TAO_EndpointPolicy_i::copy (void)
+TAO_EndpointPolicy_i::copy ()
 {
   TAO_EndpointPolicy_i* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -61,7 +61,7 @@ TAO_EndpointPolicy_i::copy (void)
 }
 
 void
-TAO_EndpointPolicy_i::destroy (void)
+TAO_EndpointPolicy_i::destroy ()
 {
   this->value_.length (0);
 }
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
index cbcf802228e..198e7a59bc2 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
@@ -57,16 +57,16 @@ public:
 
   // = The EndpointPolicy::Policy methods
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
-  virtual EndpointPolicy::EndpointList * value (void);
+  virtual EndpointPolicy::EndpointList * value ();
 
 private:
   /// The attribute
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
index 5237c0d7261..13b1dba968d 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
@@ -8,7 +8,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void)
+TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory()
 {
 }
 
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
index 7f0318ba824..40f1ec6b0d6 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
@@ -37,7 +37,7 @@ class TAO_EndpointPolicy_Export TAO_Endpoint_Acceptor_Filter_Factory
   : public TAO_Acceptor_Filter_Factory
 {
 public:
-  virtual ~TAO_Endpoint_Acceptor_Filter_Factory(void);
+  virtual ~TAO_Endpoint_Acceptor_Filter_Factory();
 
   /// Create a new TAO_Endpoint_Acceptor_Filter object.
   TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager);
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h b/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
index 062366f373f..a02c03ffcd4 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
+++ b/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
@@ -40,7 +40,7 @@ class TAO_Acceptor;
 class TAO_EndpointPolicy_Export  TAO_Endpoint_Value_Impl
 {
 public:
-  virtual ~TAO_Endpoint_Value_Impl(void);
+  virtual ~TAO_Endpoint_Value_Impl();
 
   /// This method is used to compare a candidate IOR endpoint with the
   /// endpoint defined by this policy value.
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index ac2bde0fef2..54517440cd1 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -23,7 +23,7 @@ IIOPEndpointValue_i::IIOPEndpointValue_i (const char *host, CORBA::UShort port)
     this->addr_.set_type (-1);
 }
 
-IIOPEndpointValue_i::~IIOPEndpointValue_i (void)
+IIOPEndpointValue_i::~IIOPEndpointValue_i ()
 {
 }
 
@@ -88,7 +88,7 @@ IIOPEndpointValue_i::validate_acceptor(TAO_Acceptor * acceptor,
 }
 
 char *
-IIOPEndpointValue_i::host (void)
+IIOPEndpointValue_i::host ()
 {
   return CORBA::string_dup (this->host_.in());
 }
@@ -102,7 +102,7 @@ IIOPEndpointValue_i::host (const char *h)
 }
 
 CORBA::UShort
-IIOPEndpointValue_i::port (void)
+IIOPEndpointValue_i::port ()
 {
   return this->port_;
 }
@@ -116,7 +116,7 @@ IIOPEndpointValue_i::port (CORBA::UShort p )
 }
 
 CORBA::ULong
-IIOPEndpointValue_i::protocol_tag (void)
+IIOPEndpointValue_i::protocol_tag ()
 {
   return IOP::TAG_INTERNET_IOP;
 }
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
index 96339ec012d..0f240ed5dcd 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
@@ -83,11 +83,11 @@ public:
                                     bool is_multi_prot) const;
 
   /// Host attribute get/set operators.
-  char * host (void);
+  char * host ();
   void host (const char * h);
 
   /// Port attribute get/set operators.
-  CORBA::UShort port (void);
+  CORBA::UShort port ();
   void port (CORBA::UShort p);
 
   // Protocol tag get operator, inherited from EndpointValueBase
diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h
index 16a0056b1f6..8ecb778cff6 100644
--- a/TAO/tao/Exclusive_TMS.h
+++ b/TAO/tao/Exclusive_TMS.h
@@ -42,7 +42,7 @@ public:
   TAO_Exclusive_TMS (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Exclusive_TMS (void);
+  virtual ~TAO_Exclusive_TMS ();
 
   /**
    * @name The TAO_Transport_Mux_Strategy overrided methods
@@ -51,7 +51,7 @@ public:
    * for details.
    */
   //@{
-  virtual CORBA::ULong request_id (void);
+  virtual CORBA::ULong request_id ();
   virtual int bind_dispatcher (CORBA::ULong request_id,
                                ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd);
   virtual int unbind_dispatcher (CORBA::ULong request_id);
@@ -59,10 +59,10 @@ public:
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
   virtual int reply_timed_out (CORBA::ULong request_id);
 
-  virtual bool idle_after_send (void);
-  virtual bool idle_after_reply (void);
-  virtual void connection_closed (void);
-  virtual bool has_request (void);
+  virtual bool idle_after_send ();
+  virtual bool idle_after_reply ();
+  virtual void connection_closed ();
+  virtual bool has_request ();
   //@}
 
 protected:
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 66e0dbfb0d9..cf0775a2375 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -33,7 +33,7 @@ TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::
 
 template<typename S_forany,
          template <typename> class Insert_Policy>
-TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array_Clonable_Argument_T (void)
+TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -47,7 +47,7 @@ TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array
 template<typename S_forany,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void)
+TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone ()
 {
   typedef TAO::details::array_traits<S_forany> ARRAY_TRAITS;
   typename ARRAY_TRAITS::slice_type * tmp_ptr = 0;
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 85c9537cb1b..cf3f01779bf 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -31,7 +31,7 @@ TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *a
 
 template<typename S,
          template <typename> class Insert_Policy>
-TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable_Argument_T (void)
+TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -43,7 +43,7 @@ TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable
 template<typename S,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void)
+TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::clone ()
 {
   S* clone_x = new S (*(this->x_));
   In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>* clone_arg =
diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp
index eb7f16811ec..5d1f212ba8e 100644
--- a/TAO/tao/FlResource/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource/FlResource_Factory.cpp
@@ -7,13 +7,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  FlResource_Factory::FlResource_Factory (void)
+  FlResource_Factory::FlResource_Factory ()
     : reactor_impl_( 0 )
   {
   }
 
   ACE_Reactor_Impl *
-  FlResource_Factory::reactor_impl (void)
+  FlResource_Factory::reactor_impl ()
   {
     // synchronized by external locks
     if (!this->reactor_impl_)
diff --git a/TAO/tao/FlResource/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h
index 8fe7606ce82..e079c870140 100644
--- a/TAO/tao/FlResource/FlResource_Factory.h
+++ b/TAO/tao/FlResource/FlResource_Factory.h
@@ -43,7 +43,7 @@ namespace TAO
 
   protected:
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/FlResource/FlResource_Loader.cpp b/TAO/tao/FlResource/FlResource_Loader.cpp
index 83a1fbfab7f..c7bbee25b17 100644
--- a/TAO/tao/FlResource/FlResource_Loader.cpp
+++ b/TAO/tao/FlResource/FlResource_Loader.cpp
@@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  FlResource_Loader::FlResource_Loader (void)
+  FlResource_Loader::FlResource_Loader ()
   {
     FlResource_Factory *tmp = 0;
 
@@ -17,7 +17,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory (tmp);
   }
 
-  FlResource_Loader::~FlResource_Loader (void)
+  FlResource_Loader::~FlResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/FlResource/FlResource_Loader.h b/TAO/tao/FlResource/FlResource_Loader.h
index fa7e0b1fa8e..d1a3d2ca525 100644
--- a/TAO/tao/FlResource/FlResource_Loader.h
+++ b/TAO/tao/FlResource/FlResource_Loader.h
@@ -42,9 +42,9 @@ namespace TAO
   class TAO_FlResource_Export FlResource_Loader
   {
   public:
-    FlResource_Loader (void);
+    FlResource_Loader ();
 
-    virtual ~FlResource_Loader (void);
+    virtual ~FlResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.cpp b/TAO/tao/FoxResource/FoxResource_Factory.cpp
index 33f9dd63540..794abcd15ab 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Factory.cpp
@@ -13,7 +13,7 @@ namespace TAO
   }
 
   ACE_Reactor_Impl *
-  FoxResource_Factory::reactor_impl (void)
+  FoxResource_Factory::reactor_impl ()
   {
     if (this->fxapp_ == 0)
       return 0;
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.h b/TAO/tao/FoxResource/FoxResource_Factory.h
index 270c87171e2..d14571a194e 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.h
+++ b/TAO/tao/FoxResource/FoxResource_Factory.h
@@ -41,7 +41,7 @@ namespace TAO
 
   protected:
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.cpp b/TAO/tao/FoxResource/FoxResource_Loader.cpp
index e60dd560464..795911c83f9 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Loader.cpp
@@ -16,7 +16,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory( tmp );
   }
 
-  FoxResource_Loader::~FoxResource_Loader (void)
+  FoxResource_Loader::~FoxResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.h b/TAO/tao/FoxResource/FoxResource_Loader.h
index 9ad1e75ee50..111f38f4a2d 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.h
+++ b/TAO/tao/FoxResource/FoxResource_Loader.h
@@ -47,7 +47,7 @@ namespace TAO
   public:
     FoxResource_Loader (FXApp *app);
 
-    virtual ~FoxResource_Loader (void);
+    virtual ~FoxResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
index 71f35eef866..46f2c2465b4 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ b/TAO/tao/GIOP_Message_Locate_Header.h
@@ -46,13 +46,13 @@ public:
   const TAO::ObjectKey &object_key () const;
 
   /// Get the object_key in read/write mode..
-  TAO::ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key ();
 
   /// Get the reference to the underlying profile
-  TAO_Tagged_Profile &profile (void);
+  TAO_Tagged_Profile &profile ();
 
   /// Get the CDR stream for read/write
-  TAO_InputCDR &incoming_stream (void);
+  TAO_InputCDR &incoming_stream ();
 
 private:
   /// Request id
diff --git a/TAO/tao/HR_Time_Policy_Strategy.h b/TAO/tao/HR_Time_Policy_Strategy.h
index 931994b6210..7765560d5ae 100644
--- a/TAO/tao/HR_Time_Policy_Strategy.h
+++ b/TAO/tao/HR_Time_Policy_Strategy.h
@@ -41,11 +41,11 @@ class TAO_Export TAO_HR_Time_Policy_Strategy
 public:
   virtual ~TAO_HR_Time_Policy_Strategy ();
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
-  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void);
+  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy ();
 
 private:
   static ACE_Time_Policy_T<ACE_HR_Time_Policy>  time_policy_;
diff --git a/TAO/tao/HTTP_Client.h b/TAO/tao/HTTP_Client.h
index 8fd7d51e238..e0a1ee6a6f6 100644
--- a/TAO/tao/HTTP_Client.h
+++ b/TAO/tao/HTTP_Client.h
@@ -50,8 +50,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_HTTP_Client
 {
 public:
-  TAO_HTTP_Client (void);
-  ~TAO_HTTP_Client (void);
+  TAO_HTTP_Client ();
+  ~TAO_HTTP_Client ();
 
   /// Initializes the class with the given filename, hostname and port.
   /// it should be called with the filename, before any read/write calls
diff --git a/TAO/tao/HTTP_Handler.h b/TAO/tao/HTTP_Handler.h
index 60bc2d2869f..4baf60fb1d8 100644
--- a/TAO/tao/HTTP_Handler.h
+++ b/TAO/tao/HTTP_Handler.h
@@ -40,7 +40,7 @@ class TAO_Export TAO_HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE
 {
 public:
   /// Null constructor, insures that it works properly with Connector
-  TAO_HTTP_Handler (void);
+  TAO_HTTP_Handler ();
 
   /// Always use this constructor to make HTTP_Handlers
   TAO_HTTP_Handler (ACE_Message_Block *mb,
@@ -55,11 +55,11 @@ public:
   /// Close down the Blob
   virtual int close (u_long flags = 0);
 
-  ~TAO_HTTP_Handler (void);
+  ~TAO_HTTP_Handler ();
 
 protected:
-  virtual int send_request (void);
-  virtual int receive_reply (void);
+  virtual int send_request ();
+  virtual int receive_reply ();
 
   ACE_Message_Block *mb_;
   ACE_TCHAR *filename_;
@@ -85,8 +85,8 @@ public:
 
 private:
   //NOTE: these functions return -1 on error
-  int send_request (void);
-  int receive_reply (void);
+  int send_request ();
+  int receive_reply ();
   const char *request_prefix_;
   const char *request_suffix_;
 };
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 38082de9354..f4dafe938a2 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IFR_Client_Adapter_Impl::~TAO_IFR_Client_Adapter_Impl (void)
+TAO_IFR_Client_Adapter_Impl::~TAO_IFR_Client_Adapter_Impl ()
 {
 }
 
@@ -155,7 +155,7 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list (
 // Initialization and registration of dynamic service object.
 
 int
-TAO_IFR_Client_Adapter_Impl::Initializer (void)
+TAO_IFR_Client_Adapter_Impl::Initializer ()
 {
   TAO_ORB_Core::ifr_client_adapter_name ("Concrete_IFR_Client_Adapter");
 
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index 03524d88fd1..921b6ac6750 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -39,7 +39,7 @@ class TAO_IFR_CLIENT_Export TAO_IFR_Client_Adapter_Impl
   : public TAO_IFR_Client_Adapter
 {
 public:
-  virtual ~TAO_IFR_Client_Adapter_Impl (void);
+  virtual ~TAO_IFR_Client_Adapter_Impl ();
 
   virtual CORBA::Boolean interfacedef_cdr_insert (
       TAO_OutputCDR &cdr,
@@ -66,7 +66,7 @@ public:
 #endif /*TAO_HAS_MINIMUM_CORBA*/
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 124d7f78697..d2d11311186 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -46,17 +46,17 @@ class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_IIOP_Acceptor (void);
+  TAO_IIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_IIOP_Acceptor (void);
+  ~TAO_IIOP_Acceptor ();
 
   /// @@ Helper method for the implementation repository, should go
   ///    away
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   /// Returns address for default endpoint
   const ACE_INET_Addr& default_address () const;
@@ -84,12 +84,12 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 4f171c079f8..a5734c7d8d3 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #ifdef TAO_LOG_CH_REF_COUNTS
 ACE_Event_Handler::Reference_Count
-TAO_IIOP_Connection_Handler::add_reference (void)
+TAO_IIOP_Connection_Handler::add_reference ()
 {
   Reference_Count rc = TAO_IIOP_SVC_HANDLER::add_reference ();
   if (TAO_debug_level > 9)
@@ -37,7 +37,7 @@ TAO_IIOP_Connection_Handler::add_reference (void)
 }
 
 ACE_Event_Handler::Reference_Count
-TAO_IIOP_Connection_Handler::remove_reference (void)
+TAO_IIOP_Connection_Handler::remove_reference ()
 {
   TAO_Transport *tport = this->transport ();
   Reference_Count rc = TAO_IIOP_SVC_HANDLER::remove_reference ();
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index 55c110e86f9..84eec039289 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -58,8 +58,8 @@ class TAO_Export TAO_IIOP_Connection_Handler : public TAO_IIOP_SVC_HANDLER,
 {
 public:
 #ifdef TAO_LOG_CH_REF_COUNTS
-  Reference_Count add_reference (void);
-  Reference_Count remove_reference (void);
+  Reference_Count add_reference ();
+  Reference_Count remove_reference ();
 #endif
 
   TAO_IIOP_Connection_Handler (ACE_Thread_Manager * = 0);
@@ -68,7 +68,7 @@ public:
   TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_IIOP_Connection_Handler (void);
+  ~TAO_IIOP_Connection_Handler ();
 
   /// Called by the @c Strategy_Acceptor when the handler is completely
   /// connected.  Argument is unused.
@@ -81,8 +81,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -91,13 +91,13 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   /// Process the @a listen_list
   int process_listen_point_list (IIOP::ListenPointList &listen_list);
 
   /// Check if network priority needs to be enabled
-  int enable_network_priority (void);
+  int enable_network_priority ();
 
   /// Set Diff-Serv codepoint on outgoing packets.
   int set_dscp_codepoint (CORBA::Boolean set_network_priority);
@@ -108,14 +108,14 @@ public:
   /// This is used during a canceled connection attempt. Force the
   /// SO_LINGER timeout to 0 so that when the peer is closed, it won't
   /// hang around.
-  void abort (void);
+  void abort ();
 
 protected:
   //@{
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   //@}
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 8b4cc5dd7b3..6ea3956f64e 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -51,15 +51,15 @@ class TAO_Export TAO_IIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_IIOP_Connector (void);
+  TAO_IIOP_Connector ();
 
   /// Destructor.
-  ~TAO_IIOP_Connector (void);
+  ~TAO_IIOP_Connector ();
 
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
   virtual int check_prefix (const char *endpoint);
@@ -104,7 +104,7 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index 7c4729f6a0f..ca4125a509b 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -50,7 +50,7 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_IIOP_Endpoint (void);
+  TAO_IIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -69,13 +69,13 @@ public:
                      CORBA::Short priority);
 
   /// Destructor.
-  ~TAO_IIOP_Endpoint (void);
+  ~TAO_IIOP_Endpoint ();
 
 
   // = Implementation of abstract TAO_Endpoint methods.  See
   // Endpoint.h for their documentation.
 
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
 
   /**
    * Return the next endpoint in the list, but use protocol-specific
@@ -97,14 +97,14 @@ public:
   virtual int addr_to_string (char *buffer, size_t length);
 
   /// Makes a copy of @c this
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
+  virtual CORBA::ULong hash ();
 
   // = IIOP_Endpoint-specific methods.
 
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index d912f287795..5d18f450516 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -33,8 +33,8 @@ class TAO_Connector;
 class TAO_Export TAO_IIOP_Protocol_Factory : public TAO_Protocol_Factory
 {
 public:
-  TAO_IIOP_Protocol_Factory (void);
-  virtual ~TAO_IIOP_Protocol_Factory (void);
+  TAO_IIOP_Protocol_Factory ();
+  virtual ~TAO_IIOP_Protocol_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -51,8 +51,8 @@ public:
   virtual char options_delimiter () const;
 
   // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
 };
 
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 98248d2b542..a619734ccb8 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -45,7 +45,7 @@ public:
   static const char object_key_delimiter_;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -93,25 +93,25 @@ public:
 
   /// Encode endpoints for RT profiles, using a single TAO_TAG_ENDPOINT
   /// component.
-  virtual int encode_endpoints (void);
+  virtual int encode_endpoints ();
 
   /// Encode alternate endpoints for non-RT profiles, using multiple
   /// TAG_ALTERNATE_IIOP_ADDRESS components, one endpoint per component
-  virtual int encode_alternate_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_alternate_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
 
   /// Since SSLIOP_Profile derives from IIOP_Profile, but SSLIOP_Endpoint
   /// does not derive from IIOP_Endpoint, it is necessary to have a way
   /// of always getting the IIOP_Endpoint using a generic interface
   /// regardless of the final type of the profile.
-  virtual TAO_Endpoint *base_endpoint (void);
+  virtual TAO_Endpoint *base_endpoint ();
 
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
 
 protected:
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_IIOP_Profile (void);
+  ~TAO_IIOP_Profile ();
 
   /**
    * Helper method for encode_endpoints to deal with RT requests.
@@ -126,11 +126,11 @@ protected:
    * encapsulation of a sequence of structs, each representing a
    * single endpoint.  Data format is specified in iiop_endpoins.pidl.
    */
-  int encode_endpoints_for_rt (void);
+  int encode_endpoints_for_rt ();
 
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 8e5999bb3e9..09c147dbe85 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -60,7 +60,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  virtual ~TAO_IIOP_Transport (void);
+  virtual ~TAO_IIOP_Transport ();
 
   /** @name Overridden Template Methods
    *
@@ -68,7 +68,7 @@ protected:
    * details.
    */
   //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
 
   virtual ssize_t send (iovec *iov, int iovcnt,
                         size_t &bytes_transferred,
@@ -107,7 +107,7 @@ public:
 
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
-  virtual TAO_Connection_Handler * connection_handler_i (void);
+  virtual TAO_Connection_Handler * connection_handler_i ();
   //@}
 
 private:
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index 938b6fe61fa..8ad96eb55c4 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -18,7 +18,7 @@ TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa)
 {
 }
 
-TAO_IORInfo::~TAO_IORInfo (void)
+TAO_IORInfo::~TAO_IORInfo ()
 {
 }
 
@@ -68,7 +68,7 @@ TAO_IORInfo::add_ior_component_to_profile (
 }
 
 char *
-TAO_IORInfo::manager_id (void)
+TAO_IORInfo::manager_id ()
 {
   this->check_validity ();
 
@@ -77,7 +77,7 @@ TAO_IORInfo::manager_id (void)
 }
 
 PortableInterceptor::AdapterState
-TAO_IORInfo::state (void)
+TAO_IORInfo::state ()
 {
   this->check_validity ();
 
@@ -85,7 +85,7 @@ TAO_IORInfo::state (void)
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
-TAO_IORInfo::adapter_template (void)
+TAO_IORInfo::adapter_template ()
 {
   this->check_validity ();
 
@@ -106,7 +106,7 @@ TAO_IORInfo::adapter_template (void)
 }
 
 PortableInterceptor::ObjectReferenceFactory *
-TAO_IORInfo::current_factory (void)
+TAO_IORInfo::current_factory ()
 {
   this->check_validity ();
 
@@ -136,7 +136,7 @@ TAO_IORInfo::current_factory (
 }
 
 void
-TAO_IORInfo::check_validity (void)
+TAO_IORInfo::check_validity ()
 {
   if (this->poa_ == 0)
     {
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index 6e86563beef..7ce42e6ee7c 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -67,13 +67,13 @@ public:
       const IOP::TaggedComponent & component,
       IOP::ProfileId profile_id);
 
-  virtual char * manager_id (void);
+  virtual char * manager_id ();
 
-  virtual PortableInterceptor::AdapterState state (void);
+  virtual PortableInterceptor::AdapterState state ();
 
-  virtual PortableInterceptor::ObjectReferenceTemplate *adapter_template (void);
+  virtual PortableInterceptor::ObjectReferenceTemplate *adapter_template ();
 
-  virtual PortableInterceptor::ObjectReferenceFactory *current_factory (void);
+  virtual PortableInterceptor::ObjectReferenceFactory *current_factory ();
 
   virtual void current_factory (
       PortableInterceptor::ObjectReferenceFactory * current_factory);
@@ -85,7 +85,7 @@ public:
    * Once the IOR interception points have been invoked, this IORInfo
    * instance is no longer valid.
    */
-  void invalidate (void);
+  void invalidate ();
 
   /// Inform the this IORInfo object that the
   /// IORInterceptor::components_established() interception point has
@@ -96,12 +96,12 @@ public:
    * are invalid.  They are only valid in the
    * IORInterceptor::establish_components() interception point.
    */
-  void components_established (void);
+  void components_established ();
 
 protected:
   /// Protected destructor to enforce proper memory management through
   /// the reference counting mechanism.
-  ~TAO_IORInfo (void);
+  ~TAO_IORInfo ();
 
   /// Check if this IORInfo instance is valid.
   /**
@@ -109,7 +109,7 @@ protected:
    * this IORInfo object is no longer valid.  Throw an exception in
    * that case.
    */
-  void check_validity (void);
+  void check_validity ();
 
 private:
   TAO_IORInfo (const TAO_IORInfo &) = delete;
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 3264348c172..837c4f852ea 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -7,12 +7,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInterceptor_Adapter_Factory_Impl::~
-  TAO_IORInterceptor_Adapter_Factory_Impl (void)
+  TAO_IORInterceptor_Adapter_Factory_Impl ()
 {
 }
 
 TAO_IORInterceptor_Adapter *
-TAO_IORInterceptor_Adapter_Factory_Impl::create (void)
+TAO_IORInterceptor_Adapter_Factory_Impl::create ()
 {
   TAO_IORInterceptor_Adapter_Impl *nia = 0;
   ACE_NEW_THROW_EX (nia,
@@ -28,7 +28,7 @@ TAO_IORInterceptor_Adapter_Factory_Impl::create (void)
 // Initialization and registration of dynamic service object.
 
 int
-TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void)
+TAO_IORInterceptor_Adapter_Factory_Impl::Initializer ()
 {
   TAO_ORB_Core::iorinterceptor_adapter_factory_name (
     "Concrete_IORInterceptor_Adapter_Factory");
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index 116c7662729..adb68179abd 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -39,12 +39,12 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Factory_Impl
   : public TAO_IORInterceptor_Adapter_Factory
 {
 public:
-  virtual ~TAO_IORInterceptor_Adapter_Factory_Impl (void);
+  virtual ~TAO_IORInterceptor_Adapter_Factory_Impl ();
 
-  virtual TAO_IORInterceptor_Adapter *create (void);
+  virtual TAO_IORInterceptor_Adapter *create ();
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index a56217e32dd..d4aa38b8341 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
+TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO_IORInterceptor_Adapter_Impl::add_interceptor (
 }
 
 void
-TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (void)
+TAO_IORInterceptor_Adapter_Impl::destroy_interceptors ()
 {
   this->ior_interceptor_list_.destroy_interceptors ();
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 94676c82abc..8d93549faa6 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -49,7 +49,7 @@ class TAO_IORInterceptor_Adapter_Impl
   : public TAO_IORInterceptor_Adapter
 {
 public:
-  virtual ~TAO_IORInterceptor_Adapter_Impl (void);
+  virtual ~TAO_IORInterceptor_Adapter_Impl ();
 
   virtual void add_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor);
@@ -58,7 +58,7 @@ public:
       PortableInterceptor::IORInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies);
 
-  virtual void destroy_interceptors (void);
+  virtual void destroy_interceptors ();
 
   virtual void establish_components (TAO_Root_POA *poa );
 
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h
index c446c802a16..2ad58f50390 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.h
@@ -39,7 +39,7 @@ class TAO_Export TAO_IORInterceptor_Adapter_Factory
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_IORInterceptor_Adapter_Factory (void);
+  virtual ~TAO_IORInterceptor_Adapter_Factory ();
 
   virtual TAO_IORInterceptor_Adapter * create (void) = 0;
 };
diff --git a/TAO/tao/IORManipulation/IORManip_Filter.cpp b/TAO/tao/IORManipulation/IORManip_Filter.cpp
index eb2539bc8f9..5756653eb91 100644
--- a/TAO/tao/IORManipulation/IORManip_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Filter.cpp
@@ -6,12 +6,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORManip_Filter::TAO_IORManip_Filter (void)
+TAO_IORManip_Filter::TAO_IORManip_Filter ()
 {
 }
 
 
-TAO_IORManip_Filter::~TAO_IORManip_Filter (void)
+TAO_IORManip_Filter::~TAO_IORManip_Filter ()
 {
 }
 
diff --git a/TAO/tao/IORManipulation/IORManip_Filter.h b/TAO/tao/IORManipulation/IORManip_Filter.h
index 25a319eff9b..5896182f454 100644
--- a/TAO/tao/IORManipulation/IORManip_Filter.h
+++ b/TAO/tao/IORManipulation/IORManip_Filter.h
@@ -38,10 +38,10 @@ class TAO_IORManip_Export TAO_IORManip_Filter
 {
 public:
   /// Constructor.
-  TAO_IORManip_Filter (void);
+  TAO_IORManip_Filter ();
 
   /// Destructor.
-  virtual ~TAO_IORManip_Filter (void);
+  virtual ~TAO_IORManip_Filter ();
 
   /// Perform filtering using the profile passed in as a guide.
   /// If no profile is provided, filter using the profile_matches() method.
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
index 0e1df9788a3..fe3ef5fe0c6 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
@@ -10,12 +10,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORManip_IIOP_Filter::TAO_IORManip_IIOP_Filter (void)
+TAO_IORManip_IIOP_Filter::TAO_IORManip_IIOP_Filter ()
 {
 }
 
 
-TAO_IORManip_IIOP_Filter::~TAO_IORManip_IIOP_Filter (void)
+TAO_IORManip_IIOP_Filter::~TAO_IORManip_IIOP_Filter ()
 {
 }
 
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
index 0b606e23f95..42b84878526 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
@@ -42,10 +42,10 @@ public:
   };
 
   /// Constructor.
-  TAO_IORManip_IIOP_Filter (void);
+  TAO_IORManip_IIOP_Filter ();
 
   /// Destructor.
-  virtual ~TAO_IORManip_IIOP_Filter (void);
+  virtual ~TAO_IORManip_IIOP_Filter ();
 
   /// Compares the profile to the profile info.
   virtual CORBA::Boolean compare_profile_info (
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index 11fd191b7b6..fff1b577e8e 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORManip_Loader::TAO_IORManip_Loader (void)
+TAO_IORManip_Loader::TAO_IORManip_Loader ()
 {
 }
 
@@ -20,7 +20,7 @@ TAO_IORManip_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[])
 }
 
 int
-TAO_IORManip_Loader::Initializer (void)
+TAO_IORManip_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IORManip_Loader);
 }
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index 3acc58d28a9..18e970fca5f 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -28,7 +28,7 @@ class TAO_IORManip_Export TAO_IORManip_Loader : public TAO_Object_Loader
 {
 public:
   /// Constructor
-  TAO_IORManip_Loader (void);
+  TAO_IORManip_Loader ();
 
   /// Creates a IORManip factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
@@ -36,7 +36,7 @@ public:
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 4f6772fd90d..e9122d13c5e 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -11,11 +11,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
+TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl ()
 {
 }
 
-TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
+TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl ()
 {
 }
 
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index 4b5d6f9c017..e6627234f95 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -38,7 +38,7 @@ class TAO_IOR_Manipulation_impl
 {
 public:
   /// Constructor
-  TAO_IOR_Manipulation_impl (void);
+  TAO_IOR_Manipulation_impl ();
 
   virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors);
@@ -77,7 +77,7 @@ public:
 
 protected:
   /// Destructor
-  ~TAO_IOR_Manipulation_impl (void);
+  ~TAO_IOR_Manipulation_impl ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORTable/Async_IORTable.cpp b/TAO/tao/IORTable/Async_IORTable.cpp
index 762d66d249d..181480efeea 100644
--- a/TAO/tao/IORTable/Async_IORTable.cpp
+++ b/TAO/tao/IORTable/Async_IORTable.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Async_IORTable_Initializer::init (void)
+TAO_Async_IORTable_Initializer::init ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Async_Table_Adapter_Factory);
 }
diff --git a/TAO/tao/IORTable/Async_IORTable.h b/TAO/tao/IORTable/Async_IORTable.h
index 8cb08364839..6eeebf99c42 100644
--- a/TAO/tao/IORTable/Async_IORTable.h
+++ b/TAO/tao/IORTable/Async_IORTable.h
@@ -29,7 +29,7 @@ class TAO_Async_IORTable_Export TAO_Async_IORTable_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static int
diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
index d467760a738..e343a903b12 100644
--- a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
@@ -11,11 +11,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Async_IOR_Table_Impl::TAO_Async_IOR_Table_Impl (void)
+TAO_Async_IOR_Table_Impl::TAO_Async_IOR_Table_Impl ()
 {
 }
 
-TAO_Async_IOR_Table_Impl::~TAO_Async_IOR_Table_Impl (void)
+TAO_Async_IOR_Table_Impl::~TAO_Async_IOR_Table_Impl ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.h b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
index 956e24ef602..4f57a752bdd 100644
--- a/TAO/tao/IORTable/Async_IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
@@ -38,8 +38,8 @@ class TAO_Async_IOR_Table_Impl : public virtual TAO_IOR_Table_Impl
 {
 public:
   /// Constructor
-  TAO_Async_IOR_Table_Impl (void);
-  virtual ~TAO_Async_IOR_Table_Impl (void);
+  TAO_Async_IOR_Table_Impl ();
+  virtual ~TAO_Async_IOR_Table_Impl ();
 
   virtual bool async_available (void) { return true; }
 
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.cpp b/TAO/tao/IORTable/Async_Table_Adapter.cpp
index 92ae3ea2a87..7fb88ec03a5 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Async_Table_Adapter.cpp
@@ -23,12 +23,12 @@ TAO_Async_Table_Adapter::TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO_Async_Table_Adapter::~TAO_Async_Table_Adapter (void)
+TAO_Async_Table_Adapter::~TAO_Async_Table_Adapter ()
 {
 }
 
 void
-TAO_Async_Table_Adapter::open (void)
+TAO_Async_Table_Adapter::open ()
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   TAO_Async_IOR_Table_Impl *impl = 0;
@@ -99,7 +99,7 @@ TAO_Async_Table_Adapter::find_object (IORTable::Locate_ResponseHandler rh,
 
 // ****************************************************************
 
-TAO_Async_Table_Adapter_Factory::TAO_Async_Table_Adapter_Factory (void)
+TAO_Async_Table_Adapter_Factory::TAO_Async_Table_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.h b/TAO/tao/IORTable/Async_Table_Adapter.h
index 330445362d1..8c6a558e9b3 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.h
+++ b/TAO/tao/IORTable/Async_Table_Adapter.h
@@ -32,11 +32,11 @@ public:
   TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core);
 
   /// Destructor
-  virtual ~TAO_Async_Table_Adapter (void);
+  virtual ~TAO_Async_Table_Adapter ();
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (void);
+  virtual void open ();
 
   virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
@@ -55,7 +55,7 @@ class TAO_Async_IORTable_Export TAO_Async_Table_Adapter_Factory :
 {
 public:
   /// Constructor
-  TAO_Async_Table_Adapter_Factory (void);
+  TAO_Async_Table_Adapter_Factory ();
 
   /// The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   /// details.
diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp
index ae5d20342cb..d4c63ec8ebc 100644
--- a/TAO/tao/IORTable/IORTable.cpp
+++ b/TAO/tao/IORTable/IORTable.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_IORTable_Initializer::init (void)
+TAO_IORTable_Initializer::init ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Table_Adapter_Factory);
 }
diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h
index edc17a37cf4..1dccde36fe6 100644
--- a/TAO/tao/IORTable/IORTable.h
+++ b/TAO/tao/IORTable/IORTable.h
@@ -29,7 +29,7 @@ class TAO_IORTable_Export TAO_IORTable_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static int
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index a30cb93701e..8137e5d1eb7 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -28,7 +28,7 @@ TAO::Objref_Traits <TAO_IOR_Table_Impl>::release (TAO_IOR_Table_Impl_ptr p)
 }
 
 TAO_IOR_Table_Impl_ptr
-TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil (void)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil ()
 {
   return TAO_IOR_Table_Impl::_nil ();
 }
@@ -40,7 +40,7 @@ TAO::Objref_Traits <TAO_IOR_Table_Impl>::marshal (const TAO_IOR_Table_Impl_ptr,
   return false;
 }
 
-TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
+TAO_IOR_Table_Impl::TAO_IOR_Table_Impl ()
 {
 }
 
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index be602fb44f6..01f1d36cb74 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -98,7 +98,7 @@ namespace TAO
 
     static void release (TAO_IOR_Table_Impl_ptr);
 
-    static TAO_IOR_Table_Impl_ptr nil (void);
+    static TAO_IOR_Table_Impl_ptr nil ();
 
     static ::CORBA::Boolean marshal (const TAO_IOR_Table_Impl_ptr p,
                                      TAO_OutputCDR &cdr);
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
index b2a8384ff51..021233b2b9f 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
@@ -38,7 +38,7 @@ TAO_AMH_Locate_ResponseHandler::TAO_AMH_Locate_ResponseHandler (
   this->init (sr,0);
 }
 
-TAO_AMH_Locate_ResponseHandler::~TAO_AMH_Locate_ResponseHandler (void)
+TAO_AMH_Locate_ResponseHandler::~TAO_AMH_Locate_ResponseHandler ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h
index 7f9a2a053fc..34456416143 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.h
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.h
@@ -48,11 +48,11 @@ typedef TAO_AMH_Locate_ResponseHandler *TAO_AMH_Locate_ResponseHandler_ptr;
 class TAO_Async_IORTable_Export TAO_AMH_Locate_ResponseHandler_var
 {
 public:
-  TAO_AMH_Locate_ResponseHandler_var (void);
+  TAO_AMH_Locate_ResponseHandler_var ();
   TAO_AMH_Locate_ResponseHandler_var (TAO_AMH_Locate_ResponseHandler_ptr);
   TAO_AMH_Locate_ResponseHandler_var (
       const TAO_AMH_Locate_ResponseHandler_var &);
-  ~TAO_AMH_Locate_ResponseHandler_var (void);
+  ~TAO_AMH_Locate_ResponseHandler_var ();
 
   TAO_AMH_Locate_ResponseHandler_var &operator= (
       TAO_AMH_Locate_ResponseHandler_ptr);
@@ -64,9 +64,9 @@ public:
   operator TAO_AMH_Locate_ResponseHandler_ptr &();
 
   TAO_AMH_Locate_ResponseHandler_ptr in () const;
-  TAO_AMH_Locate_ResponseHandler_ptr &inout (void);
-  TAO_AMH_Locate_ResponseHandler_ptr &out (void);
-  TAO_AMH_Locate_ResponseHandler_ptr _retn (void);
+  TAO_AMH_Locate_ResponseHandler_ptr &inout ();
+  TAO_AMH_Locate_ResponseHandler_ptr &out ();
+  TAO_AMH_Locate_ResponseHandler_ptr _retn ();
   TAO_AMH_Locate_ResponseHandler_ptr ptr () const;
 
 private:
@@ -102,7 +102,7 @@ public:
   typedef TAO_AMH_Locate_ResponseHandler_var _var_type;
 
   TAO_AMH_Locate_ResponseHandler (TAO_ServerRequest &sr);
-  ~TAO_AMH_Locate_ResponseHandler (void);
+  ~TAO_AMH_Locate_ResponseHandler ();
 
   virtual void raise_excep (const CORBA::Exception &ex);
 
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index 5c466630ad7..60d8c629706 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -26,7 +26,7 @@ TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO_Table_Adapter::~TAO_Table_Adapter (void)
+TAO_Table_Adapter::~TAO_Table_Adapter ()
 {
   delete this->lock_;
 }
@@ -43,7 +43,7 @@ TAO_Table_Adapter::create_lock (TAO_SYNCH_MUTEX &thread_lock)
 }
 
 void
-TAO_Table_Adapter::open (void)
+TAO_Table_Adapter::open ()
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   TAO_IOR_Table_Impl *impl = 0;
@@ -95,7 +95,7 @@ TAO_Table_Adapter::name () const
 }
 
 CORBA::Object_ptr
-TAO_Table_Adapter::root (void)
+TAO_Table_Adapter::root ()
 {
   return CORBA::Object::_duplicate (this->root_.in());
 }
@@ -189,7 +189,7 @@ TAO_Table_Adapter::find_object (TAO::ObjectKey &key,
 
 // ****************************************************************
 
-TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory (void)
+TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 920ac96b0f9..071709e8a88 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -36,11 +36,11 @@ public:
   TAO_Table_Adapter (TAO_ORB_Core &orb_core);
 
   /// Destructor
-  virtual ~TAO_Table_Adapter (void);
+  virtual ~TAO_Table_Adapter ();
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (void);
+  virtual void open ();
   virtual void close (int wait_for_completion);
   virtual void check_close (int wait_for_completion);
   virtual int priority () const;
@@ -49,7 +49,7 @@ public:
                         CORBA::Object_out foward_to);
 
   virtual const char *name () const;
-  virtual CORBA::Object_ptr root (void);
+  virtual CORBA::Object_ptr root ();
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
@@ -79,7 +79,7 @@ class TAO_IORTable_Export TAO_Table_Adapter_Factory : public TAO_Adapter_Factory
 {
 public:
   /// Constructor
-  TAO_Table_Adapter_Factory (void);
+  TAO_Table_Adapter_Factory ();
 
   /// The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   /// details.
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index a2c429cb4a3..4e6b3ad6891 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -208,7 +208,7 @@ namespace TAO
 {
   namespace ImR_Client
   {
-    ImR_Client_Adapter_Impl::ImR_Client_Adapter_Impl (void)
+    ImR_Client_Adapter_Impl::ImR_Client_Adapter_Impl ()
      : server_object_ (0)
     {
     }
@@ -451,7 +451,7 @@ namespace TAO
     // Initialization and registration of dynamic service object.
 
     int
-    ImR_Client_Adapter_Impl::Initializer (void)
+    ImR_Client_Adapter_Impl::Initializer ()
     {
       TAO_Root_POA::imr_client_adapter_name (
         "Concrete_ImR_Client_Adapter");
diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h
index 94acb032f72..0139e8372f5 100644
--- a/TAO/tao/ImR_Client/ImR_Client.h
+++ b/TAO/tao/ImR_Client/ImR_Client.h
@@ -46,10 +46,10 @@ namespace TAO
     {
     public:
       /// Constructor.
-      ImR_Client_Adapter_Impl (void);
+      ImR_Client_Adapter_Impl ();
 
       /// Used to force the initialization of the PortableServer code.
-      static int Initializer (void);
+      static int Initializer ();
 
       /// ImplRepo helper method, notify the ImplRepo on startup
       virtual void imr_notify_startup (TAO_Root_POA* poa);
diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
index ac871f10bdb..050cf12341c 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -12,12 +12,12 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
 }
 
 void
-ServerObject_i::ping (void)
+ServerObject_i::ping ()
 {
 }
 
 void
-ServerObject_i::shutdown (void)
+ServerObject_i::shutdown ()
 {
   // Note : We want our child POAs to be able to unregister themselves from
   // the ImR, so we must destroy them before shutting down the orb.
@@ -26,7 +26,7 @@ ServerObject_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-ServerObject_i::_default_POA (void)
+ServerObject_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h
index d3df7a0bd3e..a75b2092807 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.h
+++ b/TAO/tao/ImR_Client/ServerObject_i.h
@@ -42,13 +42,13 @@ public:
   ServerObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
   /// Ping method.
-  void ping (void);
+  void ping ();
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Returns the default POA for this servant.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 protected:
   /// Our ORB.  We need this member in case we need to shutdown the
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index b719d52c40f..2d876183efe 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -59,7 +59,7 @@ class TAO_Export TAO_Invocation_Endpoint_Selector
 {
 public:
   /// Destructor.
-  virtual ~TAO_Invocation_Endpoint_Selector (void);
+  virtual ~TAO_Invocation_Endpoint_Selector ();
 
   /// Select the endpoint and set @a r's @c profile_
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
@@ -85,7 +85,7 @@ class TAO_Export TAO_Default_Endpoint_Selector
 {
 public:
   /// Destructor.
-  virtual ~TAO_Default_Endpoint_Selector (void);
+  virtual ~TAO_Default_Endpoint_Selector ();
 
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val);
diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h
index 4e2c5a0a8a7..8be0f5ef7bf 100644
--- a/TAO/tao/LF_CH_Event.h
+++ b/TAO/tao/LF_CH_Event.h
@@ -49,10 +49,10 @@ public:
   friend class TAO_LF_Multi_Event;
 
   /// Constructor
-  TAO_LF_CH_Event (void);
+  TAO_LF_CH_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_CH_Event (void);
+  virtual ~TAO_LF_CH_Event ();
 
   //@{
 protected:
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index c6e0ea6db08..045d1959146 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -42,7 +42,7 @@ public:
   TAO_LF_Connect_Strategy (TAO_ORB_Core *orb, bool no_upcall);
 
   /// Destructor
-  ~TAO_LF_Connect_Strategy (void);
+  ~TAO_LF_Connect_Strategy ();
 
   /**
    * Concrete implementation for this class. Please see
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index 4655577b34d..9cacf590163 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -50,10 +50,10 @@ public:
   friend class TAO_Leader_Follower;
 
   /// Constructor
-  TAO_LF_Event (void);
+  TAO_LF_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_Event (void);
+  virtual ~TAO_LF_Event ();
 
   /// Bind a follower
   /**
diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h
index 441e4727f77..d4fc4730b29 100644
--- a/TAO/tao/LF_Event_Binder.h
+++ b/TAO/tao/LF_Event_Binder.h
@@ -36,7 +36,7 @@ public:
   TAO_LF_Event_Binder (TAO_LF_Event *event, TAO_LF_Follower *folloer);
 
   /// Destructor
-  ~TAO_LF_Event_Binder (void);
+  ~TAO_LF_Event_Binder ();
 
 private:
   void operator= (const TAO_LF_Event_Binder &);
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h
index 71462061a0e..f47ec1c814b 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.h
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h
@@ -37,7 +37,7 @@ public:
                                    ACE_Time_Value *max_wait_time);
 
   /// Destructor
-  ~TAO_LF_Event_Loop_Thread_Helper (void);
+  ~TAO_LF_Event_Loop_Thread_Helper ();
 
   /// Calls @c set_event_loop_thread on the leader/followers object.
   int event_loop_return () const;
diff --git a/TAO/tao/LF_Follower.h b/TAO/tao/LF_Follower.h
index 9d81113e8a3..0aa04b467da 100644
--- a/TAO/tao/LF_Follower.h
+++ b/TAO/tao/LF_Follower.h
@@ -47,16 +47,16 @@ public:
   TAO_LF_Follower (TAO_Leader_Follower &leader_follower);
 
   /// Destructor
-  ~TAO_LF_Follower (void);
+  ~TAO_LF_Follower ();
 
   /// Access the leader follower that owns this follower
-  TAO_Leader_Follower &leader_follower (void);
+  TAO_Leader_Follower &leader_follower ();
 
   /// Wait until on the underlying condition variable
   int wait (ACE_Time_Value *tv);
 
   /// Signal the underlying condition variable
-  int signal (void);
+  int signal ();
 
 private:
   /// The Leader/Follower set this Follower belongs to
diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h
index 9121627ea01..4de8316be15 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.h
+++ b/TAO/tao/LF_Follower_Auto_Adder.h
@@ -36,7 +36,7 @@ public:
   TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &, TAO_LF_Follower *follower);
 
   /// Destructor
-  ~TAO_LF_Follower_Auto_Adder (void);
+  ~TAO_LF_Follower_Auto_Adder ();
 
 private:
   /// Keep a reference to the leader follower
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.h b/TAO/tao/LF_Follower_Auto_Ptr.h
index 0cb45361a48..6ba7dd34691 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.h
+++ b/TAO/tao/LF_Follower_Auto_Ptr.h
@@ -36,12 +36,12 @@ public:
   TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &);
 
   /// Destructor
-  ~TAO_LF_Follower_Auto_Ptr (void);
+  ~TAO_LF_Follower_Auto_Ptr ();
 
   /// Implement the smart pointer methods
-  TAO_LF_Follower *get (void);
-  TAO_LF_Follower *operator->(void);
-  operator TAO_LF_Follower *(void);
+  TAO_LF_Follower *get ();
+  TAO_LF_Follower *operator->();
+  operator TAO_LF_Follower *();
 
 private:
   /// Keep a reference to the leader follower
diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h
index 1af364d0044..653edff43eb 100644
--- a/TAO/tao/LF_Invocation_Event.h
+++ b/TAO/tao/LF_Invocation_Event.h
@@ -37,10 +37,10 @@ class TAO_Export TAO_LF_Invocation_Event: public TAO_LF_Event
 {
 public:
   /// Constructor
-  TAO_LF_Invocation_Event (void);
+  TAO_LF_Invocation_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_Invocation_Event (void);
+  virtual ~TAO_LF_Invocation_Event ();
 
 protected:
   /// Validate and perform the state change
diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h
index ca59e7a4134..fa9f836d548 100644
--- a/TAO/tao/LF_Multi_Event.h
+++ b/TAO/tao/LF_Multi_Event.h
@@ -38,10 +38,10 @@ class TAO_Export TAO_LF_Multi_Event: public TAO_LF_Event
 {
 public:
   /// Constructor
-  TAO_LF_Multi_Event (void);
+  TAO_LF_Multi_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_Multi_Event (void);
+  virtual ~TAO_LF_Multi_Event ();
 
   /// Propagate the follower to all the events in the collection.
   virtual int bind (TAO_LF_Follower *follower);
@@ -54,10 +54,10 @@ public:
 
   /// Returns the connection handler that caused the successful status
   /// to be returned.
-  TAO_Connection_Handler *winner(void);
+  TAO_Connection_Handler *winner();
 
   /// Returns the transport associated with the first entry in the collection.
-  TAO_Transport *base_transport(void);
+  TAO_Transport *base_transport();
 
 private:
   void operator= (const TAO_LF_Multi_Event &);
diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h
index 1dd49e3c5b8..c0515a43bdb 100644
--- a/TAO/tao/LF_Strategy.h
+++ b/TAO/tao/LF_Strategy.h
@@ -43,7 +43,7 @@ class TAO_Export TAO_LF_Strategy
 {
 public:
   /// Destructor
-  virtual ~TAO_LF_Strategy (void);
+  virtual ~TAO_LF_Strategy ();
 
   /// The current thread will handle an upcall
   /**
diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h
index 7d4619d1000..675b032c151 100644
--- a/TAO/tao/LF_Strategy_Complete.h
+++ b/TAO/tao/LF_Strategy_Complete.h
@@ -34,7 +34,7 @@ public:
    *
    * Please check the documentation in TAO_LF_Strategy
    */
-  virtual ~TAO_LF_Strategy_Complete (void);
+  virtual ~TAO_LF_Strategy_Complete ();
 
   virtual void set_upcall_thread (TAO_Leader_Follower &);
   virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.h b/TAO/tao/LRU_Connection_Purging_Strategy.h
index ff2ceb76e43..f13ab17e8ab 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.h
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.h
@@ -41,7 +41,7 @@ public:
   TAO_LRU_Connection_Purging_Strategy (int cache_maximum);
 
   /// The destructor
-  virtual ~TAO_LRU_Connection_Purging_Strategy (void);
+  virtual ~TAO_LRU_Connection_Purging_Strategy ();
 
   /// Called when accessing an item from the cache
   virtual void update_item (TAO_Transport& transport);
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
index 204541e7678..02586bbac00 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -53,7 +53,7 @@ public:
                        TAO_New_Leader_Generator *new_leader_generator = 0);
 
   /// Destructor
-  ~TAO_Leader_Follower (void);
+  ~TAO_Leader_Follower ();
 
   /// The current thread has become a server thread (i.e. called
   /// ORB::run), update any flags and counters.
@@ -61,20 +61,20 @@ public:
 
   /// The current thread is not a server thread anymore, reset any
   /// flags and counters.
-  void reset_event_loop_thread (void);
+  void reset_event_loop_thread ();
 
   /// This thread is going to perform an upcall, it will no longer be
   /// an event loop thread.
-  void set_upcall_thread (void);
+  void set_upcall_thread ();
 
   /// Is there any thread running as a leader?
   bool leader_available () const;
 
   /// A server thread is making a request.
-  void set_client_thread (void);
+  void set_client_thread ();
 
   /// A server thread has finished is making a request.
-  void reset_client_thread (void);
+  void reset_client_thread ();
 
   /// Wait on the Leader/Followers loop until one event happens.
   /**
@@ -112,14 +112,14 @@ public:
   /// Sets the client leader avoidance flag true. This is used with the
   /// noupcall wait strategy to allow the creation of dynamic threads
   /// when possible
-  void set_avoid_client_leader (void);
+  void set_avoid_client_leader ();
 
   /**
    * A leader thread is relinquishing its role, unless there are more
    * leader threads running pick up a follower (if there is any) to
    * play the leader role.
    */
-  int elect_new_leader (void);
+  int elect_new_leader ();
 
   /** @name Follower creation/destruction
    *
@@ -143,7 +143,7 @@ public:
    */
   //@{
   /// Allocate a new follower to the caller.
-  TAO_LF_Follower *allocate_follower (void);
+  TAO_LF_Follower *allocate_follower ();
 
   /// The caller has finished using a follower.
   void release_follower (TAO_LF_Follower *);
@@ -168,7 +168,7 @@ public:
   //@}
 
   /// Get a reference to the underlying mutex
-  TAO_SYNCH_MUTEX &lock (void);
+  TAO_SYNCH_MUTEX &lock ();
 
   /// Provide a pre-initialized reverse lock for the Leader/Followers
   /// set.
@@ -177,16 +177,16 @@ public:
    * running operations.  This helper class simplifies the process of
    * releasing and reacquiring said mutex.
    */
-  ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock (void);
+  ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock ();
 
   /// Check if there are any client threads running
   bool has_clients () const;
 
   /// Accessor to the reactor
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
   /// Called when we are out of leaders.
-  bool no_leaders_available (void);
+  bool no_leaders_available ();
 
   /// Set the new leader generator.
   void set_new_leader_generator(TAO_New_Leader_Generator *new_leader_generator);
@@ -221,7 +221,7 @@ private:
    * that all the pre-conditions are satisfied the Follower set is
    * changed and the promoted Follower is signaled.
    */
-  int elect_new_leader_i (void);
+  int elect_new_leader_i ();
 
   //@}
 
@@ -306,7 +306,7 @@ public:
   TAO_LF_Client_Thread_Helper (TAO_Leader_Follower &leader_follower);
 
   /// Destructor
-  ~TAO_LF_Client_Thread_Helper (void);
+  ~TAO_LF_Client_Thread_Helper ();
 
 private:
   /// Reference to leader/followers object.
@@ -320,7 +320,7 @@ public:
   TAO_LF_Client_Leader_Thread_Helper (TAO_Leader_Follower &leader_follower);
 
   /// Destructor
-  ~TAO_LF_Client_Leader_Thread_Helper (void);
+  ~TAO_LF_Client_Leader_Thread_Helper ();
 
 private:
   /// Reference to leader/followers object.
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h
index e2fc26b31d1..25fac77b6de 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.h
@@ -59,10 +59,10 @@ namespace TAO
     LocateRequest_Invocation_Adapter (CORBA::Object_ptr target);
 
     /// Start the invocation on the target
-    void invoke (void);
+    void invoke ();
 
     /// Accessor to the inconsistent policy list
-    CORBA::PolicyList *get_inconsistent_policies (void);
+    CORBA::PolicyList *get_inconsistent_policies ();
 
   private:
     bool get_timeout (ACE_Time_Value &val);
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index fc999cceccf..62a02f9b2bc 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -40,10 +40,10 @@ class TAO_Export TAO_MCAST_Parser : public TAO_IOR_Parser
 {
 public:
   /// Constructor
-  TAO_MCAST_Parser (void);
+  TAO_MCAST_Parser ();
 
   /// The destructor
-  virtual ~TAO_MCAST_Parser (void);
+  virtual ~TAO_MCAST_Parser ();
 
   /// = The IOR_Parser methods, please read the documentation in
   ///   IOR_Parser.h
diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h
index 2967593191a..1a7ab2cd1f9 100644
--- a/TAO/tao/MMAP_Allocator.h
+++ b/TAO/tao/MMAP_Allocator.h
@@ -45,13 +45,13 @@ class TAO_MMAP_Allocator
 {
 public:
   /// Constructor
-  TAO_MMAP_Allocator (void);
+  TAO_MMAP_Allocator ();
 
   /// Destructor.
-  virtual ~TAO_MMAP_Allocator (void);
+  virtual ~TAO_MMAP_Allocator ();
 
   /// Return backing store handle.
-  ACE_HANDLE handle (void);
+  ACE_HANDLE handle ();
 
   /// Return offset in backing store file for memory address @a p. If @a p
   /// is not coming from this allocator -1 is returned.
diff --git a/TAO/tao/Monitor/Monitor.cpp b/TAO/tao/Monitor/Monitor.cpp
index ea13255cb38..65e54c5ada9 100644
--- a/TAO/tao/Monitor/Monitor.cpp
+++ b/TAO/tao/Monitor/Monitor.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Monitor_Init::TAO_Monitor_Init (void)
+TAO_Monitor_Init::TAO_Monitor_Init ()
 {
 }
 
@@ -52,7 +52,7 @@ TAO_Monitor_Init::create_object (CORBA::ORB_ptr orb,
 // This one is used during static initialization while the other is used
 // when Monitor is a shared library.
 int
-TAO_Monitor_Init::Initializer (void)
+TAO_Monitor_Init::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Monitor_Init);
 }
diff --git a/TAO/tao/Monitor/Monitor.h b/TAO/tao/Monitor/Monitor.h
index b899f7b04ce..4742bdbc52e 100644
--- a/TAO/tao/Monitor/Monitor.h
+++ b/TAO/tao/Monitor/Monitor.h
@@ -33,14 +33,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Monitor_Export TAO_Monitor_Init : public TAO_Object_Loader
 {
 public:
-  TAO_Monitor_Init (void);
+  TAO_Monitor_Init ();
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 //#if defined (TAO_AS_STATIC_LIBS)
diff --git a/TAO/tao/Nested_Upcall_Guard.h b/TAO/tao/Nested_Upcall_Guard.h
index 3673bae0fde..e13950c4b07 100644
--- a/TAO/tao/Nested_Upcall_Guard.h
+++ b/TAO/tao/Nested_Upcall_Guard.h
@@ -61,7 +61,7 @@ namespace TAO
                     "disabling upcalls\n", t->id ()));
     }
 
-    ~Nested_Upcall_Guard (void)
+    ~Nested_Upcall_Guard ()
     {
       if (!this->enable_)
         {
@@ -82,7 +82,7 @@ namespace TAO
     }
 
   private:
-    Nested_Upcall_Guard (void);
+    Nested_Upcall_Guard ();
 
     Nested_Upcall_Guard (const Nested_Upcall_Guard&) = delete;
     Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&) = delete;
diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.h b/TAO/tao/Network_Priority_Protocols_Hooks.h
index dcbc9745b81..d238ad62815 100644
--- a/TAO/tao/Network_Priority_Protocols_Hooks.h
+++ b/TAO/tao/Network_Priority_Protocols_Hooks.h
@@ -41,7 +41,7 @@ class TAO_Export TAO_Network_Priority_Protocols_Hooks
 {
 public:
   /// destructor
-  virtual ~TAO_Network_Priority_Protocols_Hooks (void);
+  virtual ~TAO_Network_Priority_Protocols_Hooks ();
 
   virtual void init_hooks (TAO_ORB_Core *orb_core) = 0;
 
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
index 9560a347fa1..13e11e15785 100644
--- a/TAO/tao/New_Leader_Generator.h
+++ b/TAO/tao/New_Leader_Generator.h
@@ -34,7 +34,7 @@ class TAO_Export TAO_New_Leader_Generator
 {
 public:
   /// Destructor.
-  virtual ~TAO_New_Leader_Generator (void);
+  virtual ~TAO_New_Leader_Generator ();
 
   /// Leader/Follower class uses this method to notify the system that
   /// we are out of leaders.
diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h
index 6efc37b0450..fa8fb0c5beb 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.h
+++ b/TAO/tao/Null_Fragmentation_Strategy.h
@@ -41,7 +41,7 @@ class TAO_Null_Fragmentation_Strategy
 {
 public:
   TAO_Null_Fragmentation_Strategy (void) {}
-  virtual ~TAO_Null_Fragmentation_Strategy (void);
+  virtual ~TAO_Null_Fragmentation_Strategy ();
   virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong);
 
 private:
diff --git a/TAO/tao/ORB_Time_Policy.h b/TAO/tao/ORB_Time_Policy.h
index 0c2ca82c860..716144fa011 100644
--- a/TAO/tao/ORB_Time_Policy.h
+++ b/TAO/tao/ORB_Time_Policy.h
@@ -42,7 +42,7 @@ namespace TAO
     ACE_Time_Value operator() () const;
 
     static void set_time_policy (ACE_Dynamic_Time_Policy_Base const * pol);
-    static void reset_time_policy (void);
+    static void reset_time_policy ();
 
   private:
     static ACE_Time_Policy_T<ACE_Default_Time_Policy> default_policy_;
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index fa7b87bf276..74c4e0893cd 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -25,7 +25,7 @@ namespace TAO
   }
 
   int
-  ORT_Adapter_Factory_Impl::Initializer (void)
+  ORT_Adapter_Factory_Impl::Initializer ()
   {
     TAO_Root_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory");
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index 2be657f40e6..bb706f1b024 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -47,7 +47,7 @@ namespace TAO
     virtual void destroy (TAO::ORT_Adapter * adapter);
 
     /// Used to force the initialization of the code.
-    static int Initializer (void);
+    static int Initializer ();
   };
 }
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index f37408a2986..ecdfb1afed6 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -7,21 +7,21 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
-TAO::ORT_Adapter_Impl::tao_server_id (void)
+TAO::ORT_Adapter_Impl::tao_server_id ()
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->server_id ();
 }
 
 char *
-TAO::ORT_Adapter_Impl::tao_orb_id (void)
+TAO::ORT_Adapter_Impl::tao_orb_id ()
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->orb_id ();
 }
 
 PortableInterceptor::AdapterName *
-TAO::ORT_Adapter_Impl::tao_adapter_name (void)
+TAO::ORT_Adapter_Impl::tao_adapter_name ()
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->adapter_name ();
@@ -35,7 +35,7 @@ TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
-TAO::ORT_Adapter_Impl::get_adapter_template (void)
+TAO::ORT_Adapter_Impl::get_adapter_template ()
 {
   CORBA::add_ref (this->ort_template_.in ());
 
@@ -43,7 +43,7 @@ TAO::ORT_Adapter_Impl::get_adapter_template (void)
 }
 
 PortableInterceptor::ObjectReferenceFactory *
-TAO::ORT_Adapter_Impl::get_obj_ref_factory (void)
+TAO::ORT_Adapter_Impl::get_obj_ref_factory ()
 {
   CORBA::add_ref (this->ort_factory_.in ());
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index a50ebd49468..e447c6fb066 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -44,10 +44,10 @@ namespace TAO
                           PortableServer::POA_ptr poa);
 
     /// Accessor methods to ObjectReferenceTemplate template
-    virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
+    virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template ();
 
     /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-    virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
+    virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory ();
 
     /// Set a different ort_factory to be used.
     virtual int set_obj_ref_factory (
@@ -63,11 +63,11 @@ namespace TAO
      * Methods
      */
     //@{
-    virtual char * tao_server_id (void);
+    virtual char * tao_server_id ();
 
-    virtual char * tao_orb_id (void);
+    virtual char * tao_orb_id ();
 
-    virtual PortableInterceptor::AdapterName * tao_adapter_name (void);
+    virtual PortableInterceptor::AdapterName * tao_adapter_name ();
     //@}
 
     /**
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index f056136bd08..ca21f06d662 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -20,12 +20,12 @@ namespace TAO
   {
   }
 
-  ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+  ObjectReferenceTemplate::~ObjectReferenceTemplate ()
   {
   }
 
   ::CORBA::ValueBase *
-  ObjectReferenceTemplate::_copy_value (void)
+  ObjectReferenceTemplate::_copy_value ()
   {
     ::CORBA::ValueBase *ret_val= 0;
     ACE_NEW_THROW_EX (
@@ -42,19 +42,19 @@ namespace TAO
   }
 
   char *
-  ObjectReferenceTemplate::server_id (void)
+  ObjectReferenceTemplate::server_id ()
   {
     return CORBA::string_dup (this->server_id_);
   }
 
   char *
-  ObjectReferenceTemplate::orb_id (void)
+  ObjectReferenceTemplate::orb_id ()
   {
     return CORBA::string_dup (this->orb_id_);
   }
 
   PortableInterceptor::AdapterName *
-  ObjectReferenceTemplate::adapter_name (void)
+  ObjectReferenceTemplate::adapter_name ()
   {
     PortableInterceptor::AdapterName *adapter_name = 0;
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index ac8a30f5e59..ce424be95cb 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -58,7 +58,7 @@ namespace TAO
                              const char *orb_id,
                              PortableInterceptor::AdapterName *adapter_name,
                              PortableServer::POA_ptr poa);
-    ::CORBA::ValueBase *_copy_value (void);
+    ::CORBA::ValueBase *_copy_value ();
 
     /**
      * @name PortableInterceptor::ObjectReferenceTemplate Methods
@@ -67,11 +67,11 @@ namespace TAO
      * PortableInterceptor::ObjectReferenceTemplate ValueType.
      */
     //@{
-    virtual char * server_id (void);
+    virtual char * server_id ();
 
-    virtual char * orb_id (void);
+    virtual char * orb_id ();
 
-    virtual PortableInterceptor::AdapterName * adapter_name (void);
+    virtual PortableInterceptor::AdapterName * adapter_name ();
     //@}
 
     /**
@@ -92,7 +92,7 @@ namespace TAO
      * Protected destructor to enforce proper memory management via
      * reference counting.
      */
-    ~ObjectReferenceTemplate (void);
+    ~ObjectReferenceTemplate ();
 
   private:
     const char *server_id_;
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index 85db86a0193..e4a318e7db2 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -51,7 +51,7 @@ TAO::In_Object_Argument_Cloner_T<S_ptr>::release (S_ptr objref)
 
 template<typename S_ptr,
          template <typename> class Insert_Policy>
-TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Argument_T (void)
+TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -62,7 +62,7 @@ TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Arg
 template<typename S_ptr,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::clone (void)
+TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::clone ()
 {
   In_Object_Argument_Cloner_T<S_ptr>::duplicate (this->x_);
 
diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.h b/TAO/tao/On_Demand_Fragmentation_Strategy.h
index a695f89f735..4005603e825 100644
--- a/TAO/tao/On_Demand_Fragmentation_Strategy.h
+++ b/TAO/tao/On_Demand_Fragmentation_Strategy.h
@@ -46,7 +46,7 @@ public:
   TAO_On_Demand_Fragmentation_Strategy (TAO_Transport * transport,
                                         ACE_CDR::ULong max_message_size);
 
-  virtual ~TAO_On_Demand_Fragmentation_Strategy (void);
+  virtual ~TAO_On_Demand_Fragmentation_Strategy ();
   virtual int fragment (TAO_OutputCDR & cdr,
                         ACE_CDR::ULong pending_alignment,
                         ACE_CDR::ULong pending_length);
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 1fd298a8791..929797f21c1 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   template <typename InterceptorType, typename DetailsType>
-  Interceptor_List<InterceptorType,DetailsType>::Interceptor_List (void)
+  Interceptor_List<InterceptorType,DetailsType>::Interceptor_List ()
   {
   }
 
diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h
index 5770b261738..41a4adc1a5d 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -37,7 +37,7 @@ class TAO_Policy_Current
 {
 public:
   /// Constructor
-  TAO_Policy_Current (void);
+  TAO_Policy_Current ();
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 97a2fea0484..382ec780394 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -37,7 +37,7 @@ class TAO_Policy_Manager
 {
 public:
   /// constructor
-  TAO_Policy_Manager (void);
+  TAO_Policy_Manager ();
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index aa81eff08c6..c052494c862 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory(void)
+TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory()
 {
 }
 
@@ -24,7 +24,7 @@ TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& )
 
 
 int
-TAO_Acceptor_Filter_Factory::initialize (void)
+TAO_Acceptor_Filter_Factory::initialize ()
 {
   return ACE_Service_Config::process_directive
     (ace_svc_desc_TAO_Acceptor_Filter_Factory);
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index e7e9478d11d..9f626b82f58 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -322,7 +322,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
 #endif /* TAO_HAS_MONITOR_POINTS==1 */
 }
 
-TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
+TAO_Active_Object_Map::~TAO_Active_Object_Map ()
 {
   user_id_map::iterator iterator = this->user_id_map_->begin ();
   user_id_map::iterator end = this->user_id_map_->end ();
@@ -377,7 +377,7 @@ TAO_Active_Object_Map::is_user_id_in_map (
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy (void)
+TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy ()
 {
 }
 
@@ -790,7 +790,7 @@ TAO_Multiple_Id_Strategy::remaining_activations (
 }
 #endif
 
-TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy (void)
+TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy ()
 {
 }
 
@@ -913,7 +913,7 @@ TAO_Active_Object_Map_Entry *&entry)
 }
 #endif
 
-TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy (void)
+TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy ()
 {
 }
 
@@ -1071,7 +1071,7 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy (void)
+TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy ()
 {
 }
 
@@ -1082,7 +1082,7 @@ TAO_Active_Hint_Strategy::TAO_Active_Hint_Strategy (CORBA::ULong map_size)
 {
 }
 
-TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy (void)
+TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy ()
 {
 }
 
@@ -1118,7 +1118,7 @@ TAO_Active_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
 }
 
 size_t
-TAO_Active_Hint_Strategy::hint_size (void)
+TAO_Active_Hint_Strategy::hint_size ()
 {
   return ACE_Active_Map_Manager_Key::size ();
 }
@@ -1135,7 +1135,7 @@ TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy (void)
+TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy ()
 {
 }
 
@@ -1172,7 +1172,7 @@ TAO_No_Hint_Strategy::find (const PortableServer::ObjectId &,
 }
 
 size_t
-TAO_No_Hint_Strategy::hint_size (void)
+TAO_No_Hint_Strategy::hint_size ()
 {
   return 0;
 }
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
index 84d938be575..1baf0f276a8 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
+TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry ()
   : user_id_ (),
     system_id_ (),
     servant_ (0),
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index 420560c0019..b8e8a753010 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -38,7 +38,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    Active_Policy_Strategies::Active_Policy_Strategies (void)
+    Active_Policy_Strategies::Active_Policy_Strategies ()
       : thread_strategy_ (0),
         request_processing_strategy_ (0),
         id_assignment_strategy_ (0),
@@ -162,7 +162,7 @@ namespace TAO
     }
 
     void
-    Active_Policy_Strategies::cleanup (void)
+    Active_Policy_Strategies::cleanup ()
     {
       if (this->lifespan_strategy_ != 0)
         {
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
index 9b682bd4bbd..1dbd80cbcb7 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -39,7 +39,7 @@ namespace TAO
   class In_BD_String_SArgument_T : public InArgument
   {
   public:
-    In_BD_String_SArgument_T (void);
+    In_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
@@ -63,14 +63,14 @@ namespace TAO
   class Inout_BD_String_SArgument_T : public InoutArgument
   {
   public:
-    Inout_BD_String_SArgument_T (void);
+    Inout_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     S_var x_;
@@ -88,13 +88,13 @@ namespace TAO
   class Out_BD_String_SArgument_T : public OutArgument
   {
   public:
-    Out_BD_String_SArgument_T (void);
+    Out_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     S_var x_;
@@ -112,13 +112,13 @@ namespace TAO
   class Ret_BD_String_SArgument_T : public RetArgument
   {
   public:
-    Ret_BD_String_SArgument_T (void);
+    Ret_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
index c33fc01d4f9..8d5105e2d01 100644
--- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
+++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-Collocated_Arguments_Converter::~Collocated_Arguments_Converter (void)
+Collocated_Arguments_Converter::~Collocated_Arguments_Converter ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h
index e72993a27d4..caf6aecabe8 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.h
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.h
@@ -56,14 +56,14 @@ namespace TAO
   class Inout_Vector_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Vector_SArgument_T (void);
+    Inout_Vector_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S x_;
@@ -81,13 +81,13 @@ namespace TAO
   class Out_Vector_SArgument_T : public OutArgument
   {
   public:
-    Out_Vector_SArgument_T (void);
+    Out_Vector_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S x_;
@@ -105,13 +105,13 @@ namespace TAO
   class Ret_Vector_SArgument_T : public RetArgument
   {
   public:
-    Ret_Vector_SArgument_T (void);
+    Ret_Vector_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S x_;
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 3c7194de2ec..673f8ebf8a8 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -79,7 +79,7 @@ namespace CORBA
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    ~Principal (void);
+    ~Principal ();
 
   private:
     // = Prevent copying
diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h
index 64ebaa20966..56cd91973f1 100644
--- a/TAO/tao/Protocol_Factory.h
+++ b/TAO/tao/Protocol_Factory.h
@@ -33,7 +33,7 @@ class TAO_Export TAO_Protocol_Factory : public ACE_Service_Object
 {
 public:
   TAO_Protocol_Factory (CORBA::ULong tag);
-  virtual ~TAO_Protocol_Factory (void);
+  virtual ~TAO_Protocol_Factory ();
 
   /// Initialization hook.
   virtual int init (int argc, ACE_TCHAR *argv[]) = 0;
diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index b65474c89fa..237cbfcc168 100644
--- a/TAO/tao/QtResource/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -13,7 +13,7 @@ namespace TAO
   }
 
   ACE_Reactor_Impl *
-  QtResource_Factory::reactor_impl (void)
+  QtResource_Factory::reactor_impl ()
   {    // synchronized by external locks
     if (this->qapp_ == 0)
       {
diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h
index 6540d2a70c8..2e830608688 100644
--- a/TAO/tao/QtResource/QtResource_Factory.h
+++ b/TAO/tao/QtResource/QtResource_Factory.h
@@ -44,7 +44,7 @@ namespace TAO
 
   protected:
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/QtResource/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
index 284077df372..8d542cc3f56 100644
--- a/TAO/tao/QtResource/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource/QtResource_Loader.cpp
@@ -16,7 +16,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory (tmp);
   }
 
-  QtResource_Loader::~QtResource_Loader (void)
+  QtResource_Loader::~QtResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/QtResource/QtResource_Loader.h b/TAO/tao/QtResource/QtResource_Loader.h
index 807fa57f301..da86625cfdc 100644
--- a/TAO/tao/QtResource/QtResource_Loader.h
+++ b/TAO/tao/QtResource/QtResource_Loader.h
@@ -52,7 +52,7 @@ namespace TAO
   {
   public:
     QtResource_Loader (QApplication *qapp);
-    virtual ~QtResource_Loader (void);
+    virtual ~QtResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index 7a934b81b81..093c3e4ab62 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -78,7 +78,7 @@ public:
                       bool is_heap_allocated = false);
 
   /// Destructor
-  virtual ~TAO_Queued_Message (void);
+  virtual ~TAO_Queued_Message ();
 
   /** @name Intrusive list manipulation
    *
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index 02e60c76f7b..549c2423320 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -13,7 +13,7 @@ TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
 {
 }
 
-TAO_Continuous_Priority_Mapping::~TAO_Continuous_Priority_Mapping (void)
+TAO_Continuous_Priority_Mapping::~TAO_Continuous_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
index ebea5fae814..1e4e0ae1ece 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
@@ -53,7 +53,7 @@ public:
   TAO_Continuous_Priority_Mapping (int policy = ACE_SCHED_OTHER);
 
   /// Destructor.
-  ~TAO_Continuous_Priority_Mapping (void);
+  ~TAO_Continuous_Priority_Mapping ();
 
   /// Convert CORBA priority to native priority.
   CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index 5c48e423064..1544d4cefcb 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -11,7 +11,7 @@ TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
 {
 }
 
-TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping (void)
+TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
index 3d6137a8583..0e3ba63cac4 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -40,7 +40,7 @@ public:
   TAO_Direct_Priority_Mapping (long);
 
   /// The destructor
-  virtual ~TAO_Direct_Priority_Mapping (void);
+  virtual ~TAO_Direct_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index 102c44a7c35..f88834ace70 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -16,7 +16,7 @@ TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
 {
 }
 
-TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void)
+TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
index f8656457b86..dc8216294f2 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -47,7 +47,7 @@ public:
   TAO_Linear_Priority_Mapping (long policy);
 
   /// The destructor
-  virtual ~TAO_Linear_Priority_Mapping (void);
+  virtual ~TAO_Linear_Priority_Mapping ();
 
   virtual CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
                                     RTCORBA::NativePriority &native_priority);
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index 2e0736adb61..9cb022112f0 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -62,7 +62,7 @@ TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (
     }
 }
 
-TAO_Multi_Priority_Mapping::~TAO_Multi_Priority_Mapping (void)
+TAO_Multi_Priority_Mapping::~TAO_Multi_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
index 13293774a73..a80c533cb50 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
@@ -59,7 +59,7 @@ public:
                               int policy = ACE_SCHED_FIFO);
 
   /// The destructor
-  virtual ~TAO_Multi_Priority_Mapping (void);
+  virtual ~TAO_Multi_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
index 725fccc42bd..a950f69fee3 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping (void)
+TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
index 94ac1a3df4d..1e25f8d2c27 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
@@ -39,7 +39,7 @@ class TAO_RTCORBA_Export TAO_Network_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_Network_Priority_Mapping (void);
+  virtual ~TAO_Network_Priority_Mapping ();
 
   virtual CORBA::Boolean
     to_network (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index 1f8add11c64..419f43b2f3b 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -53,7 +53,7 @@ public:
   void mapping (RTCORBA::NetworkPriorityMapping * mapping);
 
   ///
-  RTCORBA::NetworkPriorityMapping *mapping (void);
+  RTCORBA::NetworkPriorityMapping *mapping ();
 
 public:
   typedef TAO_Network_Priority_Mapping_Manager_ptr _ptr_type;
@@ -75,7 +75,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  ~TAO_Network_Priority_Mapping_Manager (void);
+  ~TAO_Network_Priority_Mapping_Manager ();
 
 private:
   TAO_Network_Priority_Mapping_Manager (const TAO_Network_Priority_Mapping_Manager &);
@@ -102,16 +102,16 @@ public:
   operator const TAO_Network_Priority_Mapping_Manager_ptr &() const;
   operator TAO_Network_Priority_Mapping_Manager_ptr &();
   TAO_Network_Priority_Mapping_Manager_ptr in () const;
-  TAO_Network_Priority_Mapping_Manager_ptr &inout (void);
-  TAO_Network_Priority_Mapping_Manager_ptr &out (void);
-  TAO_Network_Priority_Mapping_Manager_ptr _retn (void);
+  TAO_Network_Priority_Mapping_Manager_ptr &inout ();
+  TAO_Network_Priority_Mapping_Manager_ptr &out ();
+  TAO_Network_Priority_Mapping_Manager_ptr _retn ();
   TAO_Network_Priority_Mapping_Manager_ptr ptr () const;
 
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static TAO_Network_Priority_Mapping_Manager_ptr duplicate (TAO_Network_Priority_Mapping_Manager_ptr);
   static void release (TAO_Network_Priority_Mapping_Manager_ptr);
-  static TAO_Network_Priority_Mapping_Manager_ptr nil (void);
+  static TAO_Network_Priority_Mapping_Manager_ptr nil ();
   static TAO_Network_Priority_Mapping_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
@@ -131,8 +131,8 @@ public:
   TAO_Network_Priority_Mapping_Manager_out &operator= (const TAO_Network_Priority_Mapping_Manager_var &);
   TAO_Network_Priority_Mapping_Manager_out &operator= (TAO_Network_Priority_Mapping_Manager_ptr);
   operator TAO_Network_Priority_Mapping_Manager_ptr &();
-  TAO_Network_Priority_Mapping_Manager_ptr &ptr (void);
-  TAO_Network_Priority_Mapping_Manager_ptr operator-> (void);
+  TAO_Network_Priority_Mapping_Manager_ptr &ptr ();
+  TAO_Network_Priority_Mapping_Manager_ptr operator-> ();
 
 private:
   TAO_Network_Priority_Mapping_Manager_ptr &ptr_;
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
index c44c70f710f..8e19cbae2a4 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Priority_Mapping::~TAO_Priority_Mapping (void)
+TAO_Priority_Mapping::~TAO_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h
index ded2cf34df0..3dad6c4742c 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping.h
@@ -38,7 +38,7 @@ class TAO_RTCORBA_Export TAO_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_Priority_Mapping (void);
+  virtual ~TAO_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index cc64c8f81cd..6e275c7aee0 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
+TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager ()
 {
   delete this->mapping_;
 }
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 74c6cf04d38..23d56faba1e 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -50,7 +50,7 @@ public:
   void mapping (RTCORBA::PriorityMapping * mapping);
 
   ///
-  RTCORBA::PriorityMapping *mapping (void);
+  RTCORBA::PriorityMapping *mapping ();
 
 public:
   typedef TAO_Priority_Mapping_Manager_ptr _ptr_type;
@@ -97,16 +97,16 @@ public:
   operator const TAO_Priority_Mapping_Manager_ptr &() const;
   operator TAO_Priority_Mapping_Manager_ptr &();
   TAO_Priority_Mapping_Manager_ptr in () const;
-  TAO_Priority_Mapping_Manager_ptr &inout (void);
-  TAO_Priority_Mapping_Manager_ptr &out (void);
-  TAO_Priority_Mapping_Manager_ptr _retn (void);
+  TAO_Priority_Mapping_Manager_ptr &inout ();
+  TAO_Priority_Mapping_Manager_ptr &out ();
+  TAO_Priority_Mapping_Manager_ptr _retn ();
   TAO_Priority_Mapping_Manager_ptr ptr () const;
 
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static TAO_Priority_Mapping_Manager_ptr duplicate (TAO_Priority_Mapping_Manager_ptr);
   static void release (TAO_Priority_Mapping_Manager_ptr);
-  static TAO_Priority_Mapping_Manager_ptr nil (void);
+  static TAO_Priority_Mapping_Manager_ptr nil ();
   static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
@@ -126,8 +126,8 @@ public:
   TAO_Priority_Mapping_Manager_out &operator= (const TAO_Priority_Mapping_Manager_var &);
   TAO_Priority_Mapping_Manager_out &operator= (TAO_Priority_Mapping_Manager_ptr);
   operator TAO_Priority_Mapping_Manager_ptr &();
-  TAO_Priority_Mapping_Manager_ptr &ptr (void);
-  TAO_Priority_Mapping_Manager_ptr operator-> (void);
+  TAO_Priority_Mapping_Manager_ptr &ptr ();
+  TAO_Priority_Mapping_Manager_ptr operator-> ();
 
 private:
   TAO_Priority_Mapping_Manager_ptr &ptr_;
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
index 3cb27c57f13..26884e809a2 100644
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBA.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void)
+TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_ORB_Loader);
 }
diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h
index a4815f7f130..6a1cbcd8ddb 100644
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ b/TAO/tao/RTCORBA/RTCORBA.h
@@ -32,7 +32,7 @@ class TAO_RTCORBA_Export TAO_RTCORBA_Initializer
 {
 public:
   // Constructor.
-  TAO_RTCORBA_Initializer (void);
+  TAO_RTCORBA_Initializer ();
 };
 
 static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer;
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 5c6afe6f9f6..b38ba801416 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -18,12 +18,12 @@ TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_RT_Current::~TAO_RT_Current (void)
+TAO_RT_Current::~TAO_RT_Current ()
 {
 }
 
 RTCORBA::Priority
-TAO_RT_Current::the_priority (void)
+TAO_RT_Current::the_priority ()
 {
   TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
 
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index db2fec18854..5c2b2991336 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -46,14 +46,14 @@ public:
   /// Default constructor.
   TAO_RT_Current (TAO_ORB_Core *orb_core);
 
-  virtual RTCORBA::Priority the_priority (void);
+  virtual RTCORBA::Priority the_priority ();
 
   virtual void the_priority (RTCORBA::Priority the_priority);
 
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_RT_Current (void);
+  virtual ~TAO_RT_Current ();
 
 private:
   /// ORB Core that owns us.
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index b4bdd788a0f..1b7deda9394 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -12,19 +12,19 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
+RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory ()
 {
   ACE_NEW (this->rt_invocation_endpoint_selector_,
            TAO_RT_Invocation_Endpoint_Selector);
 }
 
-RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
+RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory ()
 {
   delete this->rt_invocation_endpoint_selector_;
 }
 
 TAO_Invocation_Endpoint_Selector *
-RT_Endpoint_Selector_Factory::get_selector (void)
+RT_Endpoint_Selector_Factory::get_selector ()
 {
   return this->rt_invocation_endpoint_selector_;
 }
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
index c3caeb1125b..6f57d85ffd8 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -52,12 +52,12 @@ class TAO_RTCORBA_Export RT_Endpoint_Selector_Factory
 {
 public:
   /// Constructor.
-  RT_Endpoint_Selector_Factory (void);
+  RT_Endpoint_Selector_Factory ();
 
   /// Destructor.
-  virtual ~RT_Endpoint_Selector_Factory (void);
+  virtual ~RT_Endpoint_Selector_Factory ();
 
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 private:
   void operator= (const RT_Endpoint_Selector_Factory &);
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 157b5747100..5bc6f820f21 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -8,19 +8,19 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Mutex::~TAO_RT_Mutex (void)
+TAO_RT_Mutex::~TAO_RT_Mutex ()
 {
 }
 
 void
-TAO_RT_Mutex::lock (void)
+TAO_RT_Mutex::lock ()
 {
   if (this->mu_.acquire () != 0)
     throw ::CORBA::INTERNAL ();
 }
 
 void
-TAO_RT_Mutex::unlock (void)
+TAO_RT_Mutex::unlock ()
 {
   if (this->mu_.release () != 0)
     throw ::CORBA::INTERNAL ();
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index 14e431e57fd..4e74854dc3f 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -51,10 +51,10 @@ class TAO_RTCORBA_Export TAO_RT_Mutex
 {
 public:
   /// Acquire the lock.
-  virtual void lock (void);
+  virtual void lock ();
 
   /// Release the lock.
-  virtual void unlock (void);
+  virtual void unlock ();
 
   /**
    * Acquire the lock, but only wait up to @a max_wait time.  Note
@@ -68,7 +68,7 @@ public:
   virtual const char *name () const;
 
   /// Destructor.
-  virtual ~TAO_RT_Mutex (void);
+  virtual ~TAO_RT_Mutex ();
 
 protected:
   /// Synchronization lock.
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 3a2229b58e3..5fccc10a95f 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -36,12 +36,12 @@ TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core,
     &rt_thread_lane_resources_manager->tp_manager ();
 }
 
-TAO_RT_ORB::~TAO_RT_ORB (void)
+TAO_RT_ORB::~TAO_RT_ORB ()
 {
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::create_mutex (void)
+TAO_RT_ORB::create_mutex ()
 {
   return this->mutex_mgr_.create_mutex ();
 }
@@ -68,16 +68,16 @@ TAO_RT_ORB::open_named_mutex (const char *name)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Named_RT_Mutex_Manager::TAO_Named_RT_Mutex_Manager (void)
+TAO_Named_RT_Mutex_Manager::TAO_Named_RT_Mutex_Manager ()
 {
 }
 
-TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
+TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager ()
 {
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_mutex (void)
+TAO_Named_RT_Mutex_Manager::create_mutex ()
 {
   TAO_RT_Mutex *mutex = 0;
   ACE_NEW_THROW_EX (mutex,
@@ -390,7 +390,7 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
-TAO_RT_ORB::create_private_connection_policy (void)
+TAO_RT_ORB::create_private_connection_policy ()
 {
   TAO_PrivateConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index d0d4f4832fb..5dde632573c 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -48,12 +48,12 @@ class TAO_RTCORBA_Export TAO_Named_RT_Mutex_Manager
 {
 public:
   /// Constructor.
-  TAO_Named_RT_Mutex_Manager (void);
+  TAO_Named_RT_Mutex_Manager ();
 
   /// Destructor.
-  ~TAO_Named_RT_Mutex_Manager (void);
+  ~TAO_Named_RT_Mutex_Manager ();
 
-  RTCORBA::Mutex_ptr create_mutex (void);
+  RTCORBA::Mutex_ptr create_mutex ();
 
   void destroy_mutex (RTCORBA::Mutex_ptr the_mutex);
 
@@ -101,7 +101,7 @@ public:
    * consistant priority inheritance/piority ceiling semantics
    * can be guaranteed.
    */
-  virtual RTCORBA::Mutex_ptr create_mutex (void);
+  virtual RTCORBA::Mutex_ptr create_mutex ();
 
   /**
    * Destroy a mutex.  Currently this is a no-op since RTCORBA::Mutex
@@ -208,7 +208,7 @@ public:
    * to the server.
    */
   virtual RTCORBA::PrivateConnectionPolicy_ptr
-  create_private_connection_policy (void);
+  create_private_connection_policy ();
 
   /**
    * Create a ServerProtocolPolicy instance to select and configure
@@ -250,7 +250,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_RT_ORB (void);
+  virtual ~TAO_RT_ORB ();
 
 protected:
   /// Reference to our creating ORB Core.
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 5e2f2cc3ff2..d42b9b2a339 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -13,12 +13,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
+TAO_RT_ORB_Loader::TAO_RT_ORB_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void)
+TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h
index 45a1fce61cc..712f777ea17 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.h
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h
@@ -34,10 +34,10 @@ class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_RT_ORB_Loader (void);
+  TAO_RT_ORB_Loader ();
 
   /// Destructor.
-  virtual ~TAO_RT_ORB_Loader (void);
+  virtual ~TAO_RT_ORB_Loader ();
 
   /// Initialize the RT ORB loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 5616f392b75..ebe65f7c2eb 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -35,13 +35,13 @@ TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy
 {
 }
 
-TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (void)
+TAO_PriorityModelPolicy::TAO_PriorityModelPolicy ()
   : priority_model_ (RTCORBA::SERVER_DECLARED),
     server_priority_ (0)
 {
 }
 
-TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void)
+TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy ()
 {
 }
 
@@ -57,31 +57,31 @@ TAO_PriorityModelPolicy::create (const CORBA::Any &)
 }
 
 RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::get_priority_model (void)
+TAO_PriorityModelPolicy::get_priority_model ()
 {
   return this->priority_model_;
 }
 
 RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::priority_model (void)
+TAO_PriorityModelPolicy::priority_model ()
 {
   return this->priority_model_;
 }
 
 RTCORBA::Priority
-TAO_PriorityModelPolicy::server_priority (void)
+TAO_PriorityModelPolicy::server_priority ()
 {
   return this->server_priority_;
 }
 
 CORBA::PolicyType
-TAO_PriorityModelPolicy::policy_type (void)
+TAO_PriorityModelPolicy::policy_type ()
 {
   return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityModelPolicy::copy (void)
+TAO_PriorityModelPolicy::copy ()
 {
   TAO_PriorityModelPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -93,7 +93,7 @@ TAO_PriorityModelPolicy::copy (void)
 }
 
 void
-TAO_PriorityModelPolicy::destroy (void)
+TAO_PriorityModelPolicy::destroy ()
 {
 }
 
@@ -151,7 +151,7 @@ TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs)
 {
 }
 
-TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void)
+TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy ()
 {
 }
 
@@ -172,19 +172,19 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::ThreadpoolId
-TAO_ThreadpoolPolicy::threadpool (void)
+TAO_ThreadpoolPolicy::threadpool ()
 {
   return this->id_;
 }
 
 CORBA::PolicyType
-TAO_ThreadpoolPolicy::policy_type (void)
+TAO_ThreadpoolPolicy::policy_type ()
 {
   return RTCORBA::THREADPOOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ThreadpoolPolicy::copy (void)
+TAO_ThreadpoolPolicy::copy ()
 {
   TAO_ThreadpoolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -196,7 +196,7 @@ TAO_ThreadpoolPolicy::copy (void)
 }
 
 void
-TAO_ThreadpoolPolicy::destroy (void)
+TAO_ThreadpoolPolicy::destroy ()
 {
 }
 
@@ -215,7 +215,7 @@ TAO_ThreadpoolPolicy::_tao_scope () const
 
 // ****************************************************************
 
-TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (void)
+TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , RTCORBA::PrivateConnectionPolicy ()
@@ -231,7 +231,7 @@ TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (const TAO_PrivateConne
 {
 }
 
-TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
+TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy ()
 {
 }
 
@@ -248,13 +248,13 @@ TAO_PrivateConnectionPolicy::create (const CORBA::Any &)
 }
 
 CORBA::PolicyType
-TAO_PrivateConnectionPolicy::policy_type (void)
+TAO_PrivateConnectionPolicy::policy_type ()
 {
   return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::copy (void)
+TAO_PrivateConnectionPolicy::copy ()
 {
   TAO_PrivateConnectionPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -266,7 +266,7 @@ TAO_PrivateConnectionPolicy::copy (void)
 }
 
 void
-TAO_PrivateConnectionPolicy::destroy (void)
+TAO_PrivateConnectionPolicy::destroy ()
 {
 }
 
@@ -304,11 +304,11 @@ TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const TA
 {
 }
 
-TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (void)
+TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy ()
 {
 }
 
-TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void)
+TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy ()
 {
 }
 
@@ -329,7 +329,7 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::PriorityBands *
-TAO_PriorityBandedConnectionPolicy::priority_bands (void)
+TAO_PriorityBandedConnectionPolicy::priority_bands ()
 {
   RTCORBA::PriorityBands *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -341,13 +341,13 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (void)
 }
 
 CORBA::PolicyType
-TAO_PriorityBandedConnectionPolicy::policy_type (void)
+TAO_PriorityBandedConnectionPolicy::policy_type ()
 {
   return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityBandedConnectionPolicy::copy (void)
+TAO_PriorityBandedConnectionPolicy::copy ()
 {
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -359,7 +359,7 @@ TAO_PriorityBandedConnectionPolicy::copy (void)
 }
 
 void
-TAO_PriorityBandedConnectionPolicy::destroy (void)
+TAO_PriorityBandedConnectionPolicy::destroy ()
 {
 }
 
@@ -389,7 +389,7 @@ TAO_PriorityBandedConnectionPolicy::_tao_scope () const
 }
 
 RTCORBA::PriorityBands &
-TAO_PriorityBandedConnectionPolicy::priority_bands_rep (void)
+TAO_PriorityBandedConnectionPolicy::priority_bands_rep ()
 {
   return this->priority_bands_;
 }
@@ -414,7 +414,7 @@ TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const TAO_ServerProtocolPoli
 {
 }
 
-TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void)
+TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy ()
 {
 }
 
@@ -435,7 +435,7 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::ProtocolList *
-TAO_ServerProtocolPolicy::protocols (void)
+TAO_ServerProtocolPolicy::protocols ()
 {
   RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -447,13 +447,13 @@ TAO_ServerProtocolPolicy::protocols (void)
 }
 
 CORBA::PolicyType
-TAO_ServerProtocolPolicy::policy_type (void)
+TAO_ServerProtocolPolicy::policy_type ()
 {
   return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ServerProtocolPolicy::copy (void)
+TAO_ServerProtocolPolicy::copy ()
 {
   TAO_ServerProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -465,7 +465,7 @@ TAO_ServerProtocolPolicy::copy (void)
 }
 
 void
-TAO_ServerProtocolPolicy::destroy (void)
+TAO_ServerProtocolPolicy::destroy ()
 {
 }
 
@@ -483,14 +483,14 @@ TAO_ServerProtocolPolicy::_tao_scope () const
 }
 
 RTCORBA::ProtocolList &
-TAO_ServerProtocolPolicy::protocols_rep (void)
+TAO_ServerProtocolPolicy::protocols_rep ()
 {
   return protocols_;
 }
 
 // ****************************************************************
 
-TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (void)
+TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy ()
 {
 }
 
@@ -534,7 +534,7 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::ProtocolList *
-TAO_ClientProtocolPolicy::protocols (void)
+TAO_ClientProtocolPolicy::protocols ()
 {
   RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -546,13 +546,13 @@ TAO_ClientProtocolPolicy::protocols (void)
 }
 
 CORBA::PolicyType
-TAO_ClientProtocolPolicy::policy_type (void)
+TAO_ClientProtocolPolicy::policy_type ()
 {
   return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ClientProtocolPolicy::copy (void)
+TAO_ClientProtocolPolicy::copy ()
 {
   TAO_ClientProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -564,7 +564,7 @@ TAO_ClientProtocolPolicy::copy (void)
 }
 
 void
-TAO_ClientProtocolPolicy::destroy (void)
+TAO_ClientProtocolPolicy::destroy ()
 {
 }
 
@@ -636,7 +636,7 @@ TAO_ClientProtocolPolicy::_tao_decode (TAO_InputCDR &in_cdr)
 }
 
 RTCORBA::ProtocolList &
-TAO_ClientProtocolPolicy::protocols_rep (void)
+TAO_ClientProtocolPolicy::protocols_rep ()
 {
   return protocols_;
 }
@@ -658,12 +658,12 @@ TAO_TCP_Protocol_Properties::TAO_TCP_Protocol_Properties (CORBA::Long send_buffe
 {
 }
 
-TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void)
+TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties ()
 {
 }
 
 CORBA::Long
-TAO_TCP_Protocol_Properties::send_buffer_size (void)
+TAO_TCP_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -675,7 +675,7 @@ TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size)
 }
 
 CORBA::Long
-TAO_TCP_Protocol_Properties::recv_buffer_size (void)
+TAO_TCP_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -687,7 +687,7 @@ TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size)
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::keep_alive (void)
+TAO_TCP_Protocol_Properties::keep_alive ()
 {
   return this->keep_alive_;
 }
@@ -699,7 +699,7 @@ TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive)
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::dont_route (void)
+TAO_TCP_Protocol_Properties::dont_route ()
 {
   return this->dont_route_;
 }
@@ -710,7 +710,7 @@ TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route)
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void)
+CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay ()
 {
   return this->no_delay_;
 }
@@ -722,7 +722,7 @@ TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay)
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::enable_network_priority (void)
+TAO_TCP_Protocol_Properties::enable_network_priority ()
 {
   return this->enable_network_priority_;
 }
@@ -771,12 +771,12 @@ TAO_UnixDomain_Protocol_Properties::TAO_UnixDomain_Protocol_Properties
 {
 }
 
-TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void)
+TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties ()
 {
 }
 
 CORBA::Long
-TAO_UnixDomain_Protocol_Properties::send_buffer_size (void)
+TAO_UnixDomain_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -788,7 +788,7 @@ TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_si
 }
 
 CORBA::Long
-TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void)
+TAO_UnixDomain_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -834,13 +834,13 @@ TAO_SharedMemory_Protocol_Properties::TAO_SharedMemory_Protocol_Properties (CORB
 {
 }
 
-TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (void)
+TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties ()
 {
 }
 
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::send_buffer_size (void)
+TAO_SharedMemory_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -852,7 +852,7 @@ TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_
 }
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void)
+TAO_SharedMemory_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -864,7 +864,7 @@ TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::keep_alive (void)
+TAO_SharedMemory_Protocol_Properties::keep_alive ()
 {
   return this->keep_alive_;
 }
@@ -876,7 +876,7 @@ TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive)
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::dont_route (void)
+TAO_SharedMemory_Protocol_Properties::dont_route ()
 {
   return this->dont_route_;
 }
@@ -888,7 +888,7 @@ TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route)
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::no_delay (void)
+TAO_SharedMemory_Protocol_Properties::no_delay ()
 {
   return this->no_delay_;
 }
@@ -900,7 +900,7 @@ TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay)
 }
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void)
+TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size ()
 {
   return this->preallocate_buffer_size_;
 }
@@ -912,7 +912,7 @@ TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preal
 }
 
 char *
-TAO_SharedMemory_Protocol_Properties::mmap_filename (void)
+TAO_SharedMemory_Protocol_Properties::mmap_filename ()
 {
   return this->mmap_filename_.rep ();
 }
@@ -924,7 +924,7 @@ TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename)
 }
 
 char *
-TAO_SharedMemory_Protocol_Properties::mmap_lockname (void)
+TAO_SharedMemory_Protocol_Properties::mmap_lockname ()
 {
   return this->mmap_lockname_.rep ();
 }
@@ -987,12 +987,12 @@ TAO_UserDatagram_Protocol_Properties::TAO_UserDatagram_Protocol_Properties (
 {
 }
 
-TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (void)
+TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties ()
 {
 }
 
 CORBA::Boolean
-TAO_UserDatagram_Protocol_Properties::enable_network_priority (void)
+TAO_UserDatagram_Protocol_Properties::enable_network_priority ()
 {
   return this->enable_network_priority_;
 }
@@ -1004,7 +1004,7 @@ TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean en
 }
 
 CORBA::Long
-TAO_UserDatagram_Protocol_Properties::send_buffer_size (void)
+TAO_UserDatagram_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -1016,7 +1016,7 @@ TAO_UserDatagram_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_
 }
 
 CORBA::Long
-TAO_UserDatagram_Protocol_Properties::recv_buffer_size (void)
+TAO_UserDatagram_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -1056,12 +1056,12 @@ TAO_StreamControl_Protocol_Properties::TAO_StreamControl_Protocol_Properties (CO
 {
 }
 
-TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (void)
+TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties ()
 {
 }
 
 CORBA::Long
-TAO_StreamControl_Protocol_Properties::send_buffer_size (void)
+TAO_StreamControl_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -1073,7 +1073,7 @@ TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer
 }
 
 CORBA::Long
-TAO_StreamControl_Protocol_Properties::recv_buffer_size (void)
+TAO_StreamControl_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -1085,7 +1085,7 @@ TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::keep_alive (void)
+TAO_StreamControl_Protocol_Properties::keep_alive ()
 {
   return this->keep_alive_;
 }
@@ -1097,7 +1097,7 @@ TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive)
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::dont_route (void)
+TAO_StreamControl_Protocol_Properties::dont_route ()
 {
   return this->dont_route_;
 }
@@ -1108,7 +1108,7 @@ TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route)
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void)
+CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay ()
 {
   return this->no_delay_;
 }
@@ -1120,7 +1120,7 @@ TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay)
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::enable_network_priority (void)
+TAO_StreamControl_Protocol_Properties::enable_network_priority ()
 {
   return this->enable_network_priority_;
 }
@@ -1161,11 +1161,11 @@ TAO_StreamControl_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 
 // ****************************************************************
 
-TAO_GIOP_Protocol_Properties::TAO_GIOP_Protocol_Properties (void)
+TAO_GIOP_Protocol_Properties::TAO_GIOP_Protocol_Properties ()
 {
 }
 
-TAO_GIOP_Protocol_Properties::~TAO_GIOP_Protocol_Properties (void)
+TAO_GIOP_Protocol_Properties::~TAO_GIOP_Protocol_Properties ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 85312df3585..a17f5b4a917 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -60,17 +60,17 @@ public:
    * (non-virtual, no exception handling) relative of the idl interface
    * implementation <priority_model> below.
    */
-  RTCORBA::PriorityModel get_priority_model (void);
+  RTCORBA::PriorityModel get_priority_model ();
 
-  RTCORBA::PriorityModel priority_model (void);
+  RTCORBA::PriorityModel priority_model ();
 
-  RTCORBA::Priority server_priority (void);
+  RTCORBA::Priority server_priority ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   /// This method writes a CDR representation of the object state.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -91,12 +91,12 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_PriorityModelPolicy (void);
+  virtual ~TAO_PriorityModelPolicy ();
 
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
-  TAO_PriorityModelPolicy (void);
+  TAO_PriorityModelPolicy ();
 
 private:
   /// Attributes.
@@ -124,13 +124,13 @@ public:
   /// Copy constructor.
   TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
 
-  RTCORBA::ThreadpoolId threadpool (void);
+  RTCORBA::ThreadpoolId threadpool ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -145,7 +145,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_ThreadpoolPolicy (void);
+  virtual ~TAO_ThreadpoolPolicy ();
 
 private:
   /// Attribute.
@@ -169,16 +169,16 @@ class TAO_RTCORBA_Export TAO_PrivateConnectionPolicy
 {
 public:
   /// Constructor.
-  TAO_PrivateConnectionPolicy (void);
+  TAO_PrivateConnectionPolicy ();
 
   /// Copy constructor.
   TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -193,7 +193,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_PrivateConnectionPolicy (void);
+  virtual ~TAO_PrivateConnectionPolicy ();
 };
 
 //*************************************************************************
@@ -225,15 +225,15 @@ public:
    * make a copy like the idl accessor <priority_bands> implementation
    * below.)
    */
-  RTCORBA::PriorityBands &priority_bands_rep (void);
+  RTCORBA::PriorityBands &priority_bands_rep ();
 
-  RTCORBA::PriorityBands *priority_bands (void);
+  RTCORBA::PriorityBands *priority_bands ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   /// This method writes a CDR representation of the current object.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -254,12 +254,12 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_PriorityBandedConnectionPolicy (void);
+  virtual ~TAO_PriorityBandedConnectionPolicy ();
 
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
-  TAO_PriorityBandedConnectionPolicy (void);
+  TAO_PriorityBandedConnectionPolicy ();
 
 private:
   /// Attribute.
@@ -292,15 +292,15 @@ public:
    * make a copy like the idl accessor <protocols> implementation
    * below.)
    */
-  RTCORBA::ProtocolList & protocols_rep (void);
+  RTCORBA::ProtocolList & protocols_rep ();
 
-  RTCORBA::ProtocolList *protocols (void);
+  RTCORBA::ProtocolList *protocols ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -315,7 +315,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_ServerProtocolPolicy (void);
+  virtual ~TAO_ServerProtocolPolicy ();
 
 private:
   /// Attribute.
@@ -348,15 +348,15 @@ public:
    * make a copy like the idl accessor <protocols> implementation
    * below.)
    */
-  RTCORBA::ProtocolList & protocols_rep (void);
+  RTCORBA::ProtocolList & protocols_rep ();
 
-  RTCORBA::ProtocolList *protocols (void);
+  RTCORBA::ProtocolList *protocols ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // = CDR Encoder/Decoder.
 
@@ -379,12 +379,12 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_ClientProtocolPolicy (void);
+  virtual ~TAO_ClientProtocolPolicy ();
 
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
-  TAO_ClientProtocolPolicy (void);
+  TAO_ClientProtocolPolicy ();
 
 private:
   /// Attribute.
@@ -413,27 +413,27 @@ public:
                                CORBA::Boolean no_delay,
                                CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void);
+  CORBA::Boolean keep_alive ();
 
   void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void);
+  CORBA::Boolean dont_route ();
 
   void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void);
+  CORBA::Boolean no_delay ();
 
   void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
   void enable_network_priority (CORBA::Boolean enable);
 
@@ -446,7 +446,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_TCP_Protocol_Properties (void);
+  virtual ~TAO_TCP_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -478,11 +478,11 @@ public:
   TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size,
                                       CORBA::Long recv_buffer_size);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
@@ -508,7 +508,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_UnixDomain_Protocol_Properties (void);
+  virtual ~TAO_UnixDomain_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -543,37 +543,37 @@ public:
 
   // = IDL interface methods.
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void);
+  CORBA::Boolean keep_alive ();
 
   void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void);
+  CORBA::Boolean dont_route ();
 
   void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void);
+  CORBA::Boolean no_delay ();
 
   void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
-  CORBA::Long preallocate_buffer_size (void);
+  CORBA::Long preallocate_buffer_size ();
 
   void preallocate_buffer_size (CORBA::Long preallocate_buffer_size);
 
-  char *mmap_filename (void);
+  char *mmap_filename ();
 
   void mmap_filename (const char *mmap_filename);
 
-  char *mmap_lockname (void);
+  char *mmap_lockname ();
 
   void mmap_lockname (const char *mmap_lockname);
 
@@ -598,7 +598,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_SharedMemory_Protocol_Properties (void);
+  virtual ~TAO_SharedMemory_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -631,15 +631,15 @@ public:
                                         CORBA::Long recv_buffer_size,
                                         CORBA::Boolean enable_network_priority);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
   void enable_network_priority (CORBA::Boolean enable);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
@@ -652,7 +652,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_UserDatagram_Protocol_Properties (void);
+  virtual ~TAO_UserDatagram_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -684,27 +684,27 @@ public:
                                          CORBA::Boolean no_delay,
                                          CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void);
+  CORBA::Boolean keep_alive ();
 
   void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void);
+  CORBA::Boolean dont_route ();
 
   void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void);
+  CORBA::Boolean no_delay ();
 
   void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
   void enable_network_priority (CORBA::Boolean enable);
 
@@ -717,7 +717,7 @@ public:
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_StreamControl_Protocol_Properties (void);
+  virtual ~TAO_StreamControl_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -747,7 +747,7 @@ protected:
   virtual ~TAO_GIOP_Protocol_Properties ();
 
   friend class TAO_Protocol_Properties_Factory;
-  TAO_GIOP_Protocol_Properties (void);
+  TAO_GIOP_Protocol_Properties ();
 };
 
 //*************************************************************************
@@ -776,7 +776,7 @@ public:
   static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id);
 
 private:
-  TAO_Protocol_Properties_Factory (void);
+  TAO_Protocol_Properties_Factory ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
index ad4ac56622d..12b4c68489d 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
@@ -75,7 +75,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release (
 }
 
 RTCORBA::ProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil (void)
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil ()
 {
   return RTCORBA::ProtocolProperties::_nil ();
 }
@@ -88,10 +88,10 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal (
   return ::CORBA::Object::marshal (p, cdr);
 }
 
-RTCORBA::ProtocolProperties::ProtocolProperties (void)
+RTCORBA::ProtocolProperties::ProtocolProperties ()
 {}
 
-RTCORBA::ProtocolProperties::~ProtocolProperties (void)
+RTCORBA::ProtocolProperties::~ProtocolProperties ()
 {}
 
 void
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
index c18fa08a7de..0689ee90320 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
@@ -117,9 +117,9 @@ namespace RTCORBA
 
   protected:
     // Abstract or local interface only.
-    ProtocolProperties (void);
+    ProtocolProperties ();
 
-    virtual ~ProtocolProperties (void);
+    virtual ~ProtocolProperties ();
 
   private:
     // Private and unimplemented for concrete interfaces.
@@ -159,7 +159,7 @@ namespace TAO
     static void release (
         ::RTCORBA::ProtocolProperties_ptr
       );
-    static ::RTCORBA::ProtocolProperties_ptr nil (void);
+    static ::RTCORBA::ProtocolProperties_ptr nil ();
     static ::CORBA::Boolean marshal (
         const ::RTCORBA::ProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 3506b34c9a8..84a8a961326 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -26,14 +26,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void)
+TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks ()
   : orb_core_ (0)
   , current_ ()
 {
 }
 
 
-TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void)
+TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks ()
 {
 }
 
@@ -409,7 +409,7 @@ TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag
 }
 
 CORBA::Long
-TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
+TAO_RT_Protocols_Hooks::get_dscp_codepoint ()
 {
   if (TAO_debug_level)
     TAOLIB_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index debe07866be..6bd681e035f 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -35,10 +35,10 @@ class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks
 {
 public:
   /// Constructor
-  TAO_RT_Protocols_Hooks (void);
+  TAO_RT_Protocols_Hooks ();
 
   /// Destructor
-  virtual ~TAO_RT_Protocols_Hooks (void);
+  virtual ~TAO_RT_Protocols_Hooks ();
 
   /// Initialize the protocols hooks instance.
   void init_hooks (TAO_ORB_Core *orb_core);
@@ -69,7 +69,7 @@ public:
 
   void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties);
 
-  CORBA::Long get_dscp_codepoint (void);
+  CORBA::Long get_dscp_codepoint ();
 
   void get_selector_hook (CORBA::Policy *model_policy,
                           CORBA::Boolean
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index e21df158c99..3c31180572c 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -23,7 +23,7 @@ TAO_RT_Stub::TAO_RT_Stub (const char *repository_id,
 {
 }
 
-TAO_RT_Stub::~TAO_RT_Stub (void)
+TAO_RT_Stub::~TAO_RT_Stub ()
 {
   if (this->priority_model_policy_.in ())
     this->priority_model_policy_->destroy ();
@@ -36,7 +36,7 @@ TAO_RT_Stub::~TAO_RT_Stub (void)
 }
 
 void
-TAO_RT_Stub::parse_policies (void)
+TAO_RT_Stub::parse_policies ()
 {
   CORBA::PolicyList_var policy_list
     = this->base_profiles_.policy_list ();
@@ -70,7 +70,7 @@ TAO_RT_Stub::parse_policies (void)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_model (void)
+TAO_RT_Stub::exposed_priority_model ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -87,7 +87,7 @@ TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_banded_connection (void)
+TAO_RT_Stub::exposed_priority_banded_connection ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -104,7 +104,7 @@ TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_client_protocol (void)
+TAO_RT_Stub::exposed_client_protocol ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -197,7 +197,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 }
 
 CORBA::Policy_ptr
-TAO_RT_Stub::effective_priority_banded_connection (void)
+TAO_RT_Stub::effective_priority_banded_connection ()
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -245,7 +245,7 @@ TAO_RT_Stub::effective_priority_banded_connection (void)
 }
 
 CORBA::Policy_ptr
-TAO_RT_Stub::effective_client_protocol (void)
+TAO_RT_Stub::effective_client_protocol ()
 {
   // Get effective override.
   CORBA::Policy_var override =
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index 9003aea8ad0..e0b4ee00140 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -49,7 +49,7 @@ public:
                const TAO_MProfile &profiles,
                TAO_ORB_Core *orb_core);
 
-  virtual ~TAO_RT_Stub (void);
+  virtual ~TAO_RT_Stub ();
 
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -70,7 +70,7 @@ public:
 
 private:
   /// Helper method used to parse the policies.
-  void parse_policies (void);
+  void parse_policies ();
 
   void exposed_priority_model (CORBA::Policy_ptr policy);
 
@@ -81,17 +81,17 @@ private:
   /// Returns the CORBA::Policy (which will be narrowed to be
   /// used as RTCORBA::PriorityModelPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_model (void);
+  CORBA::Policy_ptr exposed_priority_model ();
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::PriorityBandedConnectionPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_banded_connection (void);
+  CORBA::Policy_ptr exposed_priority_banded_connection ();
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::ClientProtocolPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_client_protocol (void);
+  CORBA::Policy_ptr exposed_client_protocol ();
 
   // = Methods for obtaining effective policies.
   //
@@ -100,8 +100,8 @@ private:
   //   override for a given policy type, and then reconciling it with
   //   the policy value exported in the Object's IOR.
 
-  CORBA::Policy_ptr effective_priority_banded_connection (void);
-  CORBA::Policy_ptr effective_client_protocol (void);
+  CORBA::Policy_ptr effective_priority_banded_connection ();
+  CORBA::Policy_ptr effective_client_protocol ();
 
   // The following attribute are used to cache
   // the different kind of policies and avoid to
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index 7e3dc469d04..e1923977161 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
+TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
index a997c5819fc..9cf21b25ecf 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -46,7 +46,7 @@ class TAO_RTCORBA_Export TAO_RT_Stub_Factory : public TAO_Stub_Factory
 {
 public:
   // -- Ctor/Dtor --
-  virtual ~TAO_RT_Stub_Factory (void);
+  virtual ~TAO_RT_Stub_Factory ();
 
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 59fc11aec4f..b07e1582c41 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -26,7 +26,7 @@ TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_
            TAO_Thread_Pool_Manager (orb_core));
 }
 
-TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (void)
+TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager ()
 {
   // Delete the default resources.
   delete this->default_lane_resources_;
@@ -36,7 +36,7 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi
 }
 
 int
-TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void)
+TAO_RT_Thread_Lane_Resources_Manager::open_default_resources ()
 {
   TAO_ORB_Parameters *params =
     this->orb_core_->orb_params ();
@@ -55,7 +55,7 @@ TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void)
 }
 
 void
-TAO_RT_Thread_Lane_Resources_Manager::finalize (void)
+TAO_RT_Thread_Lane_Resources_Manager::finalize ()
 {
   // Finalize resources managed by the thread-pool manager.
   this->tp_manager_->finalize ();
@@ -65,7 +65,7 @@ TAO_RT_Thread_Lane_Resources_Manager::finalize (void)
 }
 
 void
-TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor (void)
+TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->shutdown_reactor ();
@@ -75,7 +75,7 @@ TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor (void)
 }
 
 void
-TAO_RT_Thread_Lane_Resources_Manager::close_all_transports (void)
+TAO_RT_Thread_Lane_Resources_Manager::close_all_transports ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->close_all_transports ();
@@ -94,7 +94,7 @@ TAO_RT_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofil
 }
 
 TAO_Thread_Lane_Resources &
-TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
+TAO_RT_Thread_Lane_Resources_Manager::lane_resources ()
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources &tss =
@@ -113,13 +113,13 @@ TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
 }
 
 TAO_Thread_Lane_Resources &
-TAO_RT_Thread_Lane_Resources_Manager::default_lane_resources (void)
+TAO_RT_Thread_Lane_Resources_Manager::default_lane_resources ()
 {
   return *this->default_lane_resources_;
 }
 
 TAO_Thread_Pool_Manager &
-TAO_RT_Thread_Lane_Resources_Manager::tp_manager (void)
+TAO_RT_Thread_Lane_Resources_Manager::tp_manager ()
 {
   return *this->tp_manager_;
 }
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index 913a5e11ae7..5e7a0efae60 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -44,31 +44,31 @@ public:
   TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_RT_Thread_Lane_Resources_Manager (void);
+  ~TAO_RT_Thread_Lane_Resources_Manager ();
 
   /// Finalize resources.
-  void finalize (void);
+  void finalize ();
 
   /// Open default resources.
-  int open_default_resources (void);
+  int open_default_resources ();
 
   /// Shutdown reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Certain ORB policies such as dropping replies on shutdown
   /// would need cleanup of transports to wake threads up.
-  void close_all_transports (void);
+  void close_all_transports ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// @name Accessors
   // @{
-  TAO_Thread_Lane_Resources &lane_resources (void);
+  TAO_Thread_Lane_Resources &lane_resources ();
 
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
+  TAO_Thread_Lane_Resources &default_lane_resources ();
 
-  TAO_Thread_Pool_Manager &tp_manager (void);
+  TAO_Thread_Pool_Manager &tp_manager ();
 
   // @}
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
index ce87cde295e..78c96423d38 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -30,7 +30,7 @@ TAO_RT_Transport_Descriptor::~TAO_RT_Transport_Descriptor ()
 }
 
 TAO_Transport_Descriptor_Interface *
-TAO_RT_Transport_Descriptor::duplicate (void)
+TAO_RT_Transport_Descriptor::duplicate ()
 {
   // Get a copy of the underlying endpoint
   TAO_Endpoint *endpoint =
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
index 58144c5adc7..ceab8cd7c8a 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
@@ -49,7 +49,7 @@ public:
 
   /// This call allocates and copies the contents of this class and
   /// returns the pointer
-  virtual TAO_Transport_Descriptor_Interface *duplicate (void);
+  virtual TAO_Transport_Descriptor_Interface *duplicate ();
 
   /// Try to determine if this object is same as the <other_prop>.
   virtual CORBA::Boolean is_equivalent (
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
index 0b7150a9c5b..69f8321f9eb 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
@@ -8,18 +8,18 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void)
+TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property ()
 {
 }
 
 /*************************************************************************************************/
 
-TAO_RT_Transport_Descriptor_Private_Connection_Property::~TAO_RT_Transport_Descriptor_Private_Connection_Property (void)
+TAO_RT_Transport_Descriptor_Private_Connection_Property::~TAO_RT_Transport_Descriptor_Private_Connection_Property ()
 {
 }
 
 TAO_RT_Transport_Descriptor_Property*
-TAO_RT_Transport_Descriptor_Private_Connection_Property::duplicate (void)
+TAO_RT_Transport_Descriptor_Private_Connection_Property::duplicate ()
 {
   // Construct a copy of our class
   TAO_RT_Transport_Descriptor_Private_Connection_Property *desc_prop = 0;
@@ -47,7 +47,7 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::~TAO_RT_Transport_Descri
 }
 
 TAO_RT_Transport_Descriptor_Property*
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::duplicate (void)
+TAO_RT_Transport_Descriptor_Banded_Connection_Property::duplicate ()
 {
   // Construct a copy of our class
   TAO_RT_Transport_Descriptor_Banded_Connection_Property *desc_prop = 0;
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
index 2d960bc4659..cc67413602e 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
@@ -34,10 +34,10 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Property
 
 public:
   /// Constructor
-  TAO_RT_Transport_Descriptor_Property (void);
+  TAO_RT_Transport_Descriptor_Property ();
 
   /// Destructor
-  virtual ~TAO_RT_Transport_Descriptor_Property (void);
+  virtual ~TAO_RT_Transport_Descriptor_Property ();
 
   virtual TAO_RT_Transport_Descriptor_Property *duplicate (void) = 0;
 
@@ -67,16 +67,16 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Private_Connection_Property
 {
 public:
   /// Constructor
-  TAO_RT_Transport_Descriptor_Private_Connection_Property (void);
+  TAO_RT_Transport_Descriptor_Private_Connection_Property ();
   TAO_RT_Transport_Descriptor_Private_Connection_Property (long object_id);
 
   /// Destructor
-  ~TAO_RT_Transport_Descriptor_Private_Connection_Property (void);
+  ~TAO_RT_Transport_Descriptor_Private_Connection_Property ();
 
   /// Init
   void init (long object_id);
 
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void);
+  virtual TAO_RT_Transport_Descriptor_Property *duplicate ();
 
   virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop);
 
@@ -103,17 +103,17 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Banded_Connection_Property
 {
 public:
   /// Constructor
-  TAO_RT_Transport_Descriptor_Banded_Connection_Property (void);
+  TAO_RT_Transport_Descriptor_Banded_Connection_Property ();
   TAO_RT_Transport_Descriptor_Banded_Connection_Property (CORBA::Short low_priority,
                                                           CORBA::Short high_priority);
 
   /// Destructor
-  ~TAO_RT_Transport_Descriptor_Banded_Connection_Property (void);
+  ~TAO_RT_Transport_Descriptor_Banded_Connection_Property ();
 
   /// Init
   void init (CORBA::Short low_priority, CORBA::Short high_priority);
 
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void);
+  virtual TAO_RT_Transport_Descriptor_Property *duplicate ();
 
   virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop);
 
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 4f7653dc8fd..a5255401320 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -27,7 +27,7 @@ TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (
 }
 
 bool
-TAO_RT_New_Leader_Generator::no_leaders_available (void)
+TAO_RT_New_Leader_Generator::no_leaders_available ()
 {
   // Request a new dynamic thread from the Thread Lane
   return this->lane_.new_dynamic_thread ();
@@ -40,7 +40,7 @@ TAO_Thread_Pool_Threads::TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane)
 }
 
 int
-TAO_Thread_Pool_Threads::svc (void)
+TAO_Thread_Pool_Threads::svc ()
 {
   TAO_ORB_Core &orb_core =
     this->lane ().pool ().manager ().orb_core ();
@@ -176,7 +176,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
 }
 
 bool
-TAO_Thread_Lane::new_dynamic_thread (void)
+TAO_Thread_Lane::new_dynamic_thread ()
 {
   // Note that we are checking this condition below without the lock
   // held.
@@ -223,7 +223,7 @@ TAO_Thread_Lane::new_dynamic_thread (void)
 }
 
 void
-TAO_Thread_Lane::shutting_down (void)
+TAO_Thread_Lane::shutting_down ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              mon,
@@ -235,7 +235,7 @@ TAO_Thread_Lane::shutting_down (void)
 }
 
 void
-TAO_Thread_Lane::validate_and_map_priority (void)
+TAO_Thread_Lane::validate_and_map_priority ()
 {
   // Make sure that static_threads_number_ is not zero.
   if (this->static_threads_number_ == 0)
@@ -281,7 +281,7 @@ TAO_Thread_Lane::validate_and_map_priority (void)
 }
 
 void
-TAO_Thread_Lane::open (void)
+TAO_Thread_Lane::open ()
 {
   // Validate and map priority.
   this->validate_and_map_priority ();
@@ -353,25 +353,25 @@ TAO_Thread_Lane::open (void)
                  CORBA::COMPLETED_NO);
 }
 
-TAO_Thread_Lane::~TAO_Thread_Lane (void)
+TAO_Thread_Lane::~TAO_Thread_Lane ()
 {
 }
 
 void
-TAO_Thread_Lane::finalize (void)
+TAO_Thread_Lane::finalize ()
 {
   // Finalize resources.
   this->resources_.finalize ();
 }
 
 void
-TAO_Thread_Lane::shutdown_reactor (void)
+TAO_Thread_Lane::shutdown_reactor ()
 {
   this->resources_.shutdown_reactor ();
 }
 
 void
-TAO_Thread_Lane::wait (void)
+TAO_Thread_Lane::wait ()
 {
   this->static_threads_.wait ();
   this->dynamic_threads_.wait ();
@@ -397,7 +397,7 @@ TAO_Thread_Lane::current_threads () const
 
 
 int
-TAO_Thread_Lane::create_static_threads (void)
+TAO_Thread_Lane::create_static_threads ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
@@ -564,7 +564,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
 }
 
 void
-TAO_Thread_Pool::open (void)
+TAO_Thread_Pool::open ()
 {
   // Open all the lanes.
   for (CORBA::ULong i = 0;
@@ -575,7 +575,7 @@ TAO_Thread_Pool::open (void)
     }
 }
 
-TAO_Thread_Pool::~TAO_Thread_Pool (void)
+TAO_Thread_Pool::~TAO_Thread_Pool ()
 {
   // Delete all the lanes.
   for (CORBA::ULong i = 0;
@@ -587,7 +587,7 @@ TAO_Thread_Pool::~TAO_Thread_Pool (void)
 }
 
 void
-TAO_Thread_Pool::finalize (void)
+TAO_Thread_Pool::finalize ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -597,7 +597,7 @@ TAO_Thread_Pool::finalize (void)
 }
 
 void
-TAO_Thread_Pool::shutdown_reactor (void)
+TAO_Thread_Pool::shutdown_reactor ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -607,7 +607,7 @@ TAO_Thread_Pool::shutdown_reactor (void)
 }
 
 void
-TAO_Thread_Pool::shutting_down (void)
+TAO_Thread_Pool::shutting_down ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -618,7 +618,7 @@ TAO_Thread_Pool::shutting_down (void)
 
 
 void
-TAO_Thread_Pool::wait (void)
+TAO_Thread_Pool::wait ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -646,7 +646,7 @@ TAO_Thread_Pool::is_collocated (const TAO_MProfile &mprofile)
 }
 
 int
-TAO_Thread_Pool::create_static_threads (void)
+TAO_Thread_Pool::create_static_threads ()
 {
   for (CORBA::ULong i = 0;
        i != this->number_of_lanes_;
@@ -683,7 +683,7 @@ TAO_Thread_Pool_Manager::TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager (void)
+TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager ()
 {
   // Delete all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -693,7 +693,7 @@ TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager (void)
 }
 
 void
-TAO_Thread_Pool_Manager::finalize (void)
+TAO_Thread_Pool_Manager::finalize ()
 {
   // Finalize all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -703,7 +703,7 @@ TAO_Thread_Pool_Manager::finalize (void)
 }
 
 void
-TAO_Thread_Pool_Manager::shutdown_reactor (void)
+TAO_Thread_Pool_Manager::shutdown_reactor ()
 {
   // Finalize all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -713,7 +713,7 @@ TAO_Thread_Pool_Manager::shutdown_reactor (void)
 }
 
 void
-TAO_Thread_Pool_Manager::wait (void)
+TAO_Thread_Pool_Manager::wait ()
 {
   // Finalize all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 55058e5c6ae..0827cc25574 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -50,7 +50,7 @@ public:
 
   /// Leader/Follower class uses this method to notify the system that
   /// we are out of leaders.
-  bool no_leaders_available (void);
+  bool no_leaders_available ();
 
 private:
   /// Lane associated with this leader generator.
@@ -72,7 +72,7 @@ public:
   TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane);
 
   /// Method executed when a thread is spawned.
-  int svc (void);
+  int svc ();
 
   /// Accessor to the lane to which this thread belongs to.
   TAO_Thread_Lane &lane () const;
@@ -131,31 +131,31 @@ public:
                    ACE_Time_Value const &dynamic_thread_time);
 
   /// Destructor.
-  ~TAO_Thread_Lane (void);
+  ~TAO_Thread_Lane ();
 
   /// Open the lane.
-  void open (void);
+  void open ();
 
   /// Finalize the resources.
-  void finalize (void);
+  void finalize ();
 
   /// Shutdown the reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create the static threads - only called once.
-  int create_static_threads (void);
+  int create_static_threads ();
 
   /// Mark that this lane is shutting down, we then don't create any
   /// dynamic threads anymore. When the pool is shutting down the leader
   /// follower loop is called which can cause a request to create a
   /// new dynamic thread but we shouldn't create a new one.
-  void shutting_down (void);
+  void shutting_down ();
 
   /// Called by the TAO_RT_New_Leader_Generator to request a new dynamic
   /// thread.
@@ -166,7 +166,7 @@ public:
    * @retval true A new thread is created
    * @retval false No thread could be created
    */
-  bool new_dynamic_thread (void);
+  bool new_dynamic_thread ();
 
   /// @name Accessors
   // @{
@@ -181,7 +181,7 @@ public:
 
   CORBA::Short native_priority () const;
 
-  TAO_Thread_Lane_Resources &resources (void);
+  TAO_Thread_Lane_Resources &resources ();
 
   TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan () const;
 
@@ -190,7 +190,7 @@ public:
 
 private:
   /// Validate lane's priority and map it to a native value.
-  void validate_and_map_priority (void);
+  void validate_and_map_priority ();
 
   int create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
                         CORBA::ULong number_of_threads,
@@ -278,28 +278,28 @@ public:
                    ACE_Time_Value const &dynamic_thread_time);
 
   /// Destructor.
-  ~TAO_Thread_Pool (void);
+  ~TAO_Thread_Pool ();
 
   /// Open the pool.
-  void open (void);
+  void open ();
 
   /// Finalize the resources.
-  void finalize (void);
+  void finalize ();
 
   /// Shutdown the reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Mark this thread pool that we are shutting down.
-  void shutting_down (void);
+  void shutting_down ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create the static threads - only called once.
-  int create_static_threads (void);
+  int create_static_threads ();
 
   /// Check if this thread pool has (explicit) lanes.
   bool with_lanes () const;
@@ -315,7 +315,7 @@ public:
   CORBA::ULong max_buffered_requests () const;
   CORBA::ULong max_request_buffer_size () const;
 
-  TAO_Thread_Lane **lanes (void);
+  TAO_Thread_Lane **lanes ();
   CORBA::ULong number_of_lanes () const;
   // @}
 
@@ -352,16 +352,16 @@ public:
   TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_Thread_Pool_Manager (void);
+  ~TAO_Thread_Pool_Manager ();
 
   /// Finalize the resources.
-  void finalize (void);
+  void finalize ();
 
   /// Shutdown the reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp
index 039dbad8c6e..00e0c54c25f 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void)
+TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory);
 }
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h
index 3a9cc80a20f..3a2c7bbd7cb 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.h
+++ b/TAO/tao/RTPortableServer/RTPortableServer.h
@@ -30,7 +30,7 @@ class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer
 {
 public:
   /// Constructor.
-  TAO_RTPortableServer_Initializer (void);
+  TAO_RTPortableServer_Initializer ();
 };
 
 static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer;
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 30fabe58c1d..0ead61fa6d7 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -52,7 +52,7 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
   this->parse_rt_policies (this->policies ());
 }
 
-TAO_RT_POA::~TAO_RT_POA (void)
+TAO_RT_POA::~TAO_RT_POA ()
 {
 }
 
@@ -181,7 +181,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority)
 }
 
 void
-TAO_RT_POA::validate_policies (void)
+TAO_RT_POA::validate_policies ()
 {
   // For each of the above operations, if the POA supports the
   // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then
@@ -389,7 +389,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
 }
 
 size_t
-TAO_RT_POA::endpoint_count (void)
+TAO_RT_POA::endpoint_count ()
 {
   size_t profile_count = 0;
 
@@ -563,25 +563,25 @@ TAO_RT_POA::create_request_processing_policy (
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
 char *
-TAO_RT_POA::the_name (void)
+TAO_RT_POA::the_name ()
 {
   return this->TAO_Regular_POA::the_name ();
 }
 
 PortableServer::POA_ptr
-TAO_RT_POA::the_parent (void)
+TAO_RT_POA::the_parent ()
 {
   return this->TAO_Regular_POA::the_parent ();
 }
 
 PortableServer::POAList *
-TAO_RT_POA::the_children (void)
+TAO_RT_POA::the_children ()
 {
   return this->TAO_Regular_POA::the_children ();
 }
 
 PortableServer::POAManager_ptr
-TAO_RT_POA::the_POAManager (void)
+TAO_RT_POA::the_POAManager ()
 {
   return this->TAO_Regular_POA::the_POAManager ();
 }
@@ -590,7 +590,7 @@ TAO_RT_POA::the_POAManager (void)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::AdapterActivator_ptr
-TAO_RT_POA::the_activator (void)
+TAO_RT_POA::the_activator ()
 {
   return this->TAO_Regular_POA::the_activator ();
 }
@@ -602,7 +602,7 @@ TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activato
 }
 
 PortableServer::ServantManager_ptr
-TAO_RT_POA::get_servant_manager (void)
+TAO_RT_POA::get_servant_manager ()
 {
   return this->TAO_Regular_POA::get_servant_manager ();
 }
@@ -614,7 +614,7 @@ TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 }
 
 PortableServer::Servant
-TAO_RT_POA::get_servant (void)
+TAO_RT_POA::get_servant ()
 {
   return this->TAO_Regular_POA::get_servant ();
 }
@@ -700,7 +700,7 @@ TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid)
 }
 
 CORBA::OctetSeq *
-TAO_RT_POA::id (void)
+TAO_RT_POA::id ()
 {
   return this->TAO_Regular_POA::id ();
 }
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index e173b82479a..4c510007cb3 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -116,25 +116,25 @@ public:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-  char * the_name (void);
+  char * the_name ();
 
-  PortableServer::POA_ptr the_parent (void);
+  PortableServer::POA_ptr the_parent ();
 
-  PortableServer::POAList *the_children (void);
+  PortableServer::POAList *the_children ();
 
-  PortableServer::POAManager_ptr the_POAManager (void);
+  PortableServer::POAManager_ptr the_POAManager ();
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-  PortableServer::AdapterActivator_ptr the_activator (void);
+  PortableServer::AdapterActivator_ptr the_activator ();
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator);
 
-  PortableServer::ServantManager_ptr get_servant_manager (void);
+  PortableServer::ServantManager_ptr get_servant_manager ();
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
-  PortableServer::Servant get_servant (void);
+  PortableServer::Servant get_servant ();
 
   void set_servant (PortableServer::Servant servant);
 
@@ -168,7 +168,7 @@ public:
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
 
-  CORBA::OctetSeq *id (void);
+  CORBA::OctetSeq *id ();
 
   // End standard POA interface methods.
 
@@ -183,7 +183,7 @@ public:
               TAO_ORB_Core &orb_core,
               TAO_Object_Adapter *object_adapter);
 
-  virtual ~TAO_RT_POA (void);
+  virtual ~TAO_RT_POA ();
 
   void *thread_pool () const;
 
@@ -204,13 +204,13 @@ protected:
 
   void validate_priority (RTCORBA::Priority priority);
 
-  void validate_policies (void);
+  void validate_policies ();
 
   /// Parse the policy list for RT policies and update our
   /// cached policy instance.
   void parse_rt_policies (TAO_POA_Policy_Set &policies);
 
-  size_t endpoint_count (void);
+  size_t endpoint_count ();
 
   TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index f141bfa18eb..c49c6019527 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -24,7 +24,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
+TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher ()
 {
 }
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 7d48ae05968..dd7df712e50 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -39,7 +39,7 @@ class TAO_RTPortableServer_Export TAO_RT_Servant_Dispatcher
   : public TAO_Servant_Dispatcher
 {
 public:
-  virtual ~TAO_RT_Servant_Dispatcher (void);
+  virtual ~TAO_RT_Servant_Dispatcher ();
 
   /// Pre_invoke remote request.
   void pre_invoke_remote_request (TAO_Root_POA &poa,
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 3bcdb7faf13..a2e4eefed07 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -154,7 +154,7 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
 }
 
 RTScheduling::Current::IdType *
-TAO_RTScheduler_Current::id (void)
+TAO_RTScheduler_Current::id ()
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -165,7 +165,7 @@ TAO_RTScheduler_Current::id (void)
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current::scheduling_parameter (void)
+TAO_RTScheduler_Current::scheduling_parameter ()
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -176,7 +176,7 @@ TAO_RTScheduler_Current::scheduling_parameter (void)
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current::implicit_scheduling_parameter (void)
+TAO_RTScheduler_Current::implicit_scheduling_parameter ()
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -187,7 +187,7 @@ TAO_RTScheduler_Current::implicit_scheduling_parameter (void)
 }
 
 RTScheduling::Current::NameList *
-TAO_RTScheduler_Current::current_scheduling_segment_names (void)
+TAO_RTScheduler_Current::current_scheduling_segment_names ()
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -198,7 +198,7 @@ TAO_RTScheduler_Current::current_scheduling_segment_names (void)
 }
 
 RTCORBA::Priority
-TAO_RTScheduler_Current::the_priority (void)
+TAO_RTScheduler_Current::the_priority ()
 {
   return this->rt_current_->the_priority ();
 }
@@ -223,7 +223,7 @@ TAO_RTScheduler_Current::implementation (TAO_RTScheduler_Current_i* new_current)
 }
 
 TAO_RTScheduler_Current_i*
-TAO_RTScheduler_Current::implementation (void)
+TAO_RTScheduler_Current::implementation ()
 {
   TAO_TSS_Resources *tss =
     TAO_TSS_Resources::instance ();
@@ -616,7 +616,7 @@ TAO_RTScheduler_Current_i::implicit_scheduling_parameter ()
 }
 
 RTScheduling::Current::NameList *
-TAO_RTScheduler_Current_i::current_scheduling_segment_names (void)
+TAO_RTScheduler_Current_i::current_scheduling_segment_names ()
 {
   RTScheduling::Current::NameList* name_list;
   ACE_NEW_RETURN (name_list,
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 1361e14572a..9869380f4bc 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -256,7 +256,7 @@ public:
 
   void delete_all_currents ();
 
-  const char* name (void);
+  const char* name ();
   void name (const char *);
 
   TAO_ORB_Core* orb ();
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index 2b38b663a46..32e15c52686 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -7,12 +7,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void)
+TAO_RTScheduler_Loader::TAO_RTScheduler_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void)
+TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader ()
 {
 }
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index 61bf6f7a8b1..05aeab03674 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -85,16 +85,16 @@ public:
   operator const TAO_RTScheduler_Manager_ptr &() const;
   operator TAO_RTScheduler_Manager_ptr &();
   TAO_RTScheduler_Manager_ptr in () const;
-  TAO_RTScheduler_Manager_ptr &inout (void);
-  TAO_RTScheduler_Manager_ptr &out (void);
-  TAO_RTScheduler_Manager_ptr _retn (void);
+  TAO_RTScheduler_Manager_ptr &inout ();
+  TAO_RTScheduler_Manager_ptr &out ();
+  TAO_RTScheduler_Manager_ptr _retn ();
   TAO_RTScheduler_Manager_ptr ptr () const;
 
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static TAO_RTScheduler_Manager_ptr duplicate (TAO_RTScheduler_Manager_ptr);
   static void release (TAO_RTScheduler_Manager_ptr);
-  static TAO_RTScheduler_Manager_ptr nil (void);
+  static TAO_RTScheduler_Manager_ptr nil ();
   static TAO_RTScheduler_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h
index 9205b5c7db0..603a2e68f21 100644
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ b/TAO/tao/Reactive_Connect_Strategy.h
@@ -39,7 +39,7 @@ public:
   TAO_Reactive_Connect_Strategy (TAO_ORB_Core *orb);
 
   /// Destructor
-  ~TAO_Reactive_Connect_Strategy (void);
+  ~TAO_Reactive_Connect_Strategy ();
 
   /*
    * Concrete implementation for this class. Please see
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index de3308608ed..31bb1473212 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -62,7 +62,7 @@ namespace TAO
 
 // -----------------------------------------------------
 
-TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker (void);
+TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker ();
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index 7efd9589503..66fd7b984d2 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -46,7 +46,7 @@ class TAO_Export TAO_Request_Dispatcher
 {
 public:
   /// Destructor.
-  virtual ~TAO_Request_Dispatcher (void);
+  virtual ~TAO_Request_Dispatcher ();
 
   /**
    * Dispatch a request.
diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h
index 2353f0c6047..a9f863cfc68 100644
--- a/TAO/tao/Resume_Handle.h
+++ b/TAO/tao/Resume_Handle.h
@@ -49,7 +49,7 @@ public:
   TAO_Resume_Handle (TAO_ORB_Core *orb_core = 0,
                      ACE_HANDLE h = ACE_INVALID_HANDLE);
   /// Destructor
-  ~TAO_Resume_Handle (void);
+  ~TAO_Resume_Handle ();
 
   enum TAO_Handle_Resume_Flag
   {
@@ -66,7 +66,7 @@ public:
 
   /// Resume the handle in the reactor only if the ORB uses a TP
   /// reactor. Else we don't resume the handle.
-  void resume_handle (void);
+  void resume_handle ();
 
   /// Hook method called at the end of a connection handler's
   /// handle_input function.  Might override the handle_input
diff --git a/TAO/tao/Service_Context_Handler.h b/TAO/tao/Service_Context_Handler.h
index 0dabf427fe6..e38d4a9da50 100644
--- a/TAO/tao/Service_Context_Handler.h
+++ b/TAO/tao/Service_Context_Handler.h
@@ -36,7 +36,7 @@ class TAO_ServerRequest;
 class TAO_Export TAO_Service_Context_Handler
 {
   public:
-    TAO_Service_Context_Handler (void);
+    TAO_Service_Context_Handler ();
     virtual int process_service_context (
       TAO_Transport& transport,
       const IOP::ServiceContext& context,
@@ -49,7 +49,7 @@ class TAO_Export TAO_Service_Context_Handler
       TAO_Target_Specification &spec,
       TAO_OutputCDR &msg) = 0;
 
-    virtual ~TAO_Service_Context_Handler (void);
+    virtual ~TAO_Service_Context_Handler ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
index e0ee664366c..b4fc47a288d 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -45,7 +45,7 @@ class TAO_Export TAO_Services_Activate : public ACE_Service_Object
 {
 public:
   /// The destructor
-  virtual ~TAO_Services_Activate (void);
+  virtual ~TAO_Services_Activate ();
 
   /**
    * Create and activate the service callbacks into the orb.
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
index 8b9e0bb343d..ee5a598ebb0 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void)
+TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base ()
 {
 }
 
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
index 5cfc0ce828e..b65fd22fc8c 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -38,11 +38,11 @@ class TAO_SmartProxies_Export TAO_Smart_Proxy_Base
 {
 public:
   /// Destructor
-  virtual ~TAO_Smart_Proxy_Base (void);
+  virtual ~TAO_Smart_Proxy_Base ();
 
 protected:
   /// Constructor.
-  TAO_Smart_Proxy_Base (void);
+  TAO_Smart_Proxy_Base ();
 
   /// Constructor.
   TAO_Smart_Proxy_Base (CORBA::Object_ptr proxy);
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index d4bae6000e7..889bef472c6 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -39,7 +39,7 @@ template<typename S,
          typename to_S,
          typename from_S,
          template <typename> class Insert_Policy>
-TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::~In_Special_Basic_Clonable_Argument_T (void)
+TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::~In_Special_Basic_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -53,7 +53,7 @@ template<typename S,
          typename from_S,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::clone (void)
+TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::clone ()
 {
   S* clone_x = new S (this->x_);
   In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>* clone_arg
diff --git a/TAO/tao/Storable_File_Guard.h b/TAO/tao/Storable_File_Guard.h
index 3b61d85966d..89e12059123 100644
--- a/TAO/tao/Storable_File_Guard.h
+++ b/TAO/tao/Storable_File_Guard.h
@@ -39,7 +39,7 @@ namespace TAO
     /// Releases the lock, closes the file, and deletes the I/O stream.
     /// Destructors of derived classes should call this this will
     /// virtual functions are available.
-    void release (void);
+    void release ();
 
     /// Return when the object in memory has last changed
     virtual time_t get_object_last_changed () = 0;
@@ -79,13 +79,13 @@ namespace TAO
 
     /// Complete the initialization of the containing object, should
     /// be called with lock held after calling init_no_load
-    void reload (void);
+    void reload ();
 
     /// Check if the object is current with the last update.
-    virtual bool object_obsolete (void);
+    virtual bool object_obsolete ();
 
     /// Mark the object as up to date
-    virtual void mark_object_current (void);
+    virtual void mark_object_current ();
 
     /// Indicate when the object in memory has last changed
     virtual void set_object_last_changed (const time_t & time) = 0;
diff --git a/TAO/tao/Storable_FlatFileStream.h b/TAO/tao/Storable_FlatFileStream.h
index 6c85aa0308c..b5d69b2ee01 100644
--- a/TAO/tao/Storable_FlatFileStream.h
+++ b/TAO/tao/Storable_FlatFileStream.h
@@ -60,15 +60,15 @@ namespace TAO
     virtual int funlock (int whence, int start, int len);
 
     /// Returns the last time an open file was changed
-    virtual time_t last_changed (void);
+    virtual time_t last_changed ();
 
-    virtual void rewind (void);
+    virtual void rewind ();
 
-    virtual bool flush (void);
+    virtual bool flush ();
 
     /// Force write of storable data to storage.
     /// Returns 0 on success, otherwise EOF
-    virtual int sync (void);
+    virtual int sync ();
 
     virtual Storable_Base& operator << (const ACE_CString&);
     virtual Storable_Base& operator >> (ACE_CString&);
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp
index 776b0005090..a37e0b9f936 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (void)
+TAO_COIOP_Acceptor::TAO_COIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_COIOP_PROFILE),
     uuid_ (*ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID ()),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
@@ -23,7 +23,7 @@ TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (void)
 {
 }
 
-TAO_COIOP_Acceptor::~TAO_COIOP_Acceptor (void)
+TAO_COIOP_Acceptor::~TAO_COIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -159,7 +159,7 @@ TAO_COIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_COIOP_Acceptor::close (void)
+TAO_COIOP_Acceptor::close ()
 {
   return 0;
 }
@@ -207,7 +207,7 @@ TAO_COIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 }
 
 CORBA::ULong
-TAO_COIOP_Acceptor::endpoint_count (void)
+TAO_COIOP_Acceptor::endpoint_count ()
 {
   return 1;
 }
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.h b/TAO/tao/Strategies/COIOP_Acceptor.h
index ce27fb3d841..f74adc81ded 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.h
+++ b/TAO/tao/Strategies/COIOP_Acceptor.h
@@ -44,10 +44,10 @@ class TAO_Strategies_Export TAO_COIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_COIOP_Acceptor (void);
+  TAO_COIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_COIOP_Acceptor (void);
+  ~TAO_COIOP_Acceptor ();
 
   /**
    * @name The TAO_Acceptor Methods
@@ -66,13 +66,13 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
index 9bfb2864ac4..07527f88778 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
@@ -45,7 +45,7 @@ TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_co
 }
 
 
-TAO_COIOP_Connection_Handler::~TAO_COIOP_Connection_Handler (void)
+TAO_COIOP_Connection_Handler::~TAO_COIOP_Connection_Handler ()
 {
   delete this->transport ();
 
@@ -75,13 +75,13 @@ TAO_COIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_COIOP_Connection_Handler::resume_handler (void)
+TAO_COIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_COIOP_Connection_Handler::close_connection (void)
+TAO_COIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.h b/TAO/tao/Strategies/COIOP_Connection_Handler.h
index fbc7ee9e9fd..6b0630ed774 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.h
@@ -51,7 +51,7 @@ public:
   TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_COIOP_Connection_Handler (void);
+  ~TAO_COIOP_Connection_Handler ();
 
   /// Called by the <Strategy_Acceptor> when the handler is completely
   /// connected.  Argument is unused.
@@ -71,8 +71,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -81,7 +81,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index 52cf349b0a1..22df8844730 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -31,7 +31,7 @@ TAO_COIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_COIOP_Connector::close (void)
+TAO_COIOP_Connector::close ()
 {
   return 0;
 }
@@ -76,7 +76,7 @@ TAO_COIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_COIOP_Connector::make_profile (void)
+TAO_COIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@uuid/object_key
diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h
index 03502b6bcd3..02a0d52307d 100644
--- a/TAO/tao/Strategies/COIOP_Connector.h
+++ b/TAO/tao/Strategies/COIOP_Connector.h
@@ -46,7 +46,7 @@ class TAO_Strategies_Export TAO_COIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_COIOP_Connector (void);
+  TAO_COIOP_Connector ();
 
   /// Destructor.
   ~TAO_COIOP_Connector () = default;
@@ -58,7 +58,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -80,7 +80,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (void);
+  virtual TAO_Profile * make_profile ();
   //@}
 
   /// Cancel the passed cvs handler from the connector
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.cpp b/TAO/tao/Strategies/COIOP_Endpoint.cpp
index 7a0cbf6c6e4..c8ff7d3cbb9 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/COIOP_Endpoint.cpp
@@ -24,7 +24,7 @@ TAO_COIOP_Endpoint::TAO_COIOP_Endpoint (const ACE_Utils::UUID& uuid)
 {
 }
 
-TAO_COIOP_Endpoint::TAO_COIOP_Endpoint (void)
+TAO_COIOP_Endpoint::TAO_COIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_COIOP_PROFILE),
     uuid_ (),
     next_ (0)
@@ -48,13 +48,13 @@ TAO_COIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 }
 
 TAO_Endpoint *
-TAO_COIOP_Endpoint::next (void)
+TAO_COIOP_Endpoint::next ()
 {
   return 0;
 }
 
 TAO_Endpoint *
-TAO_COIOP_Endpoint::duplicate (void)
+TAO_COIOP_Endpoint::duplicate ()
 {
   TAO_COIOP_Endpoint *endpoint = 0;
 
@@ -78,7 +78,7 @@ TAO_COIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_COIOP_Endpoint::hash (void)
+TAO_COIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.h b/TAO/tao/Strategies/COIOP_Endpoint.h
index ae125713d46..61ac7a6ad98 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.h
+++ b/TAO/tao/Strategies/COIOP_Endpoint.h
@@ -45,7 +45,7 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_COIOP_Endpoint (void);
+  TAO_COIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -60,16 +60,16 @@ public:
    * Please check the documentation in Endpoint.h for details.
    */
   //@{
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (void);
+  CORBA::ULong hash ();
   //@}
 
   // = COIOP_Endpoint-specific methods.
diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp
index 91186a98a3e..e4b25c4bdff 100644
--- a/TAO/tao/Strategies/COIOP_Factory.cpp
+++ b/TAO/tao/Strategies/COIOP_Factory.cpp
@@ -13,7 +13,7 @@ static const char the_prefix[] = "COIOP";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_COIOP_Protocol_Factory::TAO_COIOP_Protocol_Factory (void)
+TAO_COIOP_Protocol_Factory::TAO_COIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_COIOP_PROFILE)
 {
 }
@@ -38,7 +38,7 @@ TAO_COIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_COIOP_Protocol_Factory::make_acceptor (void)
+TAO_COIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -57,7 +57,7 @@ TAO_COIOP_Protocol_Factory::init (int /* argc */,
 }
 
 TAO_Connector *
-TAO_COIOP_Protocol_Factory::make_connector (void)
+TAO_COIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/COIOP_Factory.h b/TAO/tao/Strategies/COIOP_Factory.h
index 044d6193270..c9474204ed9 100644
--- a/TAO/tao/Strategies/COIOP_Factory.h
+++ b/TAO/tao/Strategies/COIOP_Factory.h
@@ -36,7 +36,7 @@ class TAO_Strategies_Export TAO_COIOP_Protocol_Factory
 {
 public:
   /// Constructor.
-  TAO_COIOP_Protocol_Factory (void);
+  TAO_COIOP_Protocol_Factory ();
 
   /// Destructor.
   virtual ~TAO_COIOP_Protocol_Factory () = default;
@@ -61,8 +61,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 };
diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp
index edfcbd0435a..ac5e6d6b0cd 100644
--- a/TAO/tao/Strategies/COIOP_Profile.cpp
+++ b/TAO/tao/Strategies/COIOP_Profile.cpp
@@ -46,7 +46,7 @@ TAO_COIOP_Profile::TAO_COIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_COIOP_Profile::~TAO_COIOP_Profile (void)
+TAO_COIOP_Profile::~TAO_COIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -180,7 +180,7 @@ TAO_COIOP_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_COIOP_Profile::endpoint (void)
+TAO_COIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -239,7 +239,7 @@ TAO_COIOP_Profile::to_string () const
 }
 
 const char *
-TAO_COIOP_Profile::prefix (void)
+TAO_COIOP_Profile::prefix ()
 {
   return ::the_prefix;
 }
@@ -273,7 +273,7 @@ TAO_COIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_COIOP_Profile::encode_endpoints (void)
+TAO_COIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -330,7 +330,7 @@ TAO_COIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_COIOP_Profile::decode_endpoints (void)
+TAO_COIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h
index 0aabff5005c..adda3ea186c 100644
--- a/TAO/tao/Strategies/COIOP_Profile.h
+++ b/TAO/tao/Strategies/COIOP_Profile.h
@@ -47,7 +47,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, this is the most efficient since it
   /// doesn't require any address resolution processing.
@@ -60,12 +60,12 @@ public:
   TAO_COIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_COIOP_Profile (void);
+  ~TAO_COIOP_Profile ();
 
   /// Template methods. Please tao/Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -80,7 +80,7 @@ protected:
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 protected:
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index 282c00f2330..71934258658 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -28,13 +28,13 @@ TAO_COIOP_Transport::TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler,
 }
 
 ACE_Event_Handler *
-TAO_COIOP_Transport::event_handler_i (void)
+TAO_COIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_COIOP_Transport::connection_handler_i (void)
+TAO_COIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -66,7 +66,7 @@ TAO_COIOP_Transport::handle_input (TAO_Resume_Handle &,
 
 
 int
-TAO_COIOP_Transport::register_handler (void)
+TAO_COIOP_Transport::register_handler ()
 {
   // We do never register register the handler with the reactor
   // as we never need to be informed about any incoming data,
diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h
index 98a42fc419e..f8be9978d78 100644
--- a/TAO/tao/Strategies/COIOP_Transport.h
+++ b/TAO/tao/Strategies/COIOP_Transport.h
@@ -63,8 +63,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
@@ -81,7 +81,7 @@ protected:
                                    const ACE_Message_Block *message_block,
                                    ACE_Time_Value *max_wait_time);
 
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
   ///@}
 public:
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 3801d1cf174..704aa675572 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -22,7 +22,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (void)
+TAO_DIOP_Acceptor::TAO_DIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_DIOP_PROFILE),
     addrs_ (0),
     port_span_ (1),
@@ -39,7 +39,7 @@ TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (void)
 {
 }
 
-TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor (void)
+TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -231,7 +231,7 @@ TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_DIOP_Acceptor::close (void)
+TAO_DIOP_Acceptor::close ()
 {
   return 0;
 }
@@ -925,7 +925,7 @@ TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type)
 }
 
 CORBA::ULong
-TAO_DIOP_Acceptor::endpoint_count (void)
+TAO_DIOP_Acceptor::endpoint_count ()
 {
   return this->endpoint_count_;
 }
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index 41d02ece9d6..2524d20a0da 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -45,17 +45,17 @@ class TAO_Strategies_Export TAO_DIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_DIOP_Acceptor (void);
+  TAO_DIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_DIOP_Acceptor (void);
+  ~TAO_DIOP_Acceptor ();
 
   /// @@ Helper method for the implementation repository, should go
   ///    away
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   /// Returns address for default endpoint
   const ACE_INET_Addr& default_address () const;
@@ -80,13 +80,13 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 8b695fe6027..d87bb6ab8ed 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -48,7 +48,7 @@ TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core
   this->transport (specific_transport);
 }
 
-TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void)
+TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -65,7 +65,7 @@ TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void)
 
 // DIOP Additions - Begin
 const ACE_INET_Addr &
-TAO_DIOP_Connection_Handler::addr (void)
+TAO_DIOP_Connection_Handler::addr ()
 {
   return this->addr_;
 }
@@ -77,7 +77,7 @@ TAO_DIOP_Connection_Handler::addr (const ACE_INET_Addr &addr)
 }
 
 const ACE_INET_Addr &
-TAO_DIOP_Connection_Handler::local_addr (void)
+TAO_DIOP_Connection_Handler::local_addr ()
 {
   return this->local_addr_;
 }
@@ -206,7 +206,7 @@ TAO_DIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_DIOP_Connection_Handler::open_server (void)
+TAO_DIOP_Connection_Handler::open_server ()
 {
   TAO_DIOP_Protocol_Properties protocol_properties;
 
@@ -259,13 +259,13 @@ TAO_DIOP_Connection_Handler::open_server (void)
 }
 
 int
-TAO_DIOP_Connection_Handler::resume_handler (void)
+TAO_DIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_DIOP_Connection_Handler::close_connection (void)
+TAO_DIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -319,13 +319,13 @@ TAO_DIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_DIOP_Connection_Handler::release_os_resources (void)
+TAO_DIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer ().close ();
 }
 
 int
-TAO_DIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_DIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index bddca90cdeb..20cbd7f2fa3 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -52,14 +52,14 @@ public:
   TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_DIOP_Connection_Handler (void);
+  ~TAO_DIOP_Connection_Handler ();
 
   /// Called by the <Strategy_Acceptor> when the handler is completely
   /// connected.  Argument is unused.
   virtual int open (void *);
 
   // @@ Frank: Similar to open, but called on server
-  virtual int open_server (void);
+  virtual int open_server ();
 
   //@{
   /**
@@ -75,8 +75,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -85,7 +85,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   // @@ Frank: Not needed
   /*
@@ -99,11 +99,11 @@ public:
    *
    */
   //@{
-  const ACE_INET_Addr &addr (void);
+  const ACE_INET_Addr &addr ();
 
   void addr (const ACE_INET_Addr &addr);
 
-  const ACE_INET_Addr &local_addr (void);
+  const ACE_INET_Addr &local_addr ();
 
   void local_addr (const ACE_INET_Addr &addr);
   //@}
@@ -118,7 +118,7 @@ protected:
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 79bb9eb9e6f..a82ab2ed3cd 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -19,7 +19,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DIOP_Connector::TAO_DIOP_Connector (void)
+TAO_DIOP_Connector::TAO_DIOP_Connector ()
   : TAO_Connector (TAO_TAG_DIOP_PROFILE)
 {
 }
@@ -37,7 +37,7 @@ TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_DIOP_Connector::close (void)
+TAO_DIOP_Connector::close ()
 {
   return 0;
 }
@@ -222,7 +222,7 @@ TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_DIOP_Connector::make_profile (void)
+TAO_DIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 4d43cc543f0..de4b8e2109b 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -46,7 +46,7 @@ class TAO_Strategies_Export TAO_DIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_DIOP_Connector (void);
+  TAO_DIOP_Connector ();
 
   /// Destructor.
   ~TAO_DIOP_Connector () = default;
@@ -58,7 +58,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -80,7 +80,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (void);
+  virtual TAO_Profile * make_profile ();
   //@}
 
   /// Cancel the passed cvs handler from the connector
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index 599a55aaff4..335af696afb 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -52,7 +52,7 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
   this->host (host); // With IPv6 performs check for decimal address
 }
 
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (void)
+TAO_DIOP_Endpoint::TAO_DIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_DIOP_PROFILE),
     host_ (),
     port_ (0),
@@ -172,13 +172,13 @@ TAO_DIOP_Endpoint::host (const char *h)
 }
 
 TAO_Endpoint *
-TAO_DIOP_Endpoint::next (void)
+TAO_DIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_DIOP_Endpoint::duplicate (void)
+TAO_DIOP_Endpoint::duplicate ()
 {
   TAO_DIOP_Endpoint *endpoint = 0;
 
@@ -206,7 +206,7 @@ TAO_DIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_DIOP_Endpoint::hash (void)
+TAO_DIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h
index b902b1f1b6e..ead5690cc3d 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ b/TAO/tao/Strategies/DIOP_Endpoint.h
@@ -46,7 +46,7 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_DIOP_Endpoint (void);
+  TAO_DIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -73,16 +73,16 @@ public:
    * Please check the documentation in Endpoint.h for details.
    */
   //@{
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (void);
+  CORBA::ULong hash ();
   //@}
 
   // Allocates memory and returns a copy of <this>
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index 869bcba0155..66fc22e5328 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -13,7 +13,7 @@ static const char the_prefix[] = "diop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
+TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE)
 {
 }
@@ -38,7 +38,7 @@ TAO_DIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_DIOP_Protocol_Factory::make_acceptor (void)
+TAO_DIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -56,7 +56,7 @@ TAO_DIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 }
 
 TAO_Connector *
-TAO_DIOP_Protocol_Factory::make_connector (void)
+TAO_DIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h
index b38e7c8f140..1dbab86231a 100644
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ b/TAO/tao/Strategies/DIOP_Factory.h
@@ -36,7 +36,7 @@ class TAO_Strategies_Export TAO_DIOP_Protocol_Factory
 {
 public:
   /// Constructor.
-  TAO_DIOP_Protocol_Factory (void);
+  TAO_DIOP_Protocol_Factory ();
 
   /// Destructor.
   virtual ~TAO_DIOP_Protocol_Factory (void) = default;
@@ -61,8 +61,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 };
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index d72faabb28b..7bb6c2e3cd4 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -66,7 +66,7 @@ TAO_DIOP_Profile::TAO_DIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_DIOP_Profile::~TAO_DIOP_Profile (void)
+TAO_DIOP_Profile::~TAO_DIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -342,7 +342,7 @@ TAO_DIOP_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_DIOP_Profile::endpoint (void)
+TAO_DIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -448,7 +448,7 @@ TAO_DIOP_Profile::to_string () const
 }
 
 const char *
-TAO_DIOP_Profile::prefix (void)
+TAO_DIOP_Profile::prefix ()
 {
   return ::the_prefix;
 }
@@ -499,7 +499,7 @@ TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_DIOP_Profile::encode_endpoints (void)
+TAO_DIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -552,7 +552,7 @@ TAO_DIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_DIOP_Profile::decode_endpoints (void)
+TAO_DIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index a9541717e1a..a5cea7758f5 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -47,7 +47,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -70,13 +70,13 @@ public:
   TAO_DIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_DIOP_Profile (void);
+  ~TAO_DIOP_Profile ();
 
 
   /// Template methods. Please tao/Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -91,7 +91,7 @@ protected:
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 protected:
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 59cd61a83c6..6c373c2fcf5 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -29,13 +29,13 @@ TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
 }
 
 ACE_Event_Handler *
-TAO_DIOP_Transport::event_handler_i (void)
+TAO_DIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_DIOP_Transport::connection_handler_i (void)
+TAO_DIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -199,7 +199,7 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh,
 
 
 int
-TAO_DIOP_Transport::register_handler (void)
+TAO_DIOP_Transport::register_handler ()
 {
   // @@ Michael:
   //
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 2b8563a6f09..2dbd1b46019 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -67,8 +67,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
@@ -80,7 +80,7 @@ protected:
                         size_t len,
                         const ACE_Time_Value *s = 0);
 
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
   ///@}
 public:
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
index a007a8ebd5a..9254ad45457 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_OC_Endpoint_Selector_Factory::~TAO_OC_Endpoint_Selector_Factory (void)
+TAO_OC_Endpoint_Selector_Factory::~TAO_OC_Endpoint_Selector_Factory ()
 {
   delete this->oc_endpoint_selector_;
 }
@@ -41,7 +41,7 @@ TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_OC_Endpoint_Selector_Factory::register_orb_initializer (void)
+TAO_OC_Endpoint_Selector_Factory::register_orb_initializer ()
 {
   // Register the ORB initializer.
   try
@@ -75,7 +75,7 @@ TAO_OC_Endpoint_Selector_Factory::register_orb_initializer (void)
 }
 
 TAO_Invocation_Endpoint_Selector *
-TAO_OC_Endpoint_Selector_Factory::get_selector (void)
+TAO_OC_Endpoint_Selector_Factory::get_selector ()
 {
   // Trivial endpoint selector.  Just return the default selector.
   return this->oc_endpoint_selector_;
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
index d95d4108d6f..a6d1b2a544c 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
@@ -53,13 +53,13 @@ public:
   TAO_OC_Endpoint_Selector_Factory () = default;
 
   /// Destructor.
-  virtual ~TAO_OC_Endpoint_Selector_Factory (void);
+  virtual ~TAO_OC_Endpoint_Selector_Factory ();
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 protected:
   /// The possible endpoint selector strategies that can be
@@ -67,7 +67,7 @@ protected:
 
   TAO_Optimized_Connection_Endpoint_Selector *oc_endpoint_selector_ {};
 
-  int register_orb_initializer (void);
+  int register_orb_initializer ();
 };
 
 
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
index d0bff0c6aa5..1d61cb5d7f6 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
@@ -12,7 +12,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_OC_Endpoint_Selector_Loader::init (void)
+TAO_OC_Endpoint_Selector_Loader::init ()
 {
   return  ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory);
 }
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
index 0913f89df53..1a7a560912e 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
@@ -42,7 +42,7 @@ class TAO_Optimized_Connection_Endpoint_Selector;
 class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Loader
 {
 public:
-  static int init(void);
+  static int init();
 };
 
 static int
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index 1f1a862d93e..e90d111ee97 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -36,7 +36,7 @@ TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv)
 }
 
 TAO_Optimized_Connection_Endpoint_Selector::
-~TAO_Optimized_Connection_Endpoint_Selector (void)
+~TAO_Optimized_Connection_Endpoint_Selector ()
 {
 }
 
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
index 7a01714c86f..71bd45f5df9 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
@@ -50,7 +50,7 @@ public:
   TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value& tv);
 
   /// Destructor.
-  virtual ~TAO_Optimized_Connection_Endpoint_Selector (void);
+  virtual ~TAO_Optimized_Connection_Endpoint_Selector ();
 
   static void hook (TAO_ORB_Core *,
                     TAO_Stub *,
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 49819d0f4eb..b5ae1ccca8a 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -18,7 +18,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (void)
+TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE),
     addrs_ (0),
     port_span_ (1),
@@ -34,7 +34,7 @@ TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (void)
 {
 }
 
-TAO_SCIOP_Acceptor::~TAO_SCIOP_Acceptor (void)
+TAO_SCIOP_Acceptor::~TAO_SCIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -202,7 +202,7 @@ TAO_SCIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_SCIOP_Acceptor::close (void)
+TAO_SCIOP_Acceptor::close ()
 {
   return this->base_acceptor_.close ();
 }
@@ -851,7 +851,7 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames,
 }
 
 CORBA::ULong
-TAO_SCIOP_Acceptor::endpoint_count (void)
+TAO_SCIOP_Acceptor::endpoint_count ()
 {
   return this->endpoint_count_;
 }
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index 6bf3e96aeca..4c53f4dfcbe 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -46,17 +46,17 @@ class TAO_Strategies_Export TAO_SCIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_SCIOP_Acceptor (void);
+  TAO_SCIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_SCIOP_Acceptor (void);
+  ~TAO_SCIOP_Acceptor ();
 
   /// @@ Helper method for the implementation repository, should go
   ///    away
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   typedef TAO_Strategy_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> TAO_SCIOP_BASE_ACCEPTOR;
   typedef TAO_Creation_Strategy<TAO_SCIOP_Connection_Handler> TAO_SCIOP_CREATION_STRATEGY;
@@ -78,12 +78,12 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
@@ -146,7 +146,7 @@ protected:
 
   /// Obtain tcp properties that must be used by this acceptor, i.e.,
   /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
+  int init_tcp_properties ();
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 463ca2f9dc0..5d6de7fbb5a 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -58,7 +58,7 @@ TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_co
   this->transport (specific_transport);
 }
 
-TAO_SCIOP_Connection_Handler::~TAO_SCIOP_Connection_Handler (void)
+TAO_SCIOP_Connection_Handler::~TAO_SCIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -255,13 +255,13 @@ TAO_SCIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_SCIOP_Connection_Handler::resume_handler (void)
+TAO_SCIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_SCIOP_Connection_Handler::close_connection (void)
+TAO_SCIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -325,13 +325,13 @@ TAO_SCIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_SCIOP_Connection_Handler::release_os_resources (void)
+TAO_SCIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer().close ();
 }
 
 int
-TAO_SCIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_SCIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
index 0871585888b..f1dd65710cd 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -64,7 +64,7 @@ public:
   TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_SCIOP_Connection_Handler (void);
+  ~TAO_SCIOP_Connection_Handler ();
 
   //@{
   /**
@@ -84,8 +84,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -94,7 +94,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   /// Process the <listen_list>
   int process_listen_point_list (IIOP::ListenPointList &listen_list);
@@ -111,8 +111,8 @@ protected:
   /**
    * @name TAO_Connection Handler overloads
    */
-  //  void handle_close_i (void);
-  virtual int release_os_resources (void);
+  //  void handle_close_i ();
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index d41dc1a1752..2dcc7944a35 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -22,14 +22,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SCIOP_Connector::TAO_SCIOP_Connector (void)
+TAO_SCIOP_Connector::TAO_SCIOP_Connector ()
   : TAO_Connector (TAO_TAG_SCIOP_PROFILE),
     connect_strategy_ (),
     base_connector_ (0)
 {
 }
 
-TAO_SCIOP_Connector::~TAO_SCIOP_Connector (void)
+TAO_SCIOP_Connector::~TAO_SCIOP_Connector ()
 {
 }
 
@@ -70,7 +70,7 @@ TAO_SCIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_SCIOP_Connector::close (void)
+TAO_SCIOP_Connector::close ()
 {
   delete this->base_connector_.concurrency_strategy ();
   delete this->base_connector_.creation_strategy ();
@@ -333,7 +333,7 @@ TAO_SCIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SCIOP_Connector::make_profile (void)
+TAO_SCIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index d3da4648cec..c73662fb73a 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -48,15 +48,15 @@ class TAO_Strategies_Export TAO_SCIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_SCIOP_Connector (void);
+  TAO_SCIOP_Connector ();
 
   /// Destructor.
-  ~TAO_SCIOP_Connector (void);
+  ~TAO_SCIOP_Connector ();
 
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
   virtual int check_prefix (const char *endpoint);
@@ -89,7 +89,7 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 7ba3ee9a8f9..8a6b5c604d9 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -51,7 +51,7 @@ TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const char *host,
 {
 }
 
-TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (void)
+TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
   , host_ ()
   , port_ (683)  // default port (IANA assigned)
@@ -149,13 +149,13 @@ TAO_SCIOP_Endpoint::host (const char *h)
 }
 
 TAO_Endpoint *
-TAO_SCIOP_Endpoint::next (void)
+TAO_SCIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_SCIOP_Endpoint::duplicate (void)
+TAO_SCIOP_Endpoint::duplicate ()
 {
   TAO_SCIOP_Endpoint *endpoint = 0;
 
@@ -183,7 +183,7 @@ TAO_SCIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_SCIOP_Endpoint::hash (void)
+TAO_SCIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h
index b4498b45e7f..e62e0601f05 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.h
@@ -49,7 +49,7 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_SCIOP_Endpoint (void);
+  TAO_SCIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -73,16 +73,16 @@ public:
   // = Implementation of abstract TAO_Endpoint methods.  See
   // Endpoint.h for their documentation.
 
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
+  virtual CORBA::ULong hash ();
 
   // = SCIOP_Endpoint-specific methods.
 
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index d19d49692e6..aeb5c0d4c17 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -11,7 +11,7 @@ static const char prefix_[] = "sciop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void)
+TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE)
 {
 }
@@ -36,7 +36,7 @@ TAO_SCIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_SCIOP_Protocol_Factory::make_acceptor (void)
+TAO_SCIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -54,7 +54,7 @@ TAO_SCIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 }
 
 TAO_Connector *
-TAO_SCIOP_Protocol_Factory::make_connector (void)
+TAO_SCIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
index c481b61ae37..96a633968ea 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -53,8 +53,8 @@ public:
   virtual char options_delimiter () const;
 
   // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
 };
 
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index eaf71d16817..c82ac534360 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -61,7 +61,7 @@ TAO_SCIOP_Profile::TAO_SCIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_SCIOP_Profile::~TAO_SCIOP_Profile (void)
+TAO_SCIOP_Profile::~TAO_SCIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -284,7 +284,7 @@ TAO_SCIOP_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_SCIOP_Profile::endpoint (void)
+TAO_SCIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -343,7 +343,7 @@ TAO_SCIOP_Profile::to_string () const
 }
 
 const char *
-TAO_SCIOP_Profile::prefix (void)
+TAO_SCIOP_Profile::prefix ()
 {
   return ::prefix_;
 }
@@ -396,7 +396,7 @@ TAO_SCIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_SCIOP_Profile::encode_endpoints (void)
+TAO_SCIOP_Profile::encode_endpoints ()
 {
   CORBA::ULong actual_count = 0;
 
@@ -452,7 +452,7 @@ TAO_SCIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_SCIOP_Profile::decode_endpoints (void)
+TAO_SCIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index c13e6606563..d0b4994c586 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -46,7 +46,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -68,12 +68,12 @@ public:
   TAO_SCIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_SCIOP_Profile (void);
+  ~TAO_SCIOP_Profile ();
 
   /// Template methods. Please see Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -86,7 +86,7 @@ public:
 protected:
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index fa17942ca95..aadbe366401 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -29,18 +29,18 @@ TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
 {
 }
 
-TAO_SCIOP_Transport::~TAO_SCIOP_Transport (void)
+TAO_SCIOP_Transport::~TAO_SCIOP_Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO_SCIOP_Transport::event_handler_i (void)
+TAO_SCIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_SCIOP_Transport::connection_handler_i (void)
+TAO_SCIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index 29258a9b221..575d85e9476 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -56,7 +56,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  virtual ~TAO_SCIOP_Transport (void);
+  virtual ~TAO_SCIOP_Transport ();
 
   /** @name Overridden Template Methods
    *
@@ -64,7 +64,7 @@ protected:
    * details.
    */
   //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
 
   virtual ssize_t send (iovec *iov, int iovcnt,
                         size_t &bytes_transferred,
@@ -95,7 +95,7 @@ public:
 
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
-  virtual TAO_Connection_Handler * connection_handler_i (void);
+  virtual TAO_Connection_Handler * connection_handler_i ();
 
   //@}
 
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 83443fd6430..0074fa17533 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void)
+TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     orb_core_ (0),
@@ -28,7 +28,7 @@ TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void)
 {
 }
 
-TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor (void)
+TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -160,7 +160,7 @@ TAO_SHMIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_SHMIOP_Acceptor::close (void)
+TAO_SHMIOP_Acceptor::close ()
 {
   return this->base_acceptor_.close ();
 }
@@ -389,7 +389,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 
 
 CORBA::ULong
-TAO_SHMIOP_Acceptor::endpoint_count (void)
+TAO_SHMIOP_Acceptor::endpoint_count ()
 {
   // @@ for now just assume one!
   // we should take a look at the local address, if it is zero then
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index 870ea885cb6..853086b1d3e 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -41,10 +41,10 @@ class TAO_Strategies_Export TAO_SHMIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_SHMIOP_Acceptor (void);
+  TAO_SHMIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_SHMIOP_Acceptor (void);
+  ~TAO_SHMIOP_Acceptor ();
 
   typedef TAO_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> TAO_SHMIOP_BASE_ACCEPTOR;
   typedef TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler> TAO_SHMIOP_CREATION_STRATEGY;
@@ -68,13 +68,13 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint* endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index a98a0368370..ec18a6ab654 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -46,7 +46,7 @@ TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_
 }
 
 
-TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler (void)
+TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -161,13 +161,13 @@ TAO_SHMIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_SHMIOP_Connection_Handler::resume_handler (void)
+TAO_SHMIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_SHMIOP_Connection_Handler::close_connection (void)
+TAO_SHMIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -231,13 +231,13 @@ TAO_SHMIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_SHMIOP_Connection_Handler::release_os_resources (void)
+TAO_SHMIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer().close ();
 }
 
 int
-TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_SHMIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index fd87499568d..4a688d9128d 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -51,7 +51,7 @@ public:
   TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_SHMIOP_Connection_Handler (void);
+  ~TAO_SHMIOP_Connection_Handler ();
 
   /// Called by the <Strategy_Acceptor> when the handler is completely
   /// connected.  Argument is unused.
@@ -71,8 +71,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -81,14 +81,14 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
 protected:
   //@{
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 };
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 3d73ecca9cf..ab03c1c0fd4 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -17,7 +17,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (void)
+TAO_SHMIOP_Connector::TAO_SHMIOP_Connector ()
   : TAO_Connector (TAO_TAG_SHMEM_PROFILE),
     connect_strategy_ (),
     base_connector_ (0)
@@ -69,7 +69,7 @@ TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_SHMIOP_Connector::close (void)
+TAO_SHMIOP_Connector::close ()
 {
   delete this->base_connector_.concurrency_strategy ();
   delete this->base_connector_.creation_strategy ();
@@ -272,7 +272,7 @@ TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SHMIOP_Connector::make_profile (void)
+TAO_SHMIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@port/object_key
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index f9e42ff4e95..6eb0d3329a8 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -62,7 +62,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -99,7 +99,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index bb69096a8fd..ef5c6d8ab71 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -56,7 +56,7 @@ TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const char *host,
     this->host_ = host;
 }
 
-TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (void)
+TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
     , host_ ()
     , port_ (0)
@@ -82,7 +82,7 @@ TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const char *host,
   this->priority (priority);
 }
 
-TAO_SHMIOP_Endpoint::~TAO_SHMIOP_Endpoint (void)
+TAO_SHMIOP_Endpoint::~TAO_SHMIOP_Endpoint ()
 {
 }
 
@@ -151,13 +151,13 @@ TAO_SHMIOP_Endpoint::host (const char *h)
 }
 
 TAO_Endpoint *
-TAO_SHMIOP_Endpoint::next (void)
+TAO_SHMIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_SHMIOP_Endpoint::duplicate (void)
+TAO_SHMIOP_Endpoint::duplicate ()
 {
   TAO_SHMIOP_Endpoint *endpoint = 0;
   ACE_NEW_RETURN (endpoint,
@@ -186,7 +186,7 @@ TAO_SHMIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_SHMIOP_Endpoint::hash (void)
+TAO_SHMIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h
index 3199b2d684d..366d0cab3b0 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h
@@ -44,7 +44,7 @@ public:
   friend class TAO_SHMIOP_Profile;
 
   /// Default constructor.
-  TAO_SHMIOP_Endpoint (void);
+  TAO_SHMIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -68,7 +68,7 @@ public:
                        CORBA::Short priority);
 
   /// Destructor.
-  ~TAO_SHMIOP_Endpoint (void);
+  ~TAO_SHMIOP_Endpoint ();
 
   /**
    * @name TAO_Endpoint Methods
@@ -77,16 +77,16 @@ public:
    */
   //@{
   /// Return a copy of @c this
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (void);
+  CORBA::ULong hash ();
   //@}
 
   // = SHMIOP_Endpoint-specific methods.
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
index d2950755688..88ad0f33aa3 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -15,14 +15,14 @@ static const char prefix_[] = "shmiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void)
+TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory ()
   : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE),
     mmap_prefix_ (0),
     min_bytes_ (10*1024)        // @@ Nanbor, remove this magic number!!
 {
 }
 
-TAO_SHMIOP_Protocol_Factory::~TAO_SHMIOP_Protocol_Factory (void)
+TAO_SHMIOP_Protocol_Factory::~TAO_SHMIOP_Protocol_Factory ()
 {
   delete [] this->mmap_prefix_;
 }
@@ -47,7 +47,7 @@ TAO_SHMIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_SHMIOP_Protocol_Factory::make_acceptor (void)
+TAO_SHMIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_SHMIOP_Acceptor *acceptor = 0;
 
@@ -94,7 +94,7 @@ TAO_SHMIOP_Protocol_Factory::init (int argc,
 }
 
 TAO_Connector *
-TAO_SHMIOP_Protocol_Factory::make_connector (void)
+TAO_SHMIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h
index f6eb29a88d5..bbcd712bc2e 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ b/TAO/tao/Strategies/SHMIOP_Factory.h
@@ -36,10 +36,10 @@ class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory
 {
 public:
   /// Constructor.
-  TAO_SHMIOP_Protocol_Factory (void);
+  TAO_SHMIOP_Protocol_Factory ();
 
   /// Destructor.
-  virtual ~TAO_SHMIOP_Protocol_Factory (void);
+  virtual ~TAO_SHMIOP_Protocol_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -61,8 +61,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 
@@ -70,7 +70,7 @@ public:
   void mmap_file_prefix (const ACE_TCHAR *prefix);
 
   /// Get mmap file prefix
-  const ACE_TCHAR *mmap_file_prefix (void);
+  const ACE_TCHAR *mmap_file_prefix ();
 
 private:
   /// Specify the prefix (full path) for mmap files
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index ca5cbea5c7a..2af43d55793 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -65,7 +65,7 @@ TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_SHMIOP_Profile::~TAO_SHMIOP_Profile (void)
+TAO_SHMIOP_Profile::~TAO_SHMIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -81,7 +81,7 @@ TAO_SHMIOP_Profile::~TAO_SHMIOP_Profile (void)
 }
 
 TAO_Endpoint*
-TAO_SHMIOP_Profile::endpoint (void)
+TAO_SHMIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -359,7 +359,7 @@ TAO_SHMIOP_Profile::to_string () const
 }
 
 const char *
-TAO_SHMIOP_Profile::prefix (void)
+TAO_SHMIOP_Profile::prefix ()
 {
   return ::prefix_;
 }
@@ -395,7 +395,7 @@ TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_SHMIOP_Profile::encode_endpoints (void)
+TAO_SHMIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -449,7 +449,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_SHMIOP_Profile::decode_endpoints (void)
+TAO_SHMIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 84294c9b455..344f7f4a43e 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -48,7 +48,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -70,13 +70,13 @@ public:
   TAO_SHMIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_SHMIOP_Profile (void);
+  ~TAO_SHMIOP_Profile ();
 
 
   /// Template methods, please see Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -91,7 +91,7 @@ protected:
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 private:
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index c75de9b6f65..bacbceb99cb 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -24,18 +24,18 @@ TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handl
 {
 }
 
-TAO_SHMIOP_Transport::~TAO_SHMIOP_Transport (void)
+TAO_SHMIOP_Transport::~TAO_SHMIOP_Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO_SHMIOP_Transport::event_handler_i (void)
+TAO_SHMIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_SHMIOP_Transport::connection_handler_i (void)
+TAO_SHMIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index eb52a8f8a7e..ce57615d10c 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -55,7 +55,7 @@ public:
                         TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_SHMIOP_Transport (void);
+  ~TAO_SHMIOP_Transport ();
 
 protected:
   /**
@@ -64,8 +64,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index c2b7cb5287b..3d1b80571b8 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -17,7 +17,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
+TAO_UIOP_Acceptor::TAO_UIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_UIOP_PROFILE),
     base_acceptor_ (this),
     creation_strategy_ (0),
@@ -29,7 +29,7 @@ TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
 {
 }
 
-TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
+TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -168,7 +168,7 @@ TAO_UIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_UIOP_Acceptor::close (void)
+TAO_UIOP_Acceptor::close ()
 {
   if (this->unlink_on_close_)
     {
@@ -334,7 +334,7 @@ TAO_UIOP_Acceptor::rendezvous_point (ACE_UNIX_Addr &addr,
 }
 
 CORBA::ULong
-TAO_UIOP_Acceptor::endpoint_count (void)
+TAO_UIOP_Acceptor::endpoint_count ()
 {
   return 1;
 }
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index 1231f8fd0bc..498850744f3 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -46,10 +46,10 @@ public:
   // Create Acceptor object using addr.
 
   /// Create Acceptor object using addr.
-  TAO_UIOP_Acceptor (void);
+  TAO_UIOP_Acceptor ();
 
   /// Destructor
-  virtual ~TAO_UIOP_Acceptor (void);
+  virtual ~TAO_UIOP_Acceptor ();
 
   typedef TAO_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR;
   typedef TAO_Creation_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CREATION_STRATEGY;
@@ -73,13 +73,13 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint* endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
@@ -99,7 +99,7 @@ private:
 
   /// Obtains uiop properties that must be used by this acceptor, i.e.,
   /// initializes <uiop_properties_>.
-  int init_uiop_properties (void);
+  int init_uiop_properties ();
 
   /// Create a UIOP profile representing this acceptor.
   int create_new_profile (const TAO::ObjectKey &object_key,
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index e6638ac8f3f..b8ccf92b0a9 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -44,7 +44,7 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core
 }
 
 
-TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler (void)
+TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -137,13 +137,13 @@ TAO_UIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_UIOP_Connection_Handler::resume_handler (void)
+TAO_UIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_UIOP_Connection_Handler::close_connection (void)
+TAO_UIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -205,13 +205,13 @@ TAO_UIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_UIOP_Connection_Handler::release_os_resources (void)
+TAO_UIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer().close ();
 }
 
 int
-TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_UIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_UNIX_Addr addr;
 
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index 8e0b92a8e9c..e829448dae3 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -50,7 +50,7 @@ public:
   TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_UIOP_Connection_Handler (void);
+  ~TAO_UIOP_Connection_Handler ();
 
   //@{
   /**
@@ -67,8 +67,8 @@ public:
   /** @name Event Handler overloads
    */
   virtual int open (void *);
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -77,14 +77,14 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
 protected:
   //@{
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 };
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 5203ed8c22f..4e0fb62ff5e 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -19,14 +19,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIOP_Connector::TAO_UIOP_Connector (void)
+TAO_UIOP_Connector::TAO_UIOP_Connector ()
   : TAO_Connector (TAO_TAG_UIOP_PROFILE),
     connect_strategy_ (),
     base_connector_ (0)
 {
 }
 
-TAO_UIOP_Connector::~TAO_UIOP_Connector (void)
+TAO_UIOP_Connector::~TAO_UIOP_Connector ()
 {
 }
 
@@ -62,7 +62,7 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_UIOP_Connector::close (void)
+TAO_UIOP_Connector::close ()
 {
   // Zap the creation strategy that we created earlier.
   delete this->base_connector_.creation_strategy ();
@@ -306,7 +306,7 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIOP_Connector::make_profile (void)
+TAO_UIOP_Connector::make_profile ()
 {
   TAO_Profile *profile = 0;
   ACE_NEW_THROW_EX (profile,
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index 88be6638ccd..3d9a4c6df30 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -50,10 +50,10 @@ public:
    * @@ Do we want to pass in the tag here or should it be statically
    * defined?
    */
-  TAO_UIOP_Connector (void);
+  TAO_UIOP_Connector ();
 
   /// Destructor
-  ~TAO_UIOP_Connector (void);
+  ~TAO_UIOP_Connector ();
 
   /**
    * @name The TAO_Connector Methods
@@ -62,7 +62,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -104,7 +104,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   //@}
 
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp
index 41cb8cee3f5..fff5aa8b3a7 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp
@@ -19,7 +19,7 @@ TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
 {
 }
 
-TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (void)
+TAO_UIOP_Endpoint::TAO_UIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_UIOP_PROFILE)
     , object_addr_ ()
     , next_ (0)
@@ -38,13 +38,13 @@ TAO_UIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 }
 
 TAO_Endpoint *
-TAO_UIOP_Endpoint::next (void)
+TAO_UIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_UIOP_Endpoint::duplicate (void)
+TAO_UIOP_Endpoint::duplicate ()
 {
   TAO_UIOP_Endpoint *endpoint = 0;
   ACE_NEW_RETURN (endpoint,
@@ -70,7 +70,7 @@ TAO_UIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_UIOP_Endpoint::hash (void)
+TAO_UIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h
index 72cc3e777f8..80d8af174d1 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.h
+++ b/TAO/tao/Strategies/UIOP_Endpoint.h
@@ -41,7 +41,7 @@ public:
   friend class TAO_UIOP_Profile;
 
   /// Default constructor.
-  TAO_UIOP_Endpoint (void);
+  TAO_UIOP_Endpoint ();
 
   /// Constructor.
   TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
@@ -56,16 +56,16 @@ public:
    * Please check the documentation in Endpoint.h for details.
    */
   //@{
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their rendezvous points are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
+  virtual CORBA::ULong hash ();
   //@}
 
   // = UIOP_Endpoint-specific methods.
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index 05bd45b381f..e7b004e9899 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -12,12 +12,12 @@ static const char prefix_[] = "uiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
+TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE)
 {
 }
 
-TAO_UIOP_Protocol_Factory::~TAO_UIOP_Protocol_Factory (void)
+TAO_UIOP_Protocol_Factory::~TAO_UIOP_Protocol_Factory ()
 {
 }
 
@@ -41,7 +41,7 @@ TAO_UIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_UIOP_Protocol_Factory::make_acceptor (void)
+TAO_UIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -59,7 +59,7 @@ TAO_UIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 }
 
 TAO_Connector *
-TAO_UIOP_Protocol_Factory::make_connector (void)
+TAO_UIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h
index 6aa7f179bc4..3d0535e5f6b 100644
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Factory.h
@@ -35,10 +35,10 @@ class TAO_Strategies_Export TAO_UIOP_Protocol_Factory : public TAO_Protocol_Fact
 {
 public:
   /// Constructor.
-  TAO_UIOP_Protocol_Factory (void);
+  TAO_UIOP_Protocol_Factory ();
 
   /// Destructor.
-  virtual ~TAO_UIOP_Protocol_Factory (void);
+  virtual ~TAO_UIOP_Protocol_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -60,8 +60,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 };
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 3179089b4ec..0280b6ee4e7 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -64,7 +64,7 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
+TAO_UIOP_Profile::~TAO_UIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -272,7 +272,7 @@ TAO_UIOP_Profile::to_string () const
 }
 
 const char *
-TAO_UIOP_Profile::prefix (void)
+TAO_UIOP_Profile::prefix ()
 {
   return ::prefix_;
 }
@@ -340,7 +340,7 @@ TAO_UIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_UIOP_Profile::encode_endpoints (void)
+TAO_UIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -374,7 +374,7 @@ TAO_UIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_UIOP_Profile::decode_endpoints (void)
+TAO_UIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index 645fb892ee7..6bd8fdea123 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -50,7 +50,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.  (actually, no marshalling for this protocol)
@@ -70,12 +70,12 @@ public:
   TAO_UIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_UIOP_Profile (void);
+  ~TAO_UIOP_Profile ();
 
   /// Template methods. Please see Profile.h for documentation.
   virtual char *to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -91,7 +91,7 @@ protected:
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 private:
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index 62bb3514b6e..ff778763cc3 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -23,18 +23,18 @@ TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
 {
 }
 
-TAO_UIOP_Transport::~TAO_UIOP_Transport (void)
+TAO_UIOP_Transport::~TAO_UIOP_Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO_UIOP_Transport::event_handler_i (void)
+TAO_UIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_UIOP_Transport::connection_handler_i (void)
+TAO_UIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index 8441cb44d95..f44aa3a7196 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -53,7 +53,7 @@ public:
                       TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_UIOP_Transport (void);
+  ~TAO_UIOP_Transport ();
 
 protected:
   /** @name Overridden Template Methods
@@ -61,8 +61,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 3dc066cece3..72a37aaaea1 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -41,7 +41,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
+TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer ()
 {
   TAO_ORB_Core::set_resource_factory ("Advanced_Resource_Factory");
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory);
@@ -67,7 +67,7 @@ TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 #endif /* TAO_HAS_SCIOP == 1 */
 }
 
-TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
+TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory ()
   : reactor_type_ (TAO_DEFAULT_REACTOR_TYPE),
     threadqueue_type_ (TAO_THREAD_QUEUE_NOT_SET),
     cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
@@ -77,7 +77,7 @@ TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
   // Constructor
 }
 
-TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory (void)
+TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory ()
 {
   // Destructor
   TAO_ProtocolFactorySetItor end = this->protocol_factories_.end ();
@@ -301,7 +301,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-TAO_Advanced_Resource_Factory::load_default_protocols (void)
+TAO_Advanced_Resource_Factory::load_default_protocols ()
 {
   int const r =
     this->TAO_Default_Resource_Factory::load_default_protocols ();
@@ -320,7 +320,7 @@ TAO_Advanced_Resource_Factory::load_default_protocols (void)
 
 
 int
-TAO_Advanced_Resource_Factory::init_protocol_factories (void)
+TAO_Advanced_Resource_Factory::init_protocol_factories ()
 {
   // If the default resource factory exists, then disable it.
   // This causes any directives for the "Resource_Factory" to
@@ -404,7 +404,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
 
 
 TAO_ProtocolFactorySet *
-TAO_Advanced_Resource_Factory::get_protocol_factories (void)
+TAO_Advanced_Resource_Factory::get_protocol_factories ()
 {
   return &protocol_factories_;
 }
@@ -500,7 +500,7 @@ typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC;
 typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR;
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void)
+TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->cdr_allocator_type_)
@@ -519,7 +519,7 @@ TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void)
+TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->cdr_allocator_type_)
@@ -537,7 +537,7 @@ TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_msgblock_allocator (void)
+TAO_Advanced_Resource_Factory::input_cdr_msgblock_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->cdr_allocator_type_)
@@ -556,7 +556,7 @@ TAO_Advanced_Resource_Factory::input_cdr_msgblock_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::amh_response_handler_allocator (void)
+TAO_Advanced_Resource_Factory::amh_response_handler_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->amh_response_handler_allocator_lock_type_)
@@ -575,7 +575,7 @@ TAO_Advanced_Resource_Factory::amh_response_handler_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::ami_response_handler_allocator (void)
+TAO_Advanced_Resource_Factory::ami_response_handler_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->ami_response_handler_allocator_lock_type_)
@@ -594,13 +594,13 @@ TAO_Advanced_Resource_Factory::ami_response_handler_allocator (void)
 }
 
 int
-TAO_Advanced_Resource_Factory::input_cdr_allocator_type_locked (void)
+TAO_Advanced_Resource_Factory::input_cdr_allocator_type_locked ()
 {
   return this->cdr_allocator_type_ == TAO_ALLOCATOR_NULL_LOCK ? 0 : 1;
 }
 
 TAO_Connection_Purging_Strategy *
-TAO_Advanced_Resource_Factory::create_purging_strategy (void)
+TAO_Advanced_Resource_Factory::create_purging_strategy ()
 {
   TAO_Connection_Purging_Strategy *strategy = 0;
 
@@ -641,7 +641,7 @@ TAO_Advanced_Resource_Factory::create_purging_strategy (void)
 }
 
 TAO_LF_Strategy *
-TAO_Advanced_Resource_Factory::create_lf_strategy (void)
+TAO_Advanced_Resource_Factory::create_lf_strategy ()
 {
   TAO_LF_Strategy *strategy = 0;
 
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index cd4bc8ba001..db940110e70 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -19,7 +19,7 @@ class TAO_Connection_Purging_Strategy;
 class TAO_Strategies_Export TAO_Resource_Factory_Changer
 {
 public:
-  TAO_Resource_Factory_Changer (void);
+  TAO_Resource_Factory_Changer ();
 };
 
 /**
@@ -37,10 +37,10 @@ class TAO_Strategies_Export TAO_Advanced_Resource_Factory :
 {
 public:
   /// Constructor.
-  TAO_Advanced_Resource_Factory (void);
+  TAO_Advanced_Resource_Factory ();
 
   /// Destructor.
-  virtual ~TAO_Advanced_Resource_Factory (void);
+  virtual ~TAO_Advanced_Resource_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -84,18 +84,18 @@ public:
    * @name Resource Retrieval
    */
   //@{
-  virtual int init_protocol_factories (void);
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* input_cdr_msgblock_allocator (void);
-  virtual ACE_Allocator* amh_response_handler_allocator (void);
-  virtual ACE_Allocator* ami_response_handler_allocator (void);
-  virtual int input_cdr_allocator_type_locked (void);
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
+  virtual int init_protocol_factories ();
+  virtual ACE_Allocator* input_cdr_dblock_allocator ();
+  virtual ACE_Allocator* input_cdr_buffer_allocator ();
+  virtual ACE_Allocator* input_cdr_msgblock_allocator ();
+  virtual ACE_Allocator* amh_response_handler_allocator ();
+  virtual ACE_Allocator* ami_response_handler_allocator ();
+  virtual int input_cdr_allocator_type_locked ();
+  virtual TAO_ProtocolFactorySet *get_protocol_factories ();
   //@}
 
-  virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void);
-  virtual TAO_LF_Strategy *create_lf_strategy (void);
+  virtual TAO_Connection_Purging_Strategy *create_purging_strategy ();
+  virtual TAO_LF_Strategy *create_lf_strategy ();
 
 protected:
   /// Obtain the reactor implementation
@@ -125,7 +125,7 @@ protected:
   /// Type of lock used by AMI response handler allocator.
   Allocator_Lock_Type ami_response_handler_allocator_lock_type_;
 
-  virtual int load_default_protocols (void);
+  virtual int load_default_protocols ();
 };
 
 static TAO_Resource_Factory_Changer TAO_changer;
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 79f061727a7..75199865edb 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -275,10 +275,10 @@ protected:
   /// enforce proper reference counting.
   virtual ~TAO_Stub ();
 
-  /// NON-THREAD SAFE version of reset_profiles (void);
+  /// NON-THREAD SAFE version of reset_profiles ();
   void reset_profiles_i ();
 
-  /// NON-THREAD SAFE version of next_profile (void)
+  /// NON-THREAD SAFE version of next_profile ()
   TAO_Profile *next_profile_i ();
 
 private:
diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h
index b5c84d6a356..ae4534d1b39 100644
--- a/TAO/tao/Stub_Factory.h
+++ b/TAO/tao/Stub_Factory.h
@@ -48,7 +48,7 @@ class TAO_Export TAO_Stub_Factory : public ACE_Service_Object
 {
 public:
   /// Destructor.
-  virtual ~TAO_Stub_Factory (void);
+  virtual ~TAO_Stub_Factory ();
 
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index f7fdb843f84..78f4622e327 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -57,7 +57,7 @@ public:
                             bool is_heap_allocated = false);
 
   /// Destructor
-  virtual ~TAO_Synch_Queued_Message (void);
+  virtual ~TAO_Synch_Queued_Message ();
 
   const ACE_Message_Block *current_block () const;
 
@@ -69,7 +69,7 @@ public:
   virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const;
   virtual void bytes_transferred (size_t &byte_count);
   virtual TAO_Queued_Message *clone (ACE_Allocator *alloc);
-  virtual void destroy (void);
+  virtual void destroy ();
   virtual void copy_if_necessary (const ACE_Message_Block* chain);
   //@}
 
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
index 492ee780dc7..fd43063fe20 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -48,16 +48,16 @@ public:
                               IOP::ServiceContextList &sc);
 
   /// Destructor.
-  virtual ~TAO_Synch_Reply_Dispatcher (void);
+  virtual ~TAO_Synch_Reply_Dispatcher ();
 
   /// Return the reply CDR.
-  TAO_InputCDR &reply_cdr (void);
+  TAO_InputCDR &reply_cdr ();
 
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
 
-  virtual void connection_closed (void);
+  virtual void connection_closed ();
 
-  virtual void reply_timed_out (void);
+  virtual void reply_timed_out ();
 
 protected:
   /// The service context list
diff --git a/TAO/tao/System_Time_Policy_Strategy.h b/TAO/tao/System_Time_Policy_Strategy.h
index b8b52470f0c..c5a7fd76d72 100644
--- a/TAO/tao/System_Time_Policy_Strategy.h
+++ b/TAO/tao/System_Time_Policy_Strategy.h
@@ -41,11 +41,11 @@ class TAO_Export TAO_System_Time_Policy_Strategy
 public:
   virtual ~TAO_System_Time_Policy_Strategy ();
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
-  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void);
+  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy ();
 
 private:
   static ACE_Time_Policy_T<ACE_System_Time_Policy>  time_policy_;
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp
index 58d96602e2e..f5c235ae8fa 100644
--- a/TAO/tao/TAO_Singleton.cpp
+++ b/TAO/tao/TAO_Singleton.cpp
@@ -22,7 +22,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE, class ACE_LOCK> void
-TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
+TAO_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::dump");
@@ -34,13 +34,13 @@ TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
 }
 
 template <class TYPE, class ACE_LOCK> TAO_Singleton<TYPE, ACE_LOCK> *&
-TAO_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+TAO_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
   return TAO_Singleton<TYPE, ACE_LOCK>::singleton_;
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-TAO_Singleton<TYPE, ACE_LOCK>::instance (void)
+TAO_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::instance");
 
@@ -118,7 +118,7 @@ template <class TYPE, class ACE_LOCK> TAO_TSS_Singleton<TYPE, ACE_LOCK> *
 TAO_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 
 template <class TYPE, class ACE_LOCK> void
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
+TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump");
@@ -130,13 +130,13 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 }
 
 template <class TYPE, class ACE_LOCK> TAO_TSS_Singleton<TYPE, ACE_LOCK> *&
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
   return TAO_TSS_Singleton<TYPE, ACE_LOCK>::singleton_;
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
+TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance");
 
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index a3b1ed59802..be2c6bf30c4 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -48,7 +48,7 @@ class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base
 {
 public:
   /// Explicitly initialize.
-  virtual int init (void);
+  virtual int init ();
 
   /**
    * Explicitly initialize the TAO_Singleton_Manager, in addition to
@@ -64,24 +64,24 @@ public:
    * Returns 1 before the TAO_Singleton_Manager has been constructed.
    * See ACE_Object_Manager::starting_up for more information.
    */
-  static int starting_up (void);
+  static int starting_up ();
 
   /// Returns 1 after the TAO_Singleton_Manager has been destroyed.
   /// See ACE_Object_Manager::shutting_down for more information.
-  static int shutting_down (void);
+  static int shutting_down ();
 
   /// Accesses a default signal set used, for example, in
   /// ACE_Sig_Guard methods.
-  static sigset_t *default_mask (void);
+  static sigset_t *default_mask ();
 
   /// Returns the current thread hook for the process.
-  static ACE_Thread_Hook *thread_hook (void);
+  static ACE_Thread_Hook *thread_hook ();
 
   /// Returns the existing thread hook and assign a new_thread_hook.
   static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *new_thread_hook);
 
   /// Accessor to singleton instance.
-  static TAO_Singleton_Manager *instance (void);
+  static TAO_Singleton_Manager *instance ();
 
   /// Register an ACE_Cleanup object for cleanup at process
   /// termination.
@@ -119,8 +119,8 @@ public:
 protected:
   /// Force allocation on the heap.
   //@{
-  TAO_Singleton_Manager (void);
-  ~TAO_Singleton_Manager (void);
+  TAO_Singleton_Manager ();
+  ~TAO_Singleton_Manager ();
   //@}
 
 private:
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
index 2979579e685..62d3937c40d 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ b/TAO/tao/Thread_Per_Connection_Handler.h
@@ -44,7 +44,7 @@ public:
   TAO_Thread_Per_Connection_Handler (TAO_Connection_Handler *ch,
                                      TAO_ORB_Core *oc);
 
-  ~TAO_Thread_Per_Connection_Handler (void);
+  ~TAO_Thread_Per_Connection_Handler ();
 
   /// Template hook method that the thread uses...
   /**
diff --git a/TAO/tao/Time_Policy_Manager.h b/TAO/tao/Time_Policy_Manager.h
index ab665a8221a..20ba14c27ba 100644
--- a/TAO/tao/Time_Policy_Manager.h
+++ b/TAO/tao/Time_Policy_Manager.h
@@ -51,7 +51,7 @@ public:
   /// Parse svc.conf arguments
   int parse_args (int argc, ACE_TCHAR* argv[]);
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index efb04c92090..a4e4b5196bd 100644
--- a/TAO/tao/TkResource/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -6,13 +6,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  TkResource_Factory::TkResource_Factory (void)
+  TkResource_Factory::TkResource_Factory ()
     : reactor_impl_ (0)
   {
   }
 
   ACE_Reactor_Impl *
-  TkResource_Factory::reactor_impl (void)
+  TkResource_Factory::reactor_impl ()
   {
     // synchronized by external locks
     if (!this->reactor_impl_)
diff --git a/TAO/tao/TkResource/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h
index 4702f825b3a..c7ad9b22a95 100644
--- a/TAO/tao/TkResource/TkResource_Factory.h
+++ b/TAO/tao/TkResource/TkResource_Factory.h
@@ -41,7 +41,7 @@ namespace TAO
 
   protected:
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/TkResource/TkResource_Loader.cpp b/TAO/tao/TkResource/TkResource_Loader.cpp
index 23308831d6f..c576b7722a5 100644
--- a/TAO/tao/TkResource/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource/TkResource_Loader.cpp
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  TkResource_Loader::TkResource_Loader (void)
+  TkResource_Loader::TkResource_Loader ()
   {
     TkResource_Factory *tmp = 0;
 
@@ -16,7 +16,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory( tmp );
   }
 
-  TkResource_Loader::~TkResource_Loader (void)
+  TkResource_Loader::~TkResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/TkResource/TkResource_Loader.h b/TAO/tao/TkResource/TkResource_Loader.h
index bb2dfecb152..5e69fa41c0f 100644
--- a/TAO/tao/TkResource/TkResource_Loader.h
+++ b/TAO/tao/TkResource/TkResource_Loader.h
@@ -43,9 +43,9 @@ namespace TAO
   class TAO_TkResource_Export TkResource_Loader
   {
   public:
-    TkResource_Loader (void);
+    TkResource_Loader ();
 
-    virtual ~TkResource_Loader (void);
+    virtual ~TkResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 3dc2406b05a..b4c5416f540 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -28,7 +28,7 @@ namespace TAO
     }
 
     /// dtor
-    Current_Impl::~Current_Impl (void)
+    Current_Impl::~Current_Impl ()
     {
     }
 
@@ -60,34 +60,34 @@ namespace TAO
       return (t==0 || t->stats () == 0) ? &dummy_transport_stats : t->stats ();
     }
 
-    CORBA::Long Current_Impl::id (void)
+    CORBA::Long Current_Impl::id ()
     {
       const TAO_Transport* t = this->transport ();
 
       return (t==0) ? 0 : static_cast<CORBA::Long> (t->id ());
     }
 
-    CounterT Current_Impl::bytes_sent (void)
+    CounterT Current_Impl::bytes_sent ()
     {
       return transport_stats ()->bytes_sent ();
     }
 
-    CounterT Current_Impl::bytes_received (void)
+    CounterT Current_Impl::bytes_received ()
     {
       return transport_stats ()->bytes_received ();
     }
 
-    CounterT Current_Impl::messages_sent (void)
+    CounterT Current_Impl::messages_sent ()
     {
       return transport_stats ()->messages_sent ();
     }
 
-    CounterT Current_Impl::messages_received (void)
+    CounterT Current_Impl::messages_received ()
     {
       return transport_stats ()->messages_received ();
     }
 
-    TimeBase::TimeT Current_Impl::open_since (void)
+    TimeBase::TimeT Current_Impl::open_since ()
     {
       TimeBase::TimeT msecs = 0;
       transport_stats ()->opened_since ().msec (msecs);
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 7f40300e128..50e48f70c22 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -76,7 +76,7 @@ namespace TAO
         /// reference counted, and should not be destroyed using
         /// delete() by anything other than the reference counting
         /// mechanism.
-        virtual ~Current_Impl (void);
+        virtual ~Current_Impl ();
 
       private:
         Current_Impl (const Current_Impl &) = delete;
diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index 36e24d07090..8a29334892a 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -26,7 +26,7 @@ namespace TAO
   namespace Transport
   {
     /// Destructor
-    Current_Loader::~Current_Loader (void)
+    Current_Loader::~Current_Loader ()
     {
     }
 
@@ -67,7 +67,7 @@ namespace TAO
 {
   namespace Transport
   {
-    int current_static_initializer (void)
+    int current_static_initializer ()
     {
       ACE_STATIC_SVC_REGISTER (TAO_Transport_Current_Loader);
       return 0;
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index b2470e88e70..2b4302b5c78 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -41,7 +41,7 @@ namespace TAO
 
     protected:
       /// Protected destructor to enforce reference counting discipline
-      virtual ~Current_Loader (void);
+      virtual ~Current_Loader ();
     };
   }
 }
@@ -52,7 +52,7 @@ namespace TAO
 {
   namespace Transport
   {
-    int current_static_initializer (void);
+    int current_static_initializer ();
   }
 }
 
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index ca77b2e33af..4a73c4c6641 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -14,7 +14,7 @@ namespace TAO
       // do nothing
     }
 
-    Current_ORBInitializer_Base::~Current_ORBInitializer_Base(void)
+    Current_ORBInitializer_Base::~Current_ORBInitializer_Base()
     {
       // do nothing
     }
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index 8e78130a616..8cc02736757 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -38,7 +38,7 @@ namespace TAO
     {
     public:
       Current_ORBInitializer_Base (const ACE_TCHAR* id);
-      virtual ~Current_ORBInitializer_Base (void);
+      virtual ~Current_ORBInitializer_Base ();
 
       virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr);
 
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 722f7d83bbb..bb4bec3ecc9 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -22,7 +22,7 @@ namespace TAO
     /// throw NoContext, if no transport has been selected yet.
 
     TAO_IIOP_Connection_Handler*
-    IIOP_Current_Impl::handler (void)
+    IIOP_Current_Impl::handler ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       const TAO_Transport* t = this->transport ();
@@ -57,12 +57,12 @@ namespace TAO
 
     /// Dtor
 
-    IIOP_Current_Impl::~IIOP_Current_Impl (void)
+    IIOP_Current_Impl::~IIOP_Current_Impl ()
     {
     }
 
     CORBA::Long
-    IIOP_Current_Impl::id (void)
+    IIOP_Current_Impl::id ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       // Need to use cast to pacify windows compilers complaining
@@ -74,14 +74,14 @@ namespace TAO
     }
 
     ::SSLIOP::Current_ptr
-    IIOP_Current_Impl::ssliop_current (void)
+    IIOP_Current_Impl::ssliop_current ()
     {
         throw ::CORBA::NO_IMPLEMENT ();
     }
 
 
     CORBA::Long
-    IIOP_Current_Impl::remote_port (void)
+    IIOP_Current_Impl::remote_port ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -97,7 +97,7 @@ namespace TAO
     }
 
     char*
-    IIOP_Current_Impl::remote_host (void)
+    IIOP_Current_Impl::remote_host ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -113,7 +113,7 @@ namespace TAO
     }
 
     CORBA::Long
-    IIOP_Current_Impl::local_port (void)
+    IIOP_Current_Impl::local_port ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -129,7 +129,7 @@ namespace TAO
     }
 
     char*
-    IIOP_Current_Impl::local_host (void)
+    IIOP_Current_Impl::local_host ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index a4d89175c27..f74e7216f93 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -76,7 +76,7 @@ namespace TAO
       /// Transport. Will throw NoContext if the (selected) transport
       /// () == 0, or if transport->connection_handler () == 0. Will
       /// throw NoContext, if no transport has been selected yet.
-      TAO_IIOP_Connection_Handler* handler (void);
+      TAO_IIOP_Connection_Handler* handler ();
 
     private:
       IIOP_Current_Impl (const IIOP_Current_Impl &) = delete;
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
index 3901d9158a4..d3bc5c69354 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
@@ -70,7 +70,7 @@ namespace TAO
   {
     namespace IIOP
     {
-      int current_static_initializer (void)
+      int current_static_initializer ()
       {
         ACE_STATIC_SVC_REGISTER (TAO_Transport_IIOP_Current_Loader);
         return 0;
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
index 939eab0a20f..125b0ea296f 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
@@ -47,7 +47,7 @@ namespace TAO
   {
     namespace IIOP
     {
-      int current_static_initializer (void);
+      int current_static_initializer ();
     }
   }
 }
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index d4e426753a0..4cb153f66b1 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -59,7 +59,7 @@ public:
   TAO_Connector (CORBA::ULong tag);
 
   /// The destructor.
-  virtual ~TAO_Connector (void);
+  virtual ~TAO_Connector ();
 
   /**
    * The tag identifying the specific ORB transport layer protocol.
@@ -199,10 +199,10 @@ protected:
   void orb_core (TAO_ORB_Core *orb_core);
 
   /// Create a connect strategy
-  int create_connect_strategy (void);
+  int create_connect_strategy ();
 
   /// Return the TAO_ORB_Core pointer
-  TAO_ORB_Core *orb_core (void);
+  TAO_ORB_Core *orb_core ();
 
 protected:
   /// The (a)synch connect strategy
diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h
index 0986b3c4c60..45561221ee4 100644
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ b/TAO/tao/Transport_Descriptor_Interface.h
@@ -46,7 +46,7 @@ class TAO_Export TAO_Transport_Descriptor_Interface
 {
 public:
   /// Destructor
-  virtual ~TAO_Transport_Descriptor_Interface (void);
+  virtual ~TAO_Transport_Descriptor_Interface ();
 
   /// This call allocates and copies the contents of this class and
   /// returns the pointer
@@ -60,7 +60,7 @@ public:
   virtual u_long hash () const = 0;
 
   /// Return the underlying endpoint object
-  TAO_Endpoint *endpoint (void);
+  TAO_Endpoint *endpoint ();
 
   /// Reset the endpoint pointer to point to another, if that one is
   /// part of the chain based by the current endpoint. Although this
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// Default Constructor
-  TAO_Transport_Descriptor_Interface (void);
+  TAO_Transport_Descriptor_Interface ();
 
   /// Constructor
   TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 11ab6b5f086..bbbc8060fad 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
+TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl ()
 {
 }
 
@@ -280,7 +280,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc (
 // Initialization and registration of dynamic service object.
 
 int
-TAO_TypeCodeFactory_Adapter_Impl::Initializer (void)
+TAO_TypeCodeFactory_Adapter_Impl::Initializer ()
 {
   TAO_ORB_Core::typecodefactory_adapter_name ("Concrete_TypeCodeFactory_Adapter");
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index c5795c57cee..b7564aa6325 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -38,7 +38,7 @@ class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Adapter_Impl
   : public TAO_TypeCodeFactory_Adapter
 {
 public:
-  virtual ~TAO_TypeCodeFactory_Adapter_Impl (void);
+  virtual ~TAO_TypeCodeFactory_Adapter_Impl ();
 
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
@@ -181,7 +181,7 @@ public:
 
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index c799f5ba154..cab2d59fb02 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
+TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR * [])
 }
 
 int
-TAO_TypeCodeFactory_Loader::Initializer (void)
+TAO_TypeCodeFactory_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Loader);
 }
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index c0a111cd94e..54eafc2c57c 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -33,7 +33,7 @@ class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Loader
 {
 public:
   /// Constructor.
-  TAO_TypeCodeFactory_Loader (void);
+  TAO_TypeCodeFactory_Loader ();
 
   /// Overload the base class method to create a new instance
   /// of a TypeCodeFactory object.
@@ -42,7 +42,7 @@ public:
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index d6bc8c45860..bf7aba73ca0 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -92,11 +92,11 @@ namespace TCF
 }
 
 
-TAO_TypeCodeFactory_i::TAO_TypeCodeFactory_i (void)
+TAO_TypeCodeFactory_i::TAO_TypeCodeFactory_i ()
 {
 }
 
-TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void)
+TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i ()
 {
 }
 
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index c49630b75d4..0576a2d4e88 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -34,7 +34,7 @@ TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value (
 
 template<typename S_var,
          template <typename> class Insert_Policy>
-TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::~In_UB_String_Clonable_Argument_T (void)
+TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::~In_UB_String_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
diff --git a/TAO/tao/Utils/Encodable.cpp b/TAO/tao/Utils/Encodable.cpp
index 15bebee3752..5e49710d6be 100644
--- a/TAO/tao/Utils/Encodable.cpp
+++ b/TAO/tao/Utils/Encodable.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Encodable::~TAO_Encodable (void)
+TAO_Encodable::~TAO_Encodable ()
 {
 }
 
diff --git a/TAO/tao/Utils/Encodable.h b/TAO/tao/Utils/Encodable.h
index 33b18e28585..5a085d8e33d 100644
--- a/TAO/tao/Utils/Encodable.h
+++ b/TAO/tao/Utils/Encodable.h
@@ -41,7 +41,7 @@ class TAO_InputCDR;
 class TAO_UTILS_Export TAO_Encodable
 {
 public:
-  virtual ~TAO_Encodable (void);
+  virtual ~TAO_Encodable ();
 
   ///  Encodes the object implementing this method into a CDR stream.
   ///  Returns true on success and false on failure.
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index 808982f2e06..0092a304741 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -97,7 +97,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 // Activate POA manager.
 
 int
-TAO_ORB_Manager::activate_poa_manager (void)
+TAO_ORB_Manager::activate_poa_manager ()
 {
   this->poa_manager_->activate ();
   return 0;
@@ -177,7 +177,7 @@ TAO_ORB_Manager::run (ACE_Time_Value &tv)
 }
 
 int
-TAO_ORB_Manager::fini (void)
+TAO_ORB_Manager::fini ()
 {
   this->poa_->destroy (1, 1);
 
@@ -193,7 +193,7 @@ TAO_ORB_Manager::fini (void)
 }
 
 int
-TAO_ORB_Manager::run (void)
+TAO_ORB_Manager::run ()
 {
   this->poa_manager_->activate ();
 
@@ -205,34 +205,34 @@ TAO_ORB_Manager::run (void)
 // Return the corba orb reference.
 
 CORBA::ORB_ptr
-TAO_ORB_Manager::orb (void)
+TAO_ORB_Manager::orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_.in ());
 }
 
 // Return the root POA reference
 PortableServer::POA_ptr
-TAO_ORB_Manager::root_poa (void)
+TAO_ORB_Manager::root_poa ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 // Return the child POA reference
 PortableServer::POA_ptr
-TAO_ORB_Manager::child_poa (void)
+TAO_ORB_Manager::child_poa ()
 {
   return PortableServer::POA::_duplicate (this->child_poa_.in ());
 }
 
 PortableServer::POAManager_ptr
-TAO_ORB_Manager::poa_manager (void)
+TAO_ORB_Manager::poa_manager ()
 {
   return PortableServer::POAManager::_duplicate (this->poa_manager_.in ());
 }
 
 // Destructor.
 
-TAO_ORB_Manager::~TAO_ORB_Manager (void)
+TAO_ORB_Manager::~TAO_ORB_Manager ()
 {
   try
     {
diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
index eecd045d8c7..335a477b6f5 100644
--- a/TAO/tao/Utils/ORB_Manager.h
+++ b/TAO/tao/Utils/ORB_Manager.h
@@ -89,10 +89,10 @@ public:
    * @retval -1 Failure
    * @retval 0 Success
    */
-  int fini (void);
+  int fini ();
 
   /// Destructor.
-  ~TAO_ORB_Manager (void);
+  ~TAO_ORB_Manager ();
 
   // = Accessor methods.
 
@@ -106,7 +106,7 @@ public:
    * @retval -1 Failure
    * @retval 0 Success
    */
-  int activate_poa_manager (void);
+  int activate_poa_manager ();
 
   /**
    * Activate <servant>, using the POA <activate_object> call.  Users
@@ -164,7 +164,7 @@ public:
   /**
    * Run the ORB event loop.
    */
-  int run (void);
+  int run ();
 
   /**
    * Accessor which returns the ORB pointer.  Following the normal
@@ -175,7 +175,7 @@ public:
    * @return ORB pointer which has been duplicated, so caller
    *         must release pointer when done.
    */
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /**
    * Accessor which returns the root poa. Following the normal CORBA
@@ -185,7 +185,7 @@ public:
    * @return Root POA pointer which has been duplicated.  Caller
    *         must release pointer when done.
    */
-  PortableServer::POA_ptr root_poa (void);
+  PortableServer::POA_ptr root_poa ();
 
   /**
    * Accessor which returns the child poa. Following the normal CORBA
@@ -195,7 +195,7 @@ public:
    * @return Child POA pointer which has been duplicated.  Caller
    *         must release pointer when done.
    */
-  PortableServer::POA_ptr child_poa (void);
+  PortableServer::POA_ptr child_poa ();
 
   /**
    * Accessor which returns the poa manager. Following the normal
@@ -206,7 +206,7 @@ public:
    * @return POAManager pointer which has been duplicated.  Caller
    *         must release pointer when done.
    */
-  PortableServer::POAManager_ptr poa_manager (void);
+  PortableServer::POAManager_ptr poa_manager ();
 
 protected:
   /// The ORB.
diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h
index 843e3610e54..a194bc0354c 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -35,7 +35,7 @@
  *      int parse_args (int argc, ACE_TCHAR * argv[]);
  *      int init (CORBA::ORB_ptr orb );
  *      int idle(int &result);
- *      int fini (void);
+ *      int fini ();
  *      const char * identity () const;
  *
  *      parse_args, self_register, self_unregister return 0 if ok, nonzero for error.
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index b1ce49f7071..c6785f74a25 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::AbstractBase::AbstractBase (void)
+CORBA::AbstractBase::AbstractBase ()
   : is_objref_ (false)
   , refcount_ (1)
   , is_collocated_ (false)
@@ -52,7 +52,7 @@ CORBA::AbstractBase::AbstractBase (TAO_Stub * protocol_proxy,
 }
 
 void
-CORBA::AbstractBase::_add_ref (void)
+CORBA::AbstractBase::_add_ref ()
 {
   ++this->refcount_;
 
@@ -64,7 +64,7 @@ CORBA::AbstractBase::_add_ref (void)
 }
 
 void
-CORBA::AbstractBase::_remove_ref (void)
+CORBA::AbstractBase::_remove_ref ()
 {
   // This is required by the C++ Mapping 1.2.
   if (this->is_objref_)
@@ -90,7 +90,7 @@ CORBA::AbstractBase::_tao_any_destructor (void *x)
 }
 
 CORBA::Object_ptr
-CORBA::AbstractBase::_to_object (void)
+CORBA::AbstractBase::_to_object ()
 {
   if (!this->is_objref_)
     {
@@ -101,7 +101,7 @@ CORBA::AbstractBase::_to_object (void)
 }
 
 CORBA::ValueBase *
-CORBA::AbstractBase::_to_value (void)
+CORBA::AbstractBase::_to_value ()
 {
   if (this->is_objref_)
     {
@@ -376,7 +376,7 @@ CORBA::AbstractBase::_tao_stream_v (std::ostream &strm) const
 #endif /* GEN_OSTREAM_OPS */
 
 CORBA::ValueBase *
-CORBA::AbstractBase::_tao_to_value (void)
+CORBA::AbstractBase::_tao_to_value ()
 {
   return 0;
 }
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index cb0c18add1f..3a92ae576d7 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -54,7 +54,7 @@ TAO_ChunkInfo::TAO_ChunkInfo (CORBA::Boolean do_chunking,
 }
 
 CORBA::ValueBase *
-CORBA::ValueBase::_copy_value (void)
+CORBA::ValueBase::_copy_value ()
 {
   // Note that TAO traditionally has not enforced this functions PURE
   // virtual nature, thus the end user didn't have to provide an
@@ -72,7 +72,7 @@ CORBA::ValueBase::_copy_value (void)
   return 0;
 }
 
-CORBA::ValueBase::ValueBase (void)
+CORBA::ValueBase::ValueBase ()
   : is_truncatable_(0),
     chunking_(0)
 {
@@ -1368,31 +1368,31 @@ namespace CORBA
 // member functions for CORBA::DefaultValueRefCountBase ============
 
 // destructor
-CORBA::DefaultValueRefCountBase::~DefaultValueRefCountBase (void)
+CORBA::DefaultValueRefCountBase::~DefaultValueRefCountBase ()
 {
 }
 
 void
-CORBA::DefaultValueRefCountBase::_add_ref (void)
+CORBA::DefaultValueRefCountBase::_add_ref ()
 {
   this->_tao_add_ref ();
 }
 
 void
-CORBA::DefaultValueRefCountBase::_remove_ref (void)
+CORBA::DefaultValueRefCountBase::_remove_ref ()
 {
   this->_tao_remove_ref ();
 }
 
 CORBA::ULong
-CORBA::DefaultValueRefCountBase::_refcount_value (void)
+CORBA::DefaultValueRefCountBase::_refcount_value ()
 {
   return this->_tao_refcount_value ();
 }
 
 // ===========================================================
 
-CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase (void)
+CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase ()
   : refcount_ (1)
 {
 }
@@ -1407,13 +1407,13 @@ CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase
 }
 
 void
-CORBA::DefaultValueRefCountBase::_tao_add_ref (void)
+CORBA::DefaultValueRefCountBase::_tao_add_ref ()
 {
   ++this->refcount_;
 }
 
 void
-CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
+CORBA::DefaultValueRefCountBase::_tao_remove_ref ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index ad7003800d2..a7986ab90c7 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -26,23 +26,23 @@ CORBA::remove_ref (CORBA::ValueFactoryBase *val)
 
 // ===========================================================
 
-CORBA::ValueFactoryBase::ValueFactoryBase (void)
+CORBA::ValueFactoryBase::ValueFactoryBase ()
   : refcount_ (1)
 {
 }
 
-CORBA::ValueFactoryBase::~ValueFactoryBase (void)
+CORBA::ValueFactoryBase::~ValueFactoryBase ()
 {
 }
 
 void
-CORBA::ValueFactoryBase::_add_ref (void)
+CORBA::ValueFactoryBase::_add_ref ()
 {
   ++this->refcount_;
 }
 
 void
-CORBA::ValueFactoryBase::_remove_ref (void)
+CORBA::ValueFactoryBase::_remove_ref ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -52,7 +52,7 @@ CORBA::ValueFactoryBase::_remove_ref (void)
 
 // No-op. This should never be called, but it can't be pure virtual.
 CORBA::AbstractBase *
-CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void)
+CORBA::ValueFactoryBase::create_for_unmarshal_abstract ()
 {
   return 0;
 }
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index f034accba9f..e46fa050b7a 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -35,8 +35,8 @@ namespace CORBA
 class TAO_ValueFactory_Map
 {
 public:
-  TAO_ValueFactory_Map (void);
-  ~TAO_ValueFactory_Map (void);
+  TAO_ValueFactory_Map ();
+  ~TAO_ValueFactory_Map ();
 
   /**
    * Associate the factory (int_id) with the repo_id (ext_id).
@@ -62,10 +62,10 @@ public:
   int find (const char *repo_id,
             CORBA::ValueFactory &factory);
 
-  void dump (void);
+  void dump ();
 
   /// Return singleton instance of this class.
-  static TAO_ValueFactory_Map * instance (void);
+  static TAO_ValueFactory_Map * instance ();
 
 private:
   /// The hash table data structure.
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index f56c5eb7cc9..60c8722c3ff 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -32,7 +32,7 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T (const TAO_Value_Var_T<T> & p)
 }
 
 template <typename T>
-TAO_Value_Var_T<T>::~TAO_Value_Var_T (void)
+TAO_Value_Var_T<T>::~TAO_Value_Var_T ()
 {
   TAO::Value_Traits<T>::remove_ref (this->ptr_);
 }
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index b8f9b2d4dfb..b4576554821 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -8,7 +8,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Valuetype_Adapter *
-TAO_Valuetype_Adapter_Factory_Impl::create (void)
+TAO_Valuetype_Adapter_Factory_Impl::create ()
 {
   TAO_Valuetype_Adapter_Impl *nva = 0;
   ACE_NEW_THROW_EX (nva,
@@ -20,7 +20,7 @@ TAO_Valuetype_Adapter_Factory_Impl::create (void)
 
 // Initialization and registration of dynamic service object.
 int
-TAO_Valuetype_Adapter_Factory_Impl::Initializer (void)
+TAO_Valuetype_Adapter_Factory_Impl::Initializer ()
 {
   TAO_ORB_Core::valuetype_adapter_factory_name (
       "Concrete_Valuetype_Adapter_Factory");
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index 3787d47012a..4754cc4e1ed 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -35,7 +35,7 @@ TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::interceptor_value (
 
 template<typename S_forany,
          template <typename> class Insert_Policy>
-TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clonable_Argument_T (void)
+TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -49,7 +49,7 @@ TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clo
 template<typename S_forany,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void)
+TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone ()
 {
   typedef TAO::details::array_traits<S_forany> ARRAY_TRAITS;
   typename ARRAY_TRAITS::slice_type * tmp_ptr = 0;
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index a736630c989..e7e23c5201f 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -33,7 +33,7 @@ TAO::In_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (
 
 template<typename S,
          template <typename> class Insert_Policy>
-TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Argument_T (void)
+TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -45,7 +45,7 @@ TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Arg
 template<typename S,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void)
+TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::clone ()
 {
   S* clone_x = new S (*(this->x_));
   In_Var_Size_Clonable_Argument_T<S,Insert_Policy>* clone_arg
diff --git a/TAO/tao/Vector_Argument_T.h b/TAO/tao/Vector_Argument_T.h
index 3c7a22ac3b2..4cc8aa62885 100644
--- a/TAO/tao/Vector_Argument_T.h
+++ b/TAO/tao/Vector_Argument_T.h
@@ -88,7 +88,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S & x_;
@@ -112,7 +112,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S & x_;
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index bbfcbeb0073..e43a247c9da 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -44,7 +44,7 @@ namespace TAO
     explicit Wait_On_LF_No_Upcall (TAO_Transport *t);
 
     /// Destructor.
-    virtual ~Wait_On_LF_No_Upcall (void);
+    virtual ~Wait_On_LF_No_Upcall ();
 
     /*! @copydoc TAO_Wait_Strategy::wait() */
     virtual int wait (ACE_Time_Value *max_wait_time,
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index 67e6b5be830..bac0563a481 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -42,7 +42,7 @@ public:
   TAO_Wait_On_Leader_Follower (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_On_Leader_Follower (void);
+  virtual ~TAO_Wait_On_Leader_Follower ();
 
    /*! @copydoc TAO_Wait_Strategy::sending_request() */
   virtual int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics);
@@ -52,7 +52,7 @@ public:
                     TAO_Synch_Reply_Dispatcher &rd);
 
    /*! @copydoc TAO_Wait_Strategy::register_handler() */
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
    /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking () const;
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index 31816c2cb29..b090ecaac34 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -33,14 +33,14 @@ public:
   explicit TAO_Wait_On_Reactor (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_On_Reactor (void);
+  virtual ~TAO_Wait_On_Reactor ();
 
   /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
 
   /*! @copydoc TAO_Wait_Strategy::register_handler() */
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
   /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking () const;
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index 437d9a8ae0a..e5a76c0750e 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -31,7 +31,7 @@ public:
   explicit TAO_Wait_On_Read (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_On_Read (void);
+  virtual ~TAO_Wait_On_Read ();
 
   /*! @copydoc TAO_Wait_Strategy::sending_request() */
   virtual int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics);
@@ -44,7 +44,7 @@ public:
                     TAO_Synch_Reply_Dispatcher &rd);
 
   /*! @copydoc TAO_Wait_Strategy::register_handler() */
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
   /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking () const;
diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index e8be70a1318..5f24aa4e3d1 100644
--- a/TAO/tao/XtResource/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -13,7 +13,7 @@ namespace TAO
   }
 
   ACE_Reactor_Impl *
-  XtResource_Factory::reactor_impl (void)
+  XtResource_Factory::reactor_impl ()
   {
     // synchronized by external locks
     if (!this->context_)
diff --git a/TAO/tao/XtResource/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h
index 7d288b0e663..e50f217c27b 100644
--- a/TAO/tao/XtResource/XtResource_Factory.h
+++ b/TAO/tao/XtResource/XtResource_Factory.h
@@ -41,7 +41,7 @@ namespace TAO
     XtResource_Factory (XtAppContext context);
 
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp
index d1f84d8d256..d65e6f5d77a 100644
--- a/TAO/tao/ZIOP/ZIOP.cpp
+++ b/TAO/tao/ZIOP/ZIOP.cpp
@@ -10,12 +10,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ZIOP_Loader::TAO_ZIOP_Loader (void)
+TAO_ZIOP_Loader::TAO_ZIOP_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_ZIOP_Loader::~TAO_ZIOP_Loader (void)
+TAO_ZIOP_Loader::~TAO_ZIOP_Loader ()
 {
 }
 
@@ -93,7 +93,7 @@ TAO_ZIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
 }
 
 int
-TAO_ZIOP_Loader::Initializer (void)
+TAO_ZIOP_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_ZIOP_Loader);
 }
diff --git a/TAO/tao/ZIOP/ZIOP.h b/TAO/tao/ZIOP/ZIOP.h
index 0b49352c961..64d4b66990b 100644
--- a/TAO/tao/ZIOP/ZIOP.h
+++ b/TAO/tao/ZIOP/ZIOP.h
@@ -40,10 +40,10 @@ class TAO_ZIOP_Export TAO_ZIOP_Loader : public TAO_ZIOP_Adapter
 {
 public:
   /// Constructor
-  TAO_ZIOP_Loader (void);
+  TAO_ZIOP_Loader ();
 
   /// Destructor
-  virtual ~TAO_ZIOP_Loader (void);
+  virtual ~TAO_ZIOP_Loader ();
 
   virtual bool decompress (ACE_Data_Block **db, TAO_Queued_Data &qd, TAO_ORB_Core &orb_core);
 
@@ -57,7 +57,7 @@ public:
   virtual void load_policy_validators (TAO_Policy_Validator &validator);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 
   /// Converts compressor ID to a compressor name.
   static const char * ziop_compressorid_name (::Compression::CompressorId st);
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
index 1c252dee3e9..7000776893c 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
@@ -18,7 +18,7 @@ CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (
 {
 }
 
-CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (void)
+CompressorIdLevelListPolicy::CompressorIdLevelListPolicy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , ::ZIOP::CompressorIdLevelListPolicy ()
@@ -37,7 +37,7 @@ CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (const CompressorIdLeve
 }
 
 CORBA::PolicyType
-CompressorIdLevelListPolicy::policy_type (void)
+CompressorIdLevelListPolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -56,7 +56,7 @@ CompressorIdLevelListPolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressorIdLevelListPolicy::copy (void)
+CompressorIdLevelListPolicy::copy ()
 {
   CompressorIdLevelListPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, CompressorIdLevelListPolicy (*this),
@@ -67,12 +67,12 @@ CompressorIdLevelListPolicy::copy (void)
 }
 
 void
-CompressorIdLevelListPolicy::destroy (void)
+CompressorIdLevelListPolicy::destroy ()
 {
 }
 
 ::Compression::CompressorIdLevelList *
-CompressorIdLevelListPolicy::compressor_ids (void)
+CompressorIdLevelListPolicy::compressor_ids ()
 {
   return &this->value_;
 }
@@ -112,7 +112,7 @@ CompressionEnablingPolicy::CompressionEnablingPolicy (
 {
 }
 
-CompressionEnablingPolicy::CompressionEnablingPolicy (void)
+CompressionEnablingPolicy::CompressionEnablingPolicy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , ::ZIOP::CompressionEnablingPolicy ()
@@ -131,7 +131,7 @@ CompressionEnablingPolicy::CompressionEnablingPolicy (const CompressionEnablingP
 }
 
 CORBA::PolicyType
-CompressionEnablingPolicy::policy_type (void)
+CompressionEnablingPolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -150,7 +150,7 @@ CompressionEnablingPolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressionEnablingPolicy::copy (void)
+CompressionEnablingPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
  // exception safe!
@@ -164,12 +164,12 @@ CompressionEnablingPolicy::copy (void)
 }
 
 void
-CompressionEnablingPolicy::destroy (void)
+CompressionEnablingPolicy::destroy ()
 {
 }
 
 ::CORBA::Boolean
-CompressionEnablingPolicy::compression_enabled (void)
+CompressionEnablingPolicy::compression_enabled ()
 {
   return this->value_;
 }
@@ -220,7 +220,7 @@ CompressionLowValuePolicy::CompressionLowValuePolicy (const CompressionLowValueP
 }
 
 CORBA::PolicyType
-CompressionLowValuePolicy::policy_type (void)
+CompressionLowValuePolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -239,7 +239,7 @@ CompressionLowValuePolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressionLowValuePolicy::copy (void)
+CompressionLowValuePolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
  // exception safe!
@@ -253,12 +253,12 @@ CompressionLowValuePolicy::copy (void)
 }
 
 void
-CompressionLowValuePolicy::destroy (void)
+CompressionLowValuePolicy::destroy ()
 {
 }
 
 ::CORBA::ULong
-CompressionLowValuePolicy::low_value (void)
+CompressionLowValuePolicy::low_value ()
 {
   return this->value_;
 }
@@ -290,7 +290,7 @@ CompressionMinRatioPolicy::CompressionMinRatioPolicy (const CompressionMinRatioP
 }
 
 CORBA::PolicyType
-CompressionMinRatioPolicy::policy_type (void)
+CompressionMinRatioPolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -309,7 +309,7 @@ CompressionMinRatioPolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressionMinRatioPolicy::copy (void)
+CompressionMinRatioPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
  // exception safe!
@@ -323,12 +323,12 @@ CompressionMinRatioPolicy::copy (void)
 }
 
 void
-CompressionMinRatioPolicy::destroy (void)
+CompressionMinRatioPolicy::destroy ()
 {
 }
 
 ::Compression::CompressionRatio
-CompressionMinRatioPolicy::ratio (void)
+CompressionMinRatioPolicy::ratio ()
 {
   return this->value_;
 }
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.h b/TAO/tao/ZIOP/ZIOP_Policy_i.h
index 8c6e3cba148..fb7be623b81 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.h
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.h
@@ -39,7 +39,7 @@ class CompressorIdLevelListPolicy
   , public virtual ::CORBA::LocalObject
 {
 public:
-  CompressorIdLevelListPolicy (void);
+  CompressorIdLevelListPolicy ();
 
   /// Constructor.
   CompressorIdLevelListPolicy (const ::Compression::CompressorIdLevelList& val);
@@ -52,11 +52,11 @@ public:
 
   virtual ::Compression::CompressorIdLevelList * compressor_ids ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
@@ -84,7 +84,7 @@ class CompressionEnablingPolicy
   , public virtual ::CORBA::LocalObject
 {
 public:
-  CompressionEnablingPolicy (void);
+  CompressionEnablingPolicy ();
 
   /// Constructor.
   CompressionEnablingPolicy (const ::CORBA::Boolean val);
@@ -96,13 +96,13 @@ public:
   virtual CompressionEnablingPolicy *clone () const;
 
   /// = The ZIOP::BidirectionalPolicy methods
-  virtual ::CORBA::Boolean compression_enabled (void);
+  virtual ::CORBA::Boolean compression_enabled ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
@@ -140,13 +140,13 @@ public:
   virtual CompressionLowValuePolicy *clone () const;
 
   /// = The ZIOP::BidirectionalPolicy methods
-  virtual ::CORBA::ULong low_value (void);
+  virtual ::CORBA::ULong low_value ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
@@ -174,13 +174,13 @@ public:
   /// Returns a copy of this CompressionMinRatioPolicy.
   virtual CompressionMinRatioPolicy *clone () const;
 
-  virtual ::Compression::CompressionRatio ratio (void);
+  virtual ::Compression::CompressionRatio ratio ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.cpp b/TAO/tao/ZIOP/ZIOP_Stub.cpp
index 9bc84af9845..a0d819ae2e8 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub.cpp
@@ -21,7 +21,7 @@ TAO_ZIOP_Stub::TAO_ZIOP_Stub (const char *repository_id,
 {
 }
 
-TAO_ZIOP_Stub::~TAO_ZIOP_Stub (void)
+TAO_ZIOP_Stub::~TAO_ZIOP_Stub ()
 {
   if (!CORBA::is_nil (this->compression_enabling_policy_.in ()))
     this->compression_enabling_policy_->destroy ();
@@ -31,7 +31,7 @@ TAO_ZIOP_Stub::~TAO_ZIOP_Stub (void)
 }
 
 void
-TAO_ZIOP_Stub::parse_policies (void)
+TAO_ZIOP_Stub::parse_policies ()
 {
   CORBA::PolicyList_var policy_list
     = this->base_profiles_.policy_list ();
@@ -61,7 +61,7 @@ TAO_ZIOP_Stub::parse_policies (void)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::exposed_compression_id_list_policy (void)
+TAO_ZIOP_Stub::exposed_compression_id_list_policy ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -78,7 +78,7 @@ TAO_ZIOP_Stub::exposed_compression_id_list_policy (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::exposed_compression_enabling_policy (void)
+TAO_ZIOP_Stub::exposed_compression_enabling_policy ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -137,7 +137,7 @@ TAO_ZIOP_Stub::get_cached_policy (TAO_Cached_Policy_Type type)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::effective_compression_enabling_policy (void)
+TAO_ZIOP_Stub::effective_compression_enabling_policy ()
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -172,7 +172,7 @@ TAO_ZIOP_Stub::effective_compression_enabling_policy (void)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::effective_compression_id_list_policy (void)
+TAO_ZIOP_Stub::effective_compression_id_list_policy ()
 {
   // Get effective override (This is the CLIENTS compressor's priority ordered list).
   CORBA::Policy_var policy (
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.h b/TAO/tao/ZIOP/ZIOP_Stub.h
index a5693bc532b..51ce9fc5bd8 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.h
+++ b/TAO/tao/ZIOP/ZIOP_Stub.h
@@ -49,7 +49,7 @@ public:
                  const TAO_MProfile &profiles,
                  TAO_ORB_Core *orb_core);
 
-  virtual ~TAO_ZIOP_Stub (void);
+  virtual ~TAO_ZIOP_Stub ();
 
   /**
    * Returns the effective policy if @a type is a known client-exposed
@@ -62,18 +62,18 @@ public:
 
 private:
   /// Helper method used to parse the policies.
-  void parse_policies (void);
+  void parse_policies ();
 
   void exposed_compression_enabling_policy (CORBA::Policy_ptr policy);
 
   void exposed_compression_id_list_policy (CORBA::Policy_ptr policy);
 
-  CORBA::Policy_ptr exposed_compression_enabling_policy (void);
+  CORBA::Policy_ptr exposed_compression_enabling_policy ();
 
-  CORBA::Policy_ptr exposed_compression_id_list_policy (void);
+  CORBA::Policy_ptr exposed_compression_id_list_policy ();
 
-  CORBA::Policy *effective_compression_enabling_policy (void);
-  CORBA::Policy *effective_compression_id_list_policy (void);
+  CORBA::Policy *effective_compression_enabling_policy ();
+  CORBA::Policy *effective_compression_id_list_policy ();
 
   // The following attribute are used to cache
   // the different kind of policies and avoid to
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
index a9fe731afdf..23ca0b113ab 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory (void)
+TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory ()
 {
 }
 
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
index 0726fbf5dfb..e0a7b4be0f2 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
@@ -45,7 +45,7 @@ class TAO_ZIOP_Export TAO_ZIOP_Stub_Factory : public TAO_Stub_Factory
 {
 public:
   // -- Ctor/Dtor --
-  virtual ~TAO_ZIOP_Stub_Factory (void);
+  virtual ~TAO_ZIOP_Stub_Factory ();
 
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
diff --git a/TAO/tao/ZIOP_Adapter.h b/TAO/tao/ZIOP_Adapter.h
index 1044a885bcd..a8437685c55 100644
--- a/TAO/tao/ZIOP_Adapter.h
+++ b/TAO/tao/ZIOP_Adapter.h
@@ -46,7 +46,7 @@ public:
   virtual void load_policy_validators (TAO_Policy_Validator &validator) = 0;
 
   /// The virtual destructor
-  virtual ~TAO_ZIOP_Adapter (void);
+  virtual ~TAO_ZIOP_Adapter ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 9029b5a13ef..b7d36f6697b 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -37,10 +37,10 @@ class TAO_Export TAO_Default_Client_Strategy_Factory
 {
 public:
   /// Constructor.
-  TAO_Default_Client_Strategy_Factory (void);
+  TAO_Default_Client_Strategy_Factory ();
 
   /// Destructor.
-  virtual ~TAO_Default_Client_Strategy_Factory (void);
+  virtual ~TAO_Default_Client_Strategy_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -52,9 +52,9 @@ public:
   // = Check Client_Strategy_Factory.h for the documentation of the
   //   following methods.
   virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
-  virtual ACE_Lock *create_transport_mux_strategy_lock (void);
+  virtual ACE_Lock *create_transport_mux_strategy_lock ();
   virtual int reply_dispatcher_table_size () const;
-  virtual int allow_callback (void);
+  virtual int allow_callback ();
   virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
   virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *);
   virtual bool use_cleanup_options () const;
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 07c23673fbd..4f20cb03d58 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -146,7 +146,7 @@ public:
   };
 
   /// Modify and get the source for the CDR allocators
-  int cdr_allocator_source (void);
+  int cdr_allocator_source ();
 
   // = Resource Retrieval
   virtual int use_locked_data_blocks () const;
@@ -255,7 +255,7 @@ protected:
    */
   bool dynamically_allocated_reactor_;
 
-  virtual int load_default_protocols (void);
+  virtual int load_default_protocols ();
 
   /// This flag is used to determine whether options have been
   /// processed via the init() function.  It is necessary to
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 80f82534edf..3f61e85c2c6 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -33,8 +33,8 @@ class TAO_Export TAO_Default_Server_Strategy_Factory
   : public TAO_Server_Strategy_Factory
 {
 public:
-  TAO_Default_Server_Strategy_Factory (void);
-  virtual ~TAO_Default_Server_Strategy_Factory (void);
+  TAO_Default_Server_Strategy_Factory ();
+  virtual ~TAO_Default_Server_Strategy_Factory ();
 
   // = Service Configurator hooks.
   virtual int init (int argc, ACE_TCHAR* argv[]);
@@ -42,10 +42,10 @@ public:
   // = The TAO_Server_Strategy_Factory methods, please read the
   //   documentation in "tao/Server_Strategy_Factory.h"
   virtual int open (TAO_ORB_Core*);
-  virtual int activate_server_connections (void);
+  virtual int activate_server_connections ();
   virtual int thread_per_connection_timeout (ACE_Time_Value &timeout);
-  virtual int server_connection_thread_flags (void);
-  virtual int server_connection_thread_count (void);
+  virtual int server_connection_thread_flags ();
+  virtual int server_connection_thread_count ();
 
   /// Parse the arguments, check the documentation in
   /// $TAO_ROOT/docs/Options.html for details
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 5f7d3cd9fef..9335e55a899 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -72,7 +72,7 @@ public:
   virtual ~ST_AMH_Server ();
 
   /// ORB initialisation stuff
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// register the servant with the poa
   virtual void register_servant (ST_AMH_Servant *servant);
@@ -131,7 +131,7 @@ ST_AMH_Server::~ST_AMH_Server ()
 }
 
 int
-ST_AMH_Server::start_orb_and_poa (void)
+ST_AMH_Server::start_orb_and_poa ()
 {
   try
     {
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 086b43367e0..9a11058625a 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -79,7 +79,7 @@ public:
   virtual ~ST_AMH_Server ();
 
   /// ORB initialization stuff
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// register the servant with the poa
   virtual void register_servant (ST_AMH_Servant *servant);
@@ -142,7 +142,7 @@ ST_AMH_Server::cleanup ()
 }
 
 int
-ST_AMH_Server::start_orb_and_poa (void)
+ST_AMH_Server::start_orb_and_poa ()
 {
   try
     {
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index b87718680e2..05d667e8919 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -61,13 +61,13 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h
index 22f9b58728f..d6a316e2232 100644
--- a/TAO/tests/AMI/ami_test_i.h
+++ b/TAO/tests/AMI/ami_test_i.h
@@ -34,9 +34,9 @@ public:
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 56956036f51..d68560f8842 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -102,7 +102,7 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
+  Handler ()
   {
   };
 
@@ -153,7 +153,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -164,7 +164,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     };
-  ~Handler (void)
+  ~Handler ()
   {
   };
 
@@ -307,7 +307,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 8e7b68040a1..fd015614963 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -142,7 +142,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
index 4c592413169..cc3b457afe4 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -18,7 +18,7 @@ AMI_Buffering::Nest_Guard::Nest_Guard (AMI_Buffering &a)
     target_.max_nest_ = target_.nest_;
 }
 
-AMI_Buffering::Nest_Guard::~Nest_Guard (void)
+AMI_Buffering::Nest_Guard::~Nest_Guard ()
 {
   --target_.nest_;
 }
@@ -40,25 +40,25 @@ AMI_Buffering::receive_data (const Test::Payload &the_payload)
 }
 
 void
-AMI_Buffering::flush (void)
+AMI_Buffering::flush ()
 {
 }
 
 void
-AMI_Buffering::sync (void)
+AMI_Buffering::sync ()
 {
   this->admin_->flush ();
 }
 
 void
-AMI_Buffering::shutdown (void)
+AMI_Buffering::shutdown ()
 {
   this->must_shutdown_ = true;
   this->try_shutdown();
 }
 
 void
-AMI_Buffering::try_shutdown(void)
+AMI_Buffering::try_shutdown()
 {
   if (!this->must_shutdown_ || this->nest_ > 0)
     return;
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index 8717c5b5917..22de3af8fee 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h
@@ -17,20 +17,20 @@ public:
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &the_payload);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void sync (void);
+  virtual void sync ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// internal implementation of shutdown. This
-  void try_shutdown (void);
+  void try_shutdown ();
 
   class Nest_Guard
     {
     public:
       Nest_Guard (AMI_Buffering &);
-      ~Nest_Guard (void);
+      ~Nest_Guard ();
     private:
       AMI_Buffering &target_;
     };
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index 9706776f1fc..c50ae8d98eb 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -8,13 +8,13 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::request_count (void)
+AMI_Buffering_Admin::request_count ()
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::bytes_received_count (void)
+AMI_Buffering_Admin::bytes_received_count ()
 {
   return this->bytes_received_count_;
 }
@@ -27,12 +27,12 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length)
 }
 
 void
-AMI_Buffering_Admin::flush (void)
+AMI_Buffering_Admin::flush ()
 {
 }
 
 void
-AMI_Buffering_Admin::shutdown (void)
+AMI_Buffering_Admin::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index 60f0b40346a..490e0d364a2 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
@@ -14,15 +14,15 @@ public:
   AMI_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (void);
+  virtual CORBA::ULong request_count ();
 
-  virtual CORBA::ULong bytes_received_count (void);
+  virtual CORBA::ULong bytes_received_count ();
 
   virtual void request_received (CORBA::ULong payload_length);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp
index 48327cc41ca..db5bae4319d 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.cpp
+++ b/TAO/tests/AMI_Buffering/Client_Task.cpp
@@ -8,14 +8,14 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb)
 }
 
 void
-Client_Task::terminate_loop (void)
+Client_Task::terminate_loop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->terminate_loop_ = 1;
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
   try
diff --git a/TAO/tests/AMI_Buffering/Client_Task.h b/TAO/tests/AMI_Buffering/Client_Task.h
index 631aae096d2..b4b64869a89 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.h
+++ b/TAO/tests/AMI_Buffering/Client_Task.h
@@ -18,10 +18,10 @@ public:
   Client_Task (CORBA::ORB_ptr orb);
 
   /// Terminate the loop
-  void terminate_loop (void);
+  void terminate_loop ();
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index 99cf8d3157b..53848092efc 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -1,11 +1,11 @@
 #include "Reply_Handler.h"
 
-Reply_Handler::Reply_Handler (void)
+Reply_Handler::Reply_Handler ()
 {
 }
 
 void
-Reply_Handler::receive_data (void)
+Reply_Handler::receive_data ()
 {
 }
 
@@ -23,7 +23,7 @@ Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder)
 }
 
 void
-Reply_Handler::sync (void)
+Reply_Handler::sync ()
 {
 }
 
@@ -41,7 +41,7 @@ Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder)
 }
 
 void
-Reply_Handler::shutdown (void)
+Reply_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index 9260787f71b..a6ae680c824 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -11,16 +11,16 @@ class Reply_Handler
 {
 public:
   /// Constructor
-  Reply_Handler (void);
+  Reply_Handler ();
 
   // = The skeleton methods
-  virtual void receive_data (void);
+  virtual void receive_data ();
   virtual void receive_data_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void sync (void);
+  virtual void sync ();
   virtual void sync_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 };
 
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index 0a77ef98bc8..4bcfed42729 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -34,7 +34,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec)
 }
 
 void
-Timeout_i::shutdown (void)
+Timeout_i::shutdown ()
 {
   orb_->shutdown ();
   //ACE_DEBUG ((LM_DEBUG,
@@ -53,7 +53,7 @@ TimeoutHandler_i::TimeoutHandler_i ()
 }
 
 void
-TimeoutHandler_i::sendTimeToWait (void)
+TimeoutHandler_i::sendTimeToWait ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "reply"));
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index b5da504a2ed..e15ae533023 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -24,7 +24,7 @@ public:
 
   virtual void sendTimeToWait (CORBA::Long msec);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -38,7 +38,7 @@ public:
 
   ~TimeoutHandler_i () = default;
 
-  virtual void sendTimeToWait (void);
+  virtual void sendTimeToWait ();
 
   virtual void sendTimeToWait_excep (
       ::Messaging::ExceptionHolder * excep_holder);
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index 7ec9006996a..65900ae7808 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -43,7 +43,7 @@ passer_i::passer_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 }
 
 void
-passer_i::shutdown (void)
+passer_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h
index 7c103c98c8e..f6c2c3673e8 100644
--- a/TAO/tests/Abstract_Interface/test_i.h
+++ b/TAO/tests/Abstract_Interface/test_i.h
@@ -22,7 +22,7 @@ public:
 
   virtual void pass_nil (base_out outarg);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
diff --git a/TAO/tests/Alt_Mapping/alt_mapping_i.cpp b/TAO/tests/Alt_Mapping/alt_mapping_i.cpp
index ed022f1e666..b6c0de213b7 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping_i.cpp
+++ b/TAO/tests/Alt_Mapping/alt_mapping_i.cpp
@@ -20,7 +20,7 @@ Alt_Mapping_i::Alt_Mapping_i (CORBA::ORB_ptr orb)
 {
 }
 
-Alt_Mapping_i::~Alt_Mapping_i (void)
+Alt_Mapping_i::~Alt_Mapping_i ()
 {
 }
 
@@ -54,7 +54,7 @@ Alt_Mapping_i::test_struct_sequence (
 }
 
 void
-Alt_Mapping_i::shutdown (void)
+Alt_Mapping_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Alt_Mapping/alt_mapping_i.h b/TAO/tests/Alt_Mapping/alt_mapping_i.h
index e0e852b0fb9..3c52050a2eb 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping_i.h
+++ b/TAO/tests/Alt_Mapping/alt_mapping_i.h
@@ -25,7 +25,7 @@ class Alt_Mapping_i : public POA_Alt_Mapping
 public:
   Alt_Mapping_i (CORBA::ORB_ptr orb);
 
-  ~Alt_Mapping_i (void);
+  ~Alt_Mapping_i ();
 
   virtual std::string
   test_unbounded_string (const std::string s1,
@@ -37,7 +37,7 @@ public:
     Alt_Mapping::StructSeq & s2,
     Alt_Mapping::StructSeq & s3);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp
index b7751a8c753..0ee820d05cc 100644
--- a/TAO/tests/Alt_Mapping/client.cpp
+++ b/TAO/tests/Alt_Mapping/client.cpp
@@ -31,14 +31,14 @@ Alt_Mapping_Client<T>::Alt_Mapping_Client (CORBA::ORB_ptr orb,
 
 // destructor
 template <class T>
-Alt_Mapping_Client<T>::~Alt_Mapping_Client (void)
+Alt_Mapping_Client<T>::~Alt_Mapping_Client ()
 {
   delete this->test_object_;
 }
 
 // All the individual tests.
 template <class T> int
-Alt_Mapping_Client<T>::run_sii_test (void)
+Alt_Mapping_Client<T>::run_sii_test ()
 {
   CORBA::ULong i = 0;  // loop index
   Options *opt = OPTIONS::instance (); // get the options
diff --git a/TAO/tests/Alt_Mapping/client.h b/TAO/tests/Alt_Mapping/client.h
index 6dce445ec8b..8a4be2d0646 100644
--- a/TAO/tests/Alt_Mapping/client.h
+++ b/TAO/tests/Alt_Mapping/client.h
@@ -39,10 +39,10 @@ public:
                      Alt_Mapping_ptr objref,
                      T *);
 
-  ~Alt_Mapping_Client (void);
+  ~Alt_Mapping_Client ();
 
   /// run the SII test
-  int run_sii_test (void);
+  int run_sii_test ();
 
 private:
   /// underlying ORB
diff --git a/TAO/tests/Alt_Mapping/driver.cpp b/TAO/tests/Alt_Mapping/driver.cpp
index 829a8834d05..fc5f22ee919 100644
--- a/TAO/tests/Alt_Mapping/driver.cpp
+++ b/TAO/tests/Alt_Mapping/driver.cpp
@@ -40,11 +40,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 }
 
 // constructor
-Driver::Driver (void)
+Driver::Driver ()
 {
 }
 
-Driver::~Driver (void)
+Driver::~Driver ()
 {
 }
 
@@ -102,7 +102,7 @@ Driver::init (int argc, ACE_TCHAR **argv)
 }
 
 int
-Driver::run (void)
+Driver::run ()
 {
   // serves as a factory of Param_Client objects. It is also responsible to
   // start the test
diff --git a/TAO/tests/Alt_Mapping/driver.h b/TAO/tests/Alt_Mapping/driver.h
index 42b76a5c132..a1e0ac1f4f2 100644
--- a/TAO/tests/Alt_Mapping/driver.h
+++ b/TAO/tests/Alt_Mapping/driver.h
@@ -27,14 +27,14 @@ class Driver
 {
 public:
   // = Constructor and destructor.
-  Driver (void);
-  ~Driver (void);
+  Driver ();
+  ~Driver ();
 
   /// Initialize the driver object
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// underlying ORB (we do not own it)
diff --git a/TAO/tests/Alt_Mapping/helper.cpp b/TAO/tests/Alt_Mapping/helper.cpp
index b1c28b87cc1..a80382afa39 100644
--- a/TAO/tests/Alt_Mapping/helper.cpp
+++ b/TAO/tests/Alt_Mapping/helper.cpp
@@ -16,28 +16,28 @@
 
 const CORBA::ULong TEST_BUFSIZE = 128;
 
-Generator::Generator (void)
+Generator::Generator ()
 {
 }
 
-Generator::~Generator (void)
+Generator::~Generator ()
 {
 }
 
 CORBA::Short
-Generator::gen_short (void)
+Generator::gen_short ()
 {
   return (CORBA::Short) (ACE_OS::rand () % TEST_BUFSIZE);
 }
 
 CORBA::Long
-Generator::gen_long (void)
+Generator::gen_long ()
 {
   return ::ACE_OS::rand () % TEST_BUFSIZE;
 }
 
 char *
-Generator::gen_string (void)
+Generator::gen_string ()
 {
   return gen_string (TEST_BUFSIZE);
 }
@@ -64,7 +64,7 @@ Generator::gen_string (int max_length)
 }
 
 CORBA::WChar *
-Generator::gen_wstring (void)
+Generator::gen_wstring ()
 {
   return gen_wstring (TEST_BUFSIZE);
 }
@@ -92,7 +92,7 @@ Generator::gen_wstring (int max_length)
 }
 
 const Alt_Mapping::Fixed_Struct
-Generator::gen_fixed_struct (void)
+Generator::gen_fixed_struct ()
 {
   this->fixed_struct_.l = ACE_OS::rand ();
   this->fixed_struct_.c = ACE_OS::rand () % 128;
diff --git a/TAO/tests/Alt_Mapping/helper.h b/TAO/tests/Alt_Mapping/helper.h
index ab589675057..55824f5078a 100644
--- a/TAO/tests/Alt_Mapping/helper.h
+++ b/TAO/tests/Alt_Mapping/helper.h
@@ -20,17 +20,17 @@
 class Generator
 {
 public:
-  Generator (void);
+  Generator ();
 
-  ~Generator (void);
+  ~Generator ();
 
-  CORBA::Short gen_short (void);
-  CORBA::Long gen_long (void);
-  char* gen_string (void);
+  CORBA::Short gen_short ();
+  CORBA::Long gen_long ();
+  char* gen_string ();
   char* gen_string (int maxlength);
-  CORBA::WChar* gen_wstring (void);
+  CORBA::WChar* gen_wstring ();
   CORBA::WChar* gen_wstring (int maxlength);
-  const Alt_Mapping::Fixed_Struct gen_fixed_struct (void);
+  const Alt_Mapping::Fixed_Struct gen_fixed_struct ();
 
  private:
   Alt_Mapping::Fixed_Struct fixed_struct_;
diff --git a/TAO/tests/Alt_Mapping/options.cpp b/TAO/tests/Alt_Mapping/options.cpp
index 923d6ed5fa7..56659886a1c 100644
--- a/TAO/tests/Alt_Mapping/options.cpp
+++ b/TAO/tests/Alt_Mapping/options.cpp
@@ -20,7 +20,7 @@
 #include "ace/Log_Msg.h"
 
 // Constructor.p
-Options::Options (void)
+Options::Options ()
   : ior_ (CORBA::string_dup ("file://test.ior")),
     test_type_ (Options::NO_TEST),
     invoke_type_ (Options::SII),
@@ -30,7 +30,7 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
@@ -133,19 +133,19 @@ Options::param_test_ior () const
 }
 
 Options::TEST_TYPE
-Options::test_type (void)
+Options::test_type ()
 {
   return this->test_type_;
 }
 
 Options::INVOKE_TYPE
-Options::invoke_type (void)
+Options::invoke_type ()
 {
   return this->invoke_type_;
 }
 
 CORBA::ULong
-Options::loop_count (void)
+Options::loop_count ()
 {
   return this->loop_count_;
 }
diff --git a/TAO/tests/Alt_Mapping/options.h b/TAO/tests/Alt_Mapping/options.h
index 8a6796c3cef..23a36cf6720 100644
--- a/TAO/tests/Alt_Mapping/options.h
+++ b/TAO/tests/Alt_Mapping/options.h
@@ -40,10 +40,10 @@ public:
   };
 
   /// constructor
-  Options (void);
+  Options ();
 
   /// destructor
-  ~Options (void);
+  ~Options ();
 
   /// Parses the arguments passed on the command line.
   int parse_args (int argc, ACE_TCHAR **argv);
@@ -52,13 +52,13 @@ public:
   char const * param_test_ior () const;
 
   /// what test to run
-  TEST_TYPE test_type (void);
+  TEST_TYPE test_type ();
 
   /// whether to use SII or DII
-  INVOKE_TYPE invoke_type (void);
+  INVOKE_TYPE invoke_type ();
 
   /// number of times to run the test
-  CORBA::ULong loop_count (void);
+  CORBA::ULong loop_count ();
 
   /// whether debug option is on or not
   CORBA::Boolean debug () const;
diff --git a/TAO/tests/Alt_Mapping/results.cpp b/TAO/tests/Alt_Mapping/results.cpp
index 098370c8dcb..b6957633956 100644
--- a/TAO/tests/Alt_Mapping/results.cpp
+++ b/TAO/tests/Alt_Mapping/results.cpp
@@ -14,17 +14,17 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-Results::Results (void)
+Results::Results ()
 {
 }
 
-Results::~Results (void)
+Results::~Results ()
 {
   delete [] this->elapsed_time_;
 }
 
 void
-Results::print_stats (void)
+Results::print_stats ()
 {
   double
     avg_real_time = 0,
@@ -103,20 +103,20 @@ Results::print_exception (const char * /* call_name */)
 }
 
 void
-Results::start_timer (void)
+Results::start_timer ()
 {
   this->timer_.start ();
 }
 
 void
-Results::stop_timer (void)
+Results::stop_timer ()
 {
   this->timer_.stop ();
   this->timer_.elapsed_time (this->elapsed_time_[this->call_count_-1]);
 }
 
 CORBA::ULong
-Results::call_count (void)
+Results::call_count ()
 {
   return this->call_count_;
 }
@@ -128,7 +128,7 @@ Results::call_count (CORBA::ULong c)
 }
 
 CORBA::ULong
-Results::error_count (void)
+Results::error_count ()
 {
   return this->error_count_;
 }
diff --git a/TAO/tests/Alt_Mapping/results.h b/TAO/tests/Alt_Mapping/results.h
index dd2e62756f7..0607cc430e9 100644
--- a/TAO/tests/Alt_Mapping/results.h
+++ b/TAO/tests/Alt_Mapping/results.h
@@ -33,31 +33,31 @@ class Results
 {
 public:
   /// ctor
-  Results (void);
+  Results ();
 
   /// destructor
-  ~Results (void);
+  ~Results ();
 
   /// prints the time stats
-  void print_stats (void);
+  void print_stats ();
 
   /// print the exception
   void print_exception (const char *call_name);
 
   /// start timing
-  void start_timer (void);
+  void start_timer ();
 
   /// stop timing
-  void stop_timer (void);
+  void stop_timer ();
 
   /// return call count
-  CORBA::ULong call_count (void);
+  CORBA::ULong call_count ();
 
   /// set the call count
   void call_count (CORBA::ULong);
 
   /// return the error count
-  CORBA::ULong error_count (void);
+  CORBA::ULong error_count ();
 
   /// set error count
   void error_count (CORBA::ULong);
diff --git a/TAO/tests/Alt_Mapping/ub_string.cpp b/TAO/tests/Alt_Mapping/ub_string.cpp
index a1cb328c8a5..b71967dca0f 100644
--- a/TAO/tests/Alt_Mapping/ub_string.cpp
+++ b/TAO/tests/Alt_Mapping/ub_string.cpp
@@ -17,12 +17,12 @@
 //               Test_Unbounded_String
 // ************************************************************************
 
-Test_Unbounded_String::Test_Unbounded_String (void)
+Test_Unbounded_String::Test_Unbounded_String ()
   : opname_ (CORBA::string_dup ("test_unbounded_string"))
 {
 }
 
-Test_Unbounded_String::~Test_Unbounded_String (void)
+Test_Unbounded_String::~Test_Unbounded_String ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -46,7 +46,7 @@ Test_Unbounded_String::init_parameters (Alt_Mapping_ptr)
 }
 
 int
-Test_Unbounded_String::reset_parameters (void)
+Test_Unbounded_String::reset_parameters ()
 {
   this->inout_ = this->in_.c_str ();
   this->out_.clear ();
@@ -75,7 +75,7 @@ Test_Unbounded_String::run_sii_test (Alt_Mapping_ptr objref)
 }
 
 CORBA::Boolean
-Test_Unbounded_String::check_validity (void)
+Test_Unbounded_String::check_validity ()
 {
   CORBA::ULong len = this->in_.length ();
 
@@ -98,7 +98,7 @@ Test_Unbounded_String::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_String::print_values (void)
+Test_Unbounded_String::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Alt_Mapping/ub_string.h b/TAO/tests/Alt_Mapping/ub_string.h
index 7326aa8f5de..7af096f8bf8 100644
--- a/TAO/tests/Alt_Mapping/ub_string.h
+++ b/TAO/tests/Alt_Mapping/ub_string.h
@@ -22,10 +22,10 @@ class Test_Unbounded_String
 {
 public:
   /// ctor
-  Test_Unbounded_String (void);
+  Test_Unbounded_String ();
 
   /// dtor
-  ~Test_Unbounded_String (void);
+  ~Test_Unbounded_String ();
 
   /// run the SII test
   int run_sii_test (Alt_Mapping_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Alt_Mapping_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
 private:
   /// operation name
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
index 771849b9cd3..3b3c0c7e8ba 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
@@ -63,7 +63,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr)
 }
 
 int
-Test_Unbounded_Struct_Sequence::reset_parameters (void)
+Test_Unbounded_Struct_Sequence::reset_parameters ()
 {
   this->inout_.clear ();
   this->out_.clear ();
@@ -92,7 +92,7 @@ Test_Unbounded_Struct_Sequence::run_sii_test (
 }
 
 CORBA::Boolean
-Test_Unbounded_Struct_Sequence::check_validity (void)
+Test_Unbounded_Struct_Sequence::check_validity ()
 {
   return (this->compare (this->in_, this->inout_)
           && this->compare (this->in_, this->out_)
@@ -100,7 +100,7 @@ Test_Unbounded_Struct_Sequence::check_validity (void)
 }
 
 void
-Test_Unbounded_Struct_Sequence::print_values (void)
+Test_Unbounded_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.h b/TAO/tests/Alt_Mapping/ub_struct_seq.h
index 973f9a0f186..4579bef5674 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.h
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.h
@@ -23,10 +23,10 @@ class Test_Unbounded_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Unbounded_Struct_Sequence (void);
+  Test_Unbounded_Struct_Sequence ();
 
   /// dtor
-  ~Test_Unbounded_Struct_Sequence (void);
+  ~Test_Unbounded_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Alt_Mapping_ptr objref);
@@ -38,13 +38,13 @@ public:
   int init_parameters (Alt_Mapping_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
 protected:
   /// compare
diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Any/Recursive/Hello.cpp
+++ b/TAO/tests/Any/Recursive/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h
index d8ef497e2e9..97d878316d8 100644
--- a/TAO/tests/Any/Recursive/Hello.h
+++ b/TAO/tests/Any/Recursive/Hello.h
@@ -26,7 +26,7 @@ public:
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB which will be shutdown by Hello::shutdown().
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index 8ea1c79868a..286816e91c4 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -5,7 +5,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index b94de23c40e..354f30e5e11 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -10,7 +10,7 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
@@ -47,7 +47,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (void)
+Simple_Server_i::call_client ()
 {
   if (this->flag_)
     {
@@ -78,7 +78,7 @@ Simple_Server_i::call_client (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h
index f7a40ffbf10..8444d669abe 100644
--- a/TAO/tests/BiDirectional/test_i.h
+++ b/TAO/tests/BiDirectional/test_i.h
@@ -28,10 +28,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
@@ -56,9 +56,9 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
-  int call_client (void);
+  int call_client ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index 3ce3740d7ce..4ff765c785a 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -6,7 +6,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index 1ce4b4964a8..a7c003f4788 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -10,7 +10,7 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   // Shutdown the server before we shutdown our own ORB
@@ -20,7 +20,7 @@ Callback_i::shutdown (void)
 }
 
 void
-Callback_i::callback_method (void)
+Callback_i::callback_method ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
@@ -91,7 +91,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
index 7d63e09030c..3b9f0628482 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
@@ -29,10 +29,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb, Simple_Server_ptr srv);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
@@ -59,7 +59,7 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual int handle_timeout (const ACE_Time_Value &current_time,
                               const void *act = 0);
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 7c14fc00199..daa8ef6e573 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -6,7 +6,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index fb14458b6e6..750ad83399d 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -9,7 +9,7 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
@@ -63,7 +63,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
index 8051d1c805a..9b78f5a9fe1 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
@@ -28,10 +28,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
@@ -56,7 +56,7 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp
index 08a56b206e7..45a6662936f 100644
--- a/TAO/tests/Big_AMI/ami_test_i.cpp
+++ b/TAO/tests/Big_AMI/ami_test_i.cpp
@@ -37,7 +37,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h
index 843c2e2648c..4a4597272ce 100644
--- a/TAO/tests/Big_AMI/ami_test_i.h
+++ b/TAO/tests/Big_AMI/ami_test_i.h
@@ -32,7 +32,7 @@ public:
                    const char* in_str,
                    const A::Payload &the_payload);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 7b5cb6645c6..70bc80cdf48 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -8,7 +8,7 @@ Coordinator::Coordinator (CORBA::ULong peer_count)
   ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]);
 }
 
-Coordinator::~Coordinator (void)
+Coordinator::~Coordinator ()
 {
   delete[] this->peers_;
 }
@@ -42,7 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
 }
 
 void
-Coordinator::shutdown_all_peers (void)
+Coordinator::shutdown_all_peers ()
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 72e79a9389e..5995c27e2ac 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -25,14 +25,14 @@ public:
                             Test::Session_List &session_list);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (void);
+  void shutdown_all_peers ();
 
   // = The skeleton methods
   virtual void add_peer (Test::Peer_ptr peer);
 
 protected:
   /// Protected Destructor, call _remove_ref() instead
-  virtual ~Coordinator (void);
+  virtual ~Coordinator ();
 
 private:
   /// Store a reference to each peer
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index be8124c5d82..d81779cec2d 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -6,7 +6,7 @@ Peer::Peer (CORBA::ORB_ptr orb)
 {
 }
 
-Peer::~Peer (void)
+Peer::~Peer ()
 {
 }
 
@@ -41,7 +41,7 @@ Peer::create_session (Test::Session_Control_ptr control,
 }
 
 void
-Peer::shutdown (void)
+Peer::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, waiting for threads\n"));
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index 9188396fcce..61ce3f84a50 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -14,7 +14,7 @@ public:
   Peer (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~Peer (void);
+  virtual ~Peer ();
 
   // = The skeleton methods
   virtual Test::Session_ptr create_session (Test::Session_Control_ptr control,
@@ -22,7 +22,7 @@ public:
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
                                             CORBA::ULong peer_count);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a pointer to the ORB to shutdown cleanly
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index 5f205cd73a8..5baadc17457 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -18,12 +18,12 @@ Session::Session (Test::Session_Control_ptr control,
 {
 }
 
-Session::~Session (void)
+Session::~Session ()
 {
 }
 
 int
-Session::svc (void)
+Session::svc ()
 {
   this->barrier_.wait ();
   CORBA::ULong i = 0;
@@ -86,7 +86,7 @@ Session::svc (void)
 }
 
 void
-Session::validate_connections (void)
+Session::validate_connections ()
 {
   CORBA::ULong session_count =
     this->other_sessions_.length ();
@@ -151,7 +151,7 @@ Session::start (const Test::Session_List &other_sessions)
 }
 
 void
-Session::ping (void)
+Session::ping ()
 {
 }
 
@@ -197,7 +197,7 @@ Session::receive_payload (const Test::Payload &the_payload)
 
 
 void
-Session::destroy (void)
+Session::destroy ()
 {
   // Make sure local resources are released
 
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 13fe7148e09..826f35db6f8 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -26,19 +26,19 @@ public:
            CORBA::ULong peer_count);
 
   /// Destructor
-  virtual ~Session (void);
+  virtual ~Session ();
 
   /// Run one of the experiment threads
-  int svc (void);
+  int svc ();
 
   // = The skeleton methods
   virtual void start (const Test::Session_List &other_sessions);
 
-  virtual void ping (void);
+  virtual void ping ();
 
   virtual void receive_payload (const Test::Payload &the_payload);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   /// Helper function used to report any problems and destroy local
@@ -50,7 +50,7 @@ private:
 
   /// Make sure that all threads have connections avaiable to the
   /// other sessions.
-  void validate_connections (void);
+  void validate_connections ();
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index bccb40f881d..dcf22af2c38 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -12,7 +12,7 @@ Session_Control::all_sessions_finished () const
   return this->session_count_ == 0;
 }
 
-Session_Control::~Session_Control (void)
+Session_Control::~Session_Control ()
 {
   if (this->session_count_ == 0 && this->success_)
     {
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 7b7791f5f67..bd9e1d24bbd 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -17,7 +17,7 @@ public:
   Session_Control (CORBA::ULong session_count);
 
   /// Destructor
-  virtual ~Session_Control (void);
+  virtual ~Session_Control ();
 
   /// Return 1 when all sessions have finished
   int all_sessions_finished () const;
diff --git a/TAO/tests/Big_Oneways/Session_Task.cpp b/TAO/tests/Big_Oneways/Session_Task.cpp
index d457a3b146a..cdd2ec01d07 100644
--- a/TAO/tests/Big_Oneways/Session_Task.cpp
+++ b/TAO/tests/Big_Oneways/Session_Task.cpp
@@ -8,7 +8,7 @@ Session_Task::Session_Task (Session *session)
 }
 
 int
-Session_Task::svc (void)
+Session_Task::svc ()
 {
   return this->session_->svc ();
 }
diff --git a/TAO/tests/Big_Oneways/Session_Task.h b/TAO/tests/Big_Oneways/Session_Task.h
index a2b151ece63..a12710923c2 100644
--- a/TAO/tests/Big_Oneways/Session_Task.h
+++ b/TAO/tests/Big_Oneways/Session_Task.h
@@ -19,7 +19,7 @@ public:
   Session_Task (Session *session);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index 957614f04d6..a8c3761c15d 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -7,7 +7,7 @@ Big_Reply_i::Big_Reply_i (CORBA::ORB_ptr orb,
 {
 }
 
-Big_Reply_i::~Big_Reply_i (void)
+Big_Reply_i::~Big_Reply_i ()
 {
 }
 
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h
index 46d1209bbf3..0d6d2b93c2c 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.h
+++ b/TAO/tests/Big_Reply/Big_Reply_i.h
@@ -26,14 +26,14 @@ public:
                CORBA::ULong length);
 
   ///Destructor
-  virtual ~Big_Reply_i (void);
+  virtual ~Big_Reply_i ();
 
   // = The skeleton methods
-  virtual Test::Octet_Seq *get_big_reply (void);
+  virtual Test::Octet_Seq *get_big_reply ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Our local ORB ptr
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index d0732cf60f8..e2c1a4c2aa2 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -43,7 +43,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Validating connection ..\n"));
 
diff --git a/TAO/tests/Big_Reply/Client_Task.h b/TAO/tests/Big_Reply/Client_Task.h
index d19e1b48d64..b487b05b1ca 100644
--- a/TAO/tests/Big_Reply/Client_Task.h
+++ b/TAO/tests/Big_Reply/Client_Task.h
@@ -20,11 +20,11 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Validate the connection
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index df1cd5a53b2..9846d0ba5d6 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -44,7 +44,7 @@ Client_Task::ID () const
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ++tasks_running_;
   if (TAO_debug_level > 0)
@@ -138,7 +138,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   try
     {
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index 0b130075d98..1ab52fa9b08 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -28,7 +28,7 @@ public:
                const ACE_CString& ident);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   bool done() const;
   const char *ID () const;
@@ -36,7 +36,7 @@ public:
 private:
   /// Make sure that all threads have connections available to
   /// workaround bug 189
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index b55f11f3bfc..f901863619d 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -1,6 +1,6 @@
 #include "Payload_Receiver.h"
 
-Payload_Receiver::Payload_Receiver (void)
+Payload_Receiver::Payload_Receiver ()
   : message_count_ (0)
   , maybe_lost_count_ (0)
 {
@@ -25,7 +25,7 @@ Payload_Receiver::more_data (
 }
 
 void
-Payload_Receiver::ping (void)
+Payload_Receiver::ping ()
 {
 }
 
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index de55d042079..706ee6371ed 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -13,13 +13,13 @@ class Payload_Receiver
   : public virtual POA_Test::Payload_Receiver
 {
 public:
-  Payload_Receiver (void);
+  Payload_Receiver ();
 
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload,
                           CORBA::Boolean maybe_lost);
 
-  virtual void ping (void);
+  virtual void ping ();
 
   int count (bool maybe_lost = false) const;
 
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index 7813458813f..36507c31cb2 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -8,7 +8,7 @@ Coordinator::Coordinator (CORBA::ULong peer_count)
   ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]);
 }
 
-Coordinator::~Coordinator (void)
+Coordinator::~Coordinator ()
 {
   delete[] this->peers_;
 }
@@ -42,7 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
 }
 
 void
-Coordinator::shutdown_all_peers (void)
+Coordinator::shutdown_all_peers ()
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index 15809cba47e..5eea7e62c33 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -24,14 +24,14 @@ public:
                             Test::Session_List &session_list);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (void);
+  void shutdown_all_peers ();
 
   // = The skeleton methods
   virtual void add_peer (Test::Peer_ptr peer);
 
 protected:
   /// Protected destructor, call _remove_ref() to delete
-  virtual ~Coordinator (void);
+  virtual ~Coordinator ();
 
 private:
   /// Store a reference to each peer
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index a7df3f550ec..2024fb17cc6 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -6,7 +6,7 @@ Peer::Peer (CORBA::ORB_ptr orb)
 {
 }
 
-Peer::~Peer (void)
+Peer::~Peer ()
 {
 }
 
@@ -31,7 +31,7 @@ Peer::create_session (Test::Session_Control_ptr control,
 }
 
 void
-Peer::shutdown (void)
+Peer::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, waiting for threads\n"));
diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index 9188396fcce..61ce3f84a50 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/Peer.h
@@ -14,7 +14,7 @@ public:
   Peer (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~Peer (void);
+  virtual ~Peer ();
 
   // = The skeleton methods
   virtual Test::Session_ptr create_session (Test::Session_Control_ptr control,
@@ -22,7 +22,7 @@ public:
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
                                             CORBA::ULong peer_count);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a pointer to the ORB to shutdown cleanly
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 13edf85c678..9ca05f2e34a 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -18,12 +18,12 @@ Session::Session (Test::Session_Control_ptr control,
 {
 }
 
-Session::~Session (void)
+Session::~Session ()
 {
 }
 
 int
-Session::svc (void)
+Session::svc ()
 {
   this->barrier_.wait ();
 
@@ -183,7 +183,7 @@ Session::echo_payload (const Test::Payload &the_payload)
 
 
 void
-Session::destroy (void)
+Session::destroy ()
 {
   // Make sure local resources are released
 
@@ -206,7 +206,7 @@ Session::more_work () const
 }
 
 void
-Session::validate_connections (void)
+Session::validate_connections ()
 {
   const CORBA::ULong session_count =
     this->other_sessions_.length ();
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 7ee8c297f2e..9288200e1b3 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -26,18 +26,18 @@ public:
            CORBA::ULong peer_count);
 
   /// Run one of the experiment threads
-  int svc (void);
+  int svc ();
 
   // = The skeleton methods
   virtual void start (const Test::Session_List &other_sessions);
 
   virtual Test::Payload* echo_payload (const Test::Payload &the_payload);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   /// Protected destructor, call _remove_ref() to delete
-  virtual ~Session (void);
+  virtual ~Session ();
 
 private:
   /// Helper function used to report any problems and destroy local
@@ -48,7 +48,7 @@ private:
   int more_work () const;
 
   /// Validate all the connections
-  void validate_connections (void);
+  void validate_connections ();
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index 027bd658625..59a9f6a04ef 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -12,7 +12,7 @@ Session_Control::all_sessions_finished () const
   return this->session_count_ == 0;
 }
 
-Session_Control::~Session_Control (void)
+Session_Control::~Session_Control ()
 {
   if (this->session_count_ == 0 && this->success_)
     {
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 7b7791f5f67..bd9e1d24bbd 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -17,7 +17,7 @@ public:
   Session_Control (CORBA::ULong session_count);
 
   /// Destructor
-  virtual ~Session_Control (void);
+  virtual ~Session_Control ();
 
   /// Return 1 when all sessions have finished
   int all_sessions_finished () const;
diff --git a/TAO/tests/Big_Twoways/Session_Task.cpp b/TAO/tests/Big_Twoways/Session_Task.cpp
index d457a3b146a..cdd2ec01d07 100644
--- a/TAO/tests/Big_Twoways/Session_Task.cpp
+++ b/TAO/tests/Big_Twoways/Session_Task.cpp
@@ -8,7 +8,7 @@ Session_Task::Session_Task (Session *session)
 }
 
 int
-Session_Task::svc (void)
+Session_Task::svc ()
 {
   return this->session_->svc ();
 }
diff --git a/TAO/tests/Big_Twoways/Session_Task.h b/TAO/tests/Big_Twoways/Session_Task.h
index a2b151ece63..a12710923c2 100644
--- a/TAO/tests/Big_Twoways/Session_Task.h
+++ b/TAO/tests/Big_Twoways/Session_Task.h
@@ -19,7 +19,7 @@ public:
   Session_Task (Session *session);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index 64b3444a447..75ff94e7e8c 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -15,7 +15,7 @@ Blocking_Sync_None::slow_operation (const Test::Payload &,
 }
 
 void
-Blocking_Sync_None::shutdown (void)
+Blocking_Sync_None::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index 76044d36263..eff1fcb4390 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -17,7 +17,7 @@ public:
   virtual void slow_operation (const Test::Payload &the_payload,
                                CORBA::ULong sleep_microseconds);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
index 6ae6ebf541a..50c18856bd1 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
@@ -6,7 +6,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
index 40b44ee5757..d98b2894ae2 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
@@ -18,7 +18,7 @@ public:
   Client_Task (CORBA::ORB_ptr orb);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index 775f68a3c18..f2f0bb05caf 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -26,7 +26,7 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
index 8ed7ebb0b35..3f079f0cd2f 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
@@ -14,7 +14,7 @@ public:
 
   virtual void start_task (Test::Echo_ptr client);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
index e8aae406238..780d8fc11a1 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (Test::Echo_ptr echo,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   Test::Payload payload (32768);
   payload.length (32768);
diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
index cb379028636..930327a63a8 100644
--- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
@@ -13,7 +13,7 @@ ORB_Task::ORB_Task(CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp
index cb93da3a251..9828cbe2226 100644
--- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp
@@ -12,7 +12,7 @@ Server_Task::Server_Task(Test::Echo_ptr echo)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   Test::Payload pload(16); pload.length(16);
   int stop_loop = 0;
diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.h b/TAO/tests/Bug_1020_Regression/Server_Task.h
index fbd0c089642..8562bc493fe 100644
--- a/TAO/tests/Bug_1020_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1020_Regression/Server_Task.h
@@ -17,7 +17,7 @@ public:
   Server_Task (Test::Echo_ptr echo);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
index ee750de19eb..990c6dd42d7 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
@@ -26,7 +26,7 @@ BlobServerImpl::test(
 }
 
 void
-BlobServerImpl::shutdown (void)
+BlobServerImpl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h
index 3875b04a7f4..e6c77019a20 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.h
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.h
@@ -17,7 +17,7 @@ public:
         BlobType1& blob1,
         BlobType2& blob2
       );
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
index 9bed2cb6b47..846cb985b38 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
@@ -25,7 +25,7 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
index 8ae5d484754..76d1ae79a1e 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
@@ -14,7 +14,7 @@ public:
 
   virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
index 56ec581d509..82a425e5e0b 100644
--- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
@@ -15,7 +15,7 @@ Server_Timer::Server_Timer(Test::Echo_ptr echo,
 }
 
 void
-Server_Timer::activate (void)
+Server_Timer::activate ()
 {
   ACE_Time_Value tv (0, 20000);
   this->reactor()->schedule_timer (this, 0, tv);
diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.h b/TAO/tests/Bug_1269_Regression/Server_Timer.h
index b249d3afcea..f575f3ce74d 100644
--- a/TAO/tests/Bug_1269_Regression/Server_Timer.h
+++ b/TAO/tests/Bug_1269_Regression/Server_Timer.h
@@ -21,7 +21,7 @@ public:
   /// Constructor
   Server_Timer (Test::Echo_ptr echo, ACE_Reactor * reactor);
 
-  void activate (void);
+  void activate ();
 
   /// Thread entry point
   int handle_timeout(ACE_Time_Value const & tv, void const *);
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
index 5d1490074c3..8756d4d29e8 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
@@ -27,7 +27,7 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
index c480d2f76fd..bdd51cb30c5 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
@@ -15,7 +15,7 @@ public:
 
   virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
index bdb0533b1a6..4a727bce0fd 100644
--- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
@@ -17,7 +17,7 @@ Server_Timer::Server_Timer(Test::Echo_ptr echo,
 }
 
 void
-Server_Timer::activate (void)
+Server_Timer::activate ()
 {
   ACE_Time_Value tv (0, 20000);
   this->reactor()->schedule_timer (this, 0, tv, tv);
diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.h b/TAO/tests/Bug_1270_Regression/Server_Timer.h
index 6d3194ff4bb..b9e00941a97 100644
--- a/TAO/tests/Bug_1270_Regression/Server_Timer.h
+++ b/TAO/tests/Bug_1270_Regression/Server_Timer.h
@@ -21,7 +21,7 @@ public:
   /// Constructor
   Server_Timer (Test::Echo_ptr echo, ACE_Reactor * reactor);
 
-  void activate (void);
+  void activate ();
 
   /// Thread entry point
   int handle_timeout(ACE_Time_Value const & tv, void const *);
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp
index f4c287557a5..6abc12a38d4 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp
@@ -10,12 +10,12 @@ Test_i::~Test_i()
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h
index 0ae7dfeface..e2b6c7e28e5 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.h
+++ b/TAO/tests/Bug_1330_Regression/Test_i.h
@@ -12,12 +12,12 @@ public:
   Test_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~Test_i (void);
+  ~Test_i ();
 
   /// A method
-  virtual void test_method(void);
+  virtual void test_method();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
index dc7e2595146..05649be4244 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
@@ -19,7 +19,7 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown message\n"));
   pool_->shutdown();
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
index 436fae8c468..bf2fb1fcd89 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
@@ -17,7 +17,7 @@ public:
 
   virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   Thread_Pool *pool_;
diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
index d8074e356af..0f72129c222 100644
--- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
@@ -12,7 +12,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index e3e80c625f6..100c82f835e 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -26,12 +26,12 @@ Thread_Pool::Thread_Pool (CORBA::ORB_ptr orb,
                 "activate failed\n"));
 }
 
-Thread_Pool::~Thread_Pool (void)
+Thread_Pool::~Thread_Pool ()
 {
 }
 
 int
-Thread_Pool::shutdown (void)
+Thread_Pool::shutdown ()
 {
   thr_mgr_->cancel_grp (grp_id_);
 
@@ -81,7 +81,7 @@ Thread_Pool::put (ACE_Message_Block *mb,
 // for all other threads to complete this iteration.
 
 int
-Thread_Pool::svc (void)
+Thread_Pool::svc ()
 {
   // Note that the <ACE_Task::svc_run> method automatically adds us to
   // the Thread_Manager when the thread begins.
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
index 94e88b01841..bcd01b5a604 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
@@ -13,9 +13,9 @@ public:
                int n_threads);
   // Constructor activates <n_threads> in the thread pool.
 
-  virtual ~Thread_Pool (void);
+  virtual ~Thread_Pool ();
   // Destructor...
-  int shutdown (void);
+  int shutdown ();
 
   virtual int svc ();
 
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index b432f576dc5..9ece8d2188f 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -22,7 +22,7 @@ public:
       ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
   }
 
-  void activate (void)
+  void activate ()
   {
     ACE_Time_Value tv (150, 0);
     this->reactor()->schedule_timer (this, 0, tv, tv);
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
index 1a9e42386d4..7a50dd9f165 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
@@ -16,7 +16,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.h b/TAO/tests/Bug_1476_Regression/Client_Task.h
index 86427d8a6fa..a0ce97ce27c 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.h
@@ -21,7 +21,7 @@ public:
                int number_of_oneways);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
index ad02084fb96..26c6fea3bfb 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
@@ -7,7 +7,7 @@ Sender_i::Sender_i (CORBA::ORB_ptr orb)
 {
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
 }
 
@@ -19,7 +19,7 @@ Sender_i::active_objects (CORBA::ULong no_threads)
 
 
 void
-Sender_i::send_ready_message (void)
+Sender_i::send_ready_message ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received a call ...\n"));
diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.cpp b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
index d5da80805a5..9189b995034 100644
--- a/TAO/tests/Bug_1476_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.h b/TAO/tests/Bug_1476_Regression/Server_Task.h
index b00eef99fbf..48fdbd39930 100644
--- a/TAO/tests/Bug_1476_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1476_Regression/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
index ccb8dd6b03b..75fc7db51f9 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (Test::Hello_ptr receiver,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.h b/TAO/tests/Bug_1482_Regression/Client_Task.h
index 69e937d7249..203b18adea3 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.h
@@ -22,7 +22,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index 33e7e166cef..5a403fb9ee5 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -9,7 +9,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-Hello::next_prime (void)
+Hello::next_prime ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 1f9423f17c0..7a9e7650c39 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.h
@@ -14,7 +14,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong next_prime (void);
+  virtual CORBA::ULong next_prime ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
index 502da807fc9..ea1882c01a2 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
@@ -8,7 +8,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
 //   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.h b/TAO/tests/Bug_1482_Regression/Server_Task.h
index a07f998f5a1..a7faae94890 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
index 0dc9dffc534..ffcdab9ef9d 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index 93bda38044a..c414a163b65 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -22,7 +22,7 @@ Client_Task::Client_Task (const ACE_TCHAR *input,
 
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.h b/TAO/tests/Bug_1495_Regression/Client_Task.h
index cb903f47ab4..4bc3ee6cb10 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.h
@@ -28,7 +28,7 @@ class Client_Task : public ACE_Task_Base
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point.
-  int svc (void);
+  int svc ();
 
 private:
   /// File to read in the remote IOR.
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
index fa95c4361e6..7099617cadd 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
@@ -30,7 +30,7 @@ Server_ORBInitializer::post_init (
 }
 
 Echo_Server_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
index 2272771c5de..7fac80332ca 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
@@ -28,7 +28,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -36,7 +36,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  Echo_Server_Request_Interceptor * server_interceptor (void);
+  Echo_Server_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
index 0d526c9fe4a..65421ea9e3a 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
@@ -26,7 +26,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.h b/TAO/tests/Bug_1495_Regression/Server_Task.h
index 86383eaae2b..cefabdbc8dc 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.h
@@ -29,7 +29,7 @@ class Server_Task : public ACE_Task_Base
                  ACE_Thread_Manager *thr_mgr);
 
     /// Thread entry point
-    int svc (void);
+    int svc ();
 
   private:
     /// Output file for the server IOR
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
index 4bc7c2cbc34..333ac2cc665 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -12,18 +12,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 2c4921837d5..ca95623f402 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index 5eacad5a411..781480882a7 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Thread.h"
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -17,7 +17,7 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (CORBA::Object_
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
@@ -34,13 +34,13 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index 3073b9069b0..3338dd0fdbb 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -22,7 +22,7 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   Echo_Server_Request_Interceptor (CORBA::Object_ptr forward_location);
@@ -32,10 +32,10 @@ public:
 
   void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp
index ad7ed5cb1e1..a40b83d58c1 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.cpp
+++ b/TAO/tests/Bug_1495_Regression/test_i.cpp
@@ -14,7 +14,7 @@ Bug1495_i::Bug1495_i (CORBA::ORB_ptr orb)
 {
 }
 
-Bug1495_i::~Bug1495_i (void)
+Bug1495_i::~Bug1495_i ()
 {
 }
 
@@ -27,7 +27,7 @@ Bug1495_i::get_thread_id (Bug1495_Regression::ThreadId_out thread_id)
 }
 
 void
-Bug1495_i::shutdown (void)
+Bug1495_i::shutdown ()
 {
   ACE_DEBUG ((LM_INFO,
               "Shutting down orb %Q\n",
diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h
index f9a97ecee65..81f28c596a9 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.h
+++ b/TAO/tests/Bug_1495_Regression/test_i.h
@@ -40,11 +40,11 @@ public:
   Bug1495_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Bug1495_i (void);
+  virtual ~Bug1495_i ();
 
   virtual void get_thread_id (Bug1495_Regression::ThreadId_out thread_id);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp
index c99cfe0aaec..6b55ca475d1 100644
--- a/TAO/tests/Bug_1535_Regression/Test.cpp
+++ b/TAO/tests/Bug_1535_Regression/Test.cpp
@@ -6,12 +6,12 @@ Hello::Hello (PortableServer::POA_ptr poa) :
 }
 
 void
-Hello::print_hello_world (void)
+Hello::print_hello_world ()
 {
 }
 
 PortableServer::POA_ptr
-Hello::_default_POA (void)
+Hello::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h
index 9e987171955..a0d9d7e2b2b 100644
--- a/TAO/tests/Bug_1535_Regression/Test.h
+++ b/TAO/tests/Bug_1535_Regression/Test.h
@@ -13,9 +13,9 @@ public:
   Hello (PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual void print_hello_world (void);
+  virtual void print_hello_world ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
index 3c2f6013b86..245b9f0ecfb 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
@@ -11,12 +11,12 @@ Client_Task::Client_Task (Test::Hello_ptr receiver,
 {
 }
 
-Client_Task::~Client_Task (void)
+Client_Task::~Client_Task ()
 {
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.h b/TAO/tests/Bug_1551_Regression/Client_Task.h
index 4a942cc92b9..337d870aed1 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.h
@@ -17,10 +17,10 @@ public:
                CORBA::ORB_ptr o,
                ACE_Thread_Manager *thr_mgr);
 
-  ~Client_Task (void);
+  ~Client_Task ();
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index 2885a6c62ff..4ffc42f9f65 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -11,7 +11,7 @@ Hello::Hello(
 }
 
 void
-Hello::short_sleep (void)
+Hello::short_sleep ()
 {
   long count = atomic_counter_--;
 
diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h
index 20e535f3c6d..1e6d6718e61 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.h
+++ b/TAO/tests/Bug_1551_Regression/Hello.h
@@ -13,7 +13,7 @@ public:
   /// Constructor
   Hello(CORBA::ORB_ptr orb, bool simulate_crashes);
 
-  virtual void short_sleep (void);
+  virtual void short_sleep ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index 5da7ffbe20b..0bb1faffc82 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -9,7 +9,7 @@ Reply_Handler::Reply_Handler (
 }
 
 void
-Reply_Handler::short_sleep (void)
+Reply_Handler::short_sleep ()
 {
   check_counter();
 
@@ -54,7 +54,7 @@ Reply_Handler::short_sleep_excep (
 }
 
 void Reply_Handler::
-check_counter(void)
+check_counter()
 {
   long const count = --counter_;
   if(count == 0)
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
index 9b27bd8f04e..f71041cbf9b 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
@@ -14,12 +14,12 @@ public:
       Test::Hello_ptr hello,
       CORBA::ORB_ptr orb);
 
-  void short_sleep (void);
+  void short_sleep ();
 
   void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder);
 
 private:
-  void check_counter(void);
+  void check_counter();
 
 private:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> counter_;
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
index 75038ceb12a..b98d1fe56ca 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
@@ -8,7 +8,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   //   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.h b/TAO/tests/Bug_1551_Regression/Server_Task.h
index a35c3689b07..e0ae5464042 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.h
@@ -12,7 +12,7 @@ public:
   Server_Task (CORBA::ORB_ptr orb,
                ACE_Thread_Manager *thr_mgr);
 
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp
index ef59e84556d..6a328d65bac 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp
@@ -11,7 +11,7 @@ Test_i::~Test_i()
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
    // Noop
 }
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h
index 80649bd8994..385f5730315 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.h
+++ b/TAO/tests/Bug_1627_Regression/Test_i.h
@@ -9,13 +9,13 @@ class Test_i: public POA_Test
 {
 public:
    /// Constructor
-   Test_i (void);
+   Test_i ();
 
    /// Destructor
-   ~Test_i (void);
+   ~Test_i ();
 
    /// A method
-   void test_method(void);
+   void test_method();
 };
 
 #endif /* ! BUG_1330_REGRESSION_TEST_I_H */
diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp
index 04cf5fc9b90..922415c6766 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1676_Regression/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 #if 0
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
@@ -69,7 +69,7 @@ Hello::mod_stringList (::Test::StringList & iosl)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h
index 53449753f89..1c305d970a6 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.h
+++ b/TAO/tests/Bug_1676_Regression/Hello.h
@@ -20,7 +20,7 @@ public:
 
   virtual void mod_stringList (::Test::StringList & iosl);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 19d263e57b2..498f02b387a 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -16,7 +16,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.h b/TAO/tests/Bug_2084_Regression/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
index cc6680548c3..f2eeb79b35f 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp
@@ -52,7 +52,7 @@ void EventNode::registerHello ( ::Test::Hello_ptr h )
 }
 
 void
-EventNode::shutdown (void)
+EventNode::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index 768200dd39e..af70fd55ddc 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -20,7 +20,7 @@ public:
   // = The skeleton methods
   virtual void registerHello ( ::Test::Hello_ptr h);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp
index 654d838d4d4..8c20571d7dc 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2084_Regression/Hello.cpp
@@ -52,7 +52,7 @@ Hello::get_string (::Test::ThreadId caller_threadid)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index f7d4bc3b661..65fba82d8f0 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -20,7 +20,7 @@ public:
   // = The skeleton methods
   virtual char * get_string ( ::Test::ThreadId caller_threadid);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
index 714d91a81e1..37ef71e01a6 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
@@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.h b/TAO/tests/Bug_2084_Regression/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp
index 63840f67d39..09cf9b1346c 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2174_Regression/test_i.cpp
@@ -20,7 +20,7 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h
index 32129102136..a175271fcd8 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.h
+++ b/TAO/tests/Bug_2174_Regression/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
                     CORBA::Long msecs);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2183_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index 9806cdd133d..f5d4054e05f 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
@@ -19,9 +19,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
index 6cf8290cbb1..2bf8ddb2538 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2186_Regression/Hello.cpp
@@ -6,14 +6,14 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n"));
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
index 46d192e5166..c53a05c1616 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ b/TAO/tests/Bug_2186_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   virtual void request_callback (Test::Hello_ptr call_me);
 
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp
index f3b4230cd4c..4c5bd4ec6b6 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.cpp
+++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp
@@ -33,18 +33,18 @@ ServerAdmin_i::ServerAdmin_i (ArrayTest_ptr target)
 {
 }
 
-ServerAdmin_i::~ServerAdmin_i (void)
+ServerAdmin_i::~ServerAdmin_i ()
 {
 }
 
 ArrayTest_ptr
-ServerAdmin_i::target(void)
+ServerAdmin_i::target()
 {
   return ArrayTest::_duplicate(target_.in());
 }
 
 void
-ServerAdmin_i::shutdown (void)
+ServerAdmin_i::shutdown ()
 {
   int argc = 0;
   char ** argv = 0;
@@ -53,7 +53,7 @@ ServerAdmin_i::shutdown (void)
 }
 
 // Implementation skeleton constructor
-ArrayTest_i::ArrayTest_i (void)
+ArrayTest_i::ArrayTest_i ()
   :longArray_ (LongArray_alloc()),
    ulongArray_ (ULongArray_alloc()),
    stringArray_ (StringArray_alloc()),
@@ -72,7 +72,7 @@ ArrayTest_i::ArrayTest_i (void)
 }
 
 // Implementation skeleton destructor
-ArrayTest_i::~ArrayTest_i (void)
+ArrayTest_i::~ArrayTest_i ()
 {
   LongArray_free (longArray_);
   ULongArray_free (ulongArray_);
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h
index 4ecaf93f43d..aec85dd444e 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.h
+++ b/TAO/tests/Bug_2188_Regression/broken_i.h
@@ -38,10 +38,10 @@ class ServerAdmin_i : public virtual POA_ServerAdmin
 {
 public:
   ServerAdmin_i (ArrayTest_ptr target);
-  virtual ~ServerAdmin_i (void);
-  ArrayTest_ptr target(void);
+  virtual ~ServerAdmin_i ();
+  ArrayTest_ptr target();
 
-  void shutdown (void);
+  void shutdown ();
 private:
   ArrayTest_var target_;
 };
@@ -67,10 +67,10 @@ private:
   CORBA::Char char_;
 public:
   //Constructor
-  ArrayTest_i (void);
+  ArrayTest_i ();
 
   //Destructor
-  virtual ~ArrayTest_i (void);
+  virtual ~ArrayTest_i ();
 
   virtual
   ::LongArray_slice * longArrayOp (
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
index 511b3d75bac..f0a1d3f3180 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   CORBA::Boolean exception = false;
   try
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.h b/TAO/tests/Bug_2241_Regression/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Bug_2241_Regression/Hello.cpp b/TAO/tests/Bug_2241_Regression/Hello.cpp
index 69ad5eda998..1c70ca33855 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2241_Regression/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_ERROR ((LM_ERROR,
               "(%P|%t) ERROR: Unexpected Upcall in process ..\n"));
@@ -20,7 +20,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Bug_2241_Regression/Hello.h b/TAO/tests/Bug_2241_Regression/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.h
+++ b/TAO/tests/Bug_2241_Regression/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2241_Regression/Server_Task.cpp b/TAO/tests/Bug_2241_Regression/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Bug_2241_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Bug_2241_Regression/Server_Task.h b/TAO/tests/Bug_2241_Regression/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Bug_2241_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2241_Regression/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index ce6a65d029a..fedb6b515bf 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -43,7 +43,7 @@ protected:
 class ST_AMH_Server
 {
 public:
-  ST_AMH_Server (void);
+  ST_AMH_Server ();
   virtual ~ST_AMH_Server ();
 
   /// ORB inititalisation stuff
@@ -123,7 +123,7 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr,
 
 // ------------------------------------------------------------------------
 //
-ST_AMH_Server::ST_AMH_Server (void)
+ST_AMH_Server::ST_AMH_Server ()
 {
 }
 
diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp
index fbe2727b368..5e12c81c450 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2328_Regression/Hello.cpp
@@ -13,7 +13,7 @@ Hello::get_string (const char * A, const char * B, const char * C)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
index 14f9189feb0..6d6ec0fc1ef 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ b/TAO/tests/Bug_2328_Regression/Hello.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual char * get_string (const char * A, const char * B, const char * C);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp
index 73cea2da610..364d105983d 100644
--- a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp
@@ -36,7 +36,7 @@ AMI_Test_i::foo (CORBA::Long value)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2356_Regression/ami_test_i.h b/TAO/tests/Bug_2356_Regression/ami_test_i.h
index 1df67e21f06..8b94350193b 100644
--- a/TAO/tests/Bug_2356_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_2356_Regression/ami_test_i.h
@@ -29,7 +29,7 @@ public:
   // The AMI_Test methods.
   void foo (CORBA::Long value);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp
index f89bb7b3545..d7531e925e7 100644
--- a/TAO/tests/Bug_2356_Regression/client.cpp
+++ b/TAO/tests/Bug_2356_Regression/client.cpp
@@ -59,7 +59,7 @@ public:
   /// Destructor.
     ~Handler (void) {};
 
-  void foo (void)
+  void foo ()
     {
     };
 
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
index afa4ffda9d5..c20afbb4460 100644
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ b/TAO/tests/Bug_2417_Regression/client.cpp
@@ -104,7 +104,7 @@ ThreadPool::ThreadPool(CORBA::ORB_ptr orb)
 {
 }
 
-int ThreadPool::svc (void)
+int ThreadPool::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
index b7d1239cf03..19e887398db 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -50,7 +50,7 @@ void Publisher_impl::Worker::addSubscriber(Subscriber_ptr subscriber)
   s.count = 0;
 }
 
-int Publisher_impl::Worker::svc (void)
+int Publisher_impl::Worker::svc ()
 {
   double data = 0.0;
   bool doShutdown = false;
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 246554ac593..a0f37b7afa2 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -122,7 +122,7 @@ ThreadPool::ThreadPool(CORBA::ORB_ptr orb)
 {
 }
 
-int ThreadPool::svc (void)
+int ThreadPool::svc ()
 {
   try
   {
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index bdce1f67b07..c9c57ac2e8b 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -13,7 +13,7 @@ class Reply_Handler
     }
 
    virtual void
-   childMethod (void)
+   childMethod ()
     {
     }
 
@@ -32,7 +32,7 @@ class Reply_Handler
     }
 
    virtual void
-   parentMethod (void)
+   parentMethod ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "client: parentMethod reply %d @ %T\n",
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index 710fdc31597..95e93bbebc2 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -143,7 +143,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp
index c95290efda2..93e443fc1f7 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2503_Regression/test_i.cpp
@@ -36,7 +36,7 @@ create_and_activate_server()
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   if (!CORBA::is_nil (this->orb_.in ()))
     this->orb_->shutdown (false);
diff --git a/TAO/tests/Bug_2503_Regression/test_i.h b/TAO/tests/Bug_2503_Regression/test_i.h
index d4d4131ed76..5750eec636c 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.h
+++ b/TAO/tests/Bug_2503_Regression/test_i.h
@@ -11,9 +11,9 @@ public:
 
   virtual void the_operation(CORBA::Long & x);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  char * create_and_activate_server(void);
+  char * create_and_activate_server();
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2593_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.h
+++ b/TAO/tests/Bug_2593_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp
index b37ab6fb634..a3c0d15f54d 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2595_Regression/Hello.cpp
@@ -17,7 +17,7 @@ Hello::op (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h
index 4274d994541..bda9c7d4f53 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.h
+++ b/TAO/tests/Bug_2595_Regression/Hello.h
@@ -17,7 +17,7 @@ public:
         ::Test::Fls_out fstruct,
         ::Test::Vls_out vstruct);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index 22b5f692ac5..f4cefb31674 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -23,7 +23,7 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 class Callback_i : public POA_Test::CallBack
 {
 public:
-  void method2(void)
+  void method2()
   {
     ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n"));
   }
@@ -43,12 +43,12 @@ private:
   int busy_threads_;
   CORBA::Short message_counter_;
 
-  int run_test (void);
+  int run_test ();
 public:
   Worker( int ot);
   ~Worker();
 
-  int svc (void);
+  int svc ();
 };
 
 Worker::Worker(int ot)
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp
index 2df14afddd0..ab2b7bb796e 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp
@@ -4,14 +4,14 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-DllORB::DllORB (void)
+DllORB::DllORB ()
  : failPrePostInit_ (3),
    mv_orb_ (),
    mv_rootPOA_ ()
 {
 }
 
-DllORB::~DllORB (void)
+DllORB::~DllORB ()
 {
 }
 
@@ -103,7 +103,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
 
 
 int
-DllORB::fini (void)
+DllORB::fini ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h
index fc561ccfdd4..93ba2a11f46 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.h
+++ b/TAO/tests/Bug_2677_Regression/DllORB.h
@@ -9,8 +9,8 @@
 class bug_2677_regression_Export DllORB: public ACE_Service_Object
 {
 public:
-  DllORB (void);
-  virtual ~DllORB (void);
+  DllORB ();
+  virtual ~DllORB ();
 
   CORBA::ORB_ptr orb () const;
 
diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp
index da4ec179b1e..f1b3a445bd8 100644
--- a/TAO/tests/Bug_2678_Regression/server.cpp
+++ b/TAO/tests/Bug_2678_Regression/server.cpp
@@ -9,7 +9,7 @@ public:
   virtual AnySeq *RunTest(const AnySeq &params);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual void shutdown (void);
+  virtual void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 private:
   CORBA::ORB_var orb_;
@@ -20,7 +20,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb))
 }
 
 void
-Test_impl::shutdown(void)
+Test_impl::shutdown()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index cdba93ea310..b2204a920f1 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -20,7 +20,7 @@ public:
   {
   }
 
-  int svc (void)
+  int svc ()
   {
     bool keep_going = true;
     while (keep_going && !this->stop_)
diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp
index 8115009818b..5b508e5c809 100644
--- a/TAO/tests/Bug_2683_Regression/server.cpp
+++ b/TAO/tests/Bug_2683_Regression/server.cpp
@@ -45,7 +45,7 @@ public:
   {
   }
 
-  int svc (void)
+  int svc ()
   {
     try
       {
diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp
index cd37313afd3..11c4d65deeb 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2683_Regression/test_i.cpp
@@ -7,12 +7,12 @@ test_i::test_i (ORB_Killer *k)
 }
 
 void
-test_i::ping (void)
+test_i::ping ()
 {
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown\n"));
   this->killer_->activate ();
diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h
index 61ceecfc642..8809d548b0d 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.h
+++ b/TAO/tests/Bug_2683_Regression/test_i.h
@@ -26,9 +26,9 @@ public:
   test_i (ORB_Killer *k);
 
   // = The skeleton methods
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2734_Regression/test_i.cpp b/TAO/tests/Bug_2734_Regression/test_i.cpp
index d615af9689d..a240a7d9e6c 100644
--- a/TAO/tests/Bug_2734_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2734_Regression/test_i.cpp
@@ -33,7 +33,7 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Bug_2734_Regression/test_i.h b/TAO/tests/Bug_2734_Regression/test_i.h
index 32129102136..a175271fcd8 100644
--- a/TAO/tests/Bug_2734_Regression/test_i.h
+++ b/TAO/tests/Bug_2734_Regression/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
                     CORBA::Long msecs);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
index c8370491fd3..11fd77533fc 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
@@ -5,7 +5,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 {
 }
 
-void Messenger_i::send (void)
+void Messenger_i::send ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.h b/TAO/tests/Bug_2768_Regression/Messenger_i.h
index de582704c66..221ba2054d7 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.h
@@ -7,7 +7,7 @@ class Messenger_i : public POA_SimpleMessenger::Messenger
 {
 public:
   Messenger_i (CORBA::ORB_ptr orb);
-  virtual void send (void);
+  virtual void send ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.cpp b/TAO/tests/Bug_2791_Regression/Message_i.cpp
index 2a1af32e41a..3362d2b30e3 100644
--- a/TAO/tests/Bug_2791_Regression/Message_i.cpp
+++ b/TAO/tests/Bug_2791_Regression/Message_i.cpp
@@ -12,7 +12,7 @@ MessageImpl::MessageImpl (const char *user, const char *subject, const char *tex
 }
 
 ::CORBA::ValueBase *
-MessageImpl::_copy_value (void)
+MessageImpl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.h b/TAO/tests/Bug_2791_Regression/Message_i.h
index ecf5ed5958b..055640bd849 100644
--- a/TAO/tests/Bug_2791_Regression/Message_i.h
+++ b/TAO/tests/Bug_2791_Regression/Message_i.h
@@ -7,7 +7,7 @@ class MessageImpl : public virtual OBV_Message,
   public:
     MessageImpl ();
     MessageImpl (const char *user, const char *subject, const char *text);
-    virtual ::CORBA::ValueBase *_copy_value (void);
+    virtual ::CORBA::ValueBase *_copy_value ();
 
     virtual char *user ();
     virtual void user (const char *);
diff --git a/TAO/tests/Bug_2804_Regression/Hello.cpp b/TAO/tests/Bug_2804_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_2804_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2804_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2804_Regression/Hello.h b/TAO/tests/Bug_2804_Regression/Hello.h
index d8ef497e2e9..97d878316d8 100644
--- a/TAO/tests/Bug_2804_Regression/Hello.h
+++ b/TAO/tests/Bug_2804_Regression/Hello.h
@@ -26,7 +26,7 @@ public:
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB which will be shutdown by Hello::shutdown().
diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
index 08ca555dd4e..4824a2e1156 100644
--- a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
@@ -62,14 +62,14 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.h b/TAO/tests/Bug_2805_Regression/ami_test_i.h
index a019bf37775..190bddd3294 100644
--- a/TAO/tests/Bug_2805_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_2805_Regression/ami_test_i.h
@@ -33,9 +33,9 @@ public:
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp
index 84297478797..74262da89be 100644
--- a/TAO/tests/Bug_2805_Regression/client.cpp
+++ b/TAO/tests/Bug_2805_Regression/client.cpp
@@ -96,7 +96,7 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
+  Handler ()
   {
   };
 
@@ -149,7 +149,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -160,7 +160,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     };
-  ~Handler (void)
+  ~Handler ()
   {
   };
 
@@ -295,7 +295,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2844_Regression/Hello.cpp b/TAO/tests/Bug_2844_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_2844_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2844_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2844_Regression/Hello.h b/TAO/tests/Bug_2844_Regression/Hello.h
index d8ef497e2e9..97d878316d8 100644
--- a/TAO/tests/Bug_2844_Regression/Hello.h
+++ b/TAO/tests/Bug_2844_Regression/Hello.h
@@ -26,7 +26,7 @@ public:
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB which will be shutdown by Hello::shutdown().
diff --git a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp
index 3e9f7c047f6..1626a15b166 100644
--- a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp
@@ -38,7 +38,7 @@ AMI_Test_i::foo (CORBA::Long value)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2909_Regression/ami_test_i.h b/TAO/tests/Bug_2909_Regression/ami_test_i.h
index 1df67e21f06..8b94350193b 100644
--- a/TAO/tests/Bug_2909_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_2909_Regression/ami_test_i.h
@@ -29,7 +29,7 @@ public:
   // The AMI_Test methods.
   void foo (CORBA::Long value);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp
index ccdafd2ecb5..05f6a9188bd 100644
--- a/TAO/tests/Bug_2909_Regression/client.cpp
+++ b/TAO/tests/Bug_2909_Regression/client.cpp
@@ -97,7 +97,7 @@ public:
   {
   };
 
-  void foo (void)
+  void foo ()
     {
       int const reply = --number_of_replies;
 
@@ -152,7 +152,7 @@ public:
       ++request_;
     };
 
-  ~Handler (void)
+  ~Handler ()
   {
   };
 private:
@@ -279,7 +279,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2918_Regression/Hello.cpp b/TAO/tests/Bug_2918_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_2918_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2918_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2918_Regression/Hello.h b/TAO/tests/Bug_2918_Regression/Hello.h
index d8ef497e2e9..97d878316d8 100644
--- a/TAO/tests/Bug_2918_Regression/Hello.h
+++ b/TAO/tests/Bug_2918_Regression/Hello.h
@@ -26,7 +26,7 @@ public:
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB which will be shutdown by Hello::shutdown().
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
index 1c54c14eb97..914a0b54ec0 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
@@ -116,7 +116,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
 } /* end of PersistentPoa::init ( ) */
 
 
-int PersistentPoa::fini (void)
+int PersistentPoa::fini ()
 {
   int result = 0;
 
diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.cpp b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
index 48327cc41ca..db5bae4319d 100644
--- a/TAO/tests/Bug_2953_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
@@ -8,14 +8,14 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb)
 }
 
 void
-Client_Task::terminate_loop (void)
+Client_Task::terminate_loop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->terminate_loop_ = 1;
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
   try
diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.h b/TAO/tests/Bug_2953_Regression/Client_Task.h
index 631aae096d2..b4b64869a89 100644
--- a/TAO/tests/Bug_2953_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2953_Regression/Client_Task.h
@@ -18,10 +18,10 @@ public:
   Client_Task (CORBA::ORB_ptr orb);
 
   /// Terminate the loop
-  void terminate_loop (void);
+  void terminate_loop ();
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Bug_2966_Regression/Hello.cpp b/TAO/tests/Bug_2966_Regression/Hello.cpp
index cd0f84a435b..6d827808c88 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2966_Regression/Hello.cpp
@@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2966_Regression/Hello.h b/TAO/tests/Bug_2966_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.h
+++ b/TAO/tests/Bug_2966_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3000_Regression/Callback.cpp b/TAO/tests/Bug_3000_Regression/Callback.cpp
index fbf466a8735..93de0784405 100644
--- a/TAO/tests/Bug_3000_Regression/Callback.cpp
+++ b/TAO/tests/Bug_3000_Regression/Callback.cpp
@@ -1,12 +1,12 @@
 #include "Callback.h"
 
-Callback::Callback (void)
+Callback::Callback ()
   : received_callback_ (false)
 {
 }
 
 void
-Callback::test_oneway (void)
+Callback::test_oneway ()
 {
   received_callback_ = true;
 
@@ -15,7 +15,7 @@ Callback::test_oneway (void)
 }
 
 bool
-Callback::received_callback (void)
+Callback::received_callback ()
 {
   return received_callback_;
 }
diff --git a/TAO/tests/Bug_3000_Regression/Callback.h b/TAO/tests/Bug_3000_Regression/Callback.h
index e667bd5f4ff..178b4ff21dd 100644
--- a/TAO/tests/Bug_3000_Regression/Callback.h
+++ b/TAO/tests/Bug_3000_Regression/Callback.h
@@ -11,11 +11,11 @@ class Callback
 {
 public:
   /// Constructor
-  Callback (void);
+  Callback ();
 
-  virtual void test_oneway (void);
+  virtual void test_oneway ();
 
-  bool received_callback (void);
+  bool received_callback ();
 
  private:
   bool received_callback_;
diff --git a/TAO/tests/Bug_3000_Regression/Service.cpp b/TAO/tests/Bug_3000_Regression/Service.cpp
index db024beb115..53b0f4ec0d7 100644
--- a/TAO/tests/Bug_3000_Regression/Service.cpp
+++ b/TAO/tests/Bug_3000_Regression/Service.cpp
@@ -12,7 +12,7 @@ Service::run_test (Test::Callback_ptr callback)
 }
 
 void
-Service::shutdown (void)
+Service::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Shuting down self (server)\n"));
 
diff --git a/TAO/tests/Bug_3000_Regression/Service.h b/TAO/tests/Bug_3000_Regression/Service.h
index c34df5a9f97..cf310f3a4bc 100644
--- a/TAO/tests/Bug_3000_Regression/Service.h
+++ b/TAO/tests/Bug_3000_Regression/Service.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual void run_test (Test::Callback_ptr callback);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp
index 3a34daed57b..8e63098454f 100644
--- a/TAO/tests/Bug_3108_Regression/client.cpp
+++ b/TAO/tests/Bug_3108_Regression/client.cpp
@@ -60,7 +60,7 @@ Client::Client (test_ptr server)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3108_Regression/test_i.cpp b/TAO/tests/Bug_3108_Regression/test_i.cpp
index cebacc2a5a4..79a511af2f3 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3108_Regression/test_i.cpp
@@ -14,7 +14,7 @@ test_i::test_method ()
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3108_Regression/test_i.h b/TAO/tests/Bug_3108_Regression/test_i.h
index a81166bf3e3..7d68c511511 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.h
+++ b/TAO/tests/Bug_3108_Regression/test_i.h
@@ -11,7 +11,7 @@ public:
 
   /// Test method.
   CORBA::Long test_method ();
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3163_Regression/server.cpp b/TAO/tests/Bug_3163_Regression/server.cpp
index 987ec1ea579..3085980d408 100644
--- a/TAO/tests/Bug_3163_Regression/server.cpp
+++ b/TAO/tests/Bug_3163_Regression/server.cpp
@@ -51,7 +51,7 @@ public:
 
     return 0;
   }
-  void shutdown (void)
+  void shutdown ()
   {
     this->orb_->shutdown (false);
   }
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index dbdebb13338..4fd51bacac3 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -138,7 +138,7 @@ Worker::Worker ()
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   static int threadID = 0;
 
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index 85a1701db36..89d43fcdab9 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -5,7 +5,7 @@
 #include "tao/TAO_Singleton_Manager.h"
 
 
-DllOrb::DllOrb (void)
+DllOrb::DllOrb ()
  :
    ma_barrier_(),
    mv_orb_ (),
@@ -14,7 +14,7 @@ DllOrb::DllOrb (void)
 }
 
 
-DllOrb::~DllOrb (void)
+DllOrb::~DllOrb ()
 {
 }
 
@@ -89,7 +89,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
 
 int
-DllOrb::fini (void)
+DllOrb::fini ()
 {
   try
   {
@@ -129,7 +129,7 @@ DllOrb::fini (void)
 }
 
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h
index d057b189e85..a13e85e847d 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.h
@@ -13,8 +13,8 @@
 class bug_3251_Export DllOrb : public ACE_Task_Base
 {
 public:
-  DllOrb (void);
-  virtual ~DllOrb (void);
+  DllOrb ();
+  virtual ~DllOrb ();
 
   CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate (mv_orb_.in ()); }
 
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
index fa78847117a..9d889930228 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
@@ -63,7 +63,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
 } /* end of PersistentPoa::init ( ) */
 
 
-int PersistentPoa::fini (void)
+int PersistentPoa::fini ()
 {
   try
   {
diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp
index 835c6b05060..aca19bf2b19 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.cpp
+++ b/TAO/tests/Bug_3276_Regression/Manager.cpp
@@ -103,26 +103,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
   : orb_ (0),
     new_poa_var_ (0)
 {
   //no-op
 }
 
-Manager::~Manager (void)
+Manager::~Manager ()
 {
   this->orb_->destroy ();
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_.in ());
 }
 
 CORBA::Object_ptr
-Manager::server (void)
+Manager::server ()
 {
   return CORBA::Object::_duplicate (this->server_.in ());
 }
diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h
index abf99ba5968..c6fbcdc80de 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.h
+++ b/TAO/tests/Bug_3276_Regression/Manager.h
@@ -6,24 +6,24 @@
 class Manager
 {
 public:
-  Manager (void);
+  Manager ();
   // Ctor
 
-  ~Manager (void);
+  ~Manager ();
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the ORB, POA etc.
 
-  int activate_servant (void);
+  int activate_servant ();
   // Activate the servant etc.
 
-  int run (void);
+  int run ();
   // Run the ORB's event loop.
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
   // ORB's accessor.
 
-  CORBA::Object_ptr server (void);
+  CORBA::Object_ptr server ();
   // Server's accessor.
 
 private:
diff --git a/TAO/tests/Bug_3299_Regression/Hello.cpp b/TAO/tests/Bug_3299_Regression/Hello.cpp
index 0f49115aca0..ff1b7c0678c 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3299_Regression/Hello.cpp
@@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   static int our_count = 0;
 
@@ -21,7 +21,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3299_Regression/Hello.h b/TAO/tests/Bug_3299_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.h
+++ b/TAO/tests/Bug_3299_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp
index 70a5ed3f812..5cc5cd4a1f3 100644
--- a/TAO/tests/Bug_3384_Regression/client.cpp
+++ b/TAO/tests/Bug_3384_Regression/client.cpp
@@ -197,7 +197,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3430_Regression/Hello.cpp b/TAO/tests/Bug_3430_Regression/Hello.cpp
index 2e2666c0c72..5da11424d96 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3430_Regression/Hello.cpp
@@ -13,7 +13,7 @@ Hello::method(Test::Hello_out r)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3430_Regression/Hello.h b/TAO/tests/Bug_3430_Regression/Hello.h
index e7318b30deb..c32a65ae46d 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.h
+++ b/TAO/tests/Bug_3430_Regression/Hello.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual void method (Test::Hello_out r);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3471_Regression/Hello.cpp b/TAO/tests/Bug_3471_Regression/Hello.cpp
index 383b6049261..1a29e8a8844 100644
--- a/TAO/tests/Bug_3471_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3471_Regression/Hello.cpp
@@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 Test::ObjectSeq*
-Hello::get_objects (void)
+Hello::get_objects ()
 {
   Test::ObjectSeq_var my_seq = new Test::ObjectSeq (1);
   my_seq->length (1);
@@ -16,7 +16,7 @@ Hello::get_objects (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3471_Regression/Hello.h b/TAO/tests/Bug_3471_Regression/Hello.h
index 5235bc0fe8f..786fca746de 100644
--- a/TAO/tests/Bug_3471_Regression/Hello.h
+++ b/TAO/tests/Bug_3471_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::ObjectSeq* get_objects (void);
+  virtual Test::ObjectSeq* get_objects ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3479_Regression/Hello.cpp b/TAO/tests/Bug_3479_Regression/Hello.cpp
index 674e81b64e0..06899bdaadc 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3479_Regression/Hello.cpp
@@ -12,7 +12,7 @@ Hello::get_string (CORBA::String_out string_out)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3479_Regression/Hello.h b/TAO/tests/Bug_3479_Regression/Hello.h
index bdce42f931d..f92e1ee2fb6 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.h
+++ b/TAO/tests/Bug_3479_Regression/Hello.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual void get_string (CORBA::String_out string_out);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
index a4df1715d6c..7f05a4ce4da 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
@@ -1,10 +1,10 @@
 #include "DLL_Service.h"
 
-ACE_DLL_Service::ACE_DLL_Service (void)
+ACE_DLL_Service::ACE_DLL_Service ()
 {
 }
 
-ACE_DLL_Service::~ACE_DLL_Service (void)
+ACE_DLL_Service::~ACE_DLL_Service ()
 {
 }
 
@@ -13,12 +13,12 @@ int ACE_DLL_Service::init (int, ACE_TCHAR *[])
   return 0;
 }
 
-int ACE_DLL_Service::fini (void)
+int ACE_DLL_Service::fini ()
 {
   return 0;
 }
 
-void ACE_DLL_Service::destroy (void)
+void ACE_DLL_Service::destroy ()
 {
   delete this;
 }
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h
index 801ead231da..29e9cb90bbf 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h
@@ -6,20 +6,20 @@
 class ACE_DLL_SERVICE_Export ACE_DLL_Service
 {
 public:
-  ACE_DLL_Service (void);
+  ACE_DLL_Service ();
 
-  virtual ~ACE_DLL_Service (void);
+  virtual ~ACE_DLL_Service ();
 
   virtual int init (int , ACE_TCHAR * []);
 
   virtual int fini ();
 
   /// This is only here for destruction purposes
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #define ACE_DLL_SERVICE_DECL(export_macro, symbol) \
-  extern "C" export_macro ACE_DLL_Service * symbol (void)
+  extern "C" export_macro ACE_DLL_Service * symbol ()
 
 #define ACE_DLL_SERVICE_IMPL(classname, symbol) \
   ACE_DLL_Service * symbol (void) \
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
index 52ea597f868..d1c4ae09bba 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
@@ -43,7 +43,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv [])
                          -1);
     }
 
-    typedef ACE_DLL_Service * (*factory_type) (void);
+    typedef ACE_DLL_Service * (*factory_type) ();
     ptrdiff_t tmp_ptr = reinterpret_cast <ptrdiff_t> (symbol);
     factory_type f = reinterpret_cast <factory_type> (tmp_ptr);
 
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
index c1b1b21511a..8fd0c4487bb 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
@@ -2,12 +2,12 @@
 
 ACE_DLL_SERVICE_IMPL (ACE_DLL_TAO_Service, _make_ACE_DLL_TAO_Service)
 
-ACE_DLL_TAO_Service::ACE_DLL_TAO_Service (void)
+ACE_DLL_TAO_Service::ACE_DLL_TAO_Service ()
 {
   ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::ACE_DLL_TAO_Service (void)"));
 }
 
-ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service (void)
+ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service ()
 {
   ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service (void)"));
 }
@@ -42,7 +42,7 @@ int ACE_DLL_TAO_Service::init (int argc, ACE_TCHAR * argv [])
   return 0;
 }
 
-int ACE_DLL_TAO_Service::fini (void)
+int ACE_DLL_TAO_Service::fini ()
 {
   ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::fini (void)"));
 
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
index f2d26f5d3db..85f7f4f62d9 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
@@ -8,9 +8,9 @@
 class ACE_DLL_TAO_Service : public ACE_DLL_Service
 {
 public:
-  ACE_DLL_TAO_Service (void);
+  ACE_DLL_TAO_Service ();
 
-  virtual ~ACE_DLL_TAO_Service (void);
+  virtual ~ACE_DLL_TAO_Service ();
 
   virtual int init (int argc, ACE_TCHAR * argv []);
 
diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp
index 37ed18ee226..76f08066378 100644
--- a/TAO/tests/Bug_3531_Regression/client.cpp
+++ b/TAO/tests/Bug_3531_Regression/client.cpp
@@ -186,7 +186,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp
index 0988c258929..21abfe9d5c9 100644
--- a/TAO/tests/Bug_3531_Regression/server.cpp
+++ b/TAO/tests/Bug_3531_Regression/server.cpp
@@ -149,7 +149,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 490190d3a57..43806234818 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -72,16 +72,16 @@ public:
 class Worker: public ACE_Task<ACE_SYNCH>
 {
 public:
-  Worker (void)
+  Worker ()
     : shutdown_ (false)
   {}
 
   virtual int svc ();
   virtual int close (u_long = 0);
   virtual int put (ACE_Message_Block * mblk, ACE_Time_Value * tv = 0);
-  int process_cmd (void);
+  int process_cmd ();
   void shutdown (bool do_shutdown);
-  bool shutdown (void);
+  bool shutdown ();
 
 private:
   bool shutdown_;
@@ -90,7 +90,7 @@ private:
 ACE_TSS<Worker> *workers_p = 0;
 #define workers (*workers_p)
 
-int Worker::svc (void)
+int Worker::svc ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Worker thread starting up.\n")));
@@ -118,7 +118,7 @@ int Worker::put (ACE_Message_Block * mblk, ACE_Time_Value * tv)
   return this->putq (mblk, tv);
 }
 
-int Worker::process_cmd (void)
+int Worker::process_cmd ()
 {
   ACE_Message_Block *mb = 0;
   if (this->getq (mb, 0) == -1)
@@ -141,7 +141,7 @@ void Worker::shutdown (bool do_shutdown)
   shutdown_ = do_shutdown;
 }
 
-bool Worker::shutdown (void)
+bool Worker::shutdown ()
 {
   return shutdown_;
 }
@@ -310,13 +310,13 @@ public:
     return 0;
   }
 
-  virtual ACE_Event_Handler * event_handler_i (void)
+  virtual ACE_Event_Handler * event_handler_i ()
   {
     return 0;
   }
 
 protected:
-  virtual TAO_Connection_Handler * connection_handler_i (void)
+  virtual TAO_Connection_Handler * connection_handler_i ()
   {
     return 0;
   }
@@ -425,7 +425,7 @@ public:
   {
     return cond_;
   }
-  virtual ACE_Message_Block *release (void)
+  virtual ACE_Message_Block *release ()
   {
     // we need to only release once both the main and worker thread
     // are done with this object - each signals this by calling this
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
index e16dcfc4acb..d06d663db41 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-DllOrb::DllOrb (void)
+DllOrb::DllOrb ()
  :
    ma_barrier_(),
    mv_orb_ (),
@@ -12,7 +12,7 @@ DllOrb::DllOrb (void)
 {
 }
 
-DllOrb::~DllOrb (void)
+DllOrb::~DllOrb ()
 {
 }
 
@@ -86,7 +86,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
 
 int
-DllOrb::fini (void)
+DllOrb::fini ()
 {
   try
   {
@@ -126,7 +126,7 @@ DllOrb::fini (void)
 }
 
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h
index 1824980a125..a7d44a51a05 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.h
@@ -13,8 +13,8 @@
 class bug_3542_Export DllOrb : public ACE_Task_Base
 {
 public:
-  DllOrb (void);
-  virtual ~DllOrb (void);
+  DllOrb ();
+  virtual ~DllOrb ();
 
   CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate (mv_orb_.in ()); }
 
diff --git a/TAO/tests/Bug_3543_Regression/master.cpp b/TAO/tests/Bug_3543_Regression/master.cpp
index a9a80b01d2e..382fe3bd19c 100644
--- a/TAO/tests/Bug_3543_Regression/master.cpp
+++ b/TAO/tests/Bug_3543_Regression/master.cpp
@@ -74,7 +74,7 @@ public:
   }
 };
 
-void Dispatcher_shutdown(void)
+void Dispatcher_shutdown()
 {
     std::list<MasterClient::Server_var> copiedlist;
     {
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
index 4e2e4cdaba3..17cdb2bfd72 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
@@ -11,7 +11,7 @@ Stock_Quoter_i::~Stock_Quoter_i ()
 }
 
 void
-Stock_Quoter_i::shutdown (void)
+Stock_Quoter_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
index 554f6985a87..17f37c59924 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
@@ -12,7 +12,7 @@ public:
 
    CORBA::Float get_quote (const char* stock_id);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3553_Regression/Hello.cpp b/TAO/tests/Bug_3553_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3553_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3553_Regression/Hello.h b/TAO/tests/Bug_3553_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.h
+++ b/TAO/tests/Bug_3553_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3558_Regression/Hello.cpp b/TAO/tests/Bug_3558_Regression/Hello.cpp
index 789e72c09a4..95810f9386f 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3558_Regression/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("%D get_string: sleep 5 seconds before returning\n")));
   ACE_OS::sleep (5);
@@ -15,7 +15,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3558_Regression/Hello.h b/TAO/tests/Bug_3558_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.h
+++ b/TAO/tests/Bug_3558_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
index 6dbdd973f19..f356ef712c3 100644
--- a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
@@ -63,14 +63,14 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/tests/Bug_3567_Regression/ami_test_i.h b/TAO/tests/Bug_3567_Regression/ami_test_i.h
index 22f9b58728f..d6a316e2232 100644
--- a/TAO/tests/Bug_3567_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_3567_Regression/ami_test_i.h
@@ -34,9 +34,9 @@ public:
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp
index e547de1ee14..c6b77137254 100644
--- a/TAO/tests/Bug_3567_Regression/client.cpp
+++ b/TAO/tests/Bug_3567_Regression/client.cpp
@@ -112,7 +112,7 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
+  Handler ()
   {
   }
 
@@ -170,7 +170,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     }
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -181,7 +181,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     }
-  ~Handler (void)
+  ~Handler ()
   {
   }
 
@@ -325,7 +325,7 @@ Client::~Client ()
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
@@ -353,7 +353,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   while (number_of_replies > 0)
     {
diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp
index 63e4c806ef1..ac8c904bb95 100644
--- a/TAO/tests/Bug_3567_Regression/server.cpp
+++ b/TAO/tests/Bug_3567_Regression/server.cpp
@@ -153,7 +153,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3597_Regression/server.cpp b/TAO/tests/Bug_3597_Regression/server.cpp
index 23276610023..355db9e5c56 100644
--- a/TAO/tests/Bug_3597_Regression/server.cpp
+++ b/TAO/tests/Bug_3597_Regression/server.cpp
@@ -13,9 +13,9 @@ public:
 
   virtual int open (const ACE_TCHAR *logger_key);
 
-  virtual int reset (void);
+  virtual int reset ();
 
-  virtual int close (void);
+  virtual int close ();
 
   virtual ssize_t log (ACE_Log_Record &log_record);
 
@@ -34,13 +34,13 @@ Backend::open (const ACE_TCHAR *key)
 }
 
 int
-Backend::reset (void)
+Backend::reset ()
 {
   return 0;
 }
 
 int
-Backend::close (void)
+Backend::close ()
 {
   return 0;
 }
diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
index 520d8bb3495..2a7e8712c25 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
@@ -7,12 +7,12 @@
   CORBA::Boolean
   ClientRequest_Interceptor::success_flag_ = 0;
 
-  ClientRequest_Interceptor::ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::ClientRequest_Interceptor ()
     : name_ ("ClientRequest_Interceptor")
   {
   }
 
-  ClientRequest_Interceptor::~ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::~ClientRequest_Interceptor ()
   {
   }
 
diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
index 36235e54b3a..1ba41d68aba 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
+++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
@@ -28,9 +28,9 @@ class ClientRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
-ClientRequest_Interceptor (void);
+ClientRequest_Interceptor ();
 
-~ClientRequest_Interceptor (void);
+~ClientRequest_Interceptor ();
 
 /// Canonical name of the interceptor.
 virtual char * name ();
diff --git a/TAO/tests/Bug_3636_Regression/Hello.cpp b/TAO/tests/Bug_3636_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3636_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3636_Regression/Hello.h b/TAO/tests/Bug_3636_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.h
+++ b/TAO/tests/Bug_3636_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
index 4c15a619ad5..6b5a75c0f35 100644
--- a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
@@ -31,7 +31,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   ACE_OS::sleep (5);
 
diff --git a/TAO/tests/Bug_3672_Regression/ami_test_i.h b/TAO/tests/Bug_3672_Regression/ami_test_i.h
index f648ca5fe34..167b2b062dc 100644
--- a/TAO/tests/Bug_3672_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_3672_Regression/ami_test_i.h
@@ -29,7 +29,7 @@ public:
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp
index 8f83f1a53d4..4e4ee1ddf23 100644
--- a/TAO/tests/Bug_3672_Regression/client.cpp
+++ b/TAO/tests/Bug_3672_Regression/client.cpp
@@ -96,7 +96,7 @@ private:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
+  Handler ()
   {
   };
 
@@ -134,7 +134,7 @@ public:
         }
     };
 
-  ~Handler (void)
+  ~Handler ()
   {
   };
 };
@@ -293,7 +293,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3676_Regression/Hello.cpp b/TAO/tests/Bug_3676_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3676_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3676_Regression/Hello.h b/TAO/tests/Bug_3676_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.h
+++ b/TAO/tests/Bug_3676_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
index 456ee812712..a6ad523e6fb 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
@@ -13,7 +13,7 @@ Echo_Client_i::Echo_Client_i (void) : payload_length_ (0)
 }
 
 //Destructor.
-Echo_Client_i::~Echo_Client_i (void)
+Echo_Client_i::~Echo_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
index 141a23106ed..c419bf51425 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
+++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
@@ -29,10 +29,10 @@ class Echo_Client_i
 {
 public:
   /// Constructor
-  Echo_Client_i (void);
+  Echo_Client_i ();
 
   /// Destructor
-  ~Echo_Client_i (void);
+  ~Echo_Client_i ();
 
   /// Execute the methods
   int run (const char *, int, ACE_TCHAR **);
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
index 580c0547647..e0cfc3b3fc6 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
@@ -2,13 +2,13 @@
 
 // Constructor.
 
-Echo_i::Echo_i (void)
+Echo_i::Echo_i ()
 {
 }
 
 // Destructor.
 
-Echo_i::~Echo_i (void)
+Echo_i::~Echo_i ()
 {
 }
 
@@ -80,7 +80,7 @@ Echo_i::echo_string (const char *mesg)
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (void)
+Echo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe echo server is shutting down\n")));
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.h b/TAO/tests/Bug_3683_Regression/Echo_i.h
index 0cd222b57eb..6160644d8b9 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.h
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.h
@@ -30,10 +30,10 @@ class Echo_i : public POA_Echo
 {
 public:
   /// Constructor.
-  Echo_i (void);
+  Echo_i ();
 
   /// Destructor.
-  virtual ~Echo_i (void);
+  virtual ~Echo_i ();
 
   /// Return the mesg string back from the server.
   virtual Echo::List *echo_list (const char *mesg);
@@ -42,7 +42,7 @@ public:
   virtual char *echo_string (const char *mesg);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
index 8ecb7692921..186b561ecbf 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
@@ -11,7 +11,7 @@
 
 // Constructor.
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
   : servant_ (0)
   , ior_output_file_ (0)
   , ins_ (0)
@@ -25,13 +25,13 @@ Server<Servant>::Server (void)
 
 // Destructor.
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_,
                         ACE_TEXT ("do:i:"), 1, 0,
@@ -165,7 +165,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
   // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -178,7 +178,7 @@ Server<Servant>::run (void)
 
 // Constructor.
 template <class ServerInterface>
-Client<ServerInterface>::Client (void)
+Client<ServerInterface>::Client ()
   : ior_ ("")
   , do_shutdown_ (0)
 {
@@ -218,7 +218,7 @@ Client<ServerInterface>::read_ior (ACE_TCHAR *filename)
 
 // Parses the command line arguments and returns an error status.
 template <class ServerInterface> int
-Client<ServerInterface>::parse_args (void)
+Client<ServerInterface>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_,
                         ACE_TEXT ("df:nk:x"), 1, 0,
@@ -265,7 +265,7 @@ Client<ServerInterface>::parse_args (void)
 }
 
 template <class ServerInterface>
-Client<ServerInterface>::~Client (void)
+Client<ServerInterface>::~Client ()
 {
   this->orb_->destroy ();
 }
@@ -320,7 +320,7 @@ Client<ServerInterface>::init (const char *,
 }
 
 template <class ServerInterface> int
-Client<ServerInterface>::do_shutdown (void)
+Client<ServerInterface>::do_shutdown ()
 {
   // Returns the shutdwon flag
   return this->do_shutdown_;
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h
index 1dc1e1c70dc..244b5b66170 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.h
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.h
@@ -34,10 +34,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -46,7 +46,7 @@ public:
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Ignore this method if you are not testing the InterOperable
   /// Naming Service.
@@ -54,7 +54,7 @@ public:
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// A holder of the servant that does ref counting for him.
   typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var;
@@ -94,10 +94,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name, int argc, ACE_TCHAR *argv[]);
@@ -106,7 +106,7 @@ public:
   ServerInterface *operator-> () { return server_.in (); }
 
   /// Returns the shutdown flag.
-  int do_shutdown (void);
+  int do_shutdown ();
 
   /// Fills in the shutdwon flag.
   void do_shutdown (int);
@@ -114,7 +114,7 @@ public:
   /// Initialize naming service
   int obtain_initial_references (const char *name);
 
-  CORBA::ORB_ptr orb (void)
+  CORBA::ORB_ptr orb ()
     {
       return CORBA::ORB::_duplicate (this->orb_.in ());
     }
@@ -124,7 +124,7 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.cpp b/TAO/tests/Bug_3746_Regression/Test_i.cpp
index 0bc3f69157e..e79b7e4871b 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_3746_Regression/Test_i.cpp
@@ -15,7 +15,7 @@ BoundSequences::BoundSequences (CORBA::ORB_ptr orb)
 }
 
 void
-BoundSequences::shutdown (void)
+BoundSequences::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.h b/TAO/tests/Bug_3746_Regression/Test_i.h
index 370f09f3aba..296c9febd5d 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.h
+++ b/TAO/tests/Bug_3746_Regression/Test_i.h
@@ -19,7 +19,7 @@ public:
     const ::Test::BoundSequences::SequenceOf10Long &inSeq
   );
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3748_Regression/Hello.cpp b/TAO/tests/Bug_3748_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3748_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3748_Regression/Hello.h b/TAO/tests/Bug_3748_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.h
+++ b/TAO/tests/Bug_3748_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
index 4242dc7a94c..cfd8fc63c18 100644
--- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
@@ -5,7 +5,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
index 9554057647d..e3d1af0b6df 100644
--- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
@@ -26,7 +26,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
index 4782e4214e5..7cef6cdf217 100644
--- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
+++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
@@ -3,13 +3,13 @@
 #include "Test_Protocols_Hooks.h"
 #include "TestC.h"
 
-Test_Protocols_Hooks::Test_Protocols_Hooks (void)
+Test_Protocols_Hooks::Test_Protocols_Hooks ()
   : failure_count_ (0)
 {
 }
 
 
-Test_Protocols_Hooks::~Test_Protocols_Hooks (void)
+Test_Protocols_Hooks::~Test_Protocols_Hooks ()
 {
 }
 
@@ -105,7 +105,7 @@ Test_Protocols_Hooks::client_protocol_properties_at_orb_level (
 }
 
 CORBA::Long
-Test_Protocols_Hooks::get_dscp_codepoint (void)
+Test_Protocols_Hooks::get_dscp_codepoint ()
 {
   return -1;
 }
diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
index e2adfb45ba3..222eabd6bc4 100644
--- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
+++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
@@ -17,10 +17,10 @@ class Test_Protocols_Hooks : public TAO_Protocols_Hooks
 {
 public:
   /// Constructor
-  Test_Protocols_Hooks (void);
+  Test_Protocols_Hooks ();
 
   /// Destructor
-  virtual ~Test_Protocols_Hooks (void);
+  virtual ~Test_Protocols_Hooks ();
 
   /// Initialize the protocols hooks instance.
   void init_hooks (TAO_ORB_Core *orb_core);
@@ -61,7 +61,7 @@ public:
   void client_protocol_properties_at_orb_level (
     TAO_SCIOP_Protocol_Properties &protocol_properties);
 
-  CORBA::Long get_dscp_codepoint (void);
+  CORBA::Long get_dscp_codepoint ();
 
   void get_selector_hook (CORBA::Policy *model_policy,
                           CORBA::Boolean
diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.h b/TAO/tests/Bug_3755_Ext_Regression/common.h
index 023c2784466..35f2803c2fe 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/common.h
+++ b/TAO/tests/Bug_3755_Ext_Regression/common.h
@@ -3,6 +3,6 @@
 #define FIRST_ORB_NAME "first_orb"
 #define SECOND_ORB_NAME "second_orb"
 
-typedef int (*orbs_check_callback)(void);
+typedef int (*orbs_check_callback)();
 
 int do_main (int argc, ACE_TCHAR *argv[], orbs_check_callback check);
diff --git a/TAO/tests/Bug_3766_Regression/TestI.cpp b/TAO/tests/Bug_3766_Regression/TestI.cpp
index 181c2886086..e732d7d0038 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.cpp
+++ b/TAO/tests/Bug_3766_Regression/TestI.cpp
@@ -36,7 +36,7 @@ Test_i::Test_i (CORBA::ORB_ptr o)
 }
 
 // Implementation skeleton destructor
-Test_i::~Test_i (void)
+Test_i::~Test_i ()
 {
 }
 
@@ -60,7 +60,7 @@ void Test_i::do_something_VariableLength (
   my_info->d = ::CORBA::string_dup("Howdy");
 }
 
-void Test_i::shutdown (void)
+void Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe server is shutting down\n")));
diff --git a/TAO/tests/Bug_3766_Regression/TestI.h b/TAO/tests/Bug_3766_Regression/TestI.h
index b731c02c884..c398592e21c 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.h
+++ b/TAO/tests/Bug_3766_Regression/TestI.h
@@ -44,7 +44,7 @@ public:
   Test_i (CORBA::ORB_ptr o);
 
   // Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
   virtual
   void do_something_FixedLength (
@@ -54,7 +54,7 @@ public:
   void do_something_VariableLength (
     ::VariableLengthInfo_out my_info);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3768_Regression/TestCallback.cpp b/TAO/tests/Bug_3768_Regression/TestCallback.cpp
index 18cca5d1db8..03aac6b348a 100644
--- a/TAO/tests/Bug_3768_Regression/TestCallback.cpp
+++ b/TAO/tests/Bug_3768_Regression/TestCallback.cpp
@@ -7,7 +7,7 @@ TestCallback::TestCallback (CORBA::ORB_ptr orb)
 }
 
 void
-TestCallback::start_threads_and_block (void)
+TestCallback::start_threads_and_block ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - start_threads_and_block\n"));
   work_.activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED,10);
@@ -15,13 +15,13 @@ TestCallback::start_threads_and_block (void)
 }
 
 void
-TestCallback::test_call (void)
+TestCallback::test_call ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test_call\n"));
 }
 
 void
-TestCallback::shutdown (void)
+TestCallback::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test completed\n"));
   exit (0);
diff --git a/TAO/tests/Bug_3768_Regression/TestCallback.h b/TAO/tests/Bug_3768_Regression/TestCallback.h
index ada0da87940..30c6c9f41e9 100644
--- a/TAO/tests/Bug_3768_Regression/TestCallback.h
+++ b/TAO/tests/Bug_3768_Regression/TestCallback.h
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  int svc(void)
+  int svc()
   {
     orb_->run();
     return 0;
@@ -31,9 +31,9 @@ public:
   TestCallback (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void start_threads_and_block (void);
-  virtual void test_call (void);
-  virtual void shutdown (void);
+  virtual void start_threads_and_block ();
+  virtual void test_call ();
+  virtual void shutdown ();
 
 private:
   Worker work_;
diff --git a/TAO/tests/Bug_3768_Regression/TestServer.cpp b/TAO/tests/Bug_3768_Regression/TestServer.cpp
index a3e89dca5e9..948e33a5f80 100644
--- a/TAO/tests/Bug_3768_Regression/TestServer.cpp
+++ b/TAO/tests/Bug_3768_Regression/TestServer.cpp
@@ -11,19 +11,19 @@ TestServer::pass_callback (Test::TestCallback_ptr test)
 }
 
 bool
-TestServer::got_callback (void)
+TestServer::got_callback ()
 {
   return (callback_.in() != 0);
 }
 
 void
-TestServer::make_callback (void)
+TestServer::make_callback ()
 {
   callback_->test_call();
 }
 
 void
-TestServer::shutdown_client (void)
+TestServer::shutdown_client ()
 {
   callback_->shutdown();
 }
diff --git a/TAO/tests/Bug_3768_Regression/TestServer.h b/TAO/tests/Bug_3768_Regression/TestServer.h
index ab15dcf77c0..f3bfd06a415 100644
--- a/TAO/tests/Bug_3768_Regression/TestServer.h
+++ b/TAO/tests/Bug_3768_Regression/TestServer.h
@@ -12,9 +12,9 @@ public:
   // = The skeleton methods
   virtual void pass_callback (Test::TestCallback_ptr test);
 
-  bool got_callback (void);
-  void make_callback (void);
-  void shutdown_client (void);
+  bool got_callback ();
+  void make_callback ();
+  void shutdown_client ();
 
 private:
   Test::TestCallback_var callback_;
diff --git a/TAO/tests/Bug_3768_Regression/server.cpp b/TAO/tests/Bug_3768_Regression/server.cpp
index 2cdabc37c7d..4c4913109f1 100644
--- a/TAO/tests/Bug_3768_Regression/server.cpp
+++ b/TAO/tests/Bug_3768_Regression/server.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  int svc(void)
+  int svc()
   {
     orb_->run();
     return 0;
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
index ff2df5d99e8..a2f552b0d77 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
@@ -7,7 +7,7 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Test_i::shutdown (void)
+Simple_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.h b/TAO/tests/Bug_3790_Regression/simple_test_i.h
index 9918438def1..f005511d554 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.h
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.h
@@ -12,7 +12,7 @@ public:
   Simple_Test_i (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp
index c01e37c4f96..63fb1d391e3 100644
--- a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp
@@ -27,13 +27,13 @@ AMI_Test_i::inout_arg_test (char *&)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
@@ -49,7 +49,7 @@ AMI_Test_i::yadda (CORBA::Long)
 }
 
 CORBA::Long
-AMI_Test_i::dadda (void)
+AMI_Test_i::dadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)dadda\n"));
diff --git a/TAO/tests/Bug_3801_Regression/ami_test_i.h b/TAO/tests/Bug_3801_Regression/ami_test_i.h
index 629f53a90f1..965d9e20481 100644
--- a/TAO/tests/Bug_3801_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_3801_Regression/ami_test_i.h
@@ -26,13 +26,13 @@ public:
   /// ctor
   AMI_Test_i (CORBA::ORB_ptr orb);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
-  CORBA::Long dadda (void);
+  CORBA::Long dadda ();
 
   void inout_arg_test (char *& str);
 
diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp
index 94dd6d6b5c8..e40529c1a86 100644
--- a/TAO/tests/Bug_3801_Regression/simple_client.cpp
+++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp
@@ -105,7 +105,7 @@ public:
         }
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_ERROR ((LM_ERROR,
                   "Error: Callback method <set_yadda> called:\n"));
diff --git a/TAO/tests/Bug_3827_Regression/test.cpp b/TAO/tests/Bug_3827_Regression/test.cpp
index 1a8ebec6c85..94b828523ba 100644
--- a/TAO/tests/Bug_3827_Regression/test.cpp
+++ b/TAO/tests/Bug_3827_Regression/test.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
@@ -38,7 +38,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/tests/Bug_3837_Regression/Hello.cpp b/TAO/tests/Bug_3837_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3837_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3837_Regression/Hello.h b/TAO/tests/Bug_3837_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.h
+++ b/TAO/tests/Bug_3837_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
index f168b54de74..6c66d595335 100644
--- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp
+++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
@@ -8,7 +8,7 @@ Demo_HelloWorld_i::Demo_HelloWorld_i (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-Demo_HelloWorld_i::~Demo_HelloWorld_i (void)
+Demo_HelloWorld_i::~Demo_HelloWorld_i ()
 {
 }
 
diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.h b/TAO/tests/Bug_3853_Regression/Hello_i.h
index f7f361d02f1..9e46919a57f 100644
--- a/TAO/tests/Bug_3853_Regression/Hello_i.h
+++ b/TAO/tests/Bug_3853_Regression/Hello_i.h
@@ -16,7 +16,7 @@ public:
   Demo_HelloWorld_i (CORBA::ORB_ptr orb);
 
   // Destructor
-  virtual ~Demo_HelloWorld_i (void);
+  virtual ~Demo_HelloWorld_i ();
 
   virtual void sayHello (const char * msg);
 
diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp
index a64e66818c1..9b9b3686862 100644
--- a/TAO/tests/Bug_3853_Regression/client.cpp
+++ b/TAO/tests/Bug_3853_Regression/client.cpp
@@ -29,7 +29,7 @@ public:
   ClientTask () {};
   ~ ClientTask () {};
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     CORBA::Object_var helloObj = orb->string_to_object(server1_ior);
 
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
index 897099b003f..3a452de7465 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
@@ -16,18 +16,18 @@ Echo_Client_Request_Interceptor ()
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.h b/TAO/tests/Bug_3853_Regression/client_interceptor.h
index 2042b5f9872..d6524e1e8a5 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Bug_3896_Regression/Hello.cpp b/TAO/tests/Bug_3896_Regression/Hello.cpp
index 1222840c1fc..8a95efcae15 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3896_Regression/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_OS::sleep (10);
 
@@ -15,7 +15,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3896_Regression/Hello.h b/TAO/tests/Bug_3896_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.h
+++ b/TAO/tests/Bug_3896_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp
index 2f09cc510f4..5916bee8932 100644
--- a/TAO/tests/Bug_3896_Regression/client.cpp
+++ b/TAO/tests/Bug_3896_Regression/client.cpp
@@ -143,7 +143,7 @@ Client::Client (CORBA::ORB_ptr orb)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3919_Regression/Hello.cpp b/TAO/tests/Bug_3919_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_3919_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3919_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3919_Regression/Hello.h b/TAO/tests/Bug_3919_Regression/Hello.h
index d8ef497e2e9..97d878316d8 100644
--- a/TAO/tests/Bug_3919_Regression/Hello.h
+++ b/TAO/tests/Bug_3919_Regression/Hello.h
@@ -26,7 +26,7 @@ public:
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB which will be shutdown by Hello::shutdown().
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
index bb010e4f324..b47883250cc 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
@@ -21,7 +21,7 @@ Client_Request_Interceptor::name ()
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
index 1a9705658c9..89c14c6f499 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
@@ -33,9 +33,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Bug_3926_Regression/test_i.cpp b/TAO/tests/Bug_3926_Regression/test_i.cpp
index ba410931390..aae2649e9ca 100644
--- a/TAO/tests/Bug_3926_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3926_Regression/test_i.cpp
@@ -8,12 +8,12 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   ++this->number_;
   if (this->number_ == 3)
@@ -35,7 +35,7 @@ test_i::number (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "SERVER: Server is shutting down at %d.\n",
diff --git a/TAO/tests/Bug_3926_Regression/test_i.h b/TAO/tests/Bug_3926_Regression/test_i.h
index 9012612ca85..84d1a0fc050 100644
--- a/TAO/tests/Bug_3926_Regression/test_i.h
+++ b/TAO/tests/Bug_3926_Regression/test_i.h
@@ -31,13 +31,13 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The number assigned to this object.
diff --git a/TAO/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp
index 111fda81010..096b1866420 100644
--- a/TAO/tests/Bug_3953_Regression/client.cpp
+++ b/TAO/tests/Bug_3953_Regression/client.cpp
@@ -19,7 +19,7 @@ class Client_Task
 public:
   Client_Task (client_ptr c,
                server_ptr s);
-  int svc (void);
+  int svc ();
 
   bool exception () const;
 
@@ -36,7 +36,7 @@ Client_Task::Client_Task (client_ptr c,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp
index 61e4e94f853..bc99303785f 100644
--- a/TAO/tests/Bug_3953_Regression/server.cpp
+++ b/TAO/tests/Bug_3953_Regression/server.cpp
@@ -17,7 +17,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   Server_Task (CORBA::ORB_ptr orb);
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var orb_;
@@ -29,7 +29,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp
index 438203edd7f..5622dd31ddf 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.cpp
+++ b/TAO/tests/Bug_3953_Regression/server_i.cpp
@@ -48,7 +48,7 @@ server_i::ping (CORBA::UShort time_to_live)
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3953_Regression/server_i.h b/TAO/tests/Bug_3953_Regression/server_i.h
index 7aa8275ab28..1ffab0f9437 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.h
+++ b/TAO/tests/Bug_3953_Regression/server_i.h
@@ -11,7 +11,7 @@ public:
   void start (client_ptr c,
               CORBA::UShort time_to_live);
 
-  void shutdown (void);
+  void shutdown ();
 
   bool exception () const;
 private:
diff --git a/TAO/tests/Bug_3954_Regression/Hello.cpp b/TAO/tests/Bug_3954_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3954_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3954_Regression/Hello.h b/TAO/tests/Bug_3954_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.h
+++ b/TAO/tests/Bug_3954_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_4010_Regression/Hello.cpp b/TAO/tests/Bug_4010_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_4010_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4010_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_4010_Regression/Hello.h b/TAO/tests/Bug_4010_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_4010_Regression/Hello.h
+++ b/TAO/tests/Bug_4010_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_4059_Regression/Hello.cpp b/TAO/tests/Bug_4059_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_4059_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4059_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_4059_Regression/Hello.h b/TAO/tests/Bug_4059_Regression/Hello.h
index c39a60042d7..1d85db44633 100644
--- a/TAO/tests/Bug_4059_Regression/Hello.h
+++ b/TAO/tests/Bug_4059_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_4213_Regression/Hello.cpp b/TAO/tests/Bug_4213_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_4213_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4213_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_4213_Regression/Hello.h b/TAO/tests/Bug_4213_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_4213_Regression/Hello.h
+++ b/TAO/tests/Bug_4213_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.cpp b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
index 716c221810b..5c6be02450b 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
@@ -6,7 +6,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 {
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -52,7 +52,7 @@ Messenger_i::send_message (const CORBA::OctetSeq & user_name)
 }
 
 void
-Messenger_i::shutdown (void)
+Messenger_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h
index d68b1b52673..7fde917d017 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.h
@@ -13,11 +13,11 @@ class  Messenger_i : public virtual POA_Messenger
 public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual void send_message (const CORBA::OctetSeq & user_name);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index 5ff11f23e7b..cb1b4c686de 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -40,7 +40,7 @@ public:
                     int max_fragment_size);
 
   /// Destructor, releases any memory left behind.
-  ~Application_Simulator (void);
+  ~Application_Simulator ();
 
   /**
    * Simulate an upcall. The class allocates some memory and then
@@ -214,7 +214,7 @@ Application_Simulator::Application_Simulator (int max_fragments,
     *i = 0;
 }
 
-Application_Simulator::~Application_Simulator (void)
+Application_Simulator::~Application_Simulator ()
 {
   for (char** i = this->buffers_;
        i != this->buffers_ + this->max_fragments_;
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index b698505919f..e804c73abb2 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -24,7 +24,7 @@ static int nloops = 100;
 
 struct CDR_Test_Types
 {
-  CDR_Test_Types (void);
+  CDR_Test_Types ();
 
   CORBA::Octet o;
   CORBA::Short s;
@@ -40,7 +40,7 @@ struct CDR_Test_Types
   CORBA::Short a[ARRAY_SIZE];
 };
 
-CDR_Test_Types::CDR_Test_Types (void)
+CDR_Test_Types::CDR_Test_Types ()
   : o (1), s (2), l (4),
     str ("abc"), d (8)
 {
diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp
index 820404f4721..eca3d47e0bd 100644
--- a/TAO/tests/COIOP/Client_Task.cpp
+++ b/TAO/tests/COIOP/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/COIOP/Client_Task.h b/TAO/tests/COIOP/Client_Task.h
index 6246c8e12c6..6d28b35b980 100644
--- a/TAO/tests/COIOP/Client_Task.h
+++ b/TAO/tests/COIOP/Client_Task.h
@@ -21,7 +21,7 @@ public:
                CORBA::Boolean result);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp
index 5874626a298..baa9705bec3 100644
--- a/TAO/tests/COIOP/Hello.cpp
+++ b/TAO/tests/COIOP/Hello.cpp
@@ -13,7 +13,7 @@ Hello::Hello (CORBA::ORB_ptr orb,
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -56,7 +56,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/COIOP/Hello.h
+++ b/TAO/tests/COIOP/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index 04abb027a27..5461b87cf73 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/tests/COIOP/Server_Task.cpp
@@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/COIOP/Server_Task.h b/TAO/tests/COIOP/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/COIOP/Server_Task.h
+++ b/TAO/tests/COIOP/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
index d4c95c9aba1..eb85df7cc27 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
@@ -1,5 +1,5 @@
 #include "Hello.h"
 
-Hello::Hello (void)
+Hello::Hello ()
 {
 }
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
index a2a5be4ab2d..3a8204314ae 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
@@ -11,7 +11,7 @@ class Hello
 {
 public:
   /// Constructor
-  Hello (void);
+  Hello ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
index 6220eeda46c..4eb32c3e5a6 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
@@ -13,12 +13,12 @@
 
 #include "Collocation_Tester.h"
 
-Collocation_Test::Collocation_Test (void)
+Collocation_Test::Collocation_Test ()
 {
 }
 
 void
-Collocation_Test::shutdown (void)
+Collocation_Test::shutdown ()
 {
   this->root_poa_->destroy (1, 1);
   this->orb_->destroy ();
@@ -102,7 +102,7 @@ Collocation_Test::parse_args (int /*argc*/,
 }
 
 int
-Collocation_Test::test_narrow (void)
+Collocation_Test::test_narrow ()
 {
   Diamond::Top_var top =
     Diamond::Top::_narrow (this->diamond_obj_.in ());
@@ -132,7 +132,7 @@ Collocation_Test::test_narrow (void)
 }
 
 int
-Collocation_Test::run (void)
+Collocation_Test::run ()
 {
   this->poa_manager_->activate ();
 
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.h b/TAO/tests/CSD_Collocation/Collocation_Tester.h
index 0f9650b9d2b..03fcf224538 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.h
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.h
@@ -22,9 +22,9 @@
 class Collocation_Test
 {
 public:
-  Collocation_Test (void);
+  Collocation_Test ();
 
-  void shutdown (void);
+  void shutdown ();
 
   /// Initializing the Collocation_Test object.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -34,10 +34,10 @@ public:
 
   /// This test narrow an object reference to its base class and see
   /// if it works correctly.
-  int test_narrow (void);
+  int test_narrow ();
 
   /// Run the test.
-  int run (void);
+  int run ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.cpp b/TAO/tests/CSD_Collocation/Diamond_i.cpp
index 8210bbff906..2f0b46d5406 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.cpp
+++ b/TAO/tests/CSD_Collocation/Diamond_i.cpp
@@ -9,7 +9,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (void)
+Top_i::shape ()
 {
   return CORBA::string_dup ("a point.");
 }
@@ -25,13 +25,13 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (void)
+Left_i::shape ()
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
-Left_i::color (void)
+Left_i::color ()
 {
   return CORBA::string_dup ("black");
 }
@@ -45,20 +45,20 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (void)
+Right_i::shape ()
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
-Right_i::color (void)
+Right_i::color ()
 {
   return CORBA::string_dup ("red");
   //
 }
 
 CORBA::Long
-Right_i::width (void)
+Right_i::width ()
 {
   return 0;
 }
@@ -72,26 +72,26 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (void)
+Buttom_i::shape ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) In servant\n"));
   return CORBA::string_dup ("a diamond");
 }
 
 char *
-Buttom_i::color (void)
+Buttom_i::color ()
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
-Buttom_i::width (void)
+Buttom_i::width ()
 {
   return 100;
 }
 
 char *
-Buttom_i::name (void)
+Buttom_i::name ()
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.h b/TAO/tests/CSD_Collocation/Diamond_i.h
index 9c40c7fe247..f4f21c6fa5e 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.h
+++ b/TAO/tests/CSD_Collocation/Diamond_i.h
@@ -11,62 +11,62 @@
 class Top_i : public POA_Diamond::Top
 {
 public:
-  Top_i (void);
-  ~Top_i (void);
+  Top_i ();
+  ~Top_i ();
   // Ctor and dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 };
 
 class Left_i : public POA_Diamond::Left
 {
 public:
-  Left_i (void);
-  ~Left_i (void);
+  Left_i ();
+  ~Left_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 };
 
 class Right_i : public POA_Diamond::Right
 {
 public:
-  Right_i (void);
-  ~Right_i (void);
+  Right_i ();
+  ~Right_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 };
 
 class Buttom_i : public POA_Diamond::Buttom
 {
 public:
-  Buttom_i (void);
-  ~Buttom_i (void);
+  Buttom_i ();
+  ~Buttom_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index b9ae2cb7e37..9890f024599 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -78,7 +78,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::poa_setup(void)
+ClientApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -86,7 +86,7 @@ ClientApp::poa_setup(void)
 
 
 void
-ClientApp::csd_setup(void)
+ClientApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -100,7 +100,7 @@ ClientApp::csd_setup(void)
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_B obj ref.
   Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
@@ -119,7 +119,7 @@ ClientApp::client_setup(void)
 
 
 void
-ClientApp::poa_activate(void)
+ClientApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -128,7 +128,7 @@ ClientApp::poa_activate(void)
 
 
 void
-ClientApp::run_clients(void)
+ClientApp::run_clients()
 {
   if (this->client_task_.open() != 0)
     {
@@ -138,7 +138,7 @@ ClientApp::run_clients(void)
 
 
 void
-ClientApp::run_orb_event_loop(void)
+ClientApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index f6945669a44..8160a063995 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -24,12 +24,12 @@ class ClientApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void client_setup(void);
-    void poa_activate(void);
-    void run_clients(void);
-    void run_orb_event_loop(void);
+    void poa_setup();
+    void csd_setup();
+    void client_setup();
+    void poa_activate();
+    void run_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index ea45b56328d..c113ed46009 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -82,7 +82,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -95,7 +95,7 @@ ServerApp::poa_setup(void)
 }
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -131,7 +131,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->foo_servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -141,7 +141,7 @@ ServerApp::servant_setup(void)
 
 
 void
-ServerApp::collocated_setup(void)
+ServerApp::collocated_setup()
 {
   if (this->num_collocated_clients_ == 0)
     return;
@@ -169,7 +169,7 @@ ServerApp::collocated_setup(void)
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -178,7 +178,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -191,7 +191,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index ea516b3b6c7..0465ad64294 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -24,13 +24,13 @@ class ServerApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
-    void collocated_setup(void);
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
+    void collocated_setup();
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
index 4284e163ee8..bde60f3b110 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
@@ -16,7 +16,7 @@ OrbRunner::~OrbRunner()
 
 
 void
-OrbRunner::run(void)
+OrbRunner::run()
 {
   ACE_ASSERT(this->num_orb_threads_ > 0);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
index 6b776551fd7..b621080eedd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
@@ -20,7 +20,7 @@ Foo_A_ClientEngine::~Foo_A_ClientEngine()
 
 
 bool
-Foo_A_ClientEngine::execute(void)
+Foo_A_ClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
index 0eb354a8060..6b9a1eb3af1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
@@ -21,7 +21,7 @@ public:
   Foo_A_ClientEngine(Foo_A_ptr obj, unsigned  client_id = 0, bool collocated = false);
   virtual ~Foo_A_ClientEngine();
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_A_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
index c6b4504db22..ac1805dcc8e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
@@ -17,7 +17,7 @@ Foo_A_i::~Foo_A_i()
 
 
 void
-Foo_A_i::op1(void)
+Foo_A_i::op1()
 {
   this->op_count_[0] ++;
 }
@@ -49,7 +49,7 @@ Foo_A_i::op4(CORBA::Long value)
 
 
 void
-Foo_A_i::op5(void)
+Foo_A_i::op5()
 {
   this->op_count_[4] ++;
   throw FooException();
@@ -57,7 +57,7 @@ Foo_A_i::op5(void)
 
 
 void
-Foo_A_i::done(void)
+Foo_A_i::done()
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index f8e23bf4d2f..3ca06469c0b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -12,7 +12,7 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
     Foo_A_i();
     virtual ~Foo_A_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -20,9 +20,9 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
     void gather_stats (Foo_A_Statistics& stats) ;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index 2a43feb4f6d..7e881300082 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -12,7 +12,7 @@ Callback_i::~Callback_i ()
 
 
 void
-Callback_i::test_method(void)
+Callback_i::test_method()
 {
   this->num_callbacks_ ++;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index 5c71583bdd4..7ae01e2ec5d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -14,7 +14,7 @@ class CSD_TP_Foo_B_Export Callback_i
 
     virtual ~Callback_i();
 
-    virtual void test_method(void);
+    virtual void test_method();
 
     void gather_stats(Foo_B_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index 6592f5b0720..ae331669663 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -25,7 +25,7 @@ Foo_B_ClientEngine::~Foo_B_ClientEngine()
 
 
 bool
-Foo_B_ClientEngine::execute(void)
+Foo_B_ClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
index 72731110b59..d95eb496f4c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
@@ -26,7 +26,7 @@ public:
 
   virtual ~Foo_B_ClientEngine();
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_B_Statistics& stats);
   static unsigned expected_callbacks ();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index b6d215e0a94..0e1fad1a160 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -25,7 +25,7 @@ Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine()
 
 
 bool
-Foo_B_SimpleClientEngine::execute(void)
+Foo_B_SimpleClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
index e64bad650d9..8f77c6295e3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
@@ -26,7 +26,7 @@ public:
 
   virtual ~Foo_B_SimpleClientEngine();
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_B_Statistics& stats);
   static unsigned expected_callbacks ();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 151dda93167..cb804eac88b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -19,7 +19,7 @@ Foo_B_i::~Foo_B_i()
 
 
 void
-Foo_B_i::op1(void)
+Foo_B_i::op1()
 {
   this->op_count_[0] ++;
 }
@@ -51,7 +51,7 @@ Foo_B_i::op4(CORBA::Long value)
 
 
 void
-Foo_B_i::op5(void)
+Foo_B_i::op5()
 {
   this->op_count_[4] ++;
   throw FooException();
@@ -245,7 +245,7 @@ Foo_B_i::test_objref_arg(Callback_ptr cb)
 
 
 void
-Foo_B_i::done(void)
+Foo_B_i::done()
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index e2b37b7f0c8..0de419f732b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -12,7 +12,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
     Foo_B_i();
     virtual ~Foo_B_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -20,7 +20,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
     virtual CORBA::Boolean op6(const TimeOfDay& t,
                                char*& message);
@@ -46,7 +46,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
 
     virtual void test_objref_arg(Callback_ptr cb);
 
-    virtual void done(void);
+    virtual void done();
 
     void gather_stats (Foo_B_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
index 3b66b5e29c9..82fe2c2df57 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
@@ -17,7 +17,7 @@ Foo_C_ClientEngine::~Foo_C_ClientEngine()
 
 
 bool
-Foo_C_ClientEngine::execute(void)
+Foo_C_ClientEngine::execute()
 {
   // Verify the return values and return the results.
   bool check_validity = true;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
index 245c72fc54a..8b741fb83e3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
@@ -21,7 +21,7 @@ public:
                       unsigned  client_id);
   virtual ~Foo_C_ClientEngine();
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
index 8d717ec510d..99fb50a8818 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
@@ -20,7 +20,7 @@ Foo_C_Custom_ClientEngine::~Foo_C_Custom_ClientEngine()
 
 
 bool
-Foo_C_Custom_ClientEngine::execute(void)
+Foo_C_Custom_ClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
index 6ef663ec30a..8ac8c275817 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
@@ -22,7 +22,7 @@ public:
                             unsigned               client_id);
   virtual ~Foo_C_Custom_ClientEngine();
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
index b33c12bfa71..1166864d62e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
@@ -50,7 +50,7 @@ Foo_C_Custom_Proxy::validate_connection ()
 
 
 void
-Foo_C_Custom_Proxy::op1(void)
+Foo_C_Custom_Proxy::op1()
 {
   this->objref_->op1();
 }
@@ -79,21 +79,21 @@ Foo_C_Custom_Proxy::op4(CORBA::Long x)
 
 
 void
-Foo_C_Custom_Proxy::op5(void)
+Foo_C_Custom_Proxy::op5()
 {
   this->objref_->op5();
 }
 
 
 void
-Foo_C_Custom_Proxy::done(void)
+Foo_C_Custom_Proxy::done()
 {
   this->objref_->done();
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op1(void)
+Foo_C_Custom_Proxy::cust_op1()
 {
   Foo_C_cust_op1_Handle op = new Foo_C_cust_op1(this->servant_);
   this->strategy_->custom_synch_request(op.in());
@@ -127,7 +127,7 @@ Foo_C_Custom_Proxy::cust_op4(long x)
 
 
 void
-Foo_C_Custom_Proxy::cust_op5(void)
+Foo_C_Custom_Proxy::cust_op5()
 {
   Foo_C_cust_op5_Handle op = new Foo_C_cust_op5(this->servant_);
   this->strategy_->custom_synch_request(op.in());
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
index 3c82dd0f15a..7b61e19797b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
@@ -24,18 +24,18 @@ public:
 
   bool validate_connection ();
 
-  void op1(void);
+  void op1();
   void op2(CORBA::Long x);
   CORBA::Long op3(CORBA::Long x);
   void op4(CORBA::Long x);
-  void op5(void);
-  void done(void);
+  void op5();
+  void done();
 
-  void cust_op1(void);
+  void cust_op1();
   void cust_op2(long x);
   long cust_op3(long x);
   void cust_op4(long x);
-  void cust_op5(void);
+  void cust_op5();
 
 private:
   Foo_C_i*                        servant_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
index 7d20b104616..fc1a91f1b9a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
@@ -37,7 +37,7 @@ Foo_C_cust_op1::~Foo_C_cust_op1()
 
 
 void
-Foo_C_cust_op1::result(void)
+Foo_C_cust_op1::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
index 27475bb4a78..13dcab071a1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op1(Foo_C_i* servant);
   virtual ~Foo_C_cust_op1();
 
-  void result(void);
+  void result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
index 7a6933c5dfd..aa33a3a1e26 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
@@ -38,7 +38,7 @@ Foo_C_cust_op2::~Foo_C_cust_op2()
 
 
 void
-Foo_C_cust_op2::result(void)
+Foo_C_cust_op2::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
index f26caa26e60..02532c8b036 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op2(Foo_C_i* servant, long arg);
   virtual ~Foo_C_cust_op2();
 
-  void result(void);
+  void result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index 33d68371a87..03699cae58b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -39,7 +39,7 @@ Foo_C_cust_op3::~Foo_C_cust_op3()
 
 
 long
-Foo_C_cust_op3::result(void)
+Foo_C_cust_op3::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
index 61a034eb086..71c8931da96 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op3(Foo_C_i* servant, long arg);
   virtual ~Foo_C_cust_op3();
 
-  long result(void);
+  long result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
index 134cf755d07..45ee80c72ca 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
@@ -39,7 +39,7 @@ Foo_C_cust_op5::~Foo_C_cust_op5()
 
 
 void
-Foo_C_cust_op5::result(void)
+Foo_C_cust_op5::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
index 8a3c0159bbd..37bdd4954c1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op5(Foo_C_i* servant);
   virtual ~Foo_C_cust_op5();
 
-  void result(void);
+  void result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
index 144f2027738..f7a7917dbee 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
@@ -18,7 +18,7 @@ Foo_C_i::~Foo_C_i()
 
 
 void
-Foo_C_i::op1(void)
+Foo_C_i::op1()
 {
   ++this->count_[0];
 }
@@ -50,7 +50,7 @@ Foo_C_i::op4(CORBA::Long value)
 
 
 void
-Foo_C_i::op5(void)
+Foo_C_i::op5()
 {
   ++this->count_[4];
   throw FooException();
@@ -58,14 +58,14 @@ Foo_C_i::op5(void)
 
 
 void
-Foo_C_i::done(void)
+Foo_C_i::done()
 {
   TheAppShutdown->client_done();
 }
 
 
 void
-Foo_C_i::cust_op1(void)
+Foo_C_i::cust_op1()
 {
   ++this->count_[5];
 }
@@ -97,7 +97,7 @@ Foo_C_i::cust_op4(long value)
 
 
 void
-Foo_C_i::cust_op5(void)
+Foo_C_i::cust_op5()
 {
   ++this->count_[9];
   throw CustomException();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index d1150f29886..0e8bb9dd2d6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -12,7 +12,7 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
     Foo_C_i();
     virtual ~Foo_C_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -20,15 +20,15 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
-    void cust_op1(void);
+    void cust_op1();
     void cust_op2(long value);
     long cust_op3(long value);
     void cust_op4(long value);
-    void cust_op5(void);
+    void cust_op5();
 
     void gather_stats(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index abde30b72f6..78cb71484d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -50,7 +50,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_A obj ref.
   Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(this->orb_.in(),
@@ -62,7 +62,7 @@ ClientApp::client_setup(void)
 
 
 int
-ClientApp::run_engine(void)
+ClientApp::run_engine()
 {
   bool result = this->engine_->execute();
   return result ? 0 : -1;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index b688eeb9700..b45a2ba6afd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -19,8 +19,8 @@ class ClientApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void client_setup(void);
-    int  run_engine(void);
+    void client_setup();
+    int  run_engine();
     void cleanup();
 
     // Helper methods used by the methods above.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index a9331abcc0a..efa6cbd9873 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -81,7 +81,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -89,7 +89,7 @@ ServerApp::poa_setup(void)
 
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -103,7 +103,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -129,7 +129,7 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -139,7 +139,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -152,7 +152,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index bf9d6e80fad..756f99d2481 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -23,13 +23,13 @@ class ServerApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
     void collocated_setup();
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index 96b4f181f3e..d48dd6938ad 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -78,7 +78,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::poa_setup(void)
+ClientApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -86,7 +86,7 @@ ClientApp::poa_setup(void)
 
 
 void
-ClientApp::csd_setup(void)
+ClientApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -100,7 +100,7 @@ ClientApp::csd_setup(void)
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_B obj ref.
   Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
@@ -119,7 +119,7 @@ ClientApp::client_setup(void)
 
 
 void
-ClientApp::poa_activate(void)
+ClientApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -135,7 +135,7 @@ ClientApp::run_clients()
 
 
 void
-ClientApp::run_orb_event_loop(void)
+ClientApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index 8d8bf95dcd7..8160a063995 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -24,12 +24,12 @@ class ClientApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void client_setup(void);
-    void poa_activate(void);
+    void poa_setup();
+    void csd_setup();
+    void client_setup();
+    void poa_activate();
     void run_clients();
-    void run_orb_event_loop(void);
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 9d43cef70aa..a061d4a003f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -94,7 +94,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -107,7 +107,7 @@ ServerApp::poa_setup(void)
 }
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -135,7 +135,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->foo_servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -145,7 +145,7 @@ ServerApp::servant_setup(void)
 
 
 void
-ServerApp::collocated_setup(void)
+ServerApp::collocated_setup()
 {
   if (this->num_collocated_clients_ == 0)
     return;
@@ -173,7 +173,7 @@ ServerApp::collocated_setup(void)
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -182,7 +182,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -195,7 +195,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index 9b6ff34b863..f8b379d5884 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -24,13 +24,13 @@ class ServerApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int  init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
-    void collocated_setup(void);
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
+    void collocated_setup();
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index 6c37f9ed293..c271f1cba48 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -52,7 +52,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_C obj ref.
   Foo_C_var foo = RefHelper<Foo_C>::string_to_ref(this->orb_.in(),
@@ -64,7 +64,7 @@ ClientApp::client_setup(void)
 
 
 int
-ClientApp::run_engine(void)
+ClientApp::run_engine()
 {
   bool result = this->engine_->execute();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index 14691ecad41..1533218656c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -20,8 +20,8 @@ class ClientApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void client_setup(void);
-    int  run_engine(void);
+    void client_setup();
+    int  run_engine();
     void cleanup();
 
     // Helper methods used by the methods above.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 25383409b9e..d767c9bee50 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -82,7 +82,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -90,7 +90,7 @@ ServerApp::poa_setup(void)
 
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -104,7 +104,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -141,7 +141,7 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -151,7 +151,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -164,7 +164,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index cdf9226c804..6a9e146e8ab 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -23,13 +23,13 @@ class ServerApp : public TestAppBase
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
     void collocated_setup();
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index 1757a64b002..635e9e8c1ea 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -9,7 +9,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
     {
@@ -21,7 +21,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp
index a72878e305a..32143d1b8d7 100644
--- a/TAO/tests/CallbackTest/Callback.cpp
+++ b/TAO/tests/CallbackTest/Callback.cpp
@@ -17,14 +17,14 @@ Callback::are_you_there (CORBA::String_out answer)
 }
 
 void
-Callback::test_oneway (void)
+Callback::test_oneway ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - test_oneway!\n"));
 }
 
 void
-Callback::shutdown (void)
+Callback::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - shutdown!\n"));
diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h
index a2ae7b9064b..ea6628cd476 100644
--- a/TAO/tests/CallbackTest/Callback.h
+++ b/TAO/tests/CallbackTest/Callback.h
@@ -16,9 +16,9 @@ public:
   // = The skeleton methods
   virtual CORBA::Boolean are_you_there (CORBA::String_out answer);
 
-  virtual void test_oneway (void);
+  virtual void test_oneway ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   /// Use an ORB reference to shutdown the application.
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp
index 7b7cad946e0..4d8f0922237 100644
--- a/TAO/tests/CallbackTest/Service.cpp
+++ b/TAO/tests/CallbackTest/Service.cpp
@@ -7,7 +7,7 @@ Service::Service (CORBA::ORB_ptr orb)
 }
 
 void
-Service::dump_results (void)
+Service::dump_results ()
 {
   if (this->test_count_ == 0)
     {
diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h
index 78a6945d8d2..441a1c34370 100644
--- a/TAO/tests/CallbackTest/Service.h
+++ b/TAO/tests/CallbackTest/Service.h
@@ -17,7 +17,7 @@ public:
   /**
    * In case of failure this exposes any incomplete runs.
    */
-  void dump_results (void);
+  void dump_results ();
 
   // = The skeleton methods
   virtual void run_test (Test::Callback_ptr callback);
diff --git a/TAO/tests/ClientPortSpan/Hello.cpp b/TAO/tests/ClientPortSpan/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/ClientPortSpan/Hello.cpp
+++ b/TAO/tests/ClientPortSpan/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ClientPortSpan/Hello.h b/TAO/tests/ClientPortSpan/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/ClientPortSpan/Hello.h
+++ b/TAO/tests/ClientPortSpan/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp
index bd29e654510..b49b07b1c75 100644
--- a/TAO/tests/Client_Leaks/Client_Task.cpp
+++ b/TAO/tests/Client_Leaks/Client_Task.cpp
@@ -16,7 +16,7 @@ Client_Task::successful_calls () const
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -55,7 +55,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   try
     {
@@ -71,7 +71,7 @@ Client_Task::validate_connection (void)
 }
 
 int
-Client_Task::one_iteration (void)
+Client_Task::one_iteration ()
 {
   try
     {
diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h
index a8da84944ea..fbe0aa8b51b 100644
--- a/TAO/tests/Client_Leaks/Client_Task.h
+++ b/TAO/tests/Client_Leaks/Client_Task.h
@@ -22,14 +22,14 @@ public:
   int successful_calls () const;
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Run one iteration of the test
-  int one_iteration (void);
+  int one_iteration ();
 
   /// Make sure that the thread has a connection available
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index 1c6fb507e19..5ab2b0d55ac 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -7,13 +7,13 @@ Process::Process (CORBA::ORB_ptr orb)
 }
 
 CORBA::Long
-Process::get_process_id (void)
+Process::get_process_id ()
 {
   return ACE_OS::getpid ();
 }
 
 void
-Process::shutdown (void)
+Process::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index ff42dd8d9a9..6240f83d220 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -14,9 +14,9 @@ public:
   Process (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long get_process_id (void);
+  virtual CORBA::Long get_process_id ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index c090c004da1..279f6b71802 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -9,13 +9,13 @@ Process_Factory::Process_Factory (CORBA::ORB_ptr orb)
 }
 
 int
-Process_Factory::shutdown_received (void)
+Process_Factory::shutdown_received ()
 {
   return this->shutdown_received_;
 }
 
 Test::Process_ptr
-Process_Factory::create_new_process (void)
+Process_Factory::create_new_process ()
 {
   Startup_Callback *startup_callback_impl;
   ACE_NEW_THROW_EX (startup_callback_impl,
@@ -101,12 +101,12 @@ Process_Factory::create_new_process (void)
 }
 
 void
-Process_Factory::noop (void)
+Process_Factory::noop ()
 {
 }
 
 void
-Process_Factory::shutdown (void)
+Process_Factory::shutdown ()
 {
   this->shutdown_received_ = 1;
   this->orb_->shutdown (false);
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index f21a360f019..1481290e47f 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -14,14 +14,14 @@ public:
   Process_Factory (CORBA::ORB_ptr orb);
 
   /// Return 1 if the shutdown message has been received already
-  int shutdown_received (void);
+  int shutdown_received ();
 
   // = The skeleton methods
-  virtual Test::Process_ptr create_new_process (void);
+  virtual Test::Process_ptr create_new_process ();
 
-  virtual void noop (void);
+  virtual void noop ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp
index c071110e1fa..caad7b80721 100644
--- a/TAO/tests/Client_Leaks/Server_Task.cpp
+++ b/TAO/tests/Client_Leaks/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Client_Leaks/Server_Task.h b/TAO/tests/Client_Leaks/Server_Task.h
index 8b5f48d872c..4acef7697df 100644
--- a/TAO/tests/Client_Leaks/Server_Task.h
+++ b/TAO/tests/Client_Leaks/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index 7056173d188..66a214d2b4b 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -1,6 +1,6 @@
 #include "Startup_Callback.h"
 
-Startup_Callback::Startup_Callback (void)
+Startup_Callback::Startup_Callback ()
 {
 }
 
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index eae388467ec..58c36c5f15a 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_Callback.h
@@ -11,7 +11,7 @@ class Startup_Callback
 {
 public:
   /// Constructor
-  Startup_Callback (void);
+  Startup_Callback ();
 
   /// Return 1 if the process has started already
   /**
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
index 4769f62b629..7ad4be97e15 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
@@ -18,11 +18,11 @@
 
 // ****************************************************************
 
-IBM1047_ISO8859::IBM1047_ISO8859 (void)
+IBM1047_ISO8859::IBM1047_ISO8859 ()
 {
 }
 
-IBM1047_ISO8859::~IBM1047_ISO8859 (void)
+IBM1047_ISO8859::~IBM1047_ISO8859 ()
 {
 }
 
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
index 659c57cda3f..5c928d9ce2b 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
@@ -43,10 +43,10 @@ class IBM1047_ISO8859_Export IBM1047_ISO8859 : public ACE_Char_Codeset_Translato
 {
 public:
   /// A do nothing constructor.
-  IBM1047_ISO8859 (void);
+  IBM1047_ISO8859 ();
 
   /// Virtual destruction
-  virtual ~IBM1047_ISO8859 (void);
+  virtual ~IBM1047_ISO8859 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, ACE_CDR::Char &);
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
index 34424b205bd..5d786eb231a 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
@@ -16,11 +16,11 @@
 
 // ****************************************************************
 
-WIBM1047_ISO8859::WIBM1047_ISO8859 (void)
+WIBM1047_ISO8859::WIBM1047_ISO8859 ()
 {
 }
 
-WIBM1047_ISO8859::~WIBM1047_ISO8859 (void)
+WIBM1047_ISO8859::~WIBM1047_ISO8859 ()
 {
 }
 
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
index 2440833184a..d1fb1095e0b 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
@@ -42,10 +42,10 @@ class IBM1047_ISO8859_Export WIBM1047_ISO8859 : public ACE_WChar_Codeset_Transla
 {
 public:
   /// A do nothing constructor.
-  WIBM1047_ISO8859 (void);
+  WIBM1047_ISO8859 ();
 
   /// Virtual destruction
-  virtual ~WIBM1047_ISO8859 (void);
+  virtual ~WIBM1047_ISO8859 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &, ACE_CDR::WChar &);
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
index 3dbeafd115b..7699c4fda3d 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
@@ -213,11 +213,11 @@ size_t count_potential_surrogates (
 /////////////////////////////
 // WUCS4_UTF16 implementation
 
-WUCS4_UTF16::WUCS4_UTF16 (void)
+WUCS4_UTF16::WUCS4_UTF16 ()
 {
 }
 
-WUCS4_UTF16::~WUCS4_UTF16 (void)
+WUCS4_UTF16::~WUCS4_UTF16 ()
 {
 }
 
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
index 6fae5536a5f..950318eb5a1 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
@@ -36,10 +36,10 @@ class UCS4_UTF16_Export WUCS4_UTF16 : public ACE_WChar_Codeset_Translator
 {
 public:
   /// A do nothing constructor.
-  WUCS4_UTF16 (void);
+  WUCS4_UTF16 ();
 
   /// Virtual destruction
-  virtual ~WUCS4_UTF16 (void);
+  virtual ~WUCS4_UTF16 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &,
diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
index 06c3951e83d..42a23179e06 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
@@ -42,7 +42,7 @@ UTF16_UCS2_Translator::UTF16_UCS2_Translator (CONV_FRAME::CodeSetId tcs)
          this->tcs_));
 }
 
-UTF16_UCS2_Translator::~UTF16_UCS2_Translator (void)
+UTF16_UCS2_Translator::~UTF16_UCS2_Translator ()
 {
 }
 
diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h
index db90c70cd8a..f724706ee3b 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h
@@ -43,7 +43,7 @@ public:
   UTF16_UCS2_Translator (CONV_FRAME::CodeSetId tcs = ACE_CODESET_ID_ISO_UCS_2_LEVEL_1);
 
   /// Virtual destruction
-  virtual ~UTF16_UCS2_Translator (void);
+  virtual ~UTF16_UCS2_Translator ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &,
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index 3599ee95ef2..9397fe7af7d 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -85,7 +85,7 @@ public:
   };
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void)
+  void shutdown ()
   {
     this->orb_->shutdown (false);
   };
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
index 6fc065e8f78..d8c07c14341 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
   try
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
index 15951f28767..5e21009c3e4 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -57,7 +57,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
index ee66cf2ba35..ebd3d169b4a 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
 
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
index b0feddd2c8e..c6cfa8478f0 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -63,7 +63,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
index 8a3948e0e22..bd7ac56e615 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 1;
   try
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
index dabc25cce11..57283fe2995 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
@@ -12,7 +12,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -55,7 +55,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
index 6bc6a75556b..01fc08696f7 100644
--- a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
 
diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.h b/TAO/tests/Collocated_DerivedIF/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocated_DerivedIF/Client_Task.h
+++ b/TAO/tests/Collocated_DerivedIF/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.cpp b/TAO/tests/Collocated_DerivedIF/Hello.cpp
index 93aa2c63755..d126eb34a3b 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Hello.cpp
@@ -10,7 +10,7 @@ HelloAgain::HelloAgain (CORBA::ORB_ptr orb,
 {
 }
 char *
-HelloAgain::get_string_again (void)
+HelloAgain::get_string_again ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall get_string_again in process ..\n"));
@@ -40,7 +40,7 @@ HelloAgain::get_string_again (void)
 }
 
 char *
-HelloAgain::get_string (void)
+HelloAgain::get_string ()
 {
     ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) HelloAgain::get_string Upcall get_string in process ..\n"));
@@ -69,7 +69,7 @@ HelloAgain::get_string (void)
     return CORBA::string_dup ("Hello there!");
 }
 void
-HelloAgain::shutdown (void)
+HelloAgain::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.h b/TAO/tests/Collocated_DerivedIF/Hello.h
index 4bb8b790558..b1ac7dacbd1 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.h
+++ b/TAO/tests/Collocated_DerivedIF/Hello.h
@@ -16,9 +16,9 @@
            ACE_thread_t thr_id);
 
     // = The skeleton methods
-    virtual char * get_string_again (void);
-    virtual char * get_string (void);
-    virtual void shutdown (void);
+    virtual char * get_string_again ();
+    virtual char * get_string ();
+    virtual void shutdown ();
 
 
   private:
diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp b/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
index 6b89058c3ac..17b998b45ca 100644
--- a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.h b/TAO/tests/Collocated_DerivedIF/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_DerivedIF/Server_Task.h
+++ b/TAO/tests/Collocated_DerivedIF/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
index 2bc503b80c1..27276d58595 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
@@ -38,7 +38,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
index 9fecb7bef81..67ca0a504bf 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
@@ -39,7 +39,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
   /// How much requests to pass thru before forwarding.
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 548f1027c09..04f92407a48 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -36,13 +36,13 @@ Server_Request_Interceptor::forward (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   CORBA::release (this->to_);
 }
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
index d7924879e43..cdda3618c4e 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
@@ -42,9 +42,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/tests/Collocated_Forwarding/test_i.cpp b/TAO/tests/Collocated_Forwarding/test_i.cpp
index a2f0451bd10..7b52881b9a4 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.cpp
+++ b/TAO/tests/Collocated_Forwarding/test_i.cpp
@@ -24,7 +24,7 @@ test_i::forward (CORBA::Object_ptr to,
 }
 
 CORBA::Short
-test_i::collocated_call (void)
+test_i::collocated_call ()
 {
   this->request_count_++;
 
diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h
index 7cc54392e8a..cd26df18997 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.h
+++ b/TAO/tests/Collocated_Forwarding/test_i.h
@@ -24,7 +24,7 @@ public:
                 CORBA::ULong request_pass_count);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short collocated_call (void);
+  virtual CORBA::Short collocated_call ();
 
 private:
   /// Id of this instance.
diff --git a/TAO/tests/Collocated_NoColl/Client_Task.cpp b/TAO/tests/Collocated_NoColl/Client_Task.cpp
index ee66cf2ba35..ebd3d169b4a 100644
--- a/TAO/tests/Collocated_NoColl/Client_Task.cpp
+++ b/TAO/tests/Collocated_NoColl/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
 
diff --git a/TAO/tests/Collocated_NoColl/Client_Task.h b/TAO/tests/Collocated_NoColl/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocated_NoColl/Client_Task.h
+++ b/TAO/tests/Collocated_NoColl/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocated_NoColl/Hello.cpp b/TAO/tests/Collocated_NoColl/Hello.cpp
index b0feddd2c8e..c6cfa8478f0 100644
--- a/TAO/tests/Collocated_NoColl/Hello.cpp
+++ b/TAO/tests/Collocated_NoColl/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -63,7 +63,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_NoColl/Hello.h b/TAO/tests/Collocated_NoColl/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_NoColl/Hello.h
+++ b/TAO/tests/Collocated_NoColl/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_NoColl/Server_Task.cpp b/TAO/tests/Collocated_NoColl/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_NoColl/Server_Task.cpp
+++ b/TAO/tests/Collocated_NoColl/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_NoColl/Server_Task.h b/TAO/tests/Collocated_NoColl/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_NoColl/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
index 8199914c81f..46a58aef3af 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   CORBA::Boolean exception = false;
   try
diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
index 81c4b023077..1092b33968f 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_ERROR ((LM_DEBUG,
               "(%P|%t) ERROR: Upcall in process ..\n"));
@@ -19,7 +19,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.h b/TAO/tests/Collocated_ThruP_Sp/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
index 206b5e564a0..21e398ead92 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
index 8199914c81f..46a58aef3af 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   CORBA::Boolean exception = false;
   try
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
index 81c4b023077..1092b33968f 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_ERROR ((LM_DEBUG,
               "(%P|%t) ERROR: Upcall in process ..\n"));
@@ -19,7 +19,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 86f0234cdc4..ad9ee246c16 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -13,12 +13,12 @@
 
 #include "Collocation_Tester.h"
 
-Collocation_Test::Collocation_Test (void)
+Collocation_Test::Collocation_Test ()
 {
 }
 
 void
-Collocation_Test::shutdown (void)
+Collocation_Test::shutdown ()
 {
   this->root_poa_->destroy (1, 1);
   this->orb_->destroy ();
@@ -83,7 +83,7 @@ Collocation_Test::parse_args (int /*argc*/,
 }
 
 int
-Collocation_Test::test_narrow (void)
+Collocation_Test::test_narrow ()
 {
   Diamond::Top_var top =
     Diamond::Top::_narrow (this->diamond_obj_.in ());
@@ -113,7 +113,7 @@ Collocation_Test::test_narrow (void)
 }
 
 int
-Collocation_Test::run (void)
+Collocation_Test::run ()
 {
   this->poa_manager_->activate ();
 
diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h
index 0f9650b9d2b..03fcf224538 100644
--- a/TAO/tests/Collocation/Collocation_Tester.h
+++ b/TAO/tests/Collocation/Collocation_Tester.h
@@ -22,9 +22,9 @@
 class Collocation_Test
 {
 public:
-  Collocation_Test (void);
+  Collocation_Test ();
 
-  void shutdown (void);
+  void shutdown ();
 
   /// Initializing the Collocation_Test object.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -34,10 +34,10 @@ public:
 
   /// This test narrow an object reference to its base class and see
   /// if it works correctly.
-  int test_narrow (void);
+  int test_narrow ();
 
   /// Run the test.
-  int run (void);
+  int run ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index b28e1d0fe9c..85b39b1ad54 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -9,7 +9,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (void)
+Top_i::shape ()
 {
   return CORBA::string_dup ("a point.");
 }
@@ -23,13 +23,13 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (void)
+Left_i::shape ()
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
-Left_i::color (void)
+Left_i::color ()
 {
   return CORBA::string_dup ("black");
 }
@@ -43,20 +43,20 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (void)
+Right_i::shape ()
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
-Right_i::color (void)
+Right_i::color ()
 {
   return CORBA::string_dup ("red");
   //
 }
 
 CORBA::Long
-Right_i::width (void)
+Right_i::width ()
 {
   return 0;
 }
@@ -70,25 +70,25 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (void)
+Buttom_i::shape ()
 {
   return CORBA::string_dup ("a diamond");
 }
 
 char *
-Buttom_i::color (void)
+Buttom_i::color ()
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
-Buttom_i::width (void)
+Buttom_i::width ()
 {
   return 100;
 }
 
 char *
-Buttom_i::name (void)
+Buttom_i::name ()
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index 2b81c1c5906..904d2607d22 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -11,62 +11,62 @@
 class Diamond_Export Top_i : public POA_Diamond::Top
 {
 public:
-  Top_i (void);
-  ~Top_i (void);
+  Top_i ();
+  ~Top_i ();
   // Ctor and dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 };
 
 class Diamond_Export Left_i : public POA_Diamond::Left
 {
 public:
-  Left_i (void);
-  ~Left_i (void);
+  Left_i ();
+  ~Left_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 };
 
 class Diamond_Export Right_i : public POA_Diamond::Right
 {
 public:
-  Right_i (void);
-  ~Right_i (void);
+  Right_i ();
+  ~Right_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 };
 
 class Diamond_Export Buttom_i : public POA_Diamond::Buttom
 {
 public:
-  Buttom_i (void);
-  ~Buttom_i (void);
+  Buttom_i ();
+  ~Buttom_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
index f7709a3f02a..e535dc43946 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
@@ -27,7 +27,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
index f7603965ef6..b7f91b5c88e 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
@@ -83,7 +83,7 @@ Client_Task::test_user_exception_not_expected (
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h
index 3cb45fa2d24..836ae7ef879 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   void test_system_exception (Test::Hello_ptr hello_ptr);
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp
index 5151daaab6f..c9db9959f60 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp
@@ -11,31 +11,31 @@
 }
 
 void
-Hello::system_exception_test (void)
+Hello::system_exception_test ()
 {
   throw CORBA::INTERNAL ();
 }
 
 void
-Hello::user_exception_expected (void)
+Hello::user_exception_expected ()
 {
   throw ::Test::Hello::A ();
 }
 
 void
-Hello::user_exception_not_expected (void)
+Hello::user_exception_not_expected ()
 {
   this->throw_internal_b ();
 }
 
 void
-Hello::throw_internal_b (void)
+Hello::throw_internal_b ()
 {
   throw ::Test::Hello::B ();
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -78,7 +78,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index a75d4d64ea2..913b0708fd4 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -20,18 +20,18 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void system_exception_test (void);
+  virtual void system_exception_test ();
 
-  virtual void user_exception_expected (void);
+  virtual void user_exception_expected ();
 
-  virtual void user_exception_not_expected (void);
+  virtual void user_exception_not_expected ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-  void throw_internal_b (void);
+  void throw_internal_b ();
 
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index ebe3075b8fc..21ba1d3f8e3 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
index 4c61af68844..f2f97b4513e 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -17,7 +17,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
index 6d5980db093..d67e7a8e46e 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
@@ -28,7 +28,7 @@ enum ClientSyncModeEnum {
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
index aa0517f8dfd..da1097b230a 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb,
 }
 
 void
-Hello::onewayTest (void)
+Hello::onewayTest ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) onewayTest() Upcall in process ..\n"));
@@ -20,7 +20,7 @@ Hello::onewayTest (void)
 
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -63,7 +63,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h
index d2b6221d4d4..bc9e3a23043 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h
@@ -20,11 +20,11 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void onewayTest (void);
+  virtual void onewayTest ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
index 95cb690e576..8324758b0d2 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index 3b3324b9e81..06721d060af 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -13,9 +13,9 @@ public:
 
   void set_other (test_ptr test);
 
-  void method (void);
+  void method ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   CORBA::ORB_var orb_;
 
@@ -47,7 +47,7 @@ test_i::set_other (test_ptr test)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   if (this->other_.in () != test::_nil ())
     {
@@ -82,7 +82,7 @@ test_i::method (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -92,7 +92,7 @@ class Task : public ACE_Task_Base
 public:
   Task (CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -103,7 +103,7 @@ Task::Task (CORBA::ORB_ptr orb)
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp
index 5ca5e2cfa3f..8352825f766 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Collocation_Tests/Client_Task.h b/TAO/tests/Collocation_Tests/Client_Task.h
index b6ea6957134..15511cd7a02 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Tests/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp
index 6def44732c1..93b81632258 100644
--- a/TAO/tests/Collocation_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Tests/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -54,7 +54,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Tests/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.cpp
+++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Crash_On_Write/Crash_Task.cpp b/TAO/tests/Crash_On_Write/Crash_Task.cpp
index fea99bbb218..a08c78c65f5 100644
--- a/TAO/tests/Crash_On_Write/Crash_Task.cpp
+++ b/TAO/tests/Crash_On_Write/Crash_Task.cpp
@@ -10,7 +10,7 @@ Crash_Task::Crash_Task (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Crash_Task::svc (void)
+Crash_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting crash task\n"));
   ACE_OS::sleep (this->running_time_);
diff --git a/TAO/tests/Crash_On_Write/Crash_Task.h b/TAO/tests/Crash_On_Write/Crash_Task.h
index b4d9a7b63b4..c9e4516629e 100644
--- a/TAO/tests/Crash_On_Write/Crash_Task.h
+++ b/TAO/tests/Crash_On_Write/Crash_Task.h
@@ -18,7 +18,7 @@ public:
               const ACE_Time_Value &running_time);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Total running time for each thread
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
index e3610f5b633..08ec34b03c2 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
@@ -1,10 +1,10 @@
 #include "Oneway_Receiver.h"
 
-Oneway_Receiver::Oneway_Receiver (void)
+Oneway_Receiver::Oneway_Receiver ()
 {
 }
 
 void
-Oneway_Receiver::receive_oneway (void)
+Oneway_Receiver::receive_oneway ()
 {
 }
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
index 1e28f29784d..a19c77fe6b5 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
@@ -11,10 +11,10 @@ class Oneway_Receiver
 {
 public:
   /// Constructor
-  Oneway_Receiver (void);
+  Oneway_Receiver ();
 
   // = The skeleton methods
-  virtual void receive_oneway (void);
+  virtual void receive_oneway ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index b76d85f7670..cb57d3ddcaf 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -1,17 +1,17 @@
 #include "Crashed_Callback.h"
 
-Crashed_Callback::Crashed_Callback (void)
+Crashed_Callback::Crashed_Callback ()
 {
 }
 
 CORBA::Boolean
-Crashed_Callback::are_you_there (void)
+Crashed_Callback::are_you_there ()
 {
   return 1;
 }
 
 void
-Crashed_Callback::crash_now_please (void)
+Crashed_Callback::crash_now_please ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Crashed_Callback - crashing application\n"));
@@ -26,6 +26,6 @@ Crashed_Callback::crash_now_please (void)
 }
 
 void
-Crashed_Callback::test_oneway (void)
+Crashed_Callback::test_oneway ()
 {
 }
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h
index a6bd7ccc13f..0ba82c82b3b 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.h
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h
@@ -11,14 +11,14 @@ class Crashed_Callback
 {
 public:
   /// Constructor
-  Crashed_Callback (void);
+  Crashed_Callback ();
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (void);
+  virtual CORBA::Boolean are_you_there ();
 
-  virtual void crash_now_please (void);
+  virtual void crash_now_please ();
 
-  virtual void test_oneway (void);
+  virtual void test_oneway ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index 697eddf636e..e798b7e1588 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -1,13 +1,13 @@
 #include "Service.h"
 
-Service::Service (void)
+Service::Service ()
   : orb_ (CORBA::ORB::_nil ()),
     test_count_ (0)
 {
 }
 
 void
-Service::dump_results (void)
+Service::dump_results ()
 {
   if (this->test_count_ == 0)
     {
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index 4630e164764..9d3e4f4ffa3 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -11,13 +11,13 @@ class Service
 {
 public:
   /// Constructor
-  Service (void);
+  Service ();
 
   /// Dump the results.
   /**
    * In case of failure this exposes any incomplete runs.
    */
-  void dump_results (void);
+  void dump_results ();
 
   // = The skeleton methods
   virtual void run_test (Test::Crashed_Callback_ptr callback);
diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
index 345f983b3a0..8a4ec18a430 100644
--- a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
+++ b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
@@ -3,7 +3,7 @@
 #include "orb_initializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
@@ -30,7 +30,7 @@ Server_ORBInitializer::post_init (
 }
 
 ForwardTest_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.h b/TAO/tests/DII_AMI_Forward/orb_initializer.h
index 0e2986a0a93..acd48c9048a 100644
--- a/TAO/tests/DII_AMI_Forward/orb_initializer.h
+++ b/TAO/tests/DII_AMI_Forward/orb_initializer.h
@@ -28,7 +28,7 @@ class Server_ORBInitializer
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -36,7 +36,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  ForwardTest_Request_Interceptor * server_interceptor (void);
+  ForwardTest_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
index de80b330976..e231f671307 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Thread.h"
 
-ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (void)
+ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor ()
   : myname_ ("ForwardTest_Interceptor"),
     forward_location_ (CORBA::Object::_nil ()),
     forward_location_done_ (false)
@@ -19,7 +19,7 @@ ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (CORBA::Object_
 {
 }
 
-ForwardTest_Request_Interceptor::~ForwardTest_Request_Interceptor (void)
+ForwardTest_Request_Interceptor::~ForwardTest_Request_Interceptor ()
 {
 }
 
@@ -36,13 +36,13 @@ ForwardTest_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 }
 
 char *
-ForwardTest_Request_Interceptor::name (void)
+ForwardTest_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-ForwardTest_Request_Interceptor::destroy (void)
+ForwardTest_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.h b/TAO/tests/DII_AMI_Forward/server_interceptor.h
index a5496d72271..d862fcabdbf 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.h
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.h
@@ -21,7 +21,7 @@ class ForwardTest_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  ForwardTest_Request_Interceptor (void);
+  ForwardTest_Request_Interceptor ();
   // cotr.
 
   ForwardTest_Request_Interceptor (CORBA::Object_ptr forward_location);
@@ -31,10 +31,10 @@ public:
 
   void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index f1cfbec1038..71bbf2b35ee 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -25,7 +25,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
index 265b6596721..130bb198807 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
index 8e525bb5aaa..4d4d797c70f 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -20,12 +20,12 @@ extern CORBA::Short TEST_SECOND;
 }
 
 // Implementation skeleton constructor
-Test_Simple_Test_i::Test_Simple_Test_i (void)
+Test_Simple_Test_i::Test_Simple_Test_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Simple_Test_i::~Test_Simple_Test_i (void)
+Test_Simple_Test_i::~Test_Simple_Test_i ()
 {
 }
 
@@ -269,7 +269,7 @@ void Hello::test_args_3 (
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -324,7 +324,7 @@ Hello::test_unbounded_string (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index 8fc53671693..29c8f26763a 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -10,10 +10,10 @@ class  Test_Simple_Test_i
 {
 public:
   //Constructor
-  Test_Simple_Test_i (void);
+  Test_Simple_Test_i ();
 
   //Destructor
-  virtual ~Test_Simple_Test_i (void);
+  virtual ~Test_Simple_Test_i ();
 
   virtual
   void test_method (
@@ -108,7 +108,7 @@ public:
       const ::Test::Var_Array arg4
     );
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
   virtual
   char * test_unbounded_string (
@@ -117,7 +117,7 @@ public:
       CORBA::String_out s3
     );
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index 8c44fd06667..31d7959a269 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -19,7 +19,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
index 6e6d7085452..fde0740eebe 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
@@ -28,7 +28,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index 340f5d9b3a2..aba859d9fd3 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -26,7 +26,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
index 265b6596721..130bb198807 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index 2dbe25a3b22..9f8445cd6b7 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -20,12 +20,12 @@ extern CORBA::Short TEST_SECOND;
 }
 
 // Implementation skeleton constructor
-Test_Simple_Test_i::Test_Simple_Test_i (void)
+Test_Simple_Test_i::Test_Simple_Test_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Simple_Test_i::~Test_Simple_Test_i (void)
+Test_Simple_Test_i::~Test_Simple_Test_i ()
 {
 }
 
@@ -286,7 +286,7 @@ void Hello::test_args_3 (
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -341,7 +341,7 @@ Hello::test_unbounded_string (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index 4050797f772..df2a9be278c 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -10,10 +10,10 @@ class  Test_Simple_Test_i
 {
 public:
   //Constructor
-  Test_Simple_Test_i (void);
+  Test_Simple_Test_i ();
 
   //Destructor
-  virtual ~Test_Simple_Test_i (void);
+  virtual ~Test_Simple_Test_i ();
 
   virtual
   void test_method (
@@ -115,7 +115,7 @@ public:
       const ::Test::Var_Array arg4
     );
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
   virtual
   char * test_unbounded_string (
@@ -124,7 +124,7 @@ public:
       CORBA::String_out s3
     );
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index 2f8dd3327cb..cc42498052c 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
index 690c31bb2a7..4f2b3c9adf4 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
@@ -25,7 +25,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Discard_Deferred/Hello.cpp b/TAO/tests/DII_Discard_Deferred/Hello.cpp
index a2c5103edc3..81c558f5180 100644
--- a/TAO/tests/DII_Discard_Deferred/Hello.cpp
+++ b/TAO/tests/DII_Discard_Deferred/Hello.cpp
@@ -8,7 +8,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Hello::get_string called\n"));
   ACE_OS::sleep (2);
@@ -17,7 +17,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/DII_Discard_Deferred/Hello.h b/TAO/tests/DII_Discard_Deferred/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/DII_Discard_Deferred/Hello.h
+++ b/TAO/tests/DII_Discard_Deferred/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp
index eda5079b763..b1bf9cc85ff 100644
--- a/TAO/tests/DIOP/UDP_Client_i.cpp
+++ b/TAO/tests/DIOP/UDP_Client_i.cpp
@@ -19,13 +19,13 @@ UDP_Client_i::UDP_Client_i (CORBA::ORB_ptr orb,
 }
 
 //Destructor.
-UDP_Client_i::~UDP_Client_i (void)
+UDP_Client_i::~UDP_Client_i ()
 {
   //no-op
 }
 
 int
-UDP_Client_i::svc (void)
+UDP_Client_i::svc ()
 {
   ACE_CString client_name ("UDP");
 
diff --git a/TAO/tests/DIOP/UDP_Client_i.h b/TAO/tests/DIOP/UDP_Client_i.h
index f7c8261fc7c..80b8800577b 100644
--- a/TAO/tests/DIOP/UDP_Client_i.h
+++ b/TAO/tests/DIOP/UDP_Client_i.h
@@ -37,7 +37,7 @@ public:
                 ACE_UINT32 iterations);
 
   /// Destructor
-  virtual ~UDP_Client_i (void);
+  virtual ~UDP_Client_i ();
 
 private:
   // Runs in a separate thread.
diff --git a/TAO/tests/DIOP/UDP_i.cpp b/TAO/tests/DIOP/UDP_i.cpp
index bf8106c29e9..dd8e91c847b 100644
--- a/TAO/tests/DIOP/UDP_i.cpp
+++ b/TAO/tests/DIOP/UDP_i.cpp
@@ -7,7 +7,7 @@ UDP_i::UDP_i (CORBA::ORB_ptr o) :
 }
 
 // Destructor
-UDP_i::~UDP_i (void)
+UDP_i::~UDP_i ()
 {
 }
 
@@ -56,7 +56,7 @@ UDP_i::invoke (const char * client_name,
 // Shutdown.
 
 void
-UDP_i::shutdown (void)
+UDP_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "UDP_i is shutting down\n"));
diff --git a/TAO/tests/DIOP/UDP_i.h b/TAO/tests/DIOP/UDP_i.h
index 110e4385d63..c0becf8bff0 100644
--- a/TAO/tests/DIOP/UDP_i.h
+++ b/TAO/tests/DIOP/UDP_i.h
@@ -37,14 +37,14 @@ public:
   UDP_i (CORBA::ORB_ptr o);
 
   /// Destructor
-  ~UDP_i (void);
+  ~UDP_i ();
 
   virtual void invoke (const char *client_name,
                        UDP_ptr udpHandler,
                        CORBA::Long request_id);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// ORB pointer.
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index b93e888e36c..4fbd18caa77 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -127,7 +127,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Test_Client_Module::fini (void)
+Test_Client_Module::fini ()
 {
   ACE_DEBUG ((LM_INFO,
               "Client is being finalized.\n"));
@@ -147,7 +147,7 @@ Test_Client_Module::fini (void)
 }
 
 int
-Test_Client_Module::svc (void)
+Test_Client_Module::svc ()
 {
   try
     {
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index 260efda2744..5e5b1e1fb47 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Test_Server_Module::~Test_Server_Module (void)
+Test_Server_Module::~Test_Server_Module ()
 {
 }
 
@@ -157,7 +157,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Test_Server_Module::fini (void)
+Test_Server_Module::fini ()
 {
   ACE_DEBUG ((LM_INFO,
               "Server is being finalized.\n"));
@@ -177,7 +177,7 @@ Test_Server_Module::fini (void)
 }
 
 int
-Test_Server_Module::svc (void)
+Test_Server_Module::svc ()
 {
   try
     {
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h
index 7554d491117..c2011ba6c46 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.h
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.h
@@ -45,7 +45,7 @@ public:
   /// Run by a daemon thread to handle deferred processing.
   virtual int svc ();
 
-  virtual ~Test_Server_Module (void);
+  virtual ~Test_Server_Module ();
 
 private:
   /// Reference to the ORB.
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index 8f808922e71..ebbf786288f 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Test_i.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
   : orb_ ()
 {
 }
@@ -14,7 +14,7 @@ Test_i::invoke_me ( /* */)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h
index 4ad2c2af555..f6a20b953ee 100644
--- a/TAO/tests/DLL_ORB/Test_i.h
+++ b/TAO/tests/DLL_ORB/Test_i.h
@@ -27,14 +27,14 @@ class Test_i : public virtual POA_Test
 {
 public:
   /// Constructor.
-  Test_i (void);
+  Test_i ();
 
   /// Simple two-way operation used to excercise the ORB transport
   /// internals.
-  virtual void invoke_me (void);
+  virtual void invoke_me ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB to be shutdown by the shutdown() method in this
   /// class.
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
index 134dafde1e0..11a75754d40 100644
--- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
@@ -11,7 +11,7 @@ class My_DII_Reply_Handler : public virtual TAO_DII_Reply_Handler,
 public:
   My_DII_Reply_Handler (TAO_AMH_DSI_Response_Handler_ptr rph,
                         CORBA::ORB_var orb);
-  virtual ~My_DII_Reply_Handler (void);
+  virtual ~My_DII_Reply_Handler ();
 
   // Callback method for deferred synchronous requests.
   virtual void handle_response (TAO_InputCDR &incoming);
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
index 225b4a3475e..c678877fd6f 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
@@ -130,7 +130,7 @@ DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (void)
+DSI_Simple_Server::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.h b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
index e1bab6f3184..957e09e5e6b 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
@@ -50,7 +50,7 @@ public:
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.cpp b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
index b2a50ab519d..b8493c6cc96 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
@@ -33,25 +33,25 @@ Simple_Server_i::test_method (CORBA::Long x,
 }
 
 void
-Simple_Server_i::raise_user_exception (void)
+Simple_Server_i::raise_user_exception ()
 {
   throw test_exception (33, "reactor meltdown", "kaput");
 }
 
 void
-Simple_Server_i::raise_system_exception (void)
+Simple_Server_i::raise_system_exception ()
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-Simple_Server_i::test_val (void)
+Simple_Server_i::test_val ()
 {
   return vlong_;
 }
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.h b/TAO/tests/DSI_AMI_Gateway/test_i.h
index 08fb539dde6..7c38878d778 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.h
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.h
@@ -32,15 +32,15 @@ public:
                            Structure_out the_out_structure,
                            char *&name);
 
-   CORBA::Long test_val (void);
+   CORBA::Long test_val ();
 
    void test_val (CORBA::Long test_val);
 
-  void raise_user_exception (void);
+  void raise_user_exception ();
 
-  void raise_system_exception (void);
+  void raise_system_exception ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   // The ORB
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index 379110de503..d008b54fac9 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -62,7 +62,7 @@ DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (void)
+DSI_Simple_Server::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index b2a50ab519d..b8493c6cc96 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -33,25 +33,25 @@ Simple_Server_i::test_method (CORBA::Long x,
 }
 
 void
-Simple_Server_i::raise_user_exception (void)
+Simple_Server_i::raise_user_exception ()
 {
   throw test_exception (33, "reactor meltdown", "kaput");
 }
 
 void
-Simple_Server_i::raise_system_exception (void)
+Simple_Server_i::raise_system_exception ()
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-Simple_Server_i::test_val (void)
+Simple_Server_i::test_val ()
 {
   return vlong_;
 }
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index 08fb539dde6..7c38878d778 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -32,15 +32,15 @@ public:
                            Structure_out the_out_structure,
                            char *&name);
 
-   CORBA::Long test_val (void);
+   CORBA::Long test_val ();
 
    void test_val (CORBA::Long test_val);
 
-  void raise_user_exception (void);
+  void raise_user_exception ();
 
-  void raise_system_exception (void);
+  void raise_system_exception ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   // The ORB
diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index 53e4301c8b6..a42c51ca2d6 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -61,10 +61,10 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -77,14 +77,14 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test_i::test_method\n"));
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp
index 2b8ea7c7774..3526621a66b 100644
--- a/TAO/tests/DynAny_Test/analyzer.cpp
+++ b/TAO/tests/DynAny_Test/analyzer.cpp
@@ -68,11 +68,11 @@ void DynAnyAnalyzer::tab (int t)
     }
 }
 
-DynAnyAnalyzer::~DynAnyAnalyzer (void)
+DynAnyAnalyzer::~DynAnyAnalyzer ()
 {
 }
 
-void DynAnyAnalyzer::resetTab (void)
+void DynAnyAnalyzer::resetTab ()
 {
   level_ = 0;
 }
diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h
index 619380af541..7da71ab4f6a 100644
--- a/TAO/tests/DynAny_Test/analyzer.h
+++ b/TAO/tests/DynAny_Test/analyzer.h
@@ -27,9 +27,9 @@ public:
 
   void tab (int t);
 
-  ~DynAnyAnalyzer (void);
+  ~DynAnyAnalyzer ();
 
-  void resetTab (void);
+  void resetTab ();
 
   void analyze (DynamicAny::DynAny_ptr da);
 
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index fb680eab82a..4aae2c73161 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -98,7 +98,7 @@ Data::Data (CORBA::ORB_var orb)
     }
 }
 
-Data::~Data (void)
+Data::~Data ()
 {
   CORBA::string_free (m_string1);
   CORBA::string_free (m_string2);
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index 164ba8df20a..e488d233e46 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -18,7 +18,7 @@ class Data
 {
 public:
   Data (CORBA::ORB_var orb);
-  ~Data (void);
+  ~Data ();
 
   CORBA::Boolean        m_bool1,      m_bool2;
   CORBA::Octet          m_octet1,     m_octet2;
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 0ea3edfc135..c08e10e82bb 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -57,14 +57,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 
 // constructor
-Driver::Driver (void)
+Driver::Driver ()
   : test_type_ (NO_TEST),
     debug_ (0)
 {
 }
 
 // destructor
-Driver::~Driver (void)
+Driver::~Driver ()
 {
   if (this->orb_.in () != 0)
     {
@@ -158,7 +158,7 @@ Driver::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Driver::run (void)
+Driver::run ()
 {
   int error_count = 0;
 
diff --git a/TAO/tests/DynAny_Test/driver.h b/TAO/tests/DynAny_Test/driver.h
index 1ca55131df9..f337213da6a 100644
--- a/TAO/tests/DynAny_Test/driver.h
+++ b/TAO/tests/DynAny_Test/driver.h
@@ -19,8 +19,8 @@ class Driver
 {
 public:
   // = Constructor and destructor.
-  Driver (void);
-  ~Driver (void);
+  Driver ();
+  ~Driver ();
 
 enum TEST_TYPE
   {
@@ -43,7 +43,7 @@ enum TEST_TYPE
   /**
    * @return The number of errors detected
    */
-  int run (void);
+  int run ();
 
 private:
   /// underlying ORB (we do not own it)
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 53128689442..4bed14fab5b 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -24,7 +24,7 @@ Test_DynAny::Test_DynAny (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynAny::~Test_DynAny (void)
+Test_DynAny::~Test_DynAny ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -37,7 +37,7 @@ Test_DynAny::test_name () const
 }
 
 int
-Test_DynAny::run_test (void)
+Test_DynAny::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynany.h b/TAO/tests/DynAny_Test/test_dynany.h
index c04e394ed54..c19d5caca98 100644
--- a/TAO/tests/DynAny_Test/test_dynany.h
+++ b/TAO/tests/DynAny_Test/test_dynany.h
@@ -19,11 +19,11 @@ class Test_DynAny
 {
 public:
   Test_DynAny (CORBA::ORB_var orb, int debug);
-  ~Test_DynAny (void);
+  ~Test_DynAny ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 18a43659558..57b5ccb71e8 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -23,7 +23,7 @@ Test_DynArray::Test_DynArray (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynArray::~Test_DynArray (void)
+Test_DynArray::~Test_DynArray ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -36,7 +36,7 @@ Test_DynArray::test_name () const
 }
 
 int
-Test_DynArray::run_test (void)
+Test_DynArray::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynarray.h b/TAO/tests/DynAny_Test/test_dynarray.h
index 50367b2a930..fb5b35fc827 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.h
+++ b/TAO/tests/DynAny_Test/test_dynarray.h
@@ -18,11 +18,11 @@ class Test_DynArray
 {
 public:
   Test_DynArray (CORBA::ORB_var orb, int debug);
-  ~Test_DynArray (void);
+  ~Test_DynArray ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 9980259db9b..a3878393399 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -24,7 +24,7 @@ Test_DynEnum::Test_DynEnum (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynEnum::~Test_DynEnum (void)
+Test_DynEnum::~Test_DynEnum ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -37,7 +37,7 @@ Test_DynEnum::test_name () const
 }
 
 int
-Test_DynEnum::run_test (void)
+Test_DynEnum::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynenum.h b/TAO/tests/DynAny_Test/test_dynenum.h
index e6714028824..a4e671991cd 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.h
+++ b/TAO/tests/DynAny_Test/test_dynenum.h
@@ -18,11 +18,11 @@ class Test_DynEnum
 {
 public:
   Test_DynEnum (CORBA::ORB_var orb, int debug);
-  ~Test_DynEnum (void);
+  ~Test_DynEnum ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 7721aa40e59..04a4ca1b963 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -53,7 +53,7 @@ Test_DynSequence::Test_DynSequence (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynSequence::~Test_DynSequence (void)
+Test_DynSequence::~Test_DynSequence ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -66,7 +66,7 @@ Test_DynSequence::test_name () const
 }
 
 int
-Test_DynSequence::run_test (void)
+Test_DynSequence::run_test ()
 {
   Data data (this->orb_);
   DynAnyTests::test_seq ts (2);
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.h b/TAO/tests/DynAny_Test/test_dynsequence.h
index afe325722a6..415005fb00e 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.h
+++ b/TAO/tests/DynAny_Test/test_dynsequence.h
@@ -18,11 +18,11 @@ class Test_DynSequence
 {
 public:
   Test_DynSequence (CORBA::ORB_var orb, int debug);
-  ~Test_DynSequence (void);
+  ~Test_DynSequence ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 915835bfa73..1ad95f62dd0 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -24,7 +24,7 @@ Test_DynStruct::Test_DynStruct (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynStruct::~Test_DynStruct (void)
+Test_DynStruct::~Test_DynStruct ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -37,7 +37,7 @@ Test_DynStruct::test_name () const
 }
 
 int
-Test_DynStruct::run_test (void)
+Test_DynStruct::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.h b/TAO/tests/DynAny_Test/test_dynstruct.h
index 408d626dda8..6b0a5a9099f 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.h
+++ b/TAO/tests/DynAny_Test/test_dynstruct.h
@@ -18,11 +18,11 @@ class Test_DynStruct
 {
 public:
   Test_DynStruct (CORBA::ORB_var orb, int debug);
-  ~Test_DynStruct (void);
+  ~Test_DynStruct ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index f51f05ec3b9..125a533b0fa 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -23,7 +23,7 @@ Test_DynUnion::Test_DynUnion (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynUnion::~Test_DynUnion (void)
+Test_DynUnion::~Test_DynUnion ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -36,7 +36,7 @@ Test_DynUnion::test_name () const
 }
 
 int
-Test_DynUnion::run_test (void)
+Test_DynUnion::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynunion.h b/TAO/tests/DynAny_Test/test_dynunion.h
index 77ddc0eeef2..e359caac22e 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.h
+++ b/TAO/tests/DynAny_Test/test_dynunion.h
@@ -18,11 +18,11 @@ class Test_DynUnion
 {
 public:
   Test_DynUnion (CORBA::ORB_var orb, int debug);
-  ~Test_DynUnion (void);
+  ~Test_DynUnion ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_wrapper.cpp b/TAO/tests/DynAny_Test/test_wrapper.cpp
index 5befb0e0484..c95c1854038 100644
--- a/TAO/tests/DynAny_Test/test_wrapper.cpp
+++ b/TAO/tests/DynAny_Test/test_wrapper.cpp
@@ -24,14 +24,14 @@ Test_Wrapper<T>::Test_Wrapper (T* t)
 
 // Destructor
 template <class T>
-Test_Wrapper<T>::~Test_Wrapper (void)
+Test_Wrapper<T>::~Test_Wrapper ()
 {
   delete this->test_object_;
 }
 
 template <class T>
 int
-Test_Wrapper<T>::run_test (void)
+Test_Wrapper<T>::run_test ()
 {
   const char* test_name = this->test_object_->test_name ();
 
diff --git a/TAO/tests/DynAny_Test/test_wrapper.h b/TAO/tests/DynAny_Test/test_wrapper.h
index afcf83b93ac..11abca739b0 100644
--- a/TAO/tests/DynAny_Test/test_wrapper.h
+++ b/TAO/tests/DynAny_Test/test_wrapper.h
@@ -22,14 +22,14 @@ public:
   // constructor and destructor
   Test_Wrapper (T *);
 
-  ~Test_Wrapper (void);
+  ~Test_Wrapper ();
 
   /**
    * @brief Run the test.
    *
    * @return The number of errors detected.
    */
-  int run_test (void);
+  int run_test ();
 
 private:
   // This does all the work.
diff --git a/TAO/tests/DynValue_Test/ValueTypes_impl.h b/TAO/tests/DynValue_Test/ValueTypes_impl.h
index 25bd32b1323..a92c73c9e24 100644
--- a/TAO/tests/DynValue_Test/ValueTypes_impl.h
+++ b/TAO/tests/DynValue_Test/ValueTypes_impl.h
@@ -21,7 +21,7 @@ public:
   BaseValue_impl (CORBA::UShort us1, CORBA::UShort us2)
   : OBV_DynValue_Test::BaseValue (us1,us2) {}
   virtual ~BaseValue_impl ();
-  virtual CORBA::ValueBase * _copy_value (void);
+  virtual CORBA::ValueBase * _copy_value ();
   virtual void print ();
 };
 
@@ -42,7 +42,7 @@ public:
   NestedValue_impl (CORBA::Short s1, CORBA::Short s2)
   : OBV_DynValue_Test::NestedValue (s1,s2) {}
   virtual ~NestedValue_impl ();
-  virtual CORBA::ValueBase * _copy_value (void);
+  virtual CORBA::ValueBase * _copy_value ();
 };
 
 class NestedValue_Factory : public factory_id
@@ -60,7 +60,7 @@ class NullValue_impl : public virtual OBV_DynValue_Test::NullValue,
 public:
   NullValue_impl () {}
   virtual ~NullValue_impl ();
-  virtual CORBA::ValueBase * _copy_value (void);
+  virtual CORBA::ValueBase * _copy_value ();
 };
 
 class NullValue_Factory : public factory_id
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
index 7d330b5d366..7c509f094ea 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
@@ -16,7 +16,7 @@ Sleeper_i::delay(CORBA::Short sec)
 }
 
 void
-Sleeper_i::shutdown (void)
+Sleeper_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -72,7 +72,7 @@ Middle_i::call_delay(CORBA::Short sec)
 }
 
 void
-Middle_i::shutdown (void)
+Middle_i::shutdown ()
 {
   sleeper_->shutdown ();
   this->orb_->shutdown (false);
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
index 1aeb8f5a8fd..c1aec4fd9e9 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
@@ -17,7 +17,7 @@ public:
   // = The skeleton methods
   virtual void delay (CORBA::Short sec);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -34,7 +34,7 @@ public:
   // = The skeleton methods
   virtual void call_delay (CORBA::Short sec);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
index 19720e55059..67b6c09beb3 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
@@ -34,7 +34,7 @@ Hello::get_string (CORBA::Long client_num)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
index 751390c4e00..b721e04bb1d 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
@@ -18,7 +18,7 @@ public:
   virtual void sleep_sec (CORBA::Short sleep_sec);
   virtual char * get_string (CORBA::Long);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
index a1650ddd85f..c4cda2ecdb1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
@@ -70,7 +70,7 @@ public:
     target_ (Test::Hello::_duplicate(h))
   {}
 
-  int svc (void);
+  int svc ();
 
   int replies_;
   int nis_;
@@ -81,7 +81,7 @@ private:
   Test::Hello_var target_;
 };
 
-int ClientTask::svc (void)
+int ClientTask::svc ()
 {
   int ndx = 0;
   {
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
index 19720e55059..67b6c09beb3 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
@@ -34,7 +34,7 @@ Hello::get_string (CORBA::Long client_num)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
index 751390c4e00..b721e04bb1d 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
@@ -18,7 +18,7 @@ public:
   virtual void sleep_sec (CORBA::Short sleep_sec);
   virtual char * get_string (CORBA::Long);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
index a1650ddd85f..c4cda2ecdb1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
@@ -70,7 +70,7 @@ public:
     target_ (Test::Hello::_duplicate(h))
   {}
 
-  int svc (void);
+  int svc ();
 
   int replies_;
   int nis_;
@@ -81,7 +81,7 @@ private:
   Test::Hello_var target_;
 };
 
-int ClientTask::svc (void)
+int ClientTask::svc ()
 {
   int ndx = 0;
   {
diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h
index a61cc86259e..afeefeb30c9 100644
--- a/TAO/tests/Explicit_Event_Loop/server.h
+++ b/TAO/tests/Explicit_Event_Loop/server.h
@@ -19,7 +19,7 @@
 class Time_impl : public virtual POA_Time
 {
 public:
-  virtual TimeOfDay get_gmt (void);
+  virtual TimeOfDay get_gmt ();
 };
 
 #endif /* server_HH_ */
diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index 0c80c2c6e3c..2e60d01db03 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -9,7 +9,7 @@ Counter_Servant::Counter_Servant (Policy_Tester *policy_tester)
   // No-Op.
 }
 
-Counter_Servant::~Counter_Servant (void)
+Counter_Servant::~Counter_Servant ()
 {
   // No-Op.
 }
@@ -35,7 +35,7 @@ Counter_Servant::reset (/**/)
 }
 
 void
-Counter_Servant::shutdown (void)
+Counter_Servant::shutdown ()
 {
   this->policy_tester_->shutdown ();
 }
diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h
index 19464ebc6ff..eb6e66b79be 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.h
+++ b/TAO/tests/Exposed_Policies/Counter_i.h
@@ -24,17 +24,17 @@ public:
   // = Ctor-Dtor Declaration
 
   Counter_Servant (Policy_Tester *policy_tester);
-  virtual ~Counter_Servant (void);
+  virtual ~Counter_Servant ();
 
   // = Counter Interface Methods Overloading.
 
-  virtual void increment (void);
+  virtual void increment ();
 
-  virtual CORBA::Long get_count (void);
+  virtual CORBA::Long get_count ();
 
-  virtual void reset (void);
+  virtual void reset ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
   CORBA::Long count_;
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index c7b3633a048..0ae1ebae8a7 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -16,19 +16,19 @@
 #include "tao/ORB_Constants.h"
 #include "tao/ORB_Core.h"
 
-Policy_Tester::Policy_Tester (void)
+Policy_Tester::Policy_Tester ()
   : rt_object_properties_ (0),
     rt_poa_properties_ (0)
 {
   // No_Op
 }
 
-Policy_Tester::~Policy_Tester (void)
+Policy_Tester::~Policy_Tester ()
 {
 }
 
 void
-Policy_Tester::run (void)
+Policy_Tester::run ()
 {
   PortableServer::POAManager_var poa_manager =
     this->child_poa_->the_POAManager ();
@@ -127,7 +127,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 
 
 int
-Policy_Tester::create_objects (void)
+Policy_Tester::create_objects ()
 {
   CORBA::PolicyList poa_policy_list;
   poa_policy_list.length (3);
@@ -255,7 +255,7 @@ Policy_Tester::create_objects (void)
 }
 
 void
-Policy_Tester::shutdown (void)
+Policy_Tester::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h
index 106e2b94dd4..99329d281e3 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.h
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.h
@@ -25,19 +25,19 @@ class Policy_Tester
 {
 public:
   // Ctor/Dtor.
-  Policy_Tester (void);
-  ~Policy_Tester (void);
+  Policy_Tester ();
+  ~Policy_Tester ();
 
   /// Runs the test.
-  void run (void);
+  void run ();
 
   int init (int argc,
             ACE_TCHAR *argv[]);
 
-  void shutdown (void);
+  void shutdown ();
 private:
   // Helper method used internally.
-  int create_objects (void);
+  int create_objects ();
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                    const char *msg);
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index be292821e7f..1d32bc432de 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -1,7 +1,7 @@
 #include "Policy_Verifier.h"
 #include "ace/OS_NS_string.h"
 
-Policy_Verifier::Policy_Verifier (void)
+Policy_Verifier::Policy_Verifier ()
   : rt_object_properties_ (0)
   , rt_poa_properties_ (0)
   , priority_bands_ (0)
@@ -12,7 +12,7 @@ Policy_Verifier::Policy_Verifier (void)
                   ACE_TEXT("file://overridden.ior"));
 }
 
-Policy_Verifier::~Policy_Verifier (void)
+Policy_Verifier::~Policy_Verifier ()
 {
   delete rt_object_properties_;
   delete rt_poa_properties_;
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index 99ae21b2ab5..c035274d2ee 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -29,12 +29,12 @@ class Policy_Verifier
 {
 public:
   // -- Ctor/Dtor --
-  Policy_Verifier (void);
-  ~Policy_Verifier (void);
+  Policy_Verifier ();
+  ~Policy_Verifier ();
 
   bool init (int argc, ACE_TCHAR *argv[]);
 
-  void run (void);
+  void run ();
 
 private:
   // -- Helper methods --
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index 350a5a8a7ca..8218b5ac219 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -5,13 +5,13 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-RT_Properties::RT_Properties (void)
+RT_Properties::RT_Properties ()
   : priority_ (10)
 {
   ior_source_ = ACE_TEXT("poa_default.ior");
 }
 
-RT_Properties::~RT_Properties (void)
+RT_Properties::~RT_Properties ()
 {
   // No-Op.
 }
@@ -76,7 +76,7 @@ RT_Properties::priority (RTCORBA::Priority priority)
 }
 
 RTCORBA::Priority
-RT_Properties::priority (void)
+RT_Properties::priority ()
 {
   return this->priority_;
 }
@@ -88,7 +88,7 @@ RT_Properties::priority_bands (const RTCORBA::PriorityBands& priority_bands)
 }
 
 const RTCORBA::PriorityBands&
-RT_Properties::priority_bands (void)
+RT_Properties::priority_bands ()
 {
   return this->priority_bands_;
 }
@@ -100,7 +100,7 @@ RT_Properties::ior_source (const ACE_TCHAR *s)
 }
 
 const ACE_TCHAR *
-RT_Properties::ior_source (void)
+RT_Properties::ior_source ()
 {
   return this->ior_source_.c_str ();
 }
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h
index bda1697cd83..c627fb70c9a 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.h
+++ b/TAO/tests/Exposed_Policies/RT_Properties.h
@@ -19,20 +19,20 @@ class RT_Properties
 {
 public:
   // -- Ctor/Dtor --
-  RT_Properties (void);
-  ~RT_Properties (void);
+  RT_Properties ();
+  ~RT_Properties ();
 
   static RT_Properties * read_from (const ACE_TCHAR *file_name);
 
   // -- Accessor Methods --
   void priority (RTCORBA::Priority priority);
-  RTCORBA::Priority priority (void);
+  RTCORBA::Priority priority ();
 
   void priority_bands (const RTCORBA::PriorityBands& priority_bands);
-  const RTCORBA::PriorityBands& priority_bands (void);
+  const RTCORBA::PriorityBands& priority_bands ();
 
   void ior_source (const ACE_TCHAR *s);
-  const ACE_TCHAR* ior_source (void);
+  const ACE_TCHAR* ior_source ();
 
 private:
   RTCORBA::Priority priority_;
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 2e3088390d6..b66b9ae2cdf 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -19,9 +19,9 @@ public:
           Fl_Window* parent);
   // ctor
 
-  ~Client (void);
+  ~Client ();
 
-  void show (void);
+  void show ();
   // Call show on all the window objects
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
@@ -31,8 +31,8 @@ private:
   static void y_cb (Fl_Widget *widget, void* cookie);
   // The callbacks
 
-  void x_changed (void);
-  void y_changed (void);
+  void x_changed ();
+  void y_changed ();
   // The methods for the callbacks
 
 private:
@@ -99,14 +99,14 @@ Client::Client (CORBA::ORB_ptr orb,
   this->y_roller_->step (1);
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   delete x_roller_;
   delete y_roller_;
 }
 
 void
-Client::show (void)
+Client::show ()
 {
   this->x_roller_->show ();
   this->y_roller_->show ();
@@ -127,7 +127,7 @@ Client::y_cb (Fl_Widget*, void* cookie)
 }
 
 void
-Client::x_changed (void)
+Client::x_changed ()
 {
   try
     {
@@ -141,7 +141,7 @@ Client::x_changed (void)
 }
 
 void
-Client::y_changed (void)
+Client::y_changed ()
 {
   try
     {
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 1ae00f711a7..1d75cbd70c9 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -21,7 +21,7 @@ Simple_Server_i::set_y_angle (CORBA::Long y)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -60,7 +60,7 @@ Simple_Window::set_y_angle (CORBA::Long y)
 }
 
 void
-Simple_Window::draw (void)
+Simple_Window::draw ()
 {
   // Based on the CubeView example in the FL toolkit.
 
@@ -86,7 +86,7 @@ Simple_Window::draw (void)
 }
 
 void
-Simple_Window::draw_cube (void)
+Simple_Window::draw_cube ()
 {
   const float ALPHA = 0.5;
 
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index 8ae8098f7a6..62ea39f6dbc 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -28,9 +28,9 @@ public:
 
 private:
   /// from the Fl_Gl_Window...
-  virtual void draw (void);
+  virtual void draw ();
 
-  virtual void draw_cube (void);
+  virtual void draw_cube ();
 
   /// The angles...
   CORBA::Long x_angle_;
@@ -60,7 +60,7 @@ public:
   // = The Simple_Server methods.
   void set_x_angle (CORBA::Long x);
   void set_y_angle (CORBA::Long y);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index 6be7b4ec2a9..060e9a15a57 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -11,18 +11,18 @@ PingObject_i::ping (PingObject_ptr callback)
 }
 
 void
-PingObject_i::pong (void)
+PingObject_i::pong ()
 {
 }
 
 void
-PingObject_i::shutdown (void)
+PingObject_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-PingObject_i::_default_POA (void)
+PingObject_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h
index 809bf32802e..f32efaf14da 100644
--- a/TAO/tests/Faults/ping_i.h
+++ b/TAO/tests/Faults/ping_i.h
@@ -31,10 +31,10 @@ public:
 
   // = The PingObject interface methods
   void ping (PingObject_ptr callback);
-  void pong (void);
-  void shutdown (void);
+  void pong ();
+  void shutdown ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The orb
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index e88d859e42b..bdb07cfb63d 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -64,7 +64,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -105,7 +105,7 @@ Middle_i::shutdown_now (CORBA::Boolean is_clean)
 }
 
 void
-Middle_i::shutdown (void)
+Middle_i::shutdown ()
 {
   try
     {
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
index 884e62ff26d..48b304f79c4 100644
--- a/TAO/tests/Faults/test_i.h
+++ b/TAO/tests/Faults/test_i.h
@@ -55,7 +55,7 @@ public:
 
   void shutdown_now (CORBA::Boolean is_clean);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
@@ -83,7 +83,7 @@ public:
 
   void shutdown_now (CORBA::Boolean is_clean);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 5d3a6d6621c..f1f3f2e03ac 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -27,12 +27,12 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
   poa->set_servant (&this->fd_servant_);
 }
 
-FileImpl::System::~System (void)
+FileImpl::System::~System ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (void)
+FileImpl::System::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -82,19 +82,19 @@ FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa)
 {
 }
 
-FileImpl::Descriptor::~Descriptor (void)
+FileImpl::Descriptor::~Descriptor ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (void)
+FileImpl::Descriptor::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (void)
+FileImpl::Descriptor::fd ()
 {
   //
   // One way of getting our id.
@@ -194,7 +194,7 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (void)
+FileImpl::Descriptor::destroy ()
 {
   // Get the ACE_HANDLE for this object reference
   ACE_HANDLE file_descriptor = this->fd ();
diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h
index 62327714b82..971dc5eb49e 100644
--- a/TAO/tests/File_IO/File_i.h
+++ b/TAO/tests/File_IO/File_i.h
@@ -35,10 +35,10 @@ public:
     Descriptor (PortableServer::POA_ptr poa);
 
     /// Destructor
-    ~Descriptor (void);
+    ~Descriptor ();
 
     /// Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// write buffer to File corresponding to this Descriptor
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
@@ -50,11 +50,11 @@ public:
                                 CORBA::Long whence);
 
     /// closes the file corresponding to the requested ObjectID
-    virtual void destroy (void);
+    virtual void destroy ();
 
   private:
     /// Extracts the ACE_HANDLE from the objectID
-    ACE_HANDLE fd (void);
+    ACE_HANDLE fd ();
 
     PortableServer::POA_var poa_;
   };
@@ -72,10 +72,10 @@ public:
     System (PortableServer::POA_ptr poa);
 
     ///Destructor
-    ~System (void);
+    ~System ();
 
     ///Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// Opens a file ,creates a Descriptor reference with the
     /// ACE_HANDLE and returns that reference
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 5cf199a84e1..73ef4a1ea3a 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -195,7 +195,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp
index c087183bf73..619fedad3b0 100644
--- a/TAO/tests/ForwardOnceUponException/client.cpp
+++ b/TAO/tests/ForwardOnceUponException/client.cpp
@@ -179,7 +179,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/ForwardOnceUponException/test_i.cpp b/TAO/tests/ForwardOnceUponException/test_i.cpp
index c77bd7b2527..3060c08666a 100644
--- a/TAO/tests/ForwardOnceUponException/test_i.cpp
+++ b/TAO/tests/ForwardOnceUponException/test_i.cpp
@@ -39,7 +39,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ForwardOnceUponException/test_i.h b/TAO/tests/ForwardOnceUponException/test_i.h
index 1c617592d51..2ebce1f3da0 100644
--- a/TAO/tests/ForwardOnceUponException/test_i.h
+++ b/TAO/tests/ForwardOnceUponException/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
   int ncalls () const;
 
diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp
index ba98b629398..f795552f152 100644
--- a/TAO/tests/ForwardUponObjectNotExist/client.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp
@@ -58,7 +58,7 @@ public:
   Worker (CORBA::ORB_ptr orb);
 
   /// The actual implementation of the test
-  virtual void run_test (void);
+  virtual void run_test ();
 
   virtual int svc ();
 
@@ -145,7 +145,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -163,7 +163,7 @@ Worker::svc (void)
 }
 
 void
-Worker::run_test (void)
+Worker::run_test ()
 {
   CORBA::Object_var object =
     this->orb_->string_to_object (ior);
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
index 0fd5c7419c4..b14f3393c35 100644
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
@@ -13,7 +13,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.h b/TAO/tests/ForwardUponObjectNotExist/test_i.h
index 71c4495c6a8..78094fdd9cf 100644
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.h
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index c14cc58d77f..3c3094beb75 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -48,7 +48,7 @@ public:
   Worker (CORBA::ORB_ptr orb);
   // Constructor
 
-  virtual void run_test (void);
+  virtual void run_test ();
   // The actual implementation of the test
 
   // = The Task_Base methods
@@ -118,7 +118,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -133,7 +133,7 @@ Worker::svc (void)
 }
 
 void
-Worker::run_test (void)
+Worker::run_test ()
 {
   for (int j = 0; j != niterations; ++j)
     {
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index a5df35f5892..03319fc0b1e 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -12,7 +12,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h
index 71c4495c6a8..78094fdd9cf 100644
--- a/TAO/tests/Forwarding/test_i.h
+++ b/TAO/tests/Forwarding/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index 712826479b7..f7538cf098f 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -12,7 +12,7 @@ Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
index ca33c1b6446..bf995196d7e 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index ff03f1a2de6..04ebeb029e2 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -23,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload)
 
 
 void
-Payload_Receiver::shutdown (void)
+Payload_Receiver::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index d6ba365e769..ccb0aa37661 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
@@ -19,7 +19,7 @@ public:
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   int get_count () const;
 
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index ff03f1a2de6..04ebeb029e2 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -23,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload)
 
 
 void
-Payload_Receiver::shutdown (void)
+Payload_Receiver::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
index 25d0748febd..a2d635f0e69 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
@@ -19,7 +19,7 @@ public:
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   int get_count () const;
 
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index f7f449f47b6..252bde823cc 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -17,11 +17,11 @@ public:
   {
   }
 
-  void simple (void)
+  void simple ()
   {
   }
 
-  void shutdown (void)
+  void shutdown ()
   {
     this->orb_->shutdown ();
   }
@@ -33,7 +33,7 @@ private:
 class Descriptors
 {
 public:
-  Descriptors (void)
+  Descriptors ()
     : min_close_ (0),
       max_close_ (0),
       ok_ (false)
@@ -44,7 +44,7 @@ public:
       }
   }
 
-  int allow_accepts (void)
+  int allow_accepts ()
   {
     cout << "Server: closing " << (this->max_close_ - this->min_close_) + 1
          << " fds" << endl;
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index 2aa6f4a118b..e23098b21c0 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -57,7 +57,7 @@ namespace Test
       : h_ (Hang::_duplicate (h))
     {}
 
-    virtual int svc (void)
+    virtual int svc ()
     {
       try
         {
@@ -114,7 +114,7 @@ namespace Test
       : o_ (CORBA::ORB::_duplicate (o))
     {}
 
-    virtual int svc (void)
+    virtual int svc ()
     {
       try
         {
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index efb6ab0ec87..9f6914e2ab3 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
@@ -8,7 +8,7 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 }
 
 Test::HelloWorld_ptr
-Hello::get_helloworld (void)
+Hello::get_helloworld ()
 {
   HelloWorld *hello_world;
   ACE_NEW_THROW_EX (hello_world,
@@ -25,7 +25,7 @@ Hello::get_helloworld (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h
index dd62206cfef..1d2b0256a54 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.h
+++ b/TAO/tests/ICMG_Any_Bug/Hello.h
@@ -15,9 +15,9 @@ public:
   /// Constructor
   Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
-  virtual Test::HelloWorld_ptr get_helloworld (void);
+  virtual Test::HelloWorld_ptr get_helloworld ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
index 0c67b45ea2b..c15c5f65a2b 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
@@ -1,12 +1,12 @@
 
 #include "HelloWorld.h"
 
-HelloWorld::HelloWorld (void)
+HelloWorld::HelloWorld ()
 {
 }
 
 char *
-HelloWorld::get_string (void)
+HelloWorld::get_string ()
 {
   return CORBA::string_dup ("TAO Any Implementation Works!");
 }
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
index 670eeee37d7..7bcd4dc0e7d 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
@@ -11,10 +11,10 @@ class HelloWorld
   : public virtual POA_Test::HelloWorld
 {
 public:
-  HelloWorld (void);
+  HelloWorld ();
   /// Constructor
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
index 1b8bcc27184..393c0fd77f5 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
@@ -6,13 +6,13 @@ Derived_i::Derived_i (CORBA::ORB_ptr orb)
 }
 
 void
-Derived_i::BaseOp (void)
+Derived_i::BaseOp ()
 {
   ACE_DEBUG ((LM_DEBUG, "BaseOp upcall successful\n"));
 }
 
 void
-Derived_i::shutdown (void)
+Derived_i::shutdown ()
 {
   orb_->shutdown ();
 }
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
index d64d6370536..e180bd801fe 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
@@ -10,8 +10,8 @@ class Derived_i : public virtual POA_Outer::Derived
 public:
   Derived_i (CORBA::ORB_ptr orb);
 
-  virtual void BaseOp (void);
-  virtual void shutdown (void);
+  virtual void BaseOp ();
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/IORTable_Locator/simple_test_i.cpp b/TAO/tests/IORTable_Locator/simple_test_i.cpp
index ff2df5d99e8..a2f552b0d77 100644
--- a/TAO/tests/IORTable_Locator/simple_test_i.cpp
+++ b/TAO/tests/IORTable_Locator/simple_test_i.cpp
@@ -7,7 +7,7 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Test_i::shutdown (void)
+Simple_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/IORTable_Locator/simple_test_i.h b/TAO/tests/IORTable_Locator/simple_test_i.h
index 9918438def1..f005511d554 100644
--- a/TAO/tests/IORTable_Locator/simple_test_i.h
+++ b/TAO/tests/IORTable_Locator/simple_test_i.h
@@ -12,7 +12,7 @@ public:
   Simple_Test_i (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index 12f9468712a..78aa32035c0 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -9,6 +9,6 @@ bogus::~bogus()
 }
 
 void
-bogus::noop (void)
+bogus::noop ()
 {
 }
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
index f46dd98bbe7..2a57d43742f 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
@@ -12,7 +12,7 @@ public:
   bogus ();
   virtual ~bogus ();
 
-  virtual void noop (void);
+  virtual void noop ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/IPV6/Hello.cpp
+++ b/TAO/tests/IPV6/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/IPV6/Hello.h
+++ b/TAO/tests/IPV6/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index 0f1f28137e0..cbe97d5ccca 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -2,12 +2,12 @@
 
 // Constructor
 
-INS_i::INS_i (void)
+INS_i::INS_i ()
 {
 }
 
 // Destructor
-INS_i::~INS_i (void)
+INS_i::~INS_i ()
 {
 }
 
@@ -19,7 +19,7 @@ INS_i::orb (CORBA::ORB_ptr o)
 }
 
 char *
-INS_i::test_ins (void)
+INS_i::test_ins ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Inside Operation\n"));
diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h
index 5065310f172..5c64e55ab56 100644
--- a/TAO/tests/InterOp-Naming/INS_i.h
+++ b/TAO/tests/InterOp-Naming/INS_i.h
@@ -20,13 +20,13 @@ class INS_i : public POA_INS
 {
 public:
   /// Constructor.
-  INS_i (void);
+  INS_i ();
 
   /// Destructor.
-  ~INS_i (void);
+  ~INS_i ();
 
   /// test the INS.
-  char * test_ins (void);
+  char * test_ins ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index a77c39dc331..d1dca7f3a99 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -4,20 +4,20 @@
 #include "ace/OS_NS_stdio.h"
 
 // Constructor.
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : ior_output_file_ (0),
     ins_ (0)
 {
 }
 
 // Destructor.
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
 }
 
 // Parse the command-line arguments and set options.
 int
-Server_i::parse_args (void)
+Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:"));
   int c = 0;
@@ -153,7 +153,7 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   // Run the main event loop for the ORB.
   int result = this->orb_manager_.run ();
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index 69ce69d0084..5a11fc728ac 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -22,10 +22,10 @@ class Server_i
 {
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Destructor.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   int init (int argc,
@@ -35,14 +35,14 @@ public:
   int add_IOR_to_table (CORBA::String_var ior);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 protected:
   /// Servant class
   INS_i servant_;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 714894abd1f..f3f43e49599 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -103,7 +103,7 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
       try
         {
@@ -172,7 +172,7 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
       try
         {
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index ac8630b8ac6..10b2fa7e6dc 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -48,7 +48,7 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
       try
         {
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index 28473ad2c12..ad20d726c35 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -7,7 +7,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index 36c840e09fb..b89f7ffb683 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -24,7 +24,7 @@ public:
   // = The test interface methods.
   CORBA::ULong method (CORBA::ULong work);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
diff --git a/TAO/tests/LongDouble/Global.cpp b/TAO/tests/LongDouble/Global.cpp
index b09e8d927c9..9007c187886 100644
--- a/TAO/tests/LongDouble/Global.cpp
+++ b/TAO/tests/LongDouble/Global.cpp
@@ -1,7 +1,7 @@
 #include "Global.h"
 
 long double
-Global::get_long_double (void)
+Global::get_long_double ()
 {
   return 11777888333.111111109;
 }
diff --git a/TAO/tests/LongDouble/Global.h b/TAO/tests/LongDouble/Global.h
index 5c667cee8c3..bc84dbf9fee 100644
--- a/TAO/tests/LongDouble/Global.h
+++ b/TAO/tests/LongDouble/Global.h
@@ -4,7 +4,7 @@
 class Global
 {
 public:
-  static long double get_long_double (void);
+  static long double get_long_double ();
 };
 
 #endif /* TAO_TEST_GLOBAL_H */
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 74a64d7d924..fbd6a6cff16 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -44,7 +44,7 @@ AMI_Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-AMI_Manager::shutdown (void)
+AMI_Manager::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -63,7 +63,7 @@ Worker::Worker (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
   try
@@ -134,7 +134,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
 }
 
 void
-Controller_Handler::worker_started (void)
+Controller_Handler::worker_started ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
@@ -156,7 +156,7 @@ Controller_Handler::worker_started_excep
 }
 
 void
-Controller_Handler::worker_finished (void)
+Controller_Handler::worker_finished ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index c5ec6f15903..55783b506ff 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -15,7 +15,7 @@ public:
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
                               Test::Controller_ptr controller);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -56,9 +56,9 @@ public:
                       int *pending_replies);
   // Constructor
 
-  virtual void worker_started (void);
+  virtual void worker_started ();
   virtual void worker_started_excep (::Messaging::ExceptionHolder*);
-  virtual void worker_finished (void);
+  virtual void worker_finished ();
   virtual void worker_finished_excep (::Messaging::ExceptionHolder*);
 
 private:
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 5492961d17c..8df632d681a 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -1,6 +1,6 @@
 #include "Controller.h"
 
-Controller::Controller (void)
+Controller::Controller ()
   :  start_count_ (0)
   ,  finish_count_ (0)
 {
@@ -19,7 +19,7 @@ Controller::dump_results ()
 }
 
 void
-Controller::worker_started (void)
+Controller::worker_started ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->start_count_++;
@@ -28,7 +28,7 @@ Controller::worker_started (void)
 }
 
 void
-Controller::worker_finished (void)
+Controller::worker_finished ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->finish_count_++;
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index 5957473e7e4..30150930899 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -7,15 +7,15 @@ class Controller
   : public virtual POA_Test::Controller
 {
 public:
-  Controller (void);
+  Controller ();
   // Constructor
 
-  void dump_results (void);
+  void dump_results ();
   // Print out the results and any errors
 
   // = The skeleton methods
-  virtual void worker_started (void);
-  virtual void worker_finished (void);
+  virtual void worker_started ();
+  virtual void worker_finished ();
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index 4f9923c80fb..c4e19de02a5 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -43,7 +43,7 @@ Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-Manager::shutdown (void)
+Manager::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -61,7 +61,7 @@ Worker::Worker (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
   try
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 8a8c31a580d..6155301c15f 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -16,7 +16,7 @@ public:
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
                               Test::Controller_ptr controller);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index f6ed3bf55db..e5d767ec2d7 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -9,7 +9,7 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
 }
 
 void
-Manager_Handler::start_workers (void)
+Manager_Handler::start_workers ()
 {
   try
     {
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index dfb8c07e11f..6be848eef64 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -14,7 +14,7 @@ public:
   // Constructor
 
   // = The skeleton methods
-  virtual void start_workers (void);
+  virtual void start_workers ();
   virtual void start_workers_excep (::Messaging::ExceptionHolder *holder);
 
 private:
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index ac80f97ad7d..2004d24f72b 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -6,13 +6,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 CORBA::Long
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant\n"));
@@ -22,7 +22,7 @@ Simple_Server_i::remote_call (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h
index 4b9dad413fb..937e4700fd9 100644
--- a/TAO/tests/MProfile/test_i.h
+++ b/TAO/tests/MProfile/test_i.h
@@ -27,12 +27,12 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  CORBA::Long remote_call (void);
+  CORBA::Long remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
index 5a4aa60200a..e2d704d87a8 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -12,13 +12,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 CORBA::ULongLong
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant\n"));
@@ -28,7 +28,7 @@ Simple_Server_i::remote_call (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h
index 8882fd2c91b..822d6e68bd9 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.h
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h
@@ -27,12 +27,12 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  CORBA::ULongLong remote_call (void);
+  CORBA::ULongLong remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index d682c73aadb..04f43f17f9c 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -75,7 +75,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
   :orb_ (0),
    new_poa_var_ (0)
 {
@@ -142,7 +142,7 @@ Manager::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Manager::activate_servant (void)
+Manager::activate_servant ()
 {
   ACE_NEW_THROW_EX (this->servant_locator_,
                     Servant_Locator (this->orb_.in ()),
@@ -168,7 +168,7 @@ Manager::activate_servant (void)
 }
 
 int
-Manager::make_iors_register (void)
+Manager::make_iors_register ()
 {
   // First  server
   CORBA::Object_var object_primary =
@@ -244,7 +244,7 @@ Manager::make_iors_register (void)
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   this->orb_->run ();
 
diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h
index e1700fbaeb6..08cca3999f3 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.h
+++ b/TAO/tests/MProfile_Forwarding/Manager.h
@@ -6,7 +6,7 @@
 class Manager
 {
   public:
-  Manager (void);
+  Manager ();
 
   // Ctor
 
@@ -14,15 +14,15 @@ class Manager
 
   // Initialize the ORB, POA etc.
 
-  int init_register_name_service (void);
+  int init_register_name_service ();
   // Initialize the Name service, tegister the combined IOR with it
 
-  int activate_servant (void);
+  int activate_servant ();
   // Activate the servant etc.
 
-  int make_iors_register (void);
+  int make_iors_register ();
 
-  int run (void);
+  int run ();
   // Run the  ORB event loop..
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index 8ae51e821ed..f34b6906615 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -4,13 +4,13 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   :orb_ (0)
 {
 }
 
 void
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant\n"));
@@ -18,7 +18,7 @@ Simple_Server_i::remote_call (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h
index e42de5db9fb..10164445f01 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.h
+++ b/TAO/tests/MProfile_Forwarding/test_i.h
@@ -28,12 +28,12 @@ public:
   // ctor
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  void remote_call (void);
+  void remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp
index 64c5acf73df..4f1b86398cc 100644
--- a/TAO/tests/MT_BiDir/Client_Task.cpp
+++ b/TAO/tests/MT_BiDir/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/MT_BiDir/Client_Task.h b/TAO/tests/MT_BiDir/Client_Task.h
index f0e94c59e2a..cf414bdc1bd 100644
--- a/TAO/tests/MT_BiDir/Client_Task.h
+++ b/TAO/tests/MT_BiDir/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp
index 900e505506a..751dc660f08 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.cpp
+++ b/TAO/tests/MT_BiDir/Receiver_i.cpp
@@ -1,6 +1,6 @@
 #include "Receiver_i.h"
 
-Receiver_i::Receiver_i (void)
+Receiver_i::Receiver_i ()
   :  message_count_ (0)
   ,  byte_count_ (0)
 {
@@ -16,7 +16,7 @@ Receiver_i::receive_payload (const Receiver::Payload &payload)
 }
 
 CORBA::Long
-Receiver_i::get_event_count (void)
+Receiver_i::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h
index 8f426fb3106..ea27d75337e 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.h
+++ b/TAO/tests/MT_BiDir/Receiver_i.h
@@ -13,11 +13,11 @@ class Receiver_i
 {
 public:
   /// Constructor
-  Receiver_i (void);
+  Receiver_i ();
 
 
   /// Get the number of events that have been received, local method
-  CORBA::Long get_event_count (void);
+  CORBA::Long get_event_count ();
 
   // = The skeleton methods
   virtual void receive_payload (const Receiver::Payload &payload);
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 00b43a9ed7d..262880457aa 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -19,7 +19,7 @@ Sender_i::Sender_i (CORBA::ULong no_clients,
     this->payload_[j] = (j % 256);
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
   delete []this->receivers_;
 }
@@ -49,7 +49,7 @@ Sender_i::receiver_object (Receiver_ptr recv)
 
 
 void
-Sender_i::send_message (void)
+Sender_i::send_message ()
 {
   // NOTE:No synchronization with purpose. Synchrnozing this is
   // going to spoil the whole purpose of this test.
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index a57494d613d..e19766d6b8e 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/Sender_i.h
@@ -20,13 +20,13 @@ public:
   Sender_i (CORBA::ULong no_clients,
             ACE_Manual_Event &event);
 
-  virtual ~Sender_i (void);
+  virtual ~Sender_i ();
 
   // = The skeleton methods
   virtual CORBA::Long receiver_object (Receiver *recv);
 
   /// Public method defined locally
-  void send_message (void);
+  void send_message ();
 
 private:
   /// Synchronizing acces to this class
diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp
index e6b3d3e6fcc..48b6835359c 100644
--- a/TAO/tests/MT_BiDir/Server_Task.cpp
+++ b/TAO/tests/MT_BiDir/Server_Task.cpp
@@ -20,7 +20,7 @@ Server_Task::Server_Task (Sender_i *sender,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Wait for the Event\n"));
 
diff --git a/TAO/tests/MT_BiDir/Server_Task.h b/TAO/tests/MT_BiDir/Server_Task.h
index 3a34b55d44c..71c65b4a4c2 100644
--- a/TAO/tests/MT_BiDir/Server_Task.h
+++ b/TAO/tests/MT_BiDir/Server_Task.h
@@ -30,7 +30,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// The sender object
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index dae352c2acb..2649f1f14be 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -60,7 +60,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (void);
+  void validate_connection ();
   // Validate the connection
 
 private:
@@ -133,7 +133,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (void)
+Client::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -149,7 +149,7 @@ Client::validate_connection (void)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 6bbea2da704..05fd52a0ab6 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -121,7 +121,7 @@ Client::Client (int niterations,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index cca0271c9d0..583c68e2915 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -5,12 +5,12 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Simple_Server_i::test_method (void)
+Simple_Server_i::test_method ()
 {
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
index 5990b2f3642..732e54eaabd 100644
--- a/TAO/tests/MT_Client/test_i.h
+++ b/TAO/tests/MT_Client/test_i.h
@@ -27,9 +27,9 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   // = The Simple_Server methods.
-  void test_method (void);
+  void test_method ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
index f2e376eef0d..490b40f7d92 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
@@ -11,7 +11,7 @@ class  Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf
 {
    public:
       Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb);
-      virtual ~Test_Idl_SharedIntf_i (void);
+      virtual ~Test_Idl_SharedIntf_i ();
 
       virtual void ping ();
       virtual void farewell ();
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
index 5c89d60360a..891214d0c96 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
@@ -12,19 +12,19 @@ Chatter::Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mu
 }
 
 long
-Chatter::nreplies (void)
+Chatter::nreplies ()
 {
   return this->nreplies_;
 }
 
 long
-Chatter::nrequests (void)
+Chatter::nrequests ()
 {
   return this->nrequests_;
 }
 
 int
-Chatter::svc (void)
+Chatter::svc ()
 {
   long nrq = -1;
   try
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
index 224dd5a4e2d..e1b5c909ec5 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
@@ -12,8 +12,8 @@ public:
   Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond);
   virtual int svc ();
   int farewell ();
-  long nrequests (void);
-  long nreplies (void);
+  long nrequests ();
+  long nreplies ();
 public:
   volatile long nrequests_;
   volatile long nreplies_;
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
index c9d1484a04b..7e06796e775 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
@@ -6,7 +6,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n"));
   try
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
index cfaaf75e7ec..c5b9fc8c714 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
@@ -21,7 +21,7 @@ Test_Idl_SharedIntf_i::set_upper (const char *ior)
 }
 
 void
-Test_Idl_SharedIntf_i::do_upcall (void)
+Test_Idl_SharedIntf_i::do_upcall ()
 {
    ACE_DEBUG((LM_DEBUG,"(%P|%t) Test_Idl_SharedIntf::do_upcall called\n"));
 
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
index a304d41726a..5536154473f 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
@@ -11,12 +11,12 @@ class  Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf
 {
 public:
   Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb);
-  virtual ~Test_Idl_SharedIntf_i (void);
+  virtual ~Test_Idl_SharedIntf_i ();
   void set_upper (const char * ior);
 
-  virtual void do_upcall (void);
-  virtual void ping (void);
-  virtual void farewell (void);
+  virtual void do_upcall ();
+  virtual void ping ();
+  virtual void farewell ();
 private:
   CORBA::String_var upper_ior;
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/MT_NoUpcall_Connect/client.cpp b/TAO/tests/MT_NoUpcall_Connect/client.cpp
index e954f4735bf..7da39d94eb6 100644
--- a/TAO/tests/MT_NoUpcall_Connect/client.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/client.cpp
@@ -17,7 +17,7 @@ ACE_Time_Value ping_end (0,0);
 class SharedIntfCB : public POA_Test_Idl::AMI_SharedIntfHandler
 {
 public:
-  void ping (void)
+  void ping ()
   {
     ACE_DEBUG ((LM_DEBUG, "ping returned\n"));
     ping_end = ping_end.now ();
@@ -29,7 +29,7 @@ public:
     ping_end = ping_end.now ();
   }
 
-  void do_upcall (void)
+  void do_upcall ()
   {
     ACE_DEBUG ((LM_DEBUG, "upcall returned\n"));
     upcall_end = upcall_end.now ();
diff --git a/TAO/tests/MT_NoUpcall_Connect/server.cpp b/TAO/tests/MT_NoUpcall_Connect/server.cpp
index d750cb09e83..240e2b73736 100644
--- a/TAO/tests/MT_NoUpcall_Connect/server.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/server.cpp
@@ -13,7 +13,7 @@ CORBA::ORB_var orb_;
 class Worker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n"));
     try
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 99e4e4bbf33..eed467c5c16 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -138,7 +138,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index 811469bdcca..28032bad85b 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index c43b52cb2b5..c32815919d0 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -40,7 +40,7 @@ Client_Task::too_big_difference_calls () const
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int successful_calls = 0;
   int timed_out_calls = 0;
@@ -101,7 +101,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   try
     {
@@ -117,7 +117,7 @@ Client_Task::validate_connection (void)
 }
 
 int
-Client_Task::one_iteration (void)
+Client_Task::one_iteration ()
 {
   try
     {
diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h
index 9bde5efdf45..7bc86ce3050 100644
--- a/TAO/tests/MT_Timeout/Client_Task.h
+++ b/TAO/tests/MT_Timeout/Client_Task.h
@@ -48,14 +48,14 @@ public:
   int too_big_difference_calls () const;
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Run one iteration of the test
-  int one_iteration (void);
+  int one_iteration ();
 
   /// Make sure that the thread has a connection available
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// A reference to the ORB
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index 0b0503d31c5..0e0b4169136 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -11,7 +11,7 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Timeout/Server_Task.h b/TAO/tests/MT_Timeout/Server_Task.h
index 7890d0970e2..0128d2bc480 100644
--- a/TAO/tests/MT_Timeout/Server_Task.h
+++ b/TAO/tests/MT_Timeout/Server_Task.h
@@ -20,7 +20,7 @@ public:
                const ACE_Time_Value &running_time);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index 898b31179ed..ee7114f22ec 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -17,7 +17,7 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds)
 }
 
 void
-Sleep_Service::shutdown (void)
+Sleep_Service::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index bf4021284fa..d5d2f3813f3 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual void go_to_sleep (CORBA::ULong microseconds);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
index 2ee2f7a2ada..c9347ae5e33 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
@@ -87,7 +87,7 @@ Test_i::report (
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_.in ()))
   {
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
index 2afce180a26..5f7acc1211b 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
@@ -36,7 +36,7 @@ public:
   virtual void report (
     const char * msg);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
index e74ef70b9c2..c8a07d39212 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
@@ -29,7 +29,7 @@ public:
     : orb_ (orb)
   {}
 
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 58ba868e616..a28e61db52b 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -11,7 +11,7 @@ Collocation_Tester::Collocation_Tester (CORBA::Object_ptr object)
   this->object_ = CORBA::Object::_duplicate (object);
 }
 
-Collocation_Tester::~Collocation_Tester (void)
+Collocation_Tester::~Collocation_Tester ()
 {
   // No-Op.
 }
@@ -36,7 +36,7 @@ Collocation_Tester::match_answer (const char *actual_answer,
 }
 
 int
-Collocation_Tester::test_top (void)
+Collocation_Tester::test_top ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<TOP>-------------------------------\n")));
@@ -70,7 +70,7 @@ Collocation_Tester::test_top (void)
 }
 
 int
-Collocation_Tester::test_right (void)
+Collocation_Tester::test_right ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n")));
@@ -109,7 +109,7 @@ Collocation_Tester::test_right (void)
 
 
 int
-Collocation_Tester::test_left (void)
+Collocation_Tester::test_left ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<LEFT>-------------------------------\n")));
@@ -149,7 +149,7 @@ Collocation_Tester::test_left (void)
 
 
 int
-Collocation_Tester::test_bottom (void)
+Collocation_Tester::test_bottom ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n")));
@@ -196,7 +196,7 @@ Collocation_Tester::test_bottom (void)
 }
 
 void
-Collocation_Tester::shutdown (void)
+Collocation_Tester::shutdown ()
 {
   Multiple::Top_var top =
     Multiple::Top::_narrow (this->object_.in ());
@@ -215,7 +215,7 @@ Collocation_Tester::shutdown (void)
 }
 
 void
-Collocation_Tester::run (void)
+Collocation_Tester::run ()
 {
   int failure_num =   this->test_top ();
 
diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h
index fc250810992..d36740def60 100644
--- a/TAO/tests/Multiple/Collocation_Tester.h
+++ b/TAO/tests/Multiple/Collocation_Tester.h
@@ -34,7 +34,7 @@ public:
 
   // -- Command --
   /// Runs the test.
-  void run (void);
+  void run ();
 
 
 private:
@@ -42,19 +42,19 @@ private:
 
   /// Tests the method accessible thru the
   /// Top interface.
-  int  test_top (void);
+  int  test_top ();
 
   /// Tests the method accessible thru the
   /// Right interface.
-  int test_right (void);
+  int test_right ();
 
   /// Tests the method accessible thru the
   /// Left interface.
-  int test_left (void);
+  int test_left ();
 
   /// Tests the method accessible thru the
   /// Bottom interface.
-  int test_bottom (void);
+  int test_bottom ();
 
   /**
    * This method tests wether the answer obtained
@@ -67,7 +67,7 @@ private:
                      const char *right_answer,
                      const char *method_name);
 
-  void shutdown (void);
+  void shutdown ();
 private:
   CORBA::Object_var object_;
 };
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index 29b3805061f..1380efeb323 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -10,7 +10,7 @@ Bottom_Impl::Bottom_Impl (CORBA::ORB_ptr orb)
   this->orb_ = CORBA::ORB::_duplicate (orb);
 }
 
-Bottom_Impl::~Bottom_Impl (void)
+Bottom_Impl::~Bottom_Impl ()
 {
   // No-Op.
 }
@@ -40,7 +40,7 @@ Bottom_Impl::bottom_quote ( )
 }
 
 void
-Bottom_Impl::shutdown (void)
+Bottom_Impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -55,13 +55,13 @@ Delegated_Bottom_Impl::Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate,
   this->orb_ = CORBA::ORB::_duplicate (orb);
 }
 
-Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void)
+Delegated_Bottom_Impl::~Delegated_Bottom_Impl ()
 {
   // No-Op.
 }
 
 char *
-Delegated_Bottom_Impl::top_quote (void)
+Delegated_Bottom_Impl::top_quote ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <top_quote>\n")));
@@ -72,7 +72,7 @@ Delegated_Bottom_Impl::top_quote (void)
 }
 
 char *
-Delegated_Bottom_Impl::left_quote (void)
+Delegated_Bottom_Impl::left_quote ()
 {
     ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <left_quote>\n")));
@@ -83,7 +83,7 @@ Delegated_Bottom_Impl::left_quote (void)
 }
 
 char *
-Delegated_Bottom_Impl::right_quote (void)
+Delegated_Bottom_Impl::right_quote ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <right_quote>\n")));
@@ -94,7 +94,7 @@ Delegated_Bottom_Impl::right_quote (void)
 }
 
 char *
-Delegated_Bottom_Impl::bottom_quote (void)
+Delegated_Bottom_Impl::bottom_quote ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <bottom_quote>\n")));
@@ -105,7 +105,7 @@ Delegated_Bottom_Impl::bottom_quote (void)
 }
 
 void
-Delegated_Bottom_Impl::shutdown (void)
+Delegated_Bottom_Impl::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating Shut-Down.\n")));
diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h
index ae7d72bd49b..67a48bce557 100644
--- a/TAO/tests/Multiple/Multiple_Impl.h
+++ b/TAO/tests/Multiple/Multiple_Impl.h
@@ -28,18 +28,18 @@ class Bottom_Impl : public virtual POA_Multiple::Bottom
 public:
   // Ctor-Dtor
   Bottom_Impl (CORBA::ORB_ptr orb);
-  virtual ~Bottom_Impl (void);
+  virtual ~Bottom_Impl ();
 
   // IDL Interface Methods
-  virtual char * top_quote (void);
+  virtual char * top_quote ();
 
-  virtual char * left_quote (void);
+  virtual char * left_quote ();
 
-  virtual char * right_quote (void);
+  virtual char * right_quote ();
 
-  virtual char * bottom_quote (void);
+  virtual char * bottom_quote ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
 };
@@ -59,15 +59,15 @@ class Delegated_Bottom_Impl : public virtual POA_Multiple::Bottom
 public:
   // Ctor-Dtor
   Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate, CORBA::ORB_ptr orb);
-  virtual ~Delegated_Bottom_Impl (void);
+  virtual ~Delegated_Bottom_Impl ();
 
   // IDL Interface Methods.
-  virtual char * top_quote (void);
-  virtual char * left_quote (void);
-  virtual char * right_quote (void);
-  virtual char * bottom_quote (void);
+  virtual char * top_quote ();
+  virtual char * left_quote ();
+  virtual char * right_quote ();
+  virtual char * bottom_quote ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   Multiple::Bottom_var delegate_;
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index de6f2e48629..bc3da18e0c0 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -3,21 +3,21 @@
 class Multiple_Inheritance_i : public POA_D
 {
 public:
-  Multiple_Inheritance_i (void);
+  Multiple_Inheritance_i ();
 
-  virtual char* method1 (void)
+  virtual char* method1 ()
     {
       return CORBA::string_dup ("method1");
     }
-  virtual char* method2 (void)
+  virtual char* method2 ()
     {
       return CORBA::string_dup ("method2");
     }
-  virtual char* method3 (void)
+  virtual char* method3 ()
     {
       return CORBA::string_dup ("method3");
     }
-  virtual char* method4 (void)
+  virtual char* method4 ()
     {
       return CORBA::string_dup ("method4");
     }
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index aae19ba1755..1a0d87596da 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -6,7 +6,7 @@
 
 static ACE_TCHAR *ior_output_file = 0;
 
-Multiple_Inheritance_i::Multiple_Inheritance_i (void)
+Multiple_Inheritance_i::Multiple_Inheritance_i ()
 {
   // Sun/CC 5.0 crashes if there is no explicit default
   // constructor
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
index 9c89eb5b0f1..d21f93acc63 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
@@ -19,7 +19,7 @@ Hello::set_string (const char * s)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
index 206dc46fb2c..2d9575e6c4c 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
@@ -14,11 +14,11 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
   virtual void set_string (const char * s);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
index 362d4ab9cb3..9865948dd48 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
@@ -173,7 +173,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
index b178b81bafc..b9ff161ef75 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
@@ -50,7 +50,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h
index b2648bc16e9..0fd34da8e43 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index d8e2e8da78f..4858f270922 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -64,7 +64,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (void);
+  void validate_connection ();
   // Validate the connection
 
 private:
@@ -184,7 +184,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (void)
+Client::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -200,7 +200,7 @@ Client::validate_connection (void)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 5005fe0a71a..69794be33b0 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -93,7 +93,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (void);
+  void validate_connection ();
   // Validate the connection
 
 private:
@@ -208,7 +208,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -232,7 +232,7 @@ SelfClient::SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server,
 }
 
 void
-SelfClient::validate_connection (void)
+SelfClient::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -250,7 +250,7 @@ SelfClient::validate_connection (void)
 }
 
 int
-SelfClient::svc (void)
+SelfClient::svc ()
 {
   try
     {
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
index 913354f274d..e83f527b9cf 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -18,7 +18,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   // We dont shutdown the ORB. We allow the server to go away as it
   // wants.
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h
index ce21c4429cc..f9db7f0f4a2 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.h
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index 351c094666b..c4f28592684 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Receiver_ptr receiver,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
   Test::Payload payload (this->event_size_);
diff --git a/TAO/tests/Muxing/Client_Task.h b/TAO/tests/Muxing/Client_Task.h
index 6f55129af67..6b621d0ba6d 100644
--- a/TAO/tests/Muxing/Client_Task.h
+++ b/TAO/tests/Muxing/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index 18afcfde8b4..630c1be966d 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -27,14 +27,14 @@ Receiver::receive_data (const Test::Payload &payload)
 }
 
 CORBA::Long
-Receiver::get_event_count (void)
+Receiver::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
 }
 
 void
-Receiver::shutdown (void)
+Receiver::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index 19ccb9cad52..d49be298f12 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -22,13 +22,13 @@ public:
   Receiver (CORBA::ORB_ptr orb);
 
   /// Print out the results
-  void dump_results (void);
+  void dump_results ();
 
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &payload);
-  virtual CORBA::Long get_event_count (void);
+  virtual CORBA::Long get_event_count ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index c0091912959..d23f910e669 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Muxing/Server_Task.h b/TAO/tests/Muxing/Server_Task.h
index 1e2a05604e1..a731a281d3a 100644
--- a/TAO/tests/Muxing/Server_Task.h
+++ b/TAO/tests/Muxing/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp
index dfa3792ac03..d776d22610b 100644
--- a/TAO/tests/Native_Exceptions/test_i.cpp
+++ b/TAO/tests/Native_Exceptions/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::test_raise (CORBA::Long)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Native_Exceptions/test_i.h b/TAO/tests/Native_Exceptions/test_i.h
index a92d86fda64..c4c25e17e76 100644
--- a/TAO/tests/Native_Exceptions/test_i.h
+++ b/TAO/tests/Native_Exceptions/test_i.h
@@ -31,7 +31,7 @@ public:
 
   CORBA::Long test_raise (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index 961ccb58ae5..b684394d4c1 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -17,12 +17,12 @@
 #define MAX_HOP_COUNT 20
 
 // CTOR
-MT_Object_i::MT_Object_i (void)
+MT_Object_i::MT_Object_i ()
 {
 }
 
 // DTOR
-MT_Object_i::~MT_Object_i (void)
+MT_Object_i::~MT_Object_i ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index d1f4783af64..947e14c43f7 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -25,10 +25,10 @@ class MT_Object_i : public POA_MT_Object
 {
 public:
   /// Constructor.
-  MT_Object_i (void);
+  MT_Object_i ();
 
   /// Destructor.
-  virtual ~MT_Object_i (void);
+  virtual ~MT_Object_i ();
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
                              MT_Object_ptr partner);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index fbaa94d8acc..74e9b576e00 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -31,7 +31,7 @@ MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv,
 }
 
 int
-MT_Client_Task::svc (void)
+MT_Client_Task::svc ()
 {
   if (this->mT_Client_.init (this->argc_,
                              this->argv_,
@@ -79,7 +79,7 @@ MT_Client::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-MT_Client::parse_args (void)
+MT_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:g:h:i:n:s:"));
   int c;
@@ -141,7 +141,7 @@ MT_Client::parse_args (void)
 }
 
 int
-MT_Client::run (void)
+MT_Client::run ()
 {
   try
     {
@@ -169,7 +169,7 @@ MT_Client::run (void)
   return 0;
 }
 
-MT_Client::~MT_Client (void)
+MT_Client::~MT_Client ()
 {
   if (this->object_key_ != 0)
     ACE_Allocator::instance ()->free (this->object_key_);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index df1b9a7b8d0..8828e19463f 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -35,11 +35,11 @@ class MT_Client
 {
 public:
   /// = Constructor and destructor.
-  MT_Client (void);
-  ~MT_Client (void);
+  MT_Client ();
+  ~MT_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc,
@@ -51,7 +51,7 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index e166bfcfe90..0d911aa049a 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -30,7 +30,7 @@ MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
 }
 
 int
-MT_Server_Task::svc (void)
+MT_Server_Task::svc ()
 {
   if (this->mT_Server_.init (this->argc_,
                              this->argv_,
@@ -76,7 +76,7 @@ MT_Server::read_ior (ACE_TCHAR *filename)
 
 
 int
-MT_Server::parse_args (void)
+MT_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d:f:g:h:i:n:s:"));
   int c;
@@ -223,7 +223,7 @@ MT_Server::run ()
   return 0;
 }
 
-MT_Server::~MT_Server (void)
+MT_Server::~MT_Server ()
 {
   if (this->object_key_ != 0)
     ACE_OS::free (this->object_key_);
@@ -241,7 +241,7 @@ MT_Server::~MT_Server (void)
 
 
 int
-MT_Server::run_ORB_briefly (void)
+MT_Server::run_ORB_briefly ()
 {
   if (this->iterations_ > 0)
     {
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index ac9b5e5db30..db8bc482cf0 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -41,7 +41,7 @@ public:
   MT_Server ();
 
   /// Destructor
-  ~MT_Server (void);
+  ~MT_Server ();
 
   /// Initialize the MT_Server state - parsing arguments and ...
   int init (int argc,
@@ -49,17 +49,17 @@ public:
             TAO_ORB_Manager* orb_manager_ptr);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
   /// Just run it briefly
-  int run_ORB_briefly (void);
+  int run_ORB_briefly ();
 
 private:
   /// reading the IOR of mt object in
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Key of the object
   char *object_key_;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index 8c4ce3fcc17..9609b0bf950 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -32,7 +32,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
@@ -54,13 +54,13 @@ private:
   ACE_Sig_Handler shutdown_;
 };
 
-MT_Object_Server::MT_Object_Server (void)
+MT_Object_Server::MT_Object_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-MT_Object_Server::parse_args (void)
+MT_Object_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:m"));
   int c;
@@ -132,7 +132,7 @@ MT_Object_Server::init (int argc, ACE_TCHAR** argv)
 
 
 int
-MT_Object_Server::run (void)
+MT_Object_Server::run ()
 {
   CORBA::ORB_var orb = this->orb_manager_.orb ();
   TestShutdown killer (orb.in ());
@@ -146,7 +146,7 @@ MT_Object_Server::run (void)
   return 0;
 }
 
-MT_Object_Server::~MT_Object_Server (void)
+MT_Object_Server::~MT_Object_Server ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index b1d934cfa9c..3a332f35cef 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -35,21 +35,21 @@ class MT_Object_Server
 {
 public:
   /// Default constructor
-  MT_Object_Server (void);
+  MT_Object_Server ();
 
   /// Destructor
-  ~MT_Object_Server (void);
+  ~MT_Object_Server ();
 
   /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the IOR of the object A.
   FILE* ior_output_file_;
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 3195d21086d..1f251ce3521 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -19,7 +19,7 @@ class Client_Task
 public:
   Client_Task (client_ptr c,
                server_ptr s);
-  int svc (void);
+  int svc ();
 
 private:
   client_var client_;
@@ -34,7 +34,7 @@ Client_Task::Client_Task (client_ptr c,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 1aa13a59714..d5ef9e815ba 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -15,7 +15,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   Server_Task (CORBA::ORB_ptr orb);
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var orb_;
@@ -27,7 +27,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 7c72d7f57aa..93acf38c13f 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -34,7 +34,7 @@ server_i::ping (CORBA::UShort time_to_live)
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index 6b070844b0b..4d971d90ed0 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -11,7 +11,7 @@ public:
   void start (client_ptr c,
               CORBA::UShort time_to_live);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   int quiet_;
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 3210aa23441..7d64e03ee3c 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -22,7 +22,7 @@ class Client_Task
 public:
   Client_Task (client_ptr c,
                server_ptr s);
-  int svc (void);
+  int svc ();
 
 private:
   client_var client_;
@@ -37,7 +37,7 @@ Client_Task::Client_Task (client_ptr c,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index e19f51f376a..30cc8292da3 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -22,12 +22,12 @@ Initiator_i::Initiator_i (Object_A_ptr object_A_ptr,
 }
 
 // DTOR
-Initiator_i::~Initiator_i (void)
+Initiator_i::~Initiator_i ()
 {
 }
 
 void
-Initiator_i::foo_object_B (void)
+Initiator_i::foo_object_B ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index 9c99bfe59d8..0e8cd6bb58e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -29,9 +29,9 @@ public:
                   Object_B_ptr object_B_ptr);
 
   /// Destructor.
-  virtual ~Initiator_i (void);
+  virtual ~Initiator_i ();
 
-  virtual void foo_object_B (void);
+  virtual void foo_object_B ();
 
 private:
   /// reference to object A
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 41d91c21896..94d48a82e4b 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -16,13 +16,13 @@
 #include "ace/Reactor.h"
 
 // CTOR
-Object_A_i::Object_A_i (void)
+Object_A_i::Object_A_i ()
   : finish_two_way_call_ (0)
 {
 }
 
 // DTOR
-Object_A_i::~Object_A_i (void)
+Object_A_i::~Object_A_i ()
 {
 }
 
@@ -45,13 +45,13 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr)
 }
 
 void
-Object_A_i::finish (void)
+Object_A_i::finish ()
 {
   this->finish_two_way_call_ = 1;
 }
 
 void
-Object_A_i::shutdown (void)
+Object_A_i::shutdown ()
 {
   int argc = 0;
   ACE_TCHAR **argv = 0;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 7bd596bfc10..85259bae3c9 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -25,16 +25,16 @@ class Object_A_i : public POA_Object_A
 {
 public:
   /// Constructor.
-  Object_A_i (void);
+  Object_A_i ();
 
   /// Destructor.
-  virtual ~Object_A_i (void);
+  virtual ~Object_A_i ();
 
   virtual void foo (Initiator_ptr theInitiator_ptr);
 
-  virtual void finish (void);
+  virtual void finish ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   unsigned long finish_two_way_call_;
 };
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 826349cd30e..99b748b2862 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -16,12 +16,12 @@
 #include "ace/OS_NS_unistd.h"
 
 // CTOR
-Object_B_i::Object_B_i (void)
+Object_B_i::Object_B_i ()
 {
 }
 
 // DTOR
-Object_B_i::~Object_B_i (void)
+Object_B_i::~Object_B_i ()
 {
 }
 
@@ -51,7 +51,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr)
 }
 
 void
-Object_B_i::shutdown (void)
+Object_B_i::shutdown ()
 {
   int argc = 0;
   ACE_TCHAR **argv = 0;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 2a6f7e93cfd..86e48064f8e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -25,14 +25,14 @@ class Object_B_i : public POA_Object_B
 {
 public:
   /// Constructor.
-  Object_B_i (void);
+  Object_B_i ();
 
   /// Destructor.
-  virtual ~Object_B_i (void);
+  virtual ~Object_B_i ();
 
   virtual void foo(Object_A_ptr theObject_A_ptr);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 #endif /* OBJECT_B_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 079ff88d929..3adc814fe05 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -17,7 +17,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 
-Initiator_Server::Initiator_Server (void)
+Initiator_Server::Initiator_Server ()
   : object_A_key_ (0),
     object_B_key_ (0),
     object_A_var_ (0),
@@ -68,7 +68,7 @@ Initiator_Server::read_ior (ACE_TCHAR *filename, unsigned int A_B)
 
 
 int
-Initiator_Server::parse_args (void)
+Initiator_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:g:"));
   int c, result;
@@ -214,7 +214,7 @@ Initiator_Server::init (int argc,
 
 
 int
-Initiator_Server::run (void)
+Initiator_Server::run ()
 {
   try
     {
@@ -243,7 +243,7 @@ Initiator_Server::run (void)
   return 0;
 }
 
-Initiator_Server::~Initiator_Server (void)
+Initiator_Server::~Initiator_Server ()
 {
   if (this->object_A_key_ != 0)
     ACE_Allocator::instance ()->free (this->object_A_key_);
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 23324226af3..ba7c39fe1a5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -35,10 +35,10 @@ class Initiator_Server
 {
 public:
   /// Default constructor
-  Initiator_Server (void);
+  Initiator_Server ();
 
   /// Destructor
-  ~Initiator_Server (void);
+  ~Initiator_Server ();
 
   /// read in the IOR's for the two objects A and B
   int read_ior (ACE_TCHAR *filename, unsigned int A_B);
@@ -48,11 +48,11 @@ public:
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The IOR of object A
   char * object_A_key_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index 614c3f63ed1..88246d49b64 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -15,13 +15,13 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-Object_A_Server::Object_A_Server (void)
+Object_A_Server::Object_A_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-Object_A_Server::parse_args (void)
+Object_A_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:"));
   int c;
@@ -88,7 +88,7 @@ Object_A_Server::init (int argc,
 
 
 int
-Object_A_Server::run (void)
+Object_A_Server::run ()
 {
   int r = this->orb_manager_.run ();
 
@@ -99,7 +99,7 @@ Object_A_Server::run (void)
   return 0;}
 
 
-Object_A_Server::~Object_A_Server (void)
+Object_A_Server::~Object_A_Server ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index b4f312cad07..21f8d5ccd18 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -35,21 +35,21 @@ class Object_A_Server
 {
 public:
   /// Default constructor
-  Object_A_Server (void);
+  Object_A_Server ();
 
   /// Destructor
-  ~Object_A_Server (void);
+  ~Object_A_Server ();
 
   /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the IOR of the object A.
   FILE* ior_output_file_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index 43f07d30a43..0b715c8a5ba 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -15,13 +15,13 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-Object_B_Server::Object_B_Server (void)
+Object_B_Server::Object_B_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-Object_B_Server::parse_args (void)
+Object_B_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:"));
   int c;
@@ -87,7 +87,7 @@ Object_B_Server::init (int argc,
 
 
 int
-Object_B_Server::run (void)
+Object_B_Server::run ()
 {
   int result = this->orb_manager_.run ();
 
@@ -99,7 +99,7 @@ Object_B_Server::run (void)
   return 0;
 }
 
-Object_B_Server::~Object_B_Server (void)
+Object_B_Server::~Object_B_Server ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 43cfdb100b7..28f33c1469e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -35,21 +35,21 @@ class Object_B_Server
 {
 public:
   /// Default constructor
-  Object_B_Server (void);
+  Object_B_Server ();
 
   /// Destructor
-  ~Object_B_Server (void);
+  ~Object_B_Server ();
 
   /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the IOR of the object A.
   FILE* ior_output_file_;
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index 9a155f6f8ba..c4b8128ba99 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -96,7 +96,7 @@ server_i::no_op (client_ptr remote_partner,
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -153,7 +153,7 @@ client_i::oneway_no_op (const act &act_for_iterations,
 }
 
 void
-client_i::twoway_no_op (void)
+client_i::twoway_no_op ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "client_i::twoway_no_op\n"));
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index 58d9362d0f7..dbb8a69a574 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -16,7 +16,7 @@ public:
               const act &act_for_iterations,
               const act &act_for_flag);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -33,7 +33,7 @@ public:
   void oneway_no_op (const act &act_for_iterations,
                      const act &act_for_flag);
 
-  void twoway_no_op (void);
+  void twoway_no_op ();
 
 private:
   server_var remote_partner_;
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index abdf7c27e63..2704f3b026d 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -11,7 +11,7 @@
 class Crasher : public ACE_Event_Handler
 {
 public:
-  Crasher (void);
+  Crasher ();
 
   virtual int handle_timeout (ACE_Time_Value const & current_time,
                               void const * arg);
@@ -39,7 +39,7 @@ Client_Peer::callme(Test::Peer_ptr callback,
 }
 
 void
-Client_Peer::crash(void)
+Client_Peer::crash()
 {
   Crasher * crasher = new Crasher;
 
@@ -49,11 +49,11 @@ Client_Peer::crash(void)
 }
 
 void
-Client_Peer::noop(void)
+Client_Peer::noop()
 {
 }
 
-Crasher::Crasher(void)
+Crasher::Crasher()
 {
 }
 
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
index ffab60484a0..95430ca94e9 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
@@ -17,8 +17,8 @@ public:
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
               Test::Payload const &);
-  void crash(void);
-  void noop(void);
+  void crash();
+  void noop();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
index 8021d09bd0f..090ae91b3ec 100644
--- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
@@ -6,7 +6,7 @@
 #include "Clock_Ticks.h"
 
 long
-Clock_Ticks::get_hz (void)
+Clock_Ticks::get_hz ()
 {
 #if defined(_SC_CLK_TCK)
   long r = ACE_OS::sysconf(_SC_CLK_TCK);
@@ -24,7 +24,7 @@ Clock_Ticks::get_hz (void)
 }
 
 int
-Clock_Ticks::get_usecs_per_tick (void)
+Clock_Ticks::get_usecs_per_tick ()
 {
   return 1000000 / get_hz ();
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
index 1c002d2021a..1bd6e06fc69 100644
--- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
+++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
@@ -9,10 +9,10 @@
 namespace Clock_Ticks
 {
   /// Return the number of clock ticks per second
-  long get_hz (void);
+  long get_hz ();
 
   /// Return the number of microseconds per tick
-  int get_usecs_per_tick (void);
+  int get_usecs_per_tick ();
 }
 
 #endif /* Clock_Ticks__h_ */
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
index 3e47cfa1d28..381072262f8 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
@@ -54,12 +54,12 @@ Server_Peer::callme(Test::Peer_ptr callback,
 }
 
 void
-Server_Peer::crash(void)
+Server_Peer::crash()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-Server_Peer::noop(void)
+Server_Peer::noop()
 {
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
index 5fa7b4f5815..9ae7da6cb14 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
@@ -19,8 +19,8 @@ public:
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
               Test::Payload const & extra_data);
-  void crash(void);
-  void noop(void);
+  void crash();
+  void noop();
 
 private:
   unsigned int seed_;
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index 80cf170c64d..0bd61bb3908 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -129,7 +129,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
index fd5f7c68fb2..bc79e845075 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
@@ -6,12 +6,12 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Server_i::test_method (void)
+Simple_Server_i::test_method ()
 {
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
index e9a304aa039..9fd981fa5b1 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
@@ -16,9 +16,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void test_method (void);
+  void test_method ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index 28a4c1b7463..ba67d2f06f7 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -51,7 +51,7 @@ Test_impl::get_vb()
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h
index 774090a9c7e..efa989f4ad8 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.h
+++ b/TAO/tests/OBV/Any/AnyS_impl.h
@@ -30,9 +30,9 @@ public:
   virtual CORBA::Any * get_something (
       CORBA::Boolean need_vb);
 
-  virtual OBV_AnyTest::VB * get_vb (void);
+  virtual OBV_AnyTest::VB * get_vb ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index 41808959dc7..ef1e47b3672 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -12,7 +12,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int result = 0;
   try
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.h b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
index 7239ed526b1..cc9f65a040f 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
@@ -23,7 +23,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void dump_node (BaseNode *bn, int indent);
 
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index fd02bf6fec2..a23aab2b223 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -18,7 +18,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
index a921535a4eb..e203ccfd62e 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
@@ -36,7 +36,7 @@ Test_impl::reflect (TreeController * tc)
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
index 47ea5de756d..32d544194c1 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
@@ -32,7 +32,7 @@ public:
   virtual TreeController * reflect (
       TreeController * tc);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index c0cde67dcba..1fede0aa5cc 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -37,7 +37,7 @@ Value2_init_impl::create (
 }
 
 CORBA::ValueBase *
-Value2_init_impl::create_for_unmarshal (void)
+Value2_init_impl::create_for_unmarshal ()
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index 2eb16242ff3..08b40df990c 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -47,7 +47,7 @@ public:
       );
 
 public:
-  virtual CORBA::ValueBase * create_for_unmarshal (void);
+  virtual CORBA::ValueBase * create_for_unmarshal ();
 };
 
 #endif /* TAO_FACTORY_FACTORY_C_IMPL_H */
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index 169eaf05e43..711eb446d8e 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -7,7 +7,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 }
 
 OBV_FactoryTest::BaseValue *
-Test_impl::get_base_value (void)
+Test_impl::get_base_value ()
 {
   OBV_FactoryTest::BaseValue* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -18,7 +18,7 @@ Test_impl::get_base_value (void)
 }
 
 OBV_FactoryTest::Value1 *
-Test_impl::get_value1 (void)
+Test_impl::get_value1 ()
 {
   OBV_FactoryTest::Value1* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -29,7 +29,7 @@ Test_impl::get_value1 (void)
 }
 
 OBV_FactoryTest::Value2 *
-Test_impl::get_value2 (void)
+Test_impl::get_value2 ()
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -40,7 +40,7 @@ Test_impl::get_value2 (void)
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 8556cc81ebb..c963f4c3fa2 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -27,13 +27,13 @@ public:
   /// ctor
   Test_impl (CORBA::ORB_ptr orb);
 
-  virtual OBV_FactoryTest::BaseValue * get_base_value (void);
+  virtual OBV_FactoryTest::BaseValue * get_base_value ();
 
-  virtual OBV_FactoryTest::Value1 * get_value1 (void);
+  virtual OBV_FactoryTest::Value1 * get_value1 ();
 
-  virtual OBV_FactoryTest::Value2 * get_value2 (void);
+  virtual OBV_FactoryTest::Value2 * get_value2 ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index ad571a516a8..446c475e0b9 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -37,7 +37,7 @@ Test_impl::reflect (TreeController * tc)
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h
index ddddbe5948f..2dbb5b9fce2 100644
--- a/TAO/tests/OBV/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Forward/Test_impl.h
@@ -30,7 +30,7 @@ public:
   virtual TreeController * reflect (
       TreeController * tc);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/Indirection/Factory.cpp b/TAO/tests/OBV/Indirection/Factory.cpp
index 56e0938bd73..8a827f7e66b 100644
--- a/TAO/tests/OBV/Indirection/Factory.cpp
+++ b/TAO/tests/OBV/Indirection/Factory.cpp
@@ -9,7 +9,7 @@ NodeFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-NodeFactory::create_for_unmarshal (void)
+NodeFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
@@ -29,7 +29,7 @@ BoxedValueFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-BoxedValueFactory::create_for_unmarshal (void)
+BoxedValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
@@ -49,7 +49,7 @@ BaseValueFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-BaseValueFactory::create_for_unmarshal (void)
+BaseValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
@@ -69,7 +69,7 @@ TValueFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-TValueFactory::create_for_unmarshal (void)
+TValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
@@ -89,7 +89,7 @@ ConfigValueFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-ConfigValueFactory::create_for_unmarshal (void)
+ConfigValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
diff --git a/TAO/tests/OBV/Indirection/Factory.h b/TAO/tests/OBV/Indirection/Factory.h
index 9ea876feab7..17f21158d02 100644
--- a/TAO/tests/OBV/Indirection/Factory.h
+++ b/TAO/tests/OBV/Indirection/Factory.h
@@ -6,7 +6,7 @@ class NodeFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 
@@ -14,7 +14,7 @@ class BoxedValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 
@@ -22,7 +22,7 @@ class BaseValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 
@@ -30,14 +30,14 @@ class TValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 class ConfigValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 class ConfigValueImpl : public ::OBV_demo::value::idl::ConfigValue
diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp
index 9a677c602a9..9a9b42920c0 100644
--- a/TAO/tests/OBV/Simple/Client_i.cpp
+++ b/TAO/tests/OBV/Simple/Client_i.cpp
@@ -44,13 +44,13 @@ Checkpoint_Client_i::run (const char *name,
 }
 
 // Constructor.
-Checkpoint_Client_i::Checkpoint_Client_i (void)
+Checkpoint_Client_i::Checkpoint_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Checkpoint_Client_i::~Checkpoint_Client_i (void)
+Checkpoint_Client_i::~Checkpoint_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/tests/OBV/Simple/Client_i.h b/TAO/tests/OBV/Simple/Client_i.h
index 6796c09fb47..a3738171e01 100644
--- a/TAO/tests/OBV/Simple/Client_i.h
+++ b/TAO/tests/OBV/Simple/Client_i.h
@@ -31,10 +31,10 @@ class Checkpoint_Client_i
 {
 public:
   /// Constructor
-  Checkpoint_Client_i (void);
+  Checkpoint_Client_i ();
 
   /// Destructor
-  virtual ~Checkpoint_Client_i (void);
+  virtual ~Checkpoint_Client_i ();
 
   /// Execute the methods
   virtual int run (const char *,int, ACE_TCHAR** );
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
index b49d1f116d7..e879bce4c51 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ b/TAO/tests/OBV/Simple/OBV_impl.cpp
@@ -17,14 +17,14 @@ Event_impl::~Event_impl ()
 }
 
 CORBA::ValueBase*
-Event_impl::_copy_value (void)
+Event_impl::_copy_value ()
 {
   return new Event_impl (this->value_ ());
 }
 
 
 void
-Event_impl::do_print (void)
+Event_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG, "(value %d) \n",
              (CORBA::ULong) this->value_()));
@@ -35,7 +35,7 @@ Event_factory::~Event_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (void)
+Event_factory::create_for_unmarshal ()
 {
   return new Event_impl;
 }
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
index 3bc81eda768..133da704f92 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ b/TAO/tests/OBV/Simple/OBV_impl.h
@@ -12,8 +12,8 @@ class Event_impl : public virtual OBV_Event,
   Event_impl ();
   Event_impl (CORBA::Long value);
   virtual ~Event_impl ();
-  virtual CORBA::ValueBase* _copy_value (void);
-  virtual void do_print (void);
+  virtual CORBA::ValueBase* _copy_value ();
+  virtual void do_print ();
 };
 
 class Event_factory : public CORBA::ValueFactoryBase
@@ -25,7 +25,7 @@ protected:
   virtual ~Event_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal ();
 };
 
 #endif /* OBV_IMPL_H */
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index 1ad1a9cfb8b..602d0f9efab 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -49,7 +49,7 @@ Checkpoint_i::put_event (Event *event)
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (void)
+Checkpoint_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nThe Checkpoint server is shutting down\n"));
@@ -59,11 +59,11 @@ Checkpoint_i::shutdown (void)
 }
 
 // Constructor.
-Checkpoint_i::Checkpoint_i (void)
+Checkpoint_i::Checkpoint_i ()
 {
 }
 
 // Destructor.
-Checkpoint_i::~Checkpoint_i (void)
+Checkpoint_i::~Checkpoint_i ()
 {
 }
diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h
index cc38e9d2b6e..138569c7247 100644
--- a/TAO/tests/OBV/Simple/Server_i.h
+++ b/TAO/tests/OBV/Simple/Server_i.h
@@ -20,14 +20,14 @@ class Checkpoint_i : public POA_Checkpoint
 {
 public:
   /// Constructor.
-  Checkpoint_i (void);
+  Checkpoint_i ();
 
   /// Destructor.
-  ~Checkpoint_i (void);
+  ~Checkpoint_i ();
 
   virtual void put_event (Event * e);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 4f75ce7bbad..c8282e111d1 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -13,7 +13,7 @@
 // Constructor.
 
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
     : ior_output_file_ (0)
 {
 }
@@ -21,14 +21,14 @@ Server<Servant>::Server (void)
 // Destructor.
 
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:"));
   int c = 0;
@@ -125,7 +125,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
     // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -137,7 +137,7 @@ Server<Servant>::run (void)
 }
 
 template <class Servant> int
-Server<Servant>::register_name (void)
+Server<Servant>::register_name ()
 {
   return -1;
 }
@@ -145,7 +145,7 @@ Server<Servant>::register_name (void)
 // Constructor.
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
+Client<InterfaceObj, Var>::Client ()
   : ior_ (0)
 {
   //no-op
@@ -184,7 +184,7 @@ Client<InterfaceObj, Var>::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
+Client<InterfaceObj, Var>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:nk:x"));
   int c = 0;
@@ -217,7 +217,7 @@ Client<InterfaceObj, Var>::parse_args (void)
 }
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
+Client<InterfaceObj, Var>::~Client ()
 {
   ACE_OS::free (this->ior_);
 }
@@ -272,7 +272,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (void)
+Client<InterfaceObj, Var>::obtain_initial_references ()
 {
   return 0;
 }
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index 68abbdb1a4f..e798140edeb 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -32,10 +32,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -45,10 +45,10 @@ public:
 
   /// After calling <init>, this method will register the server with
   /// the TAO Naming Service using the servant_name passed to <init>.
-  int register_name (void);
+  int register_name ();
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 protected:
   /// Servant class
@@ -58,7 +58,7 @@ protected:
   const char *name;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
@@ -91,10 +91,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
@@ -109,14 +109,14 @@ public:
   void shutdown (int);
 
   /// Initialize naming service
-  int obtain_initial_references (void);
+  int obtain_initial_references ();
 
 protected:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
 //  TAO_Naming_Client namingClient;
   // helper class for getting access to Naming Service.
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index f2f2d2d7d57..7e311788243 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -6,7 +6,7 @@
 
 /* vt_graph_impl */
 
-vt_graph_impl::vt_graph_impl (void)
+vt_graph_impl::vt_graph_impl ()
 {
 }
 
@@ -24,7 +24,7 @@ vt_graph_impl::vt_graph_impl (int num_nodes)
 }
 
 // Get the number of nodes in the vt_graph.
-CORBA::Long vt_graph_impl::size (void)
+CORBA::Long vt_graph_impl::size ()
 {
   return nodes_ ().length ();
 }
@@ -41,7 +41,7 @@ vt_graph_impl::add_node (const char * name)
 
 // Print out information about each node.
 void
-vt_graph_impl::print (void)
+vt_graph_impl::print ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Printing graph data...\n"));
@@ -57,7 +57,7 @@ vt_graph_impl::print (void)
 /* vt_graph_init_impl - factory operations */
 
 Supports_Test::vt_graph *
-vt_graph_init_impl::create (void)
+vt_graph_init_impl::create ()
 {
   vt_graph_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, vt_graph_impl, 0);
@@ -65,7 +65,7 @@ vt_graph_init_impl::create (void)
 }
 
 CORBA::ValueBase *
-vt_graph_init_impl::create_for_unmarshal (void)
+vt_graph_init_impl::create_for_unmarshal ()
 {
   vt_graph_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, vt_graph_impl, 0);
@@ -79,7 +79,7 @@ test_impl::test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
-test_impl::~test_impl (void)
+test_impl::~test_impl ()
 {
 }
 
@@ -146,12 +146,12 @@ test_impl::pass_vt_graph_inout (
 }
 
 void
-test_impl::start (void)
+test_impl::start ()
 {
 }
 
 void
-test_impl::finish (void)
+test_impl::finish ()
 {
   this->orb_->shutdown (false);
 }
@@ -159,7 +159,7 @@ test_impl::finish (void)
 
 /* node_impl */
 
-node_impl::node_impl (void)
+node_impl::node_impl ()
 {
 }
 
@@ -203,7 +203,7 @@ node_impl::change_weight (CORBA::Long new_weight)
 }
 
 void
-node_impl::print (void)
+node_impl::print ()
 {
   cout << "  Name: " << name_ () << endl;
   cout << "    Weight: " << weight_ () << endl;
@@ -216,7 +216,7 @@ node_impl::print (void)
 /* node_init_impl - factory operations */
 
 Supports_Test::Node *
-node_init_impl::create (void)
+node_init_impl::create ()
 {
   node_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, node_impl, 0);
@@ -224,7 +224,7 @@ node_init_impl::create (void)
 }
 
 CORBA::ValueBase *
-node_init_impl::create_for_unmarshal (void)
+node_init_impl::create_for_unmarshal ()
 {
   node_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, node_impl, 0);
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 590eaca9269..733d5beb0b4 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -12,7 +12,7 @@ class node_impl :
   public virtual CORBA::DefaultValueRefCountBase
 {
 public:
-  node_impl (void);
+  node_impl ();
 
   node_impl (const char * name);
 
@@ -22,15 +22,15 @@ public:
 
   void change_weight (CORBA::Long new_weight);
 
-  void print (void);
+  void print ();
 };
 
 class node_init_impl : public Supports_Test::Node_init
 {
  public:
-  virtual Supports_Test::Node * create (void);
+  virtual Supports_Test::Node * create ();
 
-  virtual CORBA::ValueBase * create_for_unmarshal (void);
+  virtual CORBA::ValueBase * create_for_unmarshal ();
 };
 
 
@@ -40,24 +40,24 @@ class vt_graph_impl :
   public virtual CORBA::DefaultValueRefCountBase
 {
  public:
-  vt_graph_impl (void);
+  vt_graph_impl ();
 
   vt_graph_impl (int num_nodes);
 
-  virtual CORBA::Long size (void);
+  virtual CORBA::Long size ();
 
   virtual void add_node (const char * name);
 
-  virtual void print (void);
+  virtual void print ();
 };
 
 class vt_graph_init_impl :
   public Supports_Test::vt_graph_init
 {
  public:
-  virtual Supports_Test::vt_graph * create (void);
+  virtual Supports_Test::vt_graph * create ();
 
-  virtual CORBA::ValueBase * create_for_unmarshal (void);
+  virtual CORBA::ValueBase * create_for_unmarshal ();
 };
 
 class test_impl :
@@ -66,7 +66,7 @@ class test_impl :
  public:
   test_impl (CORBA::ORB_ptr orb);
 
-  virtual ~test_impl (void);
+  virtual ~test_impl ();
 
   virtual void pass_obj_graph_in (Supports_Test::graph * graph_param);
 
@@ -80,9 +80,9 @@ class test_impl :
 
   virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param);
 
-  virtual void start (void);
+  virtual void start ();
 
-  virtual void finish (void);
+  virtual void finish ();
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index ed20848b459..dafdac61f33 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -64,7 +64,7 @@ test_i::get_value (CORBA::Long offset)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h
index 9dddc34fc28..4cc2ef89b94 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.h
+++ b/TAO/tests/OBV/TC_Alignment/test_i.h
@@ -36,7 +36,7 @@ public:
 
   virtual CORBA::Any *get_value (CORBA::Long offset);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index b38e709023f..5789adcda72 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -175,7 +175,7 @@ Test_impl::op5 (const CORBA::Any& val,
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
index 843ed75dfed..55638797122 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
@@ -64,7 +64,7 @@ public:
                     char *& desc
  );
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 9d87012b6b1..619158ea6a8 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -476,7 +476,7 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1,
 
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h
index 95b9d4af8e5..ee148e839ba 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.h
+++ b/TAO/tests/OBV/ValueBox/Test_impl.h
@@ -102,7 +102,7 @@ public:
                           ::Variable_Union1_out p3);
 
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index c82ad1d6853..b699e4f4800 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -153,7 +153,7 @@ int box_test_ref (BoxT *valuebox, UT &val1, UT &val2)
     return fail;
 }
 
-int test_basic (void)
+int test_basic ()
 {
     int fail = 0;
 
@@ -519,7 +519,7 @@ int test_boxed_string_invocations (Test * test_object)
 //
 // Test boxed sequence types.
 //
-int test_boxed_sequence (void)
+int test_boxed_sequence ()
 {
   int fail = 0;
   try
@@ -698,7 +698,7 @@ int test_boxed_sequence_invocations (Test * test_object)
 // Test a boxed struct type. This is not templated since the struct
 // members are accessed by name, so this is specific to a certain IDL.
 //
-int test_boxed_struct (void)
+int test_boxed_struct ()
 {
   int fail = 0;
 
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index fdc3591ca8d..5d4d0f0241c 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -119,7 +119,7 @@ int DllOrb::init (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-int DllOrb::fini (void)
+int DllOrb::fini ()
 {
   int result;
 
@@ -190,7 +190,7 @@ int DllOrb::fini (void)
   return 0;
 }
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
 #if defined (ACE_HAS_THREADS)
   mp_barrier->wait();
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
index 1e00a53f757..77c4ceb3290 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
@@ -21,7 +21,7 @@ invoke_service_config (void *arg)
   return 0;
 }
 
-Service_Config_DLL::Service_Config_DLL (void)
+Service_Config_DLL::Service_Config_DLL ()
 {
   ACE_OS::memset (this->directive_[0], 0, BUFSIZ * sizeof (ACE_TCHAR));
   ACE_OS::memset (this->directive_[1], 0, BUFSIZ * sizeof (ACE_TCHAR));
@@ -92,13 +92,13 @@ Service_Config_DLL::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Service_Config_DLL::fini (void)
+Service_Config_DLL::fini ()
 {
   return 0;
 }
 
 int
-Service_Config_DLL::svc (void)
+Service_Config_DLL::svc ()
 {
   if (ACE_Thread_Manager::instance ()->spawn (invoke_service_config,
                                               this->directive_[1]) == -1)
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h
index 4b260fa48c6..14dc318497e 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h
@@ -34,7 +34,7 @@ class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base
 {
 public:
   /// Constructor.
-  Service_Config_DLL (void);
+  Service_Config_DLL ();
 
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
index 211d91693b2..b8aea2d7552 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
@@ -13,12 +13,12 @@ Abstract_Worker::Abstract_Worker (const ACE_TCHAR *s)
 }
 
 //
-Abstract_Worker::~Abstract_Worker (void)
+Abstract_Worker::~Abstract_Worker ()
 {
 }
 
 //
-Service_Config_ORB_DLL::Service_Config_ORB_DLL (void)
+Service_Config_ORB_DLL::Service_Config_ORB_DLL ()
   : is_server_ (-1)
   , worker_ (0)
   , argv_ (0)
@@ -26,7 +26,7 @@ Service_Config_ORB_DLL::Service_Config_ORB_DLL (void)
 }
 
 //
-Service_Config_ORB_DLL::~Service_Config_ORB_DLL (void)
+Service_Config_ORB_DLL::~Service_Config_ORB_DLL ()
 {
 }
 
@@ -98,7 +98,7 @@ Service_Config_ORB_DLL::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Service_Config_ORB_DLL::svc (void)
+Service_Config_ORB_DLL::svc ()
 {
   ACE_ASSERT (this->worker_.get () != 0);
   ACE_ASSERT (this->argv_.get () != 0);
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
index b6950577a5a..1977726f118 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
@@ -30,7 +30,7 @@ class Abstract_Worker
 {
 public:
   Abstract_Worker (const ACE_TCHAR *ior);
-  virtual ~Abstract_Worker (void);
+  virtual ~Abstract_Worker ();
   virtual int test_main (int argc,
                     ACE_TCHAR *argv[]) = 0;
   virtual const ACE_TCHAR * kind () const = 0;
@@ -45,7 +45,7 @@ class Server_Worker : public Abstract_Worker
 {
 public:
   Server_Worker ();
-  ~Server_Worker (void);
+  ~Server_Worker ();
   int test_main (int argc, ACE_TCHAR *argv[]);
   const ACE_TCHAR * kind () const;
 
@@ -60,7 +60,7 @@ class Client_Worker : public Abstract_Worker
 {
 public:
   Client_Worker ();
-  ~Client_Worker (void);
+  ~Client_Worker ();
   int test_main (int argc, ACE_TCHAR *argv[]);
   const ACE_TCHAR * kind () const;
 
@@ -79,8 +79,8 @@ class Service_Config_ORB_DLL_Export Service_Config_ORB_DLL
 {
 public:
   /// Constructor.
-  Service_Config_ORB_DLL (void);
-  ~Service_Config_ORB_DLL (void);
+  Service_Config_ORB_DLL ();
+  ~Service_Config_ORB_DLL ();
 
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
index 17607898770..83e6ffe6929 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index db65b94520a..e14fe880855 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -17,7 +17,7 @@ Client_Worker::kind () const
   return ACE_TEXT ("Client");
 }
 
-Client_Worker::~Client_Worker (void)
+Client_Worker::~Client_Worker ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) %@ Client::<dtor>\n", this));
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index a15a9fa9720..9425ff57850 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -19,7 +19,7 @@ Server_Worker::kind () const
 }
 
 //
-Server_Worker::~Server_Worker (void)
+Server_Worker::~Server_Worker ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) %@ Server::<dtor>\n", this));
 }
diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
index 48d00ac8139..9d73704966e 100644
--- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
+++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
@@ -26,7 +26,7 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt
     {
     };
 
-  ~ACE_Service_Gestalt_Test (void)
+  ~ACE_Service_Gestalt_Test ()
     {
       if (this->teardown_)
         {
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.cpp b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
index 22288154860..bdf1fdec49a 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.cpp
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
@@ -5,7 +5,7 @@ Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb)
 {
 }
 
-Foo_Bar::~Foo_Bar (void)
+Foo_Bar::~Foo_Bar ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Shutting down the ORB again\n"));
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h
index 21c0a669204..b5b4963dfb9 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.h
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.h
@@ -14,7 +14,7 @@ public:
   Foo_Bar (CORBA::ORB_ptr orb);
 
   /// Dtor
-  ~Foo_Bar (void);
+  ~Foo_Bar ();
 
 
 private:
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index aaa376144d8..304a23bc09b 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -3,20 +3,20 @@
 
 #include "tao/ORB_Constants.h"
 
-ORT_test_IORInterceptor::ORT_test_IORInterceptor (void)
+ORT_test_IORInterceptor::ORT_test_IORInterceptor ()
   : establish_count_ (0),
     components_establish_count_ (0)
 {
 }
 
 char *
-ORT_test_IORInterceptor::name (void)
+ORT_test_IORInterceptor::name ()
 {
   return CORBA::string_dup ("ORT_IORInterceptor");
 }
 
 void
-ORT_test_IORInterceptor::destroy (void)
+ORT_test_IORInterceptor::destroy ()
 {
   ACE_ASSERT (this->establish_count_ > 0
               && this->components_establish_count_ > 0
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index b1ddb06e524..d92afd169f1 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -33,7 +33,7 @@ class ORT_test_IORInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-  ORT_test_IORInterceptor (void);
+  ORT_test_IORInterceptor ();
 
   /**
    * @name Methods Required by the IOR Interceptor Interface
@@ -44,10 +44,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index 11cab5e8254..49fb852d921 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -6,13 +6,13 @@ ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Boolean
-ORT_test_i::request_server (void)
+ORT_test_i::request_server ()
 {
   return 0;
 }
 
 void
-ORT_test_i::shutdown (void)
+ORT_test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h
index 41857c1a258..fca38d4dd19 100644
--- a/TAO/tests/ORT/ORT_test_i.h
+++ b/TAO/tests/ORT/ORT_test_i.h
@@ -23,9 +23,9 @@ class ORT_test_i : public virtual POA_ObjectReferenceTemplate::ORT_test
 public:
   ORT_test_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Boolean request_server (void);
+  virtual CORBA::Boolean request_server ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index 7bc1831378c..c7cb240663c 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -10,7 +10,7 @@ ObjectReferenceFactory::ObjectReferenceFactory (
 }
 
 ::CORBA::ValueBase *
-ObjectReferenceFactory::_copy_value (void)
+ObjectReferenceFactory::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
@@ -21,7 +21,7 @@ ObjectReferenceFactory::_copy_value (void)
   return ret_val;
 }
 
-ObjectReferenceFactory::~ObjectReferenceFactory (void)
+ObjectReferenceFactory::~ObjectReferenceFactory ()
 {
   // No need to call CORBA::remove_ref() on this->old_orf_.  It is a
   // "_var" object, meaning that will be done automatically.
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h
index 7eaa3fce6a6..06a0c3d9ac0 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.h
+++ b/TAO/tests/ORT/ObjectReferenceFactory.h
@@ -42,7 +42,7 @@ class ObjectReferenceFactory
   ObjectReferenceFactory (
     PortableInterceptor::ObjectReferenceFactory * old_orf);
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   /**
    * @name PortableInterceptor::ObjectReferenceFactory Methods
@@ -62,7 +62,7 @@ protected:
    * Protected destructor to enforce proper memory management via
    * reference counting.
    */
-  ~ObjectReferenceFactory (void);
+  ~ObjectReferenceFactory ();
 
 private:
   /// The old ObjectReferenceFactory used to create object references.
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 096d6e628d1..8b08aa66ef1 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -13,13 +13,13 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h
index 7158157b429..5e67b364566 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.h
+++ b/TAO/tests/ORT/ServerRequestInterceptor.h
@@ -62,9 +62,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 34376b8cde5..582381f75db 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -1,7 +1,7 @@
 #include "Loader.h"
 #include "Test_i.h"
 
-Loader::Loader (void)
+Loader::Loader ()
 {
 }
 
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index a8c70cee8c3..e79c3adc196 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -23,7 +23,7 @@ class OLT_Export Loader : public TAO_Object_Loader
 {
 public:
   /// ctor
-  Loader (void);
+  Loader ();
 
   /// Create a new instance
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 5df62655307..d858a4a5bd0 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -10,13 +10,13 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 }
 
 CORBA::Long
-Test_i::instance_count (void)
+Test_i::instance_count ()
 {
   return Test_i::instance_count_;
 }
 
 void
-Test_i::destroy (void)
+Test_i::destroy ()
 {
   PortableServer::POA_var poa =
     this->_default_POA ();
@@ -26,7 +26,7 @@ Test_i::destroy (void)
 }
 
 PortableServer::POA_ptr
-Test_i::_default_POA (void)
+Test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 25007c7610a..58548678371 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -25,11 +25,11 @@ public:
   /// ctor
   Test_i (PortableServer::POA_ptr poa);
 
-  CORBA::Long instance_count (void);
+  CORBA::Long instance_count ();
 
-  void destroy (void);
+  void destroy ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The default POA used for this object
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 027c3d6683b..6a53f680d96 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -17,7 +17,7 @@ public:
   void DeleteExtra (const ServerSequence &seq);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -101,7 +101,7 @@ ServerServant::DeleteExtra (const ServerSequence &seq)
 }
 
 void
-ServerServant::shutdown (void)
+ServerServant::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index faae9d09299..b1beb06c758 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -6,7 +6,7 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-Database_i::~Database_i (void)
+Database_i::~Database_i ()
 {
   delete[] this->elements_;
 }
@@ -63,7 +63,7 @@ Database_i::get_crc (Test::Index i)
 }
 
 void
-Database_i::shutdown (void)
+Database_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index cfa06030369..49ccb8b14ed 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -26,7 +26,7 @@ public:
               Test::Index max_range);
 
   /// dtor
-  ~Database_i (void);
+  ~Database_i ();
 
   // = The Simple_Server methods.
   void set (Test::Index i,
@@ -38,7 +38,7 @@ public:
 
   CORBA::ULong get_crc (Test::Index i);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer
diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp
index 5509c723b4c..4d5856ce485 100644
--- a/TAO/tests/Ondemand_Write/Hello.cpp
+++ b/TAO/tests/Ondemand_Write/Hello.cpp
@@ -16,7 +16,7 @@ Hello::get_string (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h
index 3cee6eba223..a8231962e86 100644
--- a/TAO/tests/Ondemand_Write/Hello.h
+++ b/TAO/tests/Ondemand_Write/Hello.h
@@ -20,7 +20,7 @@ public:
     ::CORBA::Long valueb,
     const char * inputb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 787b2ab6caa..b2532a87e20 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -14,18 +14,18 @@ Oneway_Buffering::receive_data (const Test::Payload &the_payload)
 }
 
 void
-Oneway_Buffering::flush (void)
+Oneway_Buffering::flush ()
 {
 }
 
 void
-Oneway_Buffering::sync (void)
+Oneway_Buffering::sync ()
 {
   this->admin_->flush ();
 }
 
 void
-Oneway_Buffering::shutdown (void)
+Oneway_Buffering::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index e0a2593a1e2..4869811be8e 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -17,11 +17,11 @@ public:
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &the_payload);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void sync (void);
+  virtual void sync ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index 30685f48631..b91d0dce11f 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -45,12 +45,12 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length)
 }
 
 void
-Oneway_Buffering_Admin::flush (void)
+Oneway_Buffering_Admin::flush ()
 {
 }
 
 void
-Oneway_Buffering_Admin::shutdown (void)
+Oneway_Buffering_Admin::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index 8942925272f..70f71c799cf 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -20,9 +20,9 @@ public:
 
   virtual void request_received (CORBA::ULong payload_length);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 4e00819f0f5..ac119dcc052 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (Test::Sender_ptr reply_gen,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
index 838aee7e9e7..fa2065ae72b 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
@@ -22,7 +22,7 @@ public:
                Receiver_i * receiver_impl);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index fff3f2968f8..c995acf9084 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -10,12 +10,12 @@ Receiver_i::Receiver_i (CORBA::ORB_ptr orb,
 {
 }
 
-Receiver_i::~Receiver_i (void)
+Receiver_i::~Receiver_i ()
 {
 }
 
 CORBA::Long
-Receiver_i::receive_call (void)
+Receiver_i::receive_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)  Doing a ping...\n"));
@@ -32,7 +32,7 @@ Receiver_i::get_call_count ( /**/)
 }
 
 void
-Receiver_i::shutdown (void)
+Receiver_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shutdown...\n"));
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
index 111bf6147bd..1e5f30c10dd 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
@@ -27,15 +27,15 @@ public:
               CORBA::ULong iter);
 
   ///Destructor
-  virtual ~Receiver_i (void);
+  virtual ~Receiver_i ();
 
   // = The skeleton methods
-  virtual CORBA::Long receive_call (void);
+  virtual CORBA::Long receive_call ();
 
   /// Retun the number of calls that every thread would make...
-  virtual CORBA::Long get_call_count (void);
+  virtual CORBA::Long get_call_count ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Number of calls processed so far..
   CORBA::ULong no_calls_;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 3322734f790..ffba37e322f 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -8,7 +8,7 @@ Sender_i::Sender_i (CORBA::ORB_ptr orb,
 {
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
 }
 
@@ -45,7 +45,7 @@ Sender_i::ping ( /**/)
 }
 
 void
-Sender_i::shutdown (void)
+Sender_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shutdown...\n"));
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
index 2c045a7d8bd..ba0f87bbdfa 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
@@ -27,16 +27,16 @@ public:
             CORBA::ULong no);
 
   ///Destructor
-  virtual ~Sender_i (void);
+  virtual ~Sender_i ();
 
   // = The skeleton methods
   virtual void active_objects (CORBA::Short ao);
 
   virtual void send_ready_message (Test::Receiver_ptr receiver);
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Our local ORB ptr
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
index 86260515097..782e097b9a4 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
index b00eef99fbf..48fdbd39930 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
index 6035eafe86f..68139aea534 100644
--- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
@@ -11,7 +11,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb)
 {
 }
 
-ServantLocator::~ServantLocator (void)
+ServantLocator::~ServantLocator ()
 {
 }
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
index 38caae26934..eef4dec7c8f 100644
--- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
@@ -62,7 +62,7 @@ public:
   bool error_status_;
 protected:
   /// Destructor.
-  ~ServantLocator (void);
+  ~ServantLocator ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
index 11972183323..1e5fe385f82 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "tao/ORB_Constants.h"
 #include "Server_Request_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
index 15846c31dd9..01220953a95 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
@@ -36,7 +36,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
index 8a9a3a32d87..6c6975dad68 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
@@ -5,22 +5,22 @@ CORBA::Boolean receive_request_called = 0;
 CORBA::Boolean ending_interception_point_called = 0;
 
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("");  // Anonymous
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
index df2471c7a8f..d75c1105ebe 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
@@ -43,7 +43,7 @@ class Server_Request_Interceptor
 {
 public:
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -55,9 +55,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -77,7 +77,7 @@ public:
 
 protected:
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
index c5df0e47b0c..ebc4ceb0c8d 100644
--- a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
@@ -7,12 +7,12 @@ test_i::test_i (CORBA::ORB_ptr orb)
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 void
-test_i::op (void)
+test_i::op ()
 {
   // PortableInterceptor::ServerRequestInterceptor::receive_request()
   // should have been invoked.
@@ -28,7 +28,7 @@ test_i::op (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.h b/TAO/tests/POA/Bug_1592_Regression/test_i.h
index 215f5fc1fa3..bab87491665 100644
--- a/TAO/tests/POA/Bug_1592_Regression/test_i.h
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.h
@@ -30,14 +30,14 @@ public:
   /// Constructor.
   test_i (CORBA::ORB_ptr orb);
 
-  virtual void op (void);
+  virtual void op ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp
index 7c406cdb756..40efbd8d9b2 100644
--- a/TAO/tests/POA/Bug_2511_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp
@@ -24,11 +24,11 @@ class test_i :
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  void normal (void);
+  void normal ();
 
-  void exceptional (void);
+  void exceptional ();
 
-  void notexisting (void);
+  void notexisting ();
 
   PortableServer::POA_var poa_;
 };
@@ -39,19 +39,19 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::normal (void)
+test_i::normal ()
 {
   ACE_DEBUG ((LM_DEBUG, "executing normal\n"));
 }
 
 void
-test_i::exceptional (void)
+test_i::exceptional ()
 {
   ACE_DEBUG ((LM_DEBUG, "executing exceptional\n"));
 }
 
 void
-test_i::notexisting (void)
+test_i::notexisting ()
 {
   ACE_DEBUG ((LM_DEBUG, "executing notexisting\n"));
 }
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index 6b784f888bb..ffde543eed5 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -6,12 +6,12 @@
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/Null_Mutex.h"
 
-DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc (void)
+DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc ()
   //  : DATABASE_MALLOC ()
 {
 }
 
-DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void)
+DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc ()
 {
   this->remove ();
 }
@@ -30,7 +30,7 @@ DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb,
     PortableServer::Current::_narrow (obj.in ());
 }
 
-DatabaseImpl::Entry::~Entry (void)
+DatabaseImpl::Entry::~Entry ()
 {
 }
 
@@ -106,7 +106,7 @@ DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Entry::_default_POA (void)
+DatabaseImpl::Entry::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -121,7 +121,7 @@ DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb,
   this->poa_->set_servant (&this->common_servant_);
 }
 
-DatabaseImpl::Agent::~Agent (void)
+DatabaseImpl::Agent::~Agent ()
 {
 }
 
@@ -261,13 +261,13 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
 }
 
 void
-DatabaseImpl::Agent::shutdown (void)
+DatabaseImpl::Agent::shutdown ()
 {
   this->orb_->shutdown ();
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Agent::_default_POA (void)
+DatabaseImpl::Agent::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -303,7 +303,7 @@ DatabaseImpl::Employee::Employee (const char* name,
   this->name (name);
 }
 
-DatabaseImpl::Employee::~Employee (void)
+DatabaseImpl::Employee::~Employee ()
 {
   DATABASE::instance ()->free (this->name_);
 }
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index 93623274c11..a097500c96c 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -20,8 +20,8 @@ public:
   class Simpler_Database_Malloc : public DATABASE_MALLOC
   {
   public:
-    Simpler_Database_Malloc (void);
-    ~Simpler_Database_Malloc (void);
+    Simpler_Database_Malloc ();
+    ~Simpler_Database_Malloc ();
   };
 
   typedef ACE_Singleton<Simpler_Database_Malloc, ACE_Null_Mutex> DATABASE;
@@ -33,7 +33,7 @@ public:
   public:
     Entry (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa);
-    ~Entry (void);
+    ~Entry ();
 
     virtual void invoke (CORBA::ServerRequest_ptr request);
     // The invoke() method receives requests issued to any CORBA
@@ -46,7 +46,7 @@ public:
     // a POA_ptr as input parameters and returns a valid RepositoryId
     // representing the most-derived interface for that oid.
 
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
     // Returns the default POA for this servant.
 
     virtual void is_a (CORBA::ServerRequest_ptr request);
@@ -68,7 +68,7 @@ public:
   public:
     Agent (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa);
-    ~Agent (void);
+    ~Agent ();
 
     virtual Database::Entry_ptr create_entry (const char *key,
                                               const char *entry_type,
@@ -80,9 +80,9 @@ public:
     virtual void destroy_entry (const char *key,
                                 const char *entry_type);
 
-    virtual void shutdown (void);
+    virtual void shutdown ();
 
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
     // Returns the default POA for this servant.
 
   protected:
diff --git a/TAO/tests/POA/DSI/client.cpp b/TAO/tests/POA/DSI/client.cpp
index fb704e0fde3..589b90aa958 100644
--- a/TAO/tests/POA/DSI/client.cpp
+++ b/TAO/tests/POA/DSI/client.cpp
@@ -64,7 +64,7 @@ parse_args (int argc, ACE_TCHAR **argv)
 }
 
 int
-read_IOR_from_file (void)
+read_IOR_from_file ()
 {
   // Open the file for reading.
   ACE_HANDLE f_handle =
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp
index 1f1a0cbf0a9..465a1bb2de4 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.cpp
+++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp
@@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h
index f802f09dd1d..05cf2daf9bf 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.h
+++ b/TAO/tests/POA/Deactivate_Object/Hello.h
@@ -14,7 +14,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/POA/Default_Servant2/File_i.cpp b/TAO/tests/POA/Default_Servant2/File_i.cpp
index 141af0dbd9e..dfdc1f3496b 100644
--- a/TAO/tests/POA/Default_Servant2/File_i.cpp
+++ b/TAO/tests/POA/Default_Servant2/File_i.cpp
@@ -29,12 +29,12 @@ FileImpl::System::System (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
   poa->set_servant (&this->fd_servant_);
 }
 
-FileImpl::System::~System (void)
+FileImpl::System::~System ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (void)
+FileImpl::System::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -79,7 +79,7 @@ FileImpl::System::open (const char *file_name,
 }
 
 void
-FileImpl::System::shutdown (void)
+FileImpl::System::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -90,19 +90,19 @@ FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa)
 {
 }
 
-FileImpl::Descriptor::~Descriptor (void)
+FileImpl::Descriptor::~Descriptor ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (void)
+FileImpl::Descriptor::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (void)
+FileImpl::Descriptor::fd ()
 {
   //
   // One way of getting our id.
@@ -202,7 +202,7 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (void)
+FileImpl::Descriptor::destroy ()
 {
   // Get the ACE_HANDLE for this object reference
   ACE_HANDLE file_descriptor = this->fd ();
diff --git a/TAO/tests/POA/Default_Servant2/File_i.h b/TAO/tests/POA/Default_Servant2/File_i.h
index df1e8a47aa9..5a2faf71ea3 100644
--- a/TAO/tests/POA/Default_Servant2/File_i.h
+++ b/TAO/tests/POA/Default_Servant2/File_i.h
@@ -35,10 +35,10 @@ public:
     Descriptor (PortableServer::POA_ptr poa);
 
     /// Destructor
-    ~Descriptor (void);
+    ~Descriptor ();
 
     /// Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// write buffer to File corresponding to this Descriptor
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
@@ -50,11 +50,11 @@ public:
                                 CORBA::Long whence);
 
     /// closes the file corresponding to the requested ObjectID
-    virtual void destroy (void);
+    virtual void destroy ();
 
   private:
     /// Extracts the ACE_HANDLE from the objectID
-    ACE_HANDLE fd (void);
+    ACE_HANDLE fd ();
 
     PortableServer::POA_var poa_;
   };
@@ -73,17 +73,17 @@ public:
             PortableServer::POA_ptr poa);
 
     ///Destructor
-    ~System (void);
+    ~System ();
 
     ///Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// Opens a file ,creates a Descriptor reference with the
     /// ACE_HANDLE and returns that reference
     File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags);
 
-    void shutdown (void);
+    void shutdown ();
   private:
     CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.cpp
+++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.h
+++ b/TAO/tests/POA/EndpointPolicy/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index 524539b0e89..66b3a05fd9a 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -22,7 +22,7 @@ public:
   {
   }
 
-  ~test_i (void)
+  ~test_i ()
   {
     ACE_DEBUG ((LM_DEBUG, "~test_i called\n"));
   }
@@ -32,11 +32,11 @@ class test_i_with_reference_counting :
   public virtual POA_test
 {
 public:
-  void method (void)
+  void method ()
   {
   }
 
-  ~test_i_with_reference_counting (void)
+  ~test_i_with_reference_counting ()
   {
     ACE_DEBUG ((LM_DEBUG, "~test_i_with_reference_counting called\n"));
   }
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 2f82d6b08ac..49e25f17d4b 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -18,9 +18,9 @@
 class test_i : public POA_test
 {
 public:
-  void deactivate_self (void);
+  void deactivate_self ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   PortableServer::POA_var poa_;
 
@@ -34,7 +34,7 @@ test_i::_default_POA ( /**/)
 }
 
 void
-test_i::deactivate_self (void)
+test_i::deactivate_self ()
 {
   this->poa_->deactivate_object (this->id_);
 
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.cpp b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
index 51be53d4109..2c107d09894 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
@@ -29,7 +29,7 @@ ServantActivator::etherealize (const PortableServer::ObjectId &,
 }
 
 void
-ServantActivator::forward_requests (void)
+ServantActivator::forward_requests ()
 {
   if (CORBA::is_nil (this->forward_to_.in ()))
     throw test::Cannot_Forward ();
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.h b/TAO/tests/POA/Forwarding/Servant_Activator.h
index d5e18a9e2f6..5c6414e12af 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.h
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.h
@@ -41,7 +41,7 @@ public:
                             CORBA::Boolean remaining_activations);
 
   /// Object should be forwarded from now on.
-  void forward_requests (void);
+  void forward_requests ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/POA/Forwarding/test_i.cpp b/TAO/tests/POA/Forwarding/test_i.cpp
index 23134929959..dd47e8a2326 100644
--- a/TAO/tests/POA/Forwarding/test_i.cpp
+++ b/TAO/tests/POA/Forwarding/test_i.cpp
@@ -14,13 +14,13 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Long
-test_i::doit (void)
+test_i::doit ()
 {
   return this->value_++;
 }
 
 void
-test_i::forward (void)
+test_i::forward ()
 {
   this->activator_.forward_requests ();
 
@@ -32,13 +32,13 @@ test_i::forward (void)
 
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/POA/Forwarding/test_i.h b/TAO/tests/POA/Forwarding/test_i.h
index 65d96ac8ce3..8098fd029fa 100644
--- a/TAO/tests/POA/Forwarding/test_i.h
+++ b/TAO/tests/POA/Forwarding/test_i.h
@@ -22,15 +22,15 @@ public:
                 ServantActivator &activator,
                 CORBA::Long value);
 
-  virtual CORBA::Long doit (void);
+  virtual CORBA::Long doit ();
 
   // Setup forwarding
-  virtual void forward (void);
+  virtual void forward ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 protected:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/POA/Generic_Servant/test_i.cpp b/TAO/tests/POA/Generic_Servant/test_i.cpp
index 01a1c126ffa..bc4a01965df 100644
--- a/TAO/tests/POA/Generic_Servant/test_i.cpp
+++ b/TAO/tests/POA/Generic_Servant/test_i.cpp
@@ -11,18 +11,18 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
 void
-test_i::oneway_method (void)
+test_i::oneway_method ()
 {
 }
 
@@ -57,7 +57,7 @@ test_i::timed_oneway_method (CORBA::ULong timeout)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/POA/Generic_Servant/test_i.h b/TAO/tests/POA/Generic_Servant/test_i.h
index 85e4a2d6d06..2a41e38bf17 100644
--- a/TAO/tests/POA/Generic_Servant/test_i.h
+++ b/TAO/tests/POA/Generic_Servant/test_i.h
@@ -19,13 +19,13 @@ public:
           PortableServer::POA_ptr poa);
 
   /// Returns the Default POA of this servant
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   /// A twoway operation.
-  void method (void);
+  void method ();
 
   /// A oneway operation.
-  void oneway_method (void);
+  void oneway_method ();
 
   /// A timed twoway operation.
   void timed_method (CORBA::ULong timeout);
@@ -34,7 +34,7 @@ public:
   void timed_oneway_method (CORBA::ULong timeout);
 
   /// Shutdown the ORB
-  void shutdown (void);
+  void shutdown ();
 
   /// Sleep for some time.
   void sleep (CORBA::ULong timeout,
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 5755fb27a36..4f386626926 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -23,7 +23,7 @@ public:
     {
     }
 
-  PortableServer::POA_ptr _default_POA (void)
+  PortableServer::POA_ptr _default_POA ()
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index c08515ff8ad..d349f30162c 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -2,13 +2,13 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : ior_output_file_ (0),
     policies_ (4)
 {
 }
 
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
   delete this->servant_activator_;
   delete this->servant_locator_;
@@ -302,7 +302,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 // The execution process of the server.
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
     {
diff --git a/TAO/tests/POA/Loader/Server_Manager.h b/TAO/tests/POA/Loader/Server_Manager.h
index 69901de9fef..fc8944a259f 100644
--- a/TAO/tests/POA/Loader/Server_Manager.h
+++ b/TAO/tests/POA/Loader/Server_Manager.h
@@ -31,10 +31,10 @@ class Server_i
 {
 public:
   /// Initialisation.
-  Server_i (void);
+  Server_i ();
 
   /// Destruction.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialisation of the ORB and poa.
   int init (int argc, ACE_TCHAR **argv);
@@ -56,7 +56,7 @@ public:
   int create_locator (PortableServer::POA_var second_poa);
 
   /// The server is executed.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the input arguments.
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 85ccbdeda82..5f562c6fab7 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -23,7 +23,7 @@ class test_i :
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   PortableServer::POA_var poa_;
 };
@@ -34,7 +34,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
@@ -43,7 +43,7 @@ class Task : public ACE_Task_Base
 public:
   void object (test_ptr test);
 
-  int svc (void);
+  int svc ();
 
   test_var test_;
 
@@ -59,7 +59,7 @@ Task::object (test_ptr test)
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   this->test_->method ();
   this->test_ =
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index b2280398638..74c4a3797d3 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -22,9 +22,9 @@ class test_i :
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  ~test_i (void);
+  ~test_i ();
 
-  void method (void);
+  void method ();
 
   PortableServer::POA_var poa_;
 };
@@ -37,7 +37,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
               this));
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i destroyed: instance %x\n",
@@ -45,7 +45,7 @@ test_i::~test_i (void)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
@@ -55,7 +55,7 @@ public:
   Object_Activator (ACE_Thread_Manager &thread_manager,
                     PortableServer::POA_ptr poa);
 
-  int svc (void);
+  int svc ();
 
   ACE_Auto_Event object_activated_;
 
@@ -71,7 +71,7 @@ Object_Activator::Object_Activator (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Object_Activator::svc (void)
+Object_Activator::svc ()
 {
   try
     {
diff --git a/TAO/tests/POA/Non_Retain_System_Id/test.cpp b/TAO/tests/POA/Non_Retain_System_Id/test.cpp
index 301e8aaef1d..7a22cc244e7 100644
--- a/TAO/tests/POA/Non_Retain_System_Id/test.cpp
+++ b/TAO/tests/POA/Non_Retain_System_Id/test.cpp
@@ -20,7 +20,7 @@ class ID_Check_i : public POA_ID_Check
 {
 public:
   ID_Check_i (int num);
-  ~ID_Check_i (void);
+  ~ID_Check_i ();
 
   void set_id (int index, PortableServer::ObjectId_var oid);
 
@@ -46,7 +46,7 @@ ID_Check_i::ID_Check_i (int num)
   oids_ = new PortableServer::ObjectId_var[num];
 }
 
-ID_Check_i::~ID_Check_i (void)
+ID_Check_i::~ID_Check_i ()
 {
   delete [] oids_;
 }
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index f3958139f0c..3e8eb181281 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -21,7 +21,7 @@ class test_i :
 public:
   test_i (test_i *other);
 
-  ~test_i (void);
+  ~test_i ();
 
   test_i *other_;
 };
@@ -31,7 +31,7 @@ test_i::test_i (test_i *other)
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) test_i::~test_i\n"));
 
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 4303b2aa470..30e7e8ea7e8 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -50,7 +50,7 @@ class test_i : public POA_test
 public:
   test_i (ACE_Auto_Event &event);
 
-  void deactivate_self (void);
+  void deactivate_self ();
 
 private:
   ACE_Auto_Event &event_;
@@ -62,7 +62,7 @@ test_i::test_i (ACE_Auto_Event &event)
 }
 
 void
-test_i::deactivate_self (void)
+test_i::deactivate_self ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -95,7 +95,7 @@ public:
              PortableServer::Servant servant,
              const ACE_CString &task_id,
              const PortableServer::ObjectId &id);
-  int svc (void);
+  int svc ();
 
 private:
   test_var test_;
@@ -122,7 +122,7 @@ Activator::Activator (test_ptr t,
 }
 
 int
-Activator::svc (void)
+Activator::svc ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG, "(%t) Waiting for deactivation to complete\n"));
@@ -162,7 +162,7 @@ class Deactivator : public ACE_Task_Base
 {
 public:
   Deactivator (test_ptr t);
-  int svc (void);
+  int svc ();
 
 private:
   test_var test_;
@@ -174,7 +174,7 @@ Deactivator::Deactivator (test_ptr t)
 }
 
 int
-Deactivator::svc (void)
+Deactivator::svc ()
 {
   try
     {
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
index a5658c56d49..c016fbdee32 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
   try
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
index a57c7bee437..abb02ea2152 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
@@ -21,7 +21,7 @@ public:
                CORBA::Boolean exception);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
index da78afe52c6..6f3c5e42c98 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
@@ -43,7 +43,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
index 81d081c8b6b..067f1780165 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
@@ -13,12 +13,12 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
 char *
-test_i::get_string (void)
+test_i::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
index 685c5de2b5f..33dabade22b 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
@@ -20,11 +20,11 @@ public:
           ACE_thread_t thr_id);
 
   /// A twoway operation.
-  void method (void);
+  void method ();
 
   /// A twoway operation.
   char *
-  get_string (void);
+  get_string ();
 
 protected:
   /// Our ORB.
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index 130b92172bd..74191316e78 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -21,7 +21,7 @@ ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb)
 }
 
 // Destruction.
-ServantManager_i::~ServantManager_i (void)
+ServantManager_i::~ServantManager_i ()
 {
 }
 
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
index 16b8cdb3228..8aca1431706 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
@@ -48,7 +48,7 @@ public:
   ServantManager_i (CORBA::ORB_ptr orb);
 
   /// Destruction.
-   ~ServantManager_i (void);
+   ~ServantManager_i ();
 
   /**
    * Returns an ObjectId when given an DLL name and the factory method
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index 897aab72173..45f5412c753 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -2,7 +2,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Server_i::Server_i(void)
+Server_i::Server_i()
   : ior_output_file_ (0),
     policies_ (4),
     servant_activator_impl_ (0),
@@ -10,7 +10,7 @@ Server_i::Server_i(void)
 {
 }
 
-Server_i::~Server_i(void)
+Server_i::~Server_i()
 {
   delete servant_activator_impl_;
   delete servant_locator_impl_;
@@ -299,7 +299,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 // The execution process of the server.
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
     {
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
index da3c669f680..3d0500d647c 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
@@ -30,10 +30,10 @@ class Server_i
 {
 public:
   /// Initialisation.
-  Server_i (void);
+  Server_i ();
 
   /// Destruction.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialisation of the ORB and poa.
   int init (int argc, ACE_TCHAR **argv);
@@ -55,7 +55,7 @@ public:
   int create_locator (PortableServer::POA_var second_poa);
 
   /// The server is executed.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the input arguments.
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index 433e84c9c72..614d5b21089 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -16,11 +16,11 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (void);
+  void destroy_poa ();
 };
 
 void
-test_i::destroy_poa (void)
+test_i::destroy_poa ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 551ea4575c0..06ba954cf45 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -23,17 +23,17 @@ public:
   test_i (CORBA::ORB_ptr orb_ptr,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
 
-  test_ptr create_POA (void);
+  test_ptr create_POA ();
 
-  void destroy_POA (void);
+  void destroy_POA ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 protected:
   CORBA::ORB_var orb_;
@@ -50,7 +50,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("POACurrent");
@@ -70,19 +70,19 @@ test_i::method (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 test_ptr
-test_i::create_POA (void)
+test_i::create_POA ()
 {
   CORBA::PolicyList policies (2);
   policies.length (2);
@@ -137,7 +137,7 @@ test_i::create_POA (void)
 }
 
 void
-test_i::destroy_POA (void)
+test_i::destroy_POA ()
 {
   this->child_poa_->destroy (1, 0);
 }
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index d86e66c9e3f..c9b0dfd8d59 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -22,9 +22,9 @@ class test_i : public virtual POA_test
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   PortableServer::POA_var poa_;
@@ -38,7 +38,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Entering Worker::svc from %t and sleeping....\n"));
@@ -67,7 +67,7 @@ test_i::method (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -76,7 +76,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   Worker (test_ptr t);
-  int svc (void);
+  int svc ();
 
 private:
   test_var test_;
@@ -88,7 +88,7 @@ Worker::Worker (test_ptr t)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/POA/TIE/test_i.cpp b/TAO/tests/POA/TIE/test_i.cpp
index 4e10342787f..2e4df217e53 100644
--- a/TAO/tests/POA/TIE/test_i.cpp
+++ b/TAO/tests/POA/TIE/test_i.cpp
@@ -19,13 +19,13 @@ Tie_i::Tie_i (CORBA::Long value)
 }
 
 // Destructor
-Tie_i::~Tie_i (void)
+Tie_i::~Tie_i ()
 {
 }
 
 // Return this->value
 CORBA::Long
-Tie_i::doit (void)
+Tie_i::doit ()
 {
   return this->value_;
 }
@@ -40,14 +40,14 @@ A_i::A_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-A_i::doit (void)
+A_i::doit ()
 {
   return this->value_;
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-A_i::_default_POA (void)
+A_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -62,14 +62,14 @@ Outer_i::B_i::B_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::B_i::doit (void)
+Outer_i::B_i::doit ()
 {
   return this->value_;
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::B_i::_default_POA (void)
+Outer_i::B_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -84,14 +84,14 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::Inner_i::C_i::doit (void)
+Outer_i::Inner_i::C_i::doit ()
 {
   return this->value_;
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::Inner_i::C_i::_default_POA (void)
+Outer_i::Inner_i::C_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/POA/TIE/test_i.h b/TAO/tests/POA/TIE/test_i.h
index 498d3620db1..0cdc235ffad 100644
--- a/TAO/tests/POA/TIE/test_i.h
+++ b/TAO/tests/POA/TIE/test_i.h
@@ -20,10 +20,10 @@ public:
   Tie_i (CORBA::Long value);
 
   /// Destructor.
-  virtual ~Tie_i (void);
+  virtual ~Tie_i ();
 
   // Simple doit method
-  virtual CORBA::Long doit (void);
+  virtual CORBA::Long doit ();
 
 protected:
   CORBA::Long value_;
@@ -37,10 +37,10 @@ public:
        PortableServer::POA_ptr poa);
 
   // Simple doit method
-  virtual CORBA::Long doit (void);
+  virtual CORBA::Long doit ();
 
   // Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 protected:
   CORBA::Long value_;
@@ -60,10 +60,10 @@ public:
          PortableServer::POA_ptr poa);
 
     // Simple doit method
-    virtual CORBA::Long doit (void);
+    virtual CORBA::Long doit ();
 
     // Returns the Default POA of this Servant object
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
 
   protected:
     CORBA::Long value_;
@@ -83,10 +83,10 @@ public:
            PortableServer::POA_ptr poa);
 
       // Simple doit method
-      virtual CORBA::Long doit (void);
+      virtual CORBA::Long doit ();
 
       // Returns the Default POA of this Servant object
-      virtual PortableServer::POA_ptr _default_POA (void);
+      virtual PortableServer::POA_ptr _default_POA ();
 
     protected:
       CORBA::Long value_;
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index c93b7869de2..b538f64f982 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -15,7 +15,7 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (void);
+  void destroy_poa ();
 
   void test_poa (PortableServer::POA_ptr poa);
 
@@ -29,7 +29,7 @@ test_i::test_poa (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::destroy_poa (void)
+test_i::destroy_poa ()
 {
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 1;
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
index 17607898770..83e6ffe6929 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
index 7bdf685ff97..0eff73b74dd 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
@@ -16,9 +16,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 5b596b6eb96..8f44fe95b87 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -20,14 +20,14 @@
 
 size_t Test_Any::counter = 0;
 
-Test_Any::Test_Any (void)
+Test_Any::Test_Any ()
   : opname_ (CORBA::string_dup ("test_any")),
     out_ (new CORBA::Any),
     ret_ (new CORBA::Any)
 {
 }
 
-Test_Any::~Test_Any (void)
+Test_Any::~Test_Any ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -99,7 +99,7 @@ Test_Any::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_Any::reset_parameters (void)
+Test_Any::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
   CORBA::ULong index = (counter++ % Test_Any::ANY_LAST_TEST_ITEM);
@@ -273,7 +273,7 @@ Test_Any::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Any::check_validity (void)
+Test_Any::check_validity ()
 {
   CORBA::Short short_in, short_inout, short_out, short_ret;
   const char *str_in;
@@ -462,6 +462,6 @@ Test_Any::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Any::print_values (void)
+Test_Any::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index b0515dfb0ef..80183699b2e 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -22,10 +22,10 @@ class Test_Any
 {
 public:
   /// ctor
-  Test_Any (void);
+  Test_Any ();
 
   /// dtor
-  ~Test_Any (void);
+  ~Test_Any ();
 
   enum
   {
@@ -51,16 +51,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 8616f65d5e4..6cbb5664177 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -19,7 +19,7 @@ const CORBA::ULong MAX_ARRAYSEQ_LEN = 1;
 //               Test_Bounded_Array_Sequence
 // ************************************************************************
 
-Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence (void)
+Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_array_sequence")),
     inout_ (new Param_Test::Bounded_ArraySeq),
     out_ (new Param_Test::Bounded_ArraySeq),
@@ -27,7 +27,7 @@ Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence (void)
 {
 }
 
-Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence (void)
+Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -102,7 +102,7 @@ Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_Array_Sequence::reset_parameters (void)
+Test_Bounded_Array_Sequence::reset_parameters ()
 {
   // Delete the previous ones.
   this->inout_ = new Param_Test::Bounded_ArraySeq;
@@ -133,7 +133,7 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_Array_Sequence::check_validity (void)
+Test_Bounded_Array_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -150,7 +150,7 @@ Test_Bounded_Array_Sequence::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_Array_Sequence::print_values (void)
+Test_Bounded_Array_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h
index aa65c023b62..12ebaefa8c0 100644
--- a/TAO/tests/Param_Test/bd_array_seq.h
+++ b/TAO/tests/Param_Test/bd_array_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Array_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Array_Sequence (void);
+  Test_Bounded_Array_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Array_Sequence (void);
+  ~Test_Bounded_Array_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 1e7190fd7ea..60354698a60 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_Long_Sequence
 // ************************************************************************
 
-Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence (void)
+Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_long_sequence")),
     in_ (new Param_Test::Bounded_Long_Seq),
     inout_ (new Param_Test::Bounded_Long_Seq),
@@ -26,7 +26,7 @@ Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence (void)
 {
 }
 
-Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence (void)
+Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_Long_Sequence::reset_parameters (void)
+Test_Bounded_Long_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_Long_Seq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_Long_Seq;
@@ -120,7 +120,7 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_Long_Sequence::check_validity (void)
+Test_Bounded_Long_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -149,7 +149,7 @@ Test_Bounded_Long_Sequence::check_validity (CORBA::Request_ptr req)
 }
 
 void
-Test_Bounded_Long_Sequence::print_values (void)
+Test_Bounded_Long_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index fc0c65c72c6..ee9f22ff23c 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Long_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Long_Sequence (void);
+  Test_Bounded_Long_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Long_Sequence (void);
+  ~Test_Bounded_Long_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index a87ad18369c..5b88ceff92a 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_Short_Sequence
 // ************************************************************************
 
-Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence (void)
+Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_short_sequence")),
     in_ (new Param_Test::Bounded_Short_Seq),
     inout_ (new Param_Test::Bounded_Short_Seq),
@@ -26,7 +26,7 @@ Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence (void)
 {
 }
 
-Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence (void)
+Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -92,7 +92,7 @@ Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Bounded_Short_Sequence::reset_parameters (void)
+Test_Bounded_Short_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_Short_Seq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_Short_Seq;
@@ -126,7 +126,7 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_Short_Sequence::check_validity (void)
+Test_Bounded_Short_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -154,7 +154,7 @@ Test_Bounded_Short_Sequence::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Bounded_Short_Sequence::print_values (void)
+Test_Bounded_Short_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index f148bba9f5a..74e9e1b46f5 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Short_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Short_Sequence (void);
+  Test_Bounded_Short_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Short_Sequence (void);
+  ~Test_Bounded_Short_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index fadfb85b3e4..fc6ef3a1585 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_String_Sequence
 // ************************************************************************
 
-Test_Bounded_String_Sequence::Test_Bounded_String_Sequence (void)
+Test_Bounded_String_Sequence::Test_Bounded_String_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_strseq")),
     in_ (new Param_Test::Bounded_StrSeq),
     inout_ (new Param_Test::Bounded_StrSeq),
@@ -26,7 +26,7 @@ Test_Bounded_String_Sequence::Test_Bounded_String_Sequence (void)
 {
 }
 
-Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence (void)
+Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -89,7 +89,7 @@ Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_String_Sequence::reset_parameters (void)
+Test_Bounded_String_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_StrSeq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_StrSeq;
@@ -118,7 +118,7 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_String_Sequence::check_validity (void)
+Test_Bounded_String_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -147,7 +147,7 @@ Test_Bounded_String_Sequence::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Bounded_String_Sequence::print_values (void)
+Test_Bounded_String_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index 1b4fb023039..4de9b57f7a8 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_String_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_String_Sequence (void);
+  Test_Bounded_String_Sequence ();
 
   /// dtor
-  ~Test_Bounded_String_Sequence (void);
+  ~Test_Bounded_String_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index c9062c29397..3b1ac0fbada 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_String
 // ************************************************************************
 
-Test_Bounded_String::Test_Bounded_String (void)
+Test_Bounded_String::Test_Bounded_String ()
   : opname_ (CORBA::string_dup ("test_bounded_string")),
     in_ (0),
     inout_ (0),
@@ -26,7 +26,7 @@ Test_Bounded_String::Test_Bounded_String (void)
 {
 }
 
-Test_Bounded_String::~Test_Bounded_String (void)
+Test_Bounded_String::~Test_Bounded_String ()
 {
   CORBA::string_free (this->opname_);
   CORBA::string_free (this->in_);
@@ -96,7 +96,7 @@ Test_Bounded_String::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_String::reset_parameters (void)
+Test_Bounded_String::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::string_free (this->inout_);
@@ -131,7 +131,7 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_String::check_validity (void)
+Test_Bounded_String::check_validity ()
 {
   CORBA::ULong len = ACE_OS::strlen (this->in_);
 
@@ -154,7 +154,7 @@ Test_Bounded_String::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_String::print_values (void)
+Test_Bounded_String::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index a7202b49cac..25778f332cd 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -22,10 +22,10 @@ class Test_Bounded_String
 {
 public:
   /// ctor
-  Test_Bounded_String (void);
+  Test_Bounded_String ();
 
   /// dtor
-  ~Test_Bounded_String (void);
+  ~Test_Bounded_String ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 76456620945..bfdd0a5bb40 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -19,7 +19,7 @@ const CORBA::ULong MAX_STRUCTSEQ_LEN = 1;
 //               Test_Bounded_Struct_Sequence
 // ************************************************************************
 
-Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence (void)
+Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_struct_sequence")),
     inout_ (new Param_Test::Bounded_StructSeq),
     out_ (new Param_Test::Bounded_StructSeq),
@@ -27,7 +27,7 @@ Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence (void)
 {
 }
 
-Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence (void)
+Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -90,7 +90,7 @@ Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */
 }
 
 int
-Test_Bounded_Struct_Sequence::reset_parameters (void)
+Test_Bounded_Struct_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_StructSeq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_StructSeq;
@@ -124,7 +124,7 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_Struct_Sequence::check_validity (void)
+Test_Bounded_Struct_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -141,7 +141,7 @@ Test_Bounded_Struct_Sequence::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_Struct_Sequence::print_values (void)
+Test_Bounded_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index bbda8071ff4..df9fce48977 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Struct_Sequence (void);
+  Test_Bounded_Struct_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Struct_Sequence (void);
+  ~Test_Bounded_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 6b52e20bf89..75f9cb78dc8 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -18,7 +18,7 @@
 //               Test_Bounded_WString_Sequence
 // ************************************************************************
 
-Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence (void)
+Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_wstrseq")),
     in_ (new Param_Test::Bounded_WStrSeq),
     inout_ (new Param_Test::Bounded_WStrSeq),
@@ -27,7 +27,7 @@ Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence (void)
 {
 }
 
-Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence (void)
+Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -89,7 +89,7 @@ Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_WString_Sequence::reset_parameters (void)
+Test_Bounded_WString_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_WStrSeq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_WStrSeq;
@@ -118,7 +118,7 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_WString_Sequence::check_validity (void)
+Test_Bounded_WString_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -146,6 +146,6 @@ Test_Bounded_WString_Sequence::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_WString_Sequence::print_values (void)
+Test_Bounded_WString_Sequence::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h
index c9a754dde2e..e8e8481a365 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.h
+++ b/TAO/tests/Param_Test/bd_wstr_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_WString_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_WString_Sequence (void);
+  Test_Bounded_WString_Sequence ();
 
   /// dtor
-  ~Test_Bounded_WString_Sequence (void);
+  ~Test_Bounded_WString_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index 904158bd400..afed5732f77 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -18,7 +18,7 @@
 //               Test_Bounded_WString
 // ************************************************************************
 
-Test_Bounded_WString::Test_Bounded_WString (void)
+Test_Bounded_WString::Test_Bounded_WString ()
   : opname_ (CORBA::string_dup ("test_bounded_wstring")),
     in_ (0),
     inout_ (0),
@@ -27,7 +27,7 @@ Test_Bounded_WString::Test_Bounded_WString (void)
 {
 }
 
-Test_Bounded_WString::~Test_Bounded_WString (void)
+Test_Bounded_WString::~Test_Bounded_WString ()
 {
   CORBA::string_free (this->opname_);
   CORBA::wstring_free (this->in_);
@@ -97,7 +97,7 @@ Test_Bounded_WString::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_WString::reset_parameters (void)
+Test_Bounded_WString::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::wstring_free (this->inout_);
@@ -132,7 +132,7 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Bounded_WString::check_validity (void)
+Test_Bounded_WString::check_validity ()
 {
   CORBA::ULong len = ACE_OS::wslen (this->in_);
 
@@ -155,6 +155,6 @@ Test_Bounded_WString::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_WString::print_values (void)
+Test_Bounded_WString::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h
index 7c691d97a4f..5481e25babe 100644
--- a/TAO/tests/Param_Test/bd_wstring.h
+++ b/TAO/tests/Param_Test/bd_wstring.h
@@ -22,10 +22,10 @@ class Test_Bounded_WString
 {
 public:
   /// ctor
-  Test_Bounded_WString (void);
+  Test_Bounded_WString ();
 
   /// dtor
-  ~Test_Bounded_WString (void);
+  ~Test_Bounded_WString ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index edaac0d77f3..f1826497abe 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -19,12 +19,12 @@
 
 size_t Test_Big_Union::counter = 0;
 
-Test_Big_Union::Test_Big_Union (void)
+Test_Big_Union::Test_Big_Union ()
   : opname_ (CORBA::string_dup ("test_big_union"))
 {
 }
 
-Test_Big_Union::~Test_Big_Union (void)
+Test_Big_Union::~Test_Big_Union ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -86,7 +86,7 @@ Test_Big_Union::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_Big_Union::reset_parameters (void)
+Test_Big_Union::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
   CORBA::ULong index = (counter++ % Test_Big_Union::BIG_UNION_N_BRANCHES);
@@ -233,7 +233,7 @@ Test_Big_Union::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Big_Union::check_validity (void)
+Test_Big_Union::check_validity ()
 {
   if (this->in_._d () != this->inout_._d ()
       || this->in_._d () != this->out_->_d ()
@@ -547,6 +547,6 @@ Test_Big_Union::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Big_Union::print_values (void)
+Test_Big_Union::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h
index 07e4deb5422..ac05429bb2e 100644
--- a/TAO/tests/Param_Test/big_union.h
+++ b/TAO/tests/Param_Test/big_union.h
@@ -22,10 +22,10 @@ class Test_Big_Union
 {
 public:
   /// ctor
-  Test_Big_Union (void);
+  Test_Big_Union ();
 
   /// dtor
-  ~Test_Big_Union (void);
+  ~Test_Big_Union ();
 
   enum {
     BIG_UNION_N_BRANCHES = 12
@@ -41,16 +41,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 6fa43b8100d..c163d094f6f 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -31,14 +31,14 @@ Param_Test_Client<T>::Param_Test_Client (CORBA::ORB_ptr orb,
 
 // destructor
 template <class T>
-Param_Test_Client<T>::~Param_Test_Client (void)
+Param_Test_Client<T>::~Param_Test_Client ()
 {
   delete this->test_object_;
 }
 
 // All the individual tests.
 template <class T> int
-Param_Test_Client<T>::run_sii_test (void)
+Param_Test_Client<T>::run_sii_test ()
 {
   CORBA::ULong i = 0;  // loop index
   Options *opt = OPTIONS::instance (); // get the options
@@ -144,7 +144,7 @@ Param_Test_Client<T>::run_sii_test (void)
 
 // use DII
 template <class T> int
-Param_Test_Client<T>::run_dii_test (void)
+Param_Test_Client<T>::run_dii_test ()
 {
   const char *opname = this->test_object_->opname ();
   Options *opt = OPTIONS::instance ();
diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h
index d4a139e5bd7..1989cac7797 100644
--- a/TAO/tests/Param_Test/client.h
+++ b/TAO/tests/Param_Test/client.h
@@ -40,13 +40,13 @@ public:
                      Param_Test_ptr objref,
                      T *);
 
-  ~Param_Test_Client (void);
+  ~Param_Test_Client ();
 
   /// run the SII test
-  int run_sii_test (void);
+  int run_sii_test ();
 
   /// run the DII test
-  int run_dii_test (void);
+  int run_dii_test ();
 
 private:
   /// underlying ORB
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 29a9ca724d3..d13c60fb285 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -25,14 +25,14 @@ const int LEVEL_3_LENGTH = 3;
 
 size_t Test_Complex_Any::counter = 0;
 
-Test_Complex_Any::Test_Complex_Any (void)
+Test_Complex_Any::Test_Complex_Any ()
   : opname_ (CORBA::string_dup ("test_complex_any")),
     out_ (new CORBA::Any),
     ret_ (new CORBA::Any)
 {
 }
 
-Test_Complex_Any::~Test_Complex_Any (void)
+Test_Complex_Any::~Test_Complex_Any ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -84,7 +84,7 @@ Test_Complex_Any::init_parameters (Param_Test_ptr)
 //                                                                  <- boolean
 //                                                                  <- short
 int
-Test_Complex_Any::reset_parameters (void)
+Test_Complex_Any::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -172,7 +172,7 @@ Test_Complex_Any::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Complex_Any::check_validity (void)
+Test_Complex_Any::check_validity ()
 {
   const CORBA::AnySeq *level2_in_seq = 0;
   const CORBA::AnySeq *level2_test_seq = 0;
@@ -306,6 +306,6 @@ Test_Complex_Any::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Complex_Any::print_values (void)
+Test_Complex_Any::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h
index b0ac49b1ecc..d21e9c17b0c 100644
--- a/TAO/tests/Param_Test/complex_any.h
+++ b/TAO/tests/Param_Test/complex_any.h
@@ -24,10 +24,10 @@ class Test_Complex_Any
 {
 public:
   /// ctor
-  Test_Complex_Any (void);
+  Test_Complex_Any ();
 
   /// dtor
-  ~Test_Complex_Any (void);
+  ~Test_Complex_Any ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -39,16 +39,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index c8f09c69933..c1271859d7f 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -49,11 +49,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 }
 
 // constructor
-Driver::Driver (void)
+Driver::Driver ()
 {
 }
 
-Driver::~Driver (void)
+Driver::~Driver ()
 {
 }
 
@@ -111,7 +111,7 @@ Driver::init (int argc, ACE_TCHAR **argv)
 }
 
 int
-Driver::run (void)
+Driver::run ()
 {
   // serves as a factory of Param_Client objects. It is also responsible to
   // start the test
diff --git a/TAO/tests/Param_Test/driver.h b/TAO/tests/Param_Test/driver.h
index dcc0778dd65..1385df06df4 100644
--- a/TAO/tests/Param_Test/driver.h
+++ b/TAO/tests/Param_Test/driver.h
@@ -27,14 +27,14 @@ class Driver
 {
 public:
   // = Constructor and destructor.
-  Driver (void);
-  ~Driver (void);
+  Driver ();
+  ~Driver ();
 
   /// Initialize the driver object
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// underlying ORB (we do not own it)
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 49084a4b258..d7216acb86f 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -20,13 +20,13 @@
 //               Test_Exception
 // ************************************************************************
 
-Test_Exception::Test_Exception (void)
+Test_Exception::Test_Exception ()
   : opname_ (CORBA::string_dup ("test_exception")),
     iterations_ (0)
 {
 }
 
-Test_Exception::~Test_Exception (void)
+Test_Exception::~Test_Exception ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -230,7 +230,7 @@ Test_Exception::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Exception::reset_parameters (void)
+Test_Exception::reset_parameters ()
 {
   this->inout_ =  0;
   this->out_ =  0;
@@ -380,7 +380,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Exception::check_validity (void)
+Test_Exception::check_validity ()
 {
   if (this->inout_ == this->in_ * 2 &&
       this->out_ == this->in_ * 3 &&
@@ -399,7 +399,7 @@ Test_Exception::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Exception::print_values (void)
+Test_Exception::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index 6bb02bd3d81..11953410c4e 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -19,10 +19,10 @@ class Test_Exception
 {
 public:
   /// ctor
-  Test_Exception (void);
+  Test_Exception ();
 
   /// dtor
-  ~Test_Exception (void);
+  ~Test_Exception ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -34,16 +34,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index 61f5c079118..20118bc7838 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -17,13 +17,13 @@
 //               Test_Fixed_Array
 // ************************************************************************
 
-Test_Fixed_Array::Test_Fixed_Array (void)
+Test_Fixed_Array::Test_Fixed_Array ()
   : opname_ (CORBA::string_dup ("test_fixed_array")),
     ret_ (new Param_Test::Fixed_Array)
 {
 }
 
-Test_Fixed_Array::~Test_Fixed_Array (void)
+Test_Fixed_Array::~Test_Fixed_Array ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -78,7 +78,7 @@ Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Fixed_Array::reset_parameters (void)
+Test_Fixed_Array::reset_parameters ()
 {
   for (CORBA::ULong i=0; i < Param_Test::DIM1; i++)
     {
@@ -111,7 +111,7 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Fixed_Array::check_validity (void)
+Test_Fixed_Array::check_validity ()
 {
   if (this->compare (this->in_, this->inout_) &&
       this->compare (this->in_, this->out_) &&
@@ -141,7 +141,7 @@ Test_Fixed_Array::compare (const Param_Test::Fixed_Array_slice *a1,
 }
 
 void
-Test_Fixed_Array::print_values (void)
+Test_Fixed_Array::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG, "IN array\n"));
   this->print (this->in_);
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index f6cec4953e6..ace255104ef 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -22,10 +22,10 @@ class Test_Fixed_Array
 {
 public:
   /// ctor
-  Test_Fixed_Array (void);
+  Test_Fixed_Array ();
 
   /// dtor
-  ~Test_Fixed_Array (void);
+  ~Test_Fixed_Array ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 15c7488bdca..9e6c2fdc2f4 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -17,12 +17,12 @@
 //               Test_Fixed_Struct
 // ************************************************************************
 
-Test_Fixed_Struct::Test_Fixed_Struct (void)
+Test_Fixed_Struct::Test_Fixed_Struct ()
   : opname_ (CORBA::string_dup ("test_fixed_struct"))
 {
 }
 
-Test_Fixed_Struct::~Test_Fixed_Struct (void)
+Test_Fixed_Struct::~Test_Fixed_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -75,7 +75,7 @@ Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Fixed_Struct::reset_parameters (void)
+Test_Fixed_Struct::reset_parameters ()
 {
   ACE_OS::memset (&this->inout_,
                   0,
@@ -111,7 +111,7 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Fixed_Struct::check_validity (void)
+Test_Fixed_Struct::check_validity ()
 {
   if (this->in_.l == this->inout_.l &&
       this->in_.c == this->inout_.c &&
@@ -147,7 +147,7 @@ Test_Fixed_Struct::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Fixed_Struct::print_values (void)
+Test_Fixed_Struct::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index ac0393a0303..b874bed5250 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -22,10 +22,10 @@ class Test_Fixed_Struct
 {
 public:
   /// ctor
-  Test_Fixed_Struct (void);
+  Test_Fixed_Struct ();
 
   /// dtor
-  ~Test_Fixed_Struct (void);
+  ~Test_Fixed_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp
index 8e5b49caf59..048284a6e59 100644
--- a/TAO/tests/Param_Test/helper.cpp
+++ b/TAO/tests/Param_Test/helper.cpp
@@ -16,28 +16,28 @@
 
 const CORBA::ULong TEST_BUFSIZE = 128;
 
-Generator::Generator (void)
+Generator::Generator ()
 {
 }
 
-Generator::~Generator (void)
+Generator::~Generator ()
 {
 }
 
 CORBA::Short
-Generator::gen_short (void)
+Generator::gen_short ()
 {
   return (CORBA::Short) (ACE_OS::rand () % TEST_BUFSIZE);
 }
 
 CORBA::Long
-Generator::gen_long (void)
+Generator::gen_long ()
 {
   return ::ACE_OS::rand () % TEST_BUFSIZE;
 }
 
 char *
-Generator::gen_string (void)
+Generator::gen_string ()
 {
   return gen_string (TEST_BUFSIZE);
 }
@@ -64,7 +64,7 @@ Generator::gen_string (int max_length)
 }
 
 CORBA::WChar *
-Generator::gen_wstring (void)
+Generator::gen_wstring ()
 {
   return gen_wstring (TEST_BUFSIZE);
 }
@@ -92,7 +92,7 @@ Generator::gen_wstring (int max_length)
 }
 
 const Param_Test::Fixed_Struct
-Generator::gen_fixed_struct (void)
+Generator::gen_fixed_struct ()
 {
   this->fixed_struct_.l = ACE_OS::rand ();
   this->fixed_struct_.c = ACE_OS::rand () % 128;
@@ -105,7 +105,7 @@ Generator::gen_fixed_struct (void)
 }
 
 const Param_Test::Step
-Generator::gen_step (void)
+Generator::gen_step ()
 {
   this->step_.name.id = this->gen_string ();
   this->step_.name.kind = this->gen_string ();
diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h
index 57648202ecf..37523be1c30 100644
--- a/TAO/tests/Param_Test/helper.h
+++ b/TAO/tests/Param_Test/helper.h
@@ -22,19 +22,19 @@ class Generator
 {
 public:
   /// constructor
-  Generator (void);
+  Generator ();
 
   /// destructor
-  ~Generator (void);
+  ~Generator ();
 
-  CORBA::Short gen_short (void);
-  CORBA::Long gen_long (void);
-  char* gen_string (void);
+  CORBA::Short gen_short ();
+  CORBA::Long gen_long ();
+  char* gen_string ();
   char* gen_string (int maxlength);
-  CORBA::WChar* gen_wstring (void);
+  CORBA::WChar* gen_wstring ();
   CORBA::WChar* gen_wstring (int maxlength);
-  const Param_Test::Fixed_Struct gen_fixed_struct (void);
-  const Param_Test::Step gen_step (void);
+  const Param_Test::Fixed_Struct gen_fixed_struct ();
+  const Param_Test::Step gen_step ();
  private:
   Param_Test::Fixed_Struct fixed_struct_;
   Param_Test::Step step_;
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index 4711438c044..e5b09dba3b2 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -18,7 +18,7 @@
 //               Test_Multdim_Array
 // ************************************************************************
 
-Test_Multdim_Array::Test_Multdim_Array (void)
+Test_Multdim_Array::Test_Multdim_Array ()
   : opname_ (CORBA::string_dup ("test_multdim_array")),
     in_ (new Param_Test::Multdim_Array),
     inout_ (new Param_Test::Multdim_Array),
@@ -27,7 +27,7 @@ Test_Multdim_Array::Test_Multdim_Array (void)
 {
 }
 
-Test_Multdim_Array::~Test_Multdim_Array (void)
+Test_Multdim_Array::~Test_Multdim_Array ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Multdim_Array::reset_parameters (void)
+Test_Multdim_Array::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -140,7 +140,7 @@ Test_Multdim_Array::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Multdim_Array::check_validity (void)
+Test_Multdim_Array::check_validity ()
 {
   if (this->compare (this->in_.in (),
                      this->inout_.in ()) &&
@@ -179,7 +179,7 @@ Test_Multdim_Array::compare (const Param_Test::Multdim_Array_slice *a1,
 }
 
 void
-Test_Multdim_Array::print_values (void)
+Test_Multdim_Array::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG, "IN array\n"));
   this->print (this->in_.in ());
diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h
index af149eafb9e..ff6aaa28572 100644
--- a/TAO/tests/Param_Test/multdim_array.h
+++ b/TAO/tests/Param_Test/multdim_array.h
@@ -22,10 +22,10 @@ class Test_Multdim_Array
 {
 public:
   /// ctor
-  Test_Multdim_Array (void);
+  Test_Multdim_Array ();
 
   /// dtor
-  ~Test_Multdim_Array (void);
+  ~Test_Multdim_Array ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index c12b5d945c3..5d444cae5d2 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -17,7 +17,7 @@
 //               Test_Nested_Struct
 // ************************************************************************
 
-Test_Nested_Struct::Test_Nested_Struct (void)
+Test_Nested_Struct::Test_Nested_Struct ()
   : opname_ (CORBA::string_dup ("test_nested_struct")),
     inout_ (new Param_Test::Nested_Struct),
     out_ (new Param_Test::Nested_Struct),
@@ -25,7 +25,7 @@ Test_Nested_Struct::Test_Nested_Struct (void)
 {
 }
 
-Test_Nested_Struct::~Test_Nested_Struct (void)
+Test_Nested_Struct::~Test_Nested_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -100,7 +100,7 @@ Test_Nested_Struct::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Nested_Struct::reset_parameters (void)
+Test_Nested_Struct::reset_parameters ()
 {
   this->inout_ = new Param_Test::Nested_Struct; // delete the previous ones
   this->out_ = new Param_Test::Nested_Struct;
@@ -137,7 +137,7 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Nested_Struct::check_validity (void)
+Test_Nested_Struct::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_.vs.seq.length () == this->inout_->vs.seq.length ()) &&
@@ -166,7 +166,7 @@ Test_Nested_Struct::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Nested_Struct::print_values (void)
+Test_Nested_Struct::print_values ()
 {
   for (CORBA::ULong i=0; i < this->in_.vs.seq.length (); i++)
     {
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index 2ca813c4142..6138f5ca459 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -23,10 +23,10 @@ class Test_Nested_Struct
 {
 public:
   /// ctor
-  Test_Nested_Struct (void);
+  Test_Nested_Struct ();
 
   /// dtor
-  ~Test_Nested_Struct (void);
+  ~Test_Nested_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 74dad5fa189..e86581104f8 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -17,12 +17,12 @@
 //               Test_ObjRef
 // ************************************************************************
 
-Test_ObjRef::Test_ObjRef (void)
+Test_ObjRef::Test_ObjRef ()
   : opname_ (CORBA::string_dup ("test_objref"))
 {
 }
 
-Test_ObjRef::~Test_ObjRef (void)
+Test_ObjRef::~Test_ObjRef ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -106,7 +106,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_ObjRef::reset_parameters (void)
+Test_ObjRef::reset_parameters ()
 {
   // Environemnt variable
   Coffee::Desc desc;
@@ -154,7 +154,7 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_ObjRef::check_validity (void)
+Test_ObjRef::check_validity ()
 {
   // Environemnt variable
 
@@ -209,7 +209,7 @@ Test_ObjRef::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_ObjRef::print_values (void)
+Test_ObjRef::print_values ()
 {
   // Env. variable
 
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index 9f2aa04c937..672ffd948d4 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -22,10 +22,10 @@ class Test_ObjRef
 {
 public:
   /// ctor
-  Test_ObjRef (void);
+  Test_ObjRef ();
 
   /// dtor
-  ~Test_ObjRef (void);
+  ~Test_ObjRef ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 188a7011a87..834d50f3212 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -17,7 +17,7 @@
 //               Test_Objref_Struct
 // ************************************************************************
 
-Test_Objref_Struct::Test_Objref_Struct (void)
+Test_Objref_Struct::Test_Objref_Struct ()
   : opname_ (CORBA::string_dup ("test_objref_struct")),
     inout_ (new Param_Test::Objref_Struct),
     out_ (new Param_Test::Objref_Struct),
@@ -25,7 +25,7 @@ Test_Objref_Struct::Test_Objref_Struct (void)
 {
 }
 
-Test_Objref_Struct::~Test_Objref_Struct (void)
+Test_Objref_Struct::~Test_Objref_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -99,7 +99,7 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_Objref_Struct::reset_parameters (void)
+Test_Objref_Struct::reset_parameters ()
 {
   this->inout_ = new Param_Test::Objref_Struct; // delete the previous ones
   this->out_ = new Param_Test::Objref_Struct;
@@ -136,7 +136,7 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Objref_Struct::check_validity (void)
+Test_Objref_Struct::check_validity ()
 {
   if (this->in_.x != this->inout_->x
       || this->in_.x != this->out_->x
@@ -185,7 +185,7 @@ Test_Objref_Struct::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Objref_Struct::print_values (void)
+Test_Objref_Struct::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n*=*=*=*=*=*=*=*=*=*=\n"
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index a7b8fb748a3..e5f26fb392b 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -23,10 +23,10 @@ class Test_Objref_Struct
 {
 public:
   /// ctor
-  Test_Objref_Struct (void);
+  Test_Objref_Struct ();
 
   /// dtor
-  ~Test_Objref_Struct (void);
+  ~Test_Objref_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index 6db5429ab92..b029769a160 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -19,7 +19,7 @@
 #include "ace/Log_Msg.h"
 
 // Constructor.
-Options::Options (void)
+Options::Options ()
   : ior_ (CORBA::string_dup ("file://test.ior")),
     test_type_ (Options::NO_TEST),
     invoke_type_ (Options::SII),
@@ -29,7 +29,7 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
@@ -200,19 +200,19 @@ Options::param_test_ior () const
 }
 
 Options::TEST_TYPE
-Options::test_type (void)
+Options::test_type ()
 {
   return this->test_type_;
 }
 
 Options::INVOKE_TYPE
-Options::invoke_type (void)
+Options::invoke_type ()
 {
   return this->invoke_type_;
 }
 
 CORBA::ULong
-Options::loop_count (void)
+Options::loop_count ()
 {
   return this->loop_count_;
 }
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index 1659ce72f23..75d7b99cab2 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -74,10 +74,10 @@ public:
   };
 
   /// constructor
-  Options (void);
+  Options ();
 
   /// destructor
-  ~Options (void);
+  ~Options ();
 
   /// Parses the arguments passed on the command line.
   int parse_args (int argc, ACE_TCHAR **argv);
@@ -86,13 +86,13 @@ public:
   char const * param_test_ior () const;
 
   /// what test to run
-  TEST_TYPE test_type (void);
+  TEST_TYPE test_type ();
 
   /// whether to use SII or DII
-  INVOKE_TYPE invoke_type (void);
+  INVOKE_TYPE invoke_type ();
 
   /// number of times to run the test
-  CORBA::ULong loop_count (void);
+  CORBA::ULong loop_count ();
 
   /// whether debug option is on or not
   CORBA::Boolean debug () const;
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 4a044735a8b..c53230df70b 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -25,7 +25,7 @@ Coffee_i::Coffee_i (const char *name)
 
 // Destructor
 
-Coffee_i::~Coffee_i (void)
+Coffee_i::~Coffee_i ()
 {
 }
 
@@ -60,7 +60,7 @@ Param_Test_i::Param_Test_i (const char *coffee_name,
 
 // Destructor
 
-Param_Test_i::~Param_Test_i (void)
+Param_Test_i::~Param_Test_i ()
 {
 }
 
@@ -627,7 +627,7 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 
 // make a Coffee object
 Coffee_ptr
-Param_Test_i::make_coffee (void)
+Param_Test_i::make_coffee ()
 {
   return this->obj_._this ();
 }
@@ -973,13 +973,13 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
 }
 
 void
-Param_Test_i::shutdown (void)
+Param_Test_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
 
 void
-Param_Test_i::throw_badboy (void)
+Param_Test_i::throw_badboy ()
 {
   throw Param_Test::BadBoy ();
 }
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 8c8af88d3ec..454158c2183 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -22,12 +22,12 @@ public:
   Coffee_i (const char *name);
 
   /// destructor
-  ~Coffee_i (void);
+  ~Coffee_i ();
 
   // =methods for the attribute
 
   /// get attribute
-  virtual Coffee::Desc * description (void);
+  virtual Coffee::Desc * description ();
 
   /// set attribute
   virtual void description (const Coffee::Desc &description);
@@ -53,7 +53,7 @@ public:
                 CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~Param_Test_i (void);
+  ~Param_Test_i ();
 
   /// test for shorts
   virtual CORBA::Short test_short (CORBA::Short s1,
@@ -183,7 +183,7 @@ public:
 
   /// make a coffee object
   virtual Coffee_ptr
-  make_coffee (void);
+  make_coffee ();
 
   /// test for object references
   virtual Coffee_ptr
@@ -245,7 +245,7 @@ public:
                       Param_Test::Multdim_Array ,
                       Param_Test::Multdim_Array_out);
 
-  void shutdown (void);
+  void shutdown ();
 
 
 private:
@@ -261,7 +261,7 @@ private:
    * not in its THROW_SPEC, but still test TAO's
    * conversion of such an exception to UNKNOWN.
    */
-  void throw_badboy (void);
+  void throw_badboy ();
 };
 
 #endif /* PARAM_TEST_I_H */
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 328bed47e5a..c05eb8f3c90 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -20,12 +20,12 @@ const CORBA::ULong MAX_SEQ_LENGTH = 3;
 //               Test_Recursive_Struct
 // ************************************************************************
 
-Test_Recursive_Struct::Test_Recursive_Struct (void)
+Test_Recursive_Struct::Test_Recursive_Struct ()
   : opname_ (CORBA::string_dup ("test_recursive_struct"))
 {
 }
 
-Test_Recursive_Struct::~Test_Recursive_Struct (void)
+Test_Recursive_Struct::~Test_Recursive_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -75,7 +75,7 @@ Test_Recursive_Struct::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Recursive_Struct::reset_parameters (void)
+Test_Recursive_Struct::reset_parameters ()
 {
   // Since these are _vars, we do this the first call and
   // every call thereafter (if any).
@@ -124,7 +124,7 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Recursive_Struct::check_validity (void)
+Test_Recursive_Struct::check_validity ()
 {
   // Pair in_ with each of the returned values and call the
   // helper function with that pair.
@@ -164,7 +164,7 @@ Test_Recursive_Struct::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Recursive_Struct::print_values (void)
+Test_Recursive_Struct::print_values ()
 {
 }
 
diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h
index 3e4141324a1..4fe7bdb9bed 100644
--- a/TAO/tests/Param_Test/recursive_struct.h
+++ b/TAO/tests/Param_Test/recursive_struct.h
@@ -25,10 +25,10 @@ class Test_Recursive_Struct
 {
 public:
   /// ctor
-  Test_Recursive_Struct (void);
+  Test_Recursive_Struct ();
 
   /// dtor
-  ~Test_Recursive_Struct (void);
+  ~Test_Recursive_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -40,16 +40,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index a6500e251e9..ca65bc1ffaa 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -19,12 +19,12 @@ const CORBA::ULong MAX_SEQ_LENGTH = 2;
 //               Test_Recursive_Union
 // ************************************************************************
 
-Test_Recursive_Union::Test_Recursive_Union (void)
+Test_Recursive_Union::Test_Recursive_Union ()
   : opname_ (CORBA::string_dup ("test_recursive_union"))
 {
 }
 
-Test_Recursive_Union::~Test_Recursive_Union (void)
+Test_Recursive_Union::~Test_Recursive_Union ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -74,7 +74,7 @@ Test_Recursive_Union::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Recursive_Union::reset_parameters (void)
+Test_Recursive_Union::reset_parameters ()
 {
   // Since these are _vars, we do this the first call and
   // every call thereafter (if any).
@@ -125,7 +125,7 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Recursive_Union::check_validity (void)
+Test_Recursive_Union::check_validity ()
 {
   // Pair in_ with each of the returned values and call the
   // helper function with that pair.
@@ -165,7 +165,7 @@ Test_Recursive_Union::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Recursive_Union::print_values (void)
+Test_Recursive_Union::print_values ()
 {
 }
 
diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h
index 8b62bfea172..62c729412c7 100644
--- a/TAO/tests/Param_Test/recursive_union.h
+++ b/TAO/tests/Param_Test/recursive_union.h
@@ -24,10 +24,10 @@ class Test_Recursive_Union
 {
 public:
   /// ctor
-  Test_Recursive_Union (void);
+  Test_Recursive_Union ();
 
   /// dtor
-  ~Test_Recursive_Union (void);
+  ~Test_Recursive_Union ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -39,16 +39,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 87fb68e2caa..9c298261969 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -14,17 +14,17 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-Results::Results (void)
+Results::Results ()
 {
 }
 
-Results::~Results (void)
+Results::~Results ()
 {
   delete [] this->elapsed_time_;
 }
 
 void
-Results::print_stats (void)
+Results::print_stats ()
 {
   double
     avg_real_time = 0,
@@ -103,20 +103,20 @@ Results::print_exception (const char * /* call_name */)
 }
 
 void
-Results::start_timer (void)
+Results::start_timer ()
 {
   this->timer_.start ();
 }
 
 void
-Results::stop_timer (void)
+Results::stop_timer ()
 {
   this->timer_.stop ();
   this->timer_.elapsed_time (this->elapsed_time_[this->call_count_-1]);
 }
 
 CORBA::ULong
-Results::call_count (void)
+Results::call_count ()
 {
   return this->call_count_;
 }
@@ -128,7 +128,7 @@ Results::call_count (CORBA::ULong c)
 }
 
 CORBA::ULong
-Results::error_count (void)
+Results::error_count ()
 {
   return this->error_count_;
 }
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index dd2e62756f7..0607cc430e9 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -33,31 +33,31 @@ class Results
 {
 public:
   /// ctor
-  Results (void);
+  Results ();
 
   /// destructor
-  ~Results (void);
+  ~Results ();
 
   /// prints the time stats
-  void print_stats (void);
+  void print_stats ();
 
   /// print the exception
   void print_exception (const char *call_name);
 
   /// start timing
-  void start_timer (void);
+  void start_timer ();
 
   /// stop timing
-  void stop_timer (void);
+  void stop_timer ();
 
   /// return call count
-  CORBA::ULong call_count (void);
+  CORBA::ULong call_count ();
 
   /// set the call count
   void call_count (CORBA::ULong);
 
   /// return the error count
-  CORBA::ULong error_count (void);
+  CORBA::ULong error_count ();
 
   /// set error count
   void error_count (CORBA::ULong);
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index f2b36b8d046..3fd478cd8d9 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -17,12 +17,12 @@
 //               Test_Short
 // ************************************************************************
 
-Test_Short::Test_Short (void)
+Test_Short::Test_Short ()
   : opname_ (CORBA::string_dup ("test_short"))
 {
 }
 
-Test_Short::~Test_Short (void)
+Test_Short::~Test_Short ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -67,7 +67,7 @@ Test_Short::init_parameters (Param_Test_ptr /*objref*/)
 }
 
 int
-Test_Short::reset_parameters (void)
+Test_Short::reset_parameters ()
 {
   this->inout_ =  0;
   this->out_ =  0;
@@ -94,7 +94,7 @@ Test_Short::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Short::check_validity (void)
+Test_Short::check_validity ()
 {
   if (this->inout_ == this->in_ * 2 &&
       this->out_ == this->in_ * 3 &&
@@ -111,7 +111,7 @@ Test_Short::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Short::print_values (void)
+Test_Short::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index 3434515f78e..f95f247001f 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -22,10 +22,10 @@ class Test_Short
 {
 public:
   /// ctor
-  Test_Short (void);
+  Test_Short ();
 
   /// dtor
-  ~Test_Short (void);
+  ~Test_Short ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index a3f799d1576..8f00ade64f4 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -19,12 +19,12 @@
 
 size_t Test_Small_Union::counter = 0;
 
-Test_Small_Union::Test_Small_Union (void)
+Test_Small_Union::Test_Small_Union ()
   : opname_ (CORBA::string_dup ("test_small_union"))
 {
 }
 
-Test_Small_Union::~Test_Small_Union (void)
+Test_Small_Union::~Test_Small_Union ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -86,7 +86,7 @@ Test_Small_Union::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_Small_Union::reset_parameters (void)
+Test_Small_Union::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
   CORBA::ULong index = (counter++ % 2);
@@ -133,7 +133,7 @@ Test_Small_Union::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Small_Union::check_validity (void)
+Test_Small_Union::check_validity ()
 {
   if (this->in_._d () != this->inout_._d ()
       || this->in_._d () != this->out_->_d ()
@@ -183,6 +183,6 @@ Test_Small_Union::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Small_Union::print_values (void)
+Test_Small_Union::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h
index 5a0479ba21c..c489d47dafb 100644
--- a/TAO/tests/Param_Test/small_union.h
+++ b/TAO/tests/Param_Test/small_union.h
@@ -22,10 +22,10 @@ class Test_Small_Union
 {
 public:
   /// ctor
-  Test_Small_Union (void);
+  Test_Small_Union ();
 
   /// dtor
-  ~Test_Small_Union (void);
+  ~Test_Small_Union ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index edad685cef6..12f1cf02337 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -17,12 +17,12 @@
 //               Test_TypeCode
 // ************************************************************************
 
-Test_TypeCode::Test_TypeCode (void)
+Test_TypeCode::Test_TypeCode ()
   : opname_ (CORBA::string_dup ("test_typecode"))
 {
 }
 
-Test_TypeCode::~Test_TypeCode (void)
+Test_TypeCode::~Test_TypeCode ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -94,7 +94,7 @@ Test_TypeCode::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_TypeCode::reset_parameters (void)
+Test_TypeCode::reset_parameters ()
 {
   this->in_ = this->tc_holder_;
   this->inout_ = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
@@ -124,7 +124,7 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_TypeCode::check_validity (void)
+Test_TypeCode::check_validity ()
 {
   try
     {
@@ -155,6 +155,6 @@ Test_TypeCode::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_TypeCode::print_values (void)
+Test_TypeCode::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index 93c83c58b7d..16f261be28d 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -22,10 +22,10 @@ class Test_TypeCode
 {
 public:
   /// ctor
-  Test_TypeCode (void);
+  Test_TypeCode ();
 
   /// dtor
-  ~Test_TypeCode (void);
+  ~Test_TypeCode ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index f1e3064a337..b471b54a13f 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -21,7 +21,7 @@ const CORBA::ULong NUM_TEST_TYPES = 4;
 //               Test_AnySeq
 // ************************************************************************
 
-Test_AnySeq::Test_AnySeq (void)
+Test_AnySeq::Test_AnySeq ()
   : opname_ (CORBA::string_dup ("test_anyseq")),
     in_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)),
     inout_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)),
@@ -30,7 +30,7 @@ Test_AnySeq::Test_AnySeq (void)
 {
 }
 
-Test_AnySeq::~Test_AnySeq (void)
+Test_AnySeq::~Test_AnySeq ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -140,7 +140,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_AnySeq::reset_parameters (void)
+Test_AnySeq::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -203,7 +203,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_AnySeq::check_validity (void)
+Test_AnySeq::check_validity ()
 {
   CORBA::Short short_in, short_inout, short_out, short_ret;
   const char *str_in;
@@ -286,7 +286,7 @@ Test_AnySeq::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_AnySeq::print_values (void)
+Test_AnySeq::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index 50e8431a480..03134228487 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -22,10 +22,10 @@ class Test_AnySeq
 {
 public:
   /// ctor
-  Test_AnySeq (void);
+  Test_AnySeq ();
 
   /// dtor
-  ~Test_AnySeq (void);
+  ~Test_AnySeq ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index b6bc5487c9a..2b4370ab015 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Array_Sequence
 // ************************************************************************
 
-Test_Array_Sequence::Test_Array_Sequence (void)
+Test_Array_Sequence::Test_Array_Sequence ()
   : opname_ (CORBA::string_dup ("test_array_sequence")),
     inout_ (new Param_Test::ArraySeq),
     out_ (new Param_Test::ArraySeq),
@@ -25,7 +25,7 @@ Test_Array_Sequence::Test_Array_Sequence (void)
 {
 }
 
-Test_Array_Sequence::~Test_Array_Sequence (void)
+Test_Array_Sequence::~Test_Array_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -104,7 +104,7 @@ Test_Array_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Array_Sequence::reset_parameters (void)
+Test_Array_Sequence::reset_parameters ()
 {
   // Delete the previous ones.
   this->inout_ = new Param_Test::ArraySeq;
@@ -134,7 +134,7 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Array_Sequence::check_validity (void)
+Test_Array_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -151,7 +151,7 @@ Test_Array_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Array_Sequence::print_values (void)
+Test_Array_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h
index 87701ffaee7..c2328da91c3 100644
--- a/TAO/tests/Param_Test/ub_array_seq.h
+++ b/TAO/tests/Param_Test/ub_array_seq.h
@@ -23,10 +23,10 @@ class Test_Array_Sequence
 {
 public:
   /// ctor
-  Test_Array_Sequence (void);
+  Test_Array_Sequence ();
 
   /// dtor
-  ~Test_Array_Sequence (void);
+  ~Test_Array_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index ace32631e54..2066e19c357 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Long_Sequence
 // ************************************************************************
 
-Test_Long_Sequence::Test_Long_Sequence (void)
+Test_Long_Sequence::Test_Long_Sequence ()
   : opname_ (CORBA::string_dup ("test_long_sequence")),
     in_ (new CORBA::LongSeq),
     inout_ (new CORBA::LongSeq),
@@ -26,7 +26,7 @@ Test_Long_Sequence::Test_Long_Sequence (void)
 {
 }
 
-Test_Long_Sequence::~Test_Long_Sequence (void)
+Test_Long_Sequence::~Test_Long_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -85,7 +85,7 @@ Test_Long_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Long_Sequence::reset_parameters (void)
+Test_Long_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::LongSeq; // delete the previous ones
   this->out_ = new CORBA::LongSeq;
@@ -114,7 +114,7 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Long_Sequence::check_validity (void)
+Test_Long_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -142,7 +142,7 @@ Test_Long_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Long_Sequence::print_values (void)
+Test_Long_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index 4050e7dc570..1c0408c8c2f 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -23,10 +23,10 @@ class Test_Long_Sequence
 {
 public:
   /// ctor
-  Test_Long_Sequence (void);
+  Test_Long_Sequence ();
 
   /// dtor
-  ~Test_Long_Sequence (void);
+  ~Test_Long_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index a0984f2250a..29c31d7cd3f 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -26,7 +26,7 @@ static const char *Coffee_Flavor [] = {
   "Swiss Chocolate Mocha"
 };
 
-Test_ObjRef_Sequence::Test_ObjRef_Sequence (void)
+Test_ObjRef_Sequence::Test_ObjRef_Sequence ()
   : opname_ (CORBA::string_dup ("test_coffe_mix")),
     inout_ (new Param_Test::Coffee_Mix),
     out_ (new Param_Test::Coffee_Mix),
@@ -34,7 +34,7 @@ Test_ObjRef_Sequence::Test_ObjRef_Sequence (void)
 {
 }
 
-Test_ObjRef_Sequence::~Test_ObjRef_Sequence (void)
+Test_ObjRef_Sequence::~Test_ObjRef_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -115,7 +115,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_ObjRef_Sequence::reset_parameters (void)
+Test_ObjRef_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Coffee_Mix; // delete the previous ones
   this->out_ = new Param_Test::Coffee_Mix;
@@ -144,7 +144,7 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_ObjRef_Sequence::check_validity (void)
+Test_ObjRef_Sequence::check_validity ()
 {
   try
     {
@@ -174,7 +174,7 @@ Test_ObjRef_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_ObjRef_Sequence::print_values (void)
+Test_ObjRef_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index b9165d990cb..79c70d8bf1f 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -23,10 +23,10 @@ class Test_ObjRef_Sequence
 {
 public:
   /// ctor
-  Test_ObjRef_Sequence (void);
+  Test_ObjRef_Sequence ();
 
   /// dtor
-  ~Test_ObjRef_Sequence (void);
+  ~Test_ObjRef_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index c0d44106fe3..b87466b81d7 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Short_Sequence
 // ************************************************************************
 
-Test_Short_Sequence::Test_Short_Sequence (void)
+Test_Short_Sequence::Test_Short_Sequence ()
   : opname_ (CORBA::string_dup ("test_short_sequence")),
     in_ (new CORBA::ShortSeq),
     inout_ (new CORBA::ShortSeq),
@@ -26,7 +26,7 @@ Test_Short_Sequence::Test_Short_Sequence (void)
 {
 }
 
-Test_Short_Sequence::~Test_Short_Sequence (void)
+Test_Short_Sequence::~Test_Short_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_Short_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Short_Sequence::reset_parameters (void)
+Test_Short_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::ShortSeq; // delete the previous ones
   this->out_ = new CORBA::ShortSeq;
@@ -116,7 +116,7 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Short_Sequence::check_validity (void)
+Test_Short_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -144,7 +144,7 @@ Test_Short_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Short_Sequence::print_values (void)
+Test_Short_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index 1105cae9bf7..1aafe12fa2f 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -23,10 +23,10 @@ class Test_Short_Sequence
 {
 public:
   /// ctor
-  Test_Short_Sequence (void);
+  Test_Short_Sequence ();
 
   /// dtor
-  ~Test_Short_Sequence (void);
+  ~Test_Short_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 42059a4cc16..979ee4d1ff2 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_String_Sequence
 // ************************************************************************
 
-Test_String_Sequence::Test_String_Sequence (void)
+Test_String_Sequence::Test_String_Sequence ()
   : opname_ (CORBA::string_dup ("test_strseq")),
     in_ (new CORBA::StringSeq),
     inout_ (new CORBA::StringSeq),
@@ -26,7 +26,7 @@ Test_String_Sequence::Test_String_Sequence (void)
 {
 }
 
-Test_String_Sequence::~Test_String_Sequence (void)
+Test_String_Sequence::~Test_String_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -91,7 +91,7 @@ Test_String_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_String_Sequence::reset_parameters (void)
+Test_String_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::StringSeq; // delete the previous ones
   this->out_ = new CORBA::StringSeq;
@@ -120,7 +120,7 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_String_Sequence::check_validity (void)
+Test_String_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -148,7 +148,7 @@ Test_String_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_String_Sequence::print_values (void)
+Test_String_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index a4340e8c5d5..28392276af0 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -23,10 +23,10 @@ class Test_String_Sequence
 {
 public:
   /// ctor
-  Test_String_Sequence (void);
+  Test_String_Sequence ();
 
   /// dtor
-  ~Test_String_Sequence (void);
+  ~Test_String_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index c155a65bf85..75c70bd84b8 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -17,7 +17,7 @@
 //               Test_Unbounded_String
 // ************************************************************************
 
-Test_Unbounded_String::Test_Unbounded_String (void)
+Test_Unbounded_String::Test_Unbounded_String ()
   : opname_ (CORBA::string_dup ("test_unbounded_string")),
     in_ (0),
     inout_ (0),
@@ -26,7 +26,7 @@ Test_Unbounded_String::Test_Unbounded_String (void)
 {
 }
 
-Test_Unbounded_String::~Test_Unbounded_String (void)
+Test_Unbounded_String::~Test_Unbounded_String ()
 {
   CORBA::string_free (this->opname_);
   CORBA::string_free (this->in_);
@@ -97,7 +97,7 @@ Test_Unbounded_String::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Unbounded_String::reset_parameters (void)
+Test_Unbounded_String::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::string_free (this->inout_);
@@ -132,7 +132,7 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Unbounded_String::check_validity (void)
+Test_Unbounded_String::check_validity ()
 {
   CORBA::ULong len = ACE_OS::strlen (this->in_);
 
@@ -155,7 +155,7 @@ Test_Unbounded_String::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_String::print_values (void)
+Test_Unbounded_String::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index d633291c015..92f0f4f61c6 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -21,10 +21,10 @@ class Test_Unbounded_String
 {
 public:
   /// ctor
-  Test_Unbounded_String (void);
+  Test_Unbounded_String ();
 
   /// dtor
-  ~Test_Unbounded_String (void);
+  ~Test_Unbounded_String ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -36,16 +36,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 694796a5990..41b7bfa40ec 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -18,7 +18,7 @@
 //               Test_Struct_Sequence
 // ************************************************************************
 
-Test_Struct_Sequence::Test_Struct_Sequence (void)
+Test_Struct_Sequence::Test_Struct_Sequence ()
   : opname_ (CORBA::string_dup ("test_struct_sequence")),
     inout_ (new Param_Test::StructSeq),
     out_ (new Param_Test::StructSeq),
@@ -26,7 +26,7 @@ Test_Struct_Sequence::Test_Struct_Sequence (void)
 {
 }
 
-Test_Struct_Sequence::~Test_Struct_Sequence (void)
+Test_Struct_Sequence::~Test_Struct_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -89,7 +89,7 @@ Test_Struct_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Struct_Sequence::reset_parameters (void)
+Test_Struct_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::StructSeq; // delete the previous one
   this->out_ = new Param_Test::StructSeq;
@@ -118,7 +118,7 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Struct_Sequence::check_validity (void)
+Test_Struct_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -135,7 +135,7 @@ Test_Struct_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Struct_Sequence::print_values (void)
+Test_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
@@ -214,7 +214,7 @@ Test_Struct_Sequence::print_sequence (const Param_Test::StructSeq &s)
 //               Test_Unbounded_Struct_Sequence
 // ************************************************************************
 
-Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence (void)
+Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence ()
   : opname_ (CORBA::string_dup ("test_unbounded_struct_sequence")),
     inout_ (new Param_Test::PathSpec),
     out_ (new Param_Test::PathSpec),
@@ -222,7 +222,7 @@ Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence (void)
 {
 }
 
-Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence (void)
+Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -286,7 +286,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Unbounded_Struct_Sequence::reset_parameters (void)
+Test_Unbounded_Struct_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::PathSpec; // delete the previous one
   this->out_ = new Param_Test::PathSpec;
@@ -306,7 +306,7 @@ Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Unbounded_Struct_Sequence::check_validity (void)
+Test_Unbounded_Struct_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -323,7 +323,7 @@ Test_Unbounded_Struct_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_Struct_Sequence::print_values (void)
+Test_Unbounded_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index 22c18764a05..835b2abc195 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -23,10 +23,10 @@ class Test_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Struct_Sequence (void);
+  Test_Struct_Sequence ();
 
   /// dtor
-  ~Test_Struct_Sequence (void);
+  ~Test_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
@@ -83,10 +83,10 @@ class Test_Unbounded_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Unbounded_Struct_Sequence (void);
+  Test_Unbounded_Struct_Sequence ();
 
   /// dtor
-  ~Test_Unbounded_Struct_Sequence (void);
+  ~Test_Unbounded_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -98,16 +98,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index c2777d6a899..732dfa60d43 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -18,7 +18,7 @@
 //               Test_WString_Sequence
 // ************************************************************************
 
-Test_WString_Sequence::Test_WString_Sequence (void)
+Test_WString_Sequence::Test_WString_Sequence ()
   : opname_ (CORBA::string_dup ("test_wstrseq")),
     in_ (new CORBA::WStringSeq),
     inout_ (new CORBA::WStringSeq),
@@ -27,7 +27,7 @@ Test_WString_Sequence::Test_WString_Sequence (void)
 {
 }
 
-Test_WString_Sequence::~Test_WString_Sequence (void)
+Test_WString_Sequence::~Test_WString_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_WString_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_WString_Sequence::reset_parameters (void)
+Test_WString_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::WStringSeq; // delete the previous ones
   this->out_ = new CORBA::WStringSeq;
@@ -116,7 +116,7 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_WString_Sequence::check_validity (void)
+Test_WString_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -144,6 +144,6 @@ Test_WString_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_WString_Sequence::print_values (void)
+Test_WString_Sequence::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h
index 8e30b16baf3..2c9f0e1ecd5 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.h
+++ b/TAO/tests/Param_Test/ub_wstr_seq.h
@@ -23,10 +23,10 @@ class Test_WString_Sequence
 {
 public:
   /// ctor
-  Test_WString_Sequence (void);
+  Test_WString_Sequence ();
 
   /// dtor
-  ~Test_WString_Sequence (void);
+  ~Test_WString_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 0c29105ecc3..a7cb2661178 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -18,7 +18,7 @@
 //               Test_Unbounded_WString
 // ************************************************************************
 
-Test_Unbounded_WString::Test_Unbounded_WString (void)
+Test_Unbounded_WString::Test_Unbounded_WString ()
   : opname_ (CORBA::string_dup ("test_unbounded_wstring")),
     in_ (0),
     inout_ (0),
@@ -27,7 +27,7 @@ Test_Unbounded_WString::Test_Unbounded_WString (void)
 {
 }
 
-Test_Unbounded_WString::~Test_Unbounded_WString (void)
+Test_Unbounded_WString::~Test_Unbounded_WString ()
 {
   CORBA::string_free (this->opname_);
   CORBA::wstring_free (this->in_);
@@ -97,7 +97,7 @@ Test_Unbounded_WString::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Unbounded_WString::reset_parameters (void)
+Test_Unbounded_WString::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::wstring_free (this->inout_);
@@ -132,7 +132,7 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Unbounded_WString::check_validity (void)
+Test_Unbounded_WString::check_validity ()
 {
   CORBA::ULong len = ACE_OS::wslen (this->in_);
 
@@ -155,6 +155,6 @@ Test_Unbounded_WString::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_WString::print_values (void)
+Test_Unbounded_WString::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h
index 9363e126dc9..f8a4b2869cc 100644
--- a/TAO/tests/Param_Test/ub_wstring.h
+++ b/TAO/tests/Param_Test/ub_wstring.h
@@ -22,10 +22,10 @@ class Test_Unbounded_WString
 {
 public:
   /// ctor
-  Test_Unbounded_WString (void);
+  Test_Unbounded_WString ();
 
   /// dtor
-  ~Test_Unbounded_WString (void);
+  ~Test_Unbounded_WString ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 241323e65f2..f605579e183 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -13,12 +13,12 @@
 #include "helper.h"
 #include "ulonglong.h"
 
-Test_ULongLong::Test_ULongLong (void)
+Test_ULongLong::Test_ULongLong ()
   : opname_ (CORBA::string_dup ("test_ulonglong"))
 {
 }
 
-Test_ULongLong::~Test_ULongLong (void)
+Test_ULongLong::~Test_ULongLong ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -63,7 +63,7 @@ Test_ULongLong::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_ULongLong::reset_parameters (void)
+Test_ULongLong::reset_parameters ()
 {
   this->inout_ =  0;
   this->out_ =  0;
@@ -91,7 +91,7 @@ Test_ULongLong::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_ULongLong::check_validity (void)
+Test_ULongLong::check_validity ()
 {
   if (this->inout_ == this->in_ * 2 &&
       this->out_ == this->in_ * 3 &&
@@ -108,7 +108,7 @@ Test_ULongLong::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_ULongLong::print_values (void)
+Test_ULongLong::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index 3ac6270a6a9..44c091b0f52 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -19,10 +19,10 @@ class Test_ULongLong
 {
 public:
   /// ctor
-  Test_ULongLong (void);
+  Test_ULongLong ();
 
   /// dtor
-  ~Test_ULongLong (void);
+  ~Test_ULongLong ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -34,16 +34,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 21b03d99ff2..52697acbe29 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -17,14 +17,14 @@
 //               Test_Var_Array
 // ************************************************************************
 
-Test_Var_Array::Test_Var_Array (void)
+Test_Var_Array::Test_Var_Array ()
   : opname_ (CORBA::string_dup ("test_var_array")),
     out_ (new Param_Test::Var_Array),
     ret_ (new Param_Test::Var_Array)
 {
 }
 
-Test_Var_Array::~Test_Var_Array (void)
+Test_Var_Array::~Test_Var_Array ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -79,7 +79,7 @@ Test_Var_Array::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Var_Array::reset_parameters (void)
+Test_Var_Array::reset_parameters ()
 {
   // free the out, and return value arrays
   Param_Test::Var_Array_free (this->out_._retn ());
@@ -109,7 +109,7 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Var_Array::check_validity (void)
+Test_Var_Array::check_validity ()
 {
   if (this->compare (this->in_, this->inout_) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -138,7 +138,7 @@ Test_Var_Array::compare (const Param_Test::Var_Array_slice *a1,
 }
 
 void
-Test_Var_Array::print_values (void)
+Test_Var_Array::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG, "IN array\n"));
   this->print (this->in_);
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index 6bdfb158f99..a2819a96748 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -22,10 +22,10 @@ class Test_Var_Array
 {
 public:
   /// ctor
-  Test_Var_Array (void);
+  Test_Var_Array ();
 
   /// dtor
-  ~Test_Var_Array (void);
+  ~Test_Var_Array ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index f574a260093..e865893a4bc 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -17,7 +17,7 @@
 //               Test_Var_Struct
 // ************************************************************************
 
-Test_Var_Struct::Test_Var_Struct (void)
+Test_Var_Struct::Test_Var_Struct ()
   : opname_ (CORBA::string_dup ("test_var_struct")),
     inout_ (new Param_Test::Var_Struct),
     out_ (new Param_Test::Var_Struct),
@@ -25,7 +25,7 @@ Test_Var_Struct::Test_Var_Struct (void)
 {
 }
 
-Test_Var_Struct::~Test_Var_Struct (void)
+Test_Var_Struct::~Test_Var_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -102,7 +102,7 @@ Test_Var_Struct::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Var_Struct::reset_parameters (void)
+Test_Var_Struct::reset_parameters ()
 {
   this->inout_ = new Param_Test::Var_Struct; // delete the previous ones
   this->out_ = new Param_Test::Var_Struct;
@@ -139,7 +139,7 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Var_Struct::check_validity (void)
+Test_Var_Struct::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if (ACE::is_equal (this->in_.dbl, this->inout_->dbl) &&
@@ -182,7 +182,7 @@ Test_Var_Struct::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Var_Struct::print_values (void)
+Test_Var_Struct::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n*=*=*=*=*=*=*=*=*=*=\n"
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index 810060418bd..63744ac5301 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -23,10 +23,10 @@ class Test_Var_Struct
 {
 public:
   /// ctor
-  Test_Var_Struct (void);
+  Test_Var_Struct ();
 
   /// dtor
-  ~Test_Var_Struct (void);
+  ~Test_Var_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index 1c8ca3a272f..1138c02984e 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -269,7 +269,7 @@ Manipulation::perform_iteration (unsigned int *seed,
 
 
 int
-Manipulation::svc (void)
+Manipulation::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
index 470fb405b73..bb5950624a9 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
@@ -17,18 +17,18 @@ unsigned long Echo_Client_Request_Interceptor::other_count = 0;
 unsigned long Echo_Client_Request_Interceptor::exception_count = 0;
 
 Echo_Client_Request_Interceptor::
-Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Echo_Client_Interceptor");
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
index 9caeacbf816..423d2b4c3c5 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
@@ -16,17 +16,17 @@ class Echo_Client_Request_Interceptor
   , public virtual ::CORBA::LocalObject
 {
 public:
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
 
   static unsigned long request_count;
   static unsigned long reply_count;
   static unsigned long other_count;
   static unsigned long exception_count;
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
index 6c61020b8ad..8f2d59e1c85 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
@@ -17,7 +17,7 @@ Echo::echo_operation(char const * the_input)
 }
 
 void
-Echo::shutdown(void)
+Echo::shutdown()
 {
   this->orb_->shutdown(0);
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h
index 08ccf99822a..cfeeb682916 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h
@@ -16,7 +16,7 @@ public:
   Echo(CORBA::ORB_ptr orb);
 
   virtual char * echo_operation(char const * the_input);
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index f42f292c474..5035f9222a8 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
@@ -5,7 +5,7 @@
  */
 #include "Echo_Handler.h"
 
-Echo_Handler::Echo_Handler(void)
+Echo_Handler::Echo_Handler()
   : replies_ (0)
 {
 }
@@ -22,7 +22,7 @@ Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *)
 }
 
 void
-Echo_Handler::shutdown (void)
+Echo_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
index da7f3446d66..c6724297e0f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
@@ -13,11 +13,11 @@ class Echo_Handler
   : public POA_Test::AMI_EchoHandler
 {
 public:
-  Echo_Handler(void);
+  Echo_Handler();
 
   virtual void echo_operation(char const * retval);
   virtual void echo_operation_excep(::Messaging::ExceptionHolder * h);
-  virtual void shutdown(void);
+  virtual void shutdown();
   virtual void shutdown_excep(::Messaging::ExceptionHolder * h);
 
   CORBA::ULong replies () const;
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
index 8c66d25f688..4ad01b0f983 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
@@ -9,18 +9,18 @@
 #include "tao/OctetSeqC.h"
 #include "ace/OS_NS_string.h"
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Echo_Server_Interceptor");
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
index 9c1a3479fd2..642eb6ed55f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
@@ -18,9 +18,9 @@ class Echo_Server_Request_Interceptor
 public:
   Echo_Server_Request_Interceptor ();
 
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
index 90f68a20090..3937b416bee 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
@@ -7,7 +7,7 @@
 #include "Server_ORBInitializer.h"
 #include "Server_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
index e7d40ed1447..22e298362fe 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
@@ -16,7 +16,7 @@ class Server_ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index 62e80790483..2b058217bb8 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -8,7 +8,7 @@
 const CORBA::ULong request_ctx_id = 0xdead;
 //const CORBA::ULong reply_ctx_id = 0xbeef;   // Never used.
 
-Vault_Client_Request_Interceptor::Vault_Client_Request_Interceptor (void)
+Vault_Client_Request_Interceptor::Vault_Client_Request_Interceptor ()
   : myname_ ("Vault_Client_Interceptor")
 {
 }
@@ -18,13 +18,13 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor ()
 }
 
 char *
-Vault_Client_Request_Interceptor::name (void)
+Vault_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Client_Request_Interceptor::destroy (void)
+Vault_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -119,7 +119,7 @@ Vault_Client_Request_Interceptor::receive_exception (
 
 //////////////////////////////////  Context /////////////////////////
 
-Vault_Client_Request_Context_Interceptor::Vault_Client_Request_Context_Interceptor (void)
+Vault_Client_Request_Context_Interceptor::Vault_Client_Request_Context_Interceptor ()
   : myname_ ("Vault_Client_Context_Interceptor")
 {
 }
@@ -205,7 +205,7 @@ Vault_Client_Request_Context_Interceptor::receive_exception (
 
 ///////////////////////////////////Dynamic ////////////////////////////////////
 
-Vault_Client_Request_Dynamic_Interceptor::Vault_Client_Request_Dynamic_Interceptor (void)
+Vault_Client_Request_Dynamic_Interceptor::Vault_Client_Request_Dynamic_Interceptor ()
   : myname_ ("Vault_Client_Dynamic_Interceptor")
 {
 }
@@ -318,7 +318,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception (
 
 //////////////////////////////NOOP///////////////////////////////////////
 
-Vault_Client_Request_NOOP_Interceptor::Vault_Client_Request_NOOP_Interceptor (void)
+Vault_Client_Request_NOOP_Interceptor::Vault_Client_Request_NOOP_Interceptor ()
   : myname_ ("Vault_Client_NOOP_Interceptor")
 {
 }
@@ -328,7 +328,7 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor ()
 }
 
 char *
-Vault_Client_Request_NOOP_Interceptor::name (void)
+Vault_Client_Request_NOOP_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
index de95918d721..c03c79af263 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
@@ -23,15 +23,15 @@ class Vault_Client_Request_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_Interceptor (void);
+  Vault_Client_Request_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -53,15 +53,15 @@ class Vault_Client_Request_Context_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_Context_Interceptor (void);
+  Vault_Client_Request_Context_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_Context_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -83,15 +83,15 @@ class Vault_Client_Request_Dynamic_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_Dynamic_Interceptor (void);
+  Vault_Client_Request_Dynamic_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_Dynamic_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -113,15 +113,15 @@ class Vault_Client_Request_NOOP_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_NOOP_Interceptor (void);
+  Vault_Client_Request_NOOP_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_NOOP_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index eaf668deda6..ca63b652bc1 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -8,7 +8,7 @@
 const CORBA::ULong request_ctx_id = 0xdead;
 //const CORBA::ULong reply_ctx_id = 0xbeef;   // Never used.
 
-Vault_Server_Request_Interceptor::Vault_Server_Request_Interceptor (void)
+Vault_Server_Request_Interceptor::Vault_Server_Request_Interceptor ()
   : myname_ ("Vault_Server_Interceptor")
 {
 }
@@ -18,13 +18,13 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor ()
 }
 
 char *
-Vault_Server_Request_Interceptor::name (void)
+Vault_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Server_Request_Interceptor::destroy (void)
+Vault_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -100,7 +100,7 @@ Vault_Server_Request_Interceptor::send_other (
 
 //////////////////////////////////  Context /////////////////////////
 
-Vault_Server_Request_Context_Interceptor::Vault_Server_Request_Context_Interceptor (void)
+Vault_Server_Request_Context_Interceptor::Vault_Server_Request_Context_Interceptor ()
   : myname_ ("Vault_Server_Context_Interceptor")
 {
 }
@@ -162,7 +162,7 @@ Vault_Server_Request_Context_Interceptor::send_other (
 
 ///////////////////////////////////Dynamic ////////////////////////////////////
 
-Vault_Server_Request_Dynamic_Interceptor::Vault_Server_Request_Dynamic_Interceptor (void)
+Vault_Server_Request_Dynamic_Interceptor::Vault_Server_Request_Dynamic_Interceptor ()
   : myname_ ("Vault_Server_Dynamic_Interceptor")
 {
 }
@@ -258,7 +258,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_other (
 
 //////////////////////////////NOOP///////////////////////////////////////
 
-Vault_Server_Request_NOOP_Interceptor::Vault_Server_Request_NOOP_Interceptor (void)
+Vault_Server_Request_NOOP_Interceptor::Vault_Server_Request_NOOP_Interceptor ()
   : myname_ ("Vault_Server_NOOP_Interceptor")
 {
 }
@@ -268,7 +268,7 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor ()
 }
 
 char *
-Vault_Server_Request_NOOP_Interceptor::name (void)
+Vault_Server_Request_NOOP_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
index 0f2492ffa39..81b3db59fea 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
@@ -23,15 +23,15 @@ class Vault_Server_Request_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_Interceptor (void);
+  Vault_Server_Request_Interceptor ();
   // cotr.
   ~Vault_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
@@ -54,15 +54,15 @@ class Vault_Server_Request_Context_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_Context_Interceptor (void);
+  Vault_Server_Request_Context_Interceptor ();
   // cotr.
   ~Vault_Server_Request_Context_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
@@ -85,15 +85,15 @@ class Vault_Server_Request_Dynamic_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_Dynamic_Interceptor (void);
+  Vault_Server_Request_Dynamic_Interceptor ();
   // cotr.
   ~Vault_Server_Request_Dynamic_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
@@ -116,15 +116,15 @@ class Vault_Server_Request_NOOP_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_NOOP_Interceptor (void);
+  Vault_Server_Request_NOOP_Interceptor ();
   // cotr.
   ~Vault_Server_Request_NOOP_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index 292c6e6a067..83e4589c1ee 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -9,7 +9,7 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb)
 // ctor
 
 CORBA::Short
-Secure_Vault_i::ready (void)
+Secure_Vault_i::ready ()
 {
   return 1;
 }
@@ -29,7 +29,7 @@ return 1;
 }
 
 void
-Secure_Vault_i::shutdown (void)
+Secure_Vault_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
index 9a5a3bb48b1..e851bded5d1 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
@@ -24,7 +24,7 @@ public:
   /// ctor
   Secure_Vault_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Short ready (void);
+  virtual CORBA::Short ready ();
 
   /// Passwd sent in the service context list
   virtual void authenticate (const char * user);
@@ -32,7 +32,7 @@ public:
   virtual CORBA::Long update_records (CORBA::Long id,
                                       const Test_Interceptors::Secure_Vault::Record & val);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
  private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index a70f9da6453..566d38b8efb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index 83fff97dd0e..ebcb1dea9b6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Server_ORBInitializer.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
@@ -27,7 +27,7 @@ Server_ORBInitializer::post_init (
 }
 
 Echo_Server_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index 78a1655f7cd..5e0bcf8d23d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -27,7 +27,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -35,7 +35,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  Echo_Server_Request_Interceptor * server_interceptor (void);
+  Echo_Server_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index 985f0a49049..31bcf86a546 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -18,18 +18,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index 571addecc3e..2d45f3da618 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index a6ed938f31b..2754caf08c9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -11,7 +11,7 @@ const char *forward_msg = "FORWARD message";
 int send_request_count = 0;
 int exception_count = 0;
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -22,7 +22,7 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (CORBA::Object_
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
@@ -39,13 +39,13 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 940b75fd189..ddad3bc28d5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -22,7 +22,7 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   Echo_Server_Request_Interceptor (CORBA::Object_ptr forward_location);
@@ -32,10 +32,10 @@ public:
 
   void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 268a43a0843..782c68db4b9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long arg)
 }
 
 void
-Visual_i::nothing (void)
+Visual_i::nothing ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
index f53eeb2cb07..9575ea19d64 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
@@ -26,13 +26,13 @@ public:
 
   void normal (CORBA::Long arg);
 
-  void nothing (void);
+  void nothing ();
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pseudo-reference (for shutdown).
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
index 8370ccc962f..e9a21bcabfb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
index 3c88fae18c2..776f2b80058 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
@@ -7,12 +7,12 @@
   CORBA::Boolean
   ClientRequest_Interceptor::success_flag_ = 0;
 
-  ClientRequest_Interceptor::ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::ClientRequest_Interceptor ()
     : name_ ("ClientRequest_Interceptor")
   {
   }
 
-  ClientRequest_Interceptor::~ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::~ClientRequest_Interceptor ()
   {
   }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
index 36235e54b3a..1ba41d68aba 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
@@ -28,9 +28,9 @@ class ClientRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
-ClientRequest_Interceptor (void);
+ClientRequest_Interceptor ();
 
-~ClientRequest_Interceptor (void);
+~ClientRequest_Interceptor ();
 
 /// Canonical name of the interceptor.
 virtual char * name ();
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
index e161807d365..61c8e926566 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
index bf5d836fee0..151590a95a5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
@@ -31,7 +31,7 @@ Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 }
 
 Echo_Server_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
index 78a1655f7cd..5e0bcf8d23d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
@@ -27,7 +27,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -35,7 +35,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  Echo_Server_Request_Interceptor * server_interceptor (void);
+  Echo_Server_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
index ae8793e46e2..7b759392ab7 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
@@ -13,18 +13,18 @@ Echo_Client_Request_Interceptor ()
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
index 33ed2b76898..b95a9c42942 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
index ebd31a9366d..a72fdff27e8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
@@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0x08154711;
 const char * const request_msg = "TEST 0123456789 TEST";
 PortableInterceptor::SlotId slotId = 0;
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
index 40f5e613113..d1a0232cc2c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
@@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index 8c8edb1a9b0..e49d7dc6140 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -49,7 +49,7 @@ Visual_i::normal (CORBA::Long arg)
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
index 4dd3a4a22de..907bd7cf5c1 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
@@ -25,7 +25,7 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
 
   void normal (CORBA::Long arg);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pseudo-reference (for shutdown).
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
index 3847c69378d..2bbe7130977 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
@@ -19,13 +19,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
index f9b84bd9681..f49952472cb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
@@ -42,9 +42,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
index a59e89f3924..8102a86f94b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 #include "Server_Request_Interceptor.h"
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
index 116752a998e..d00d8969405 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
@@ -31,7 +31,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
index a30c6d173d6..cfd431d23c5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
@@ -4,23 +4,23 @@
 #include "ace/Log_Msg.h"
 #include "CrashPoint.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
index 5907543ac8b..dfe78ead1d4 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
@@ -27,7 +27,7 @@ class Server_Request_Interceptor
 {
 public:
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -39,9 +39,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -61,7 +61,7 @@ public:
 
 protected:
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
   /// The number of requests intercepted by this interceptor.
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
index 64c03e24b9f..230593e47fb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
@@ -20,13 +20,13 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The number assigned to this object.
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
index 696af631cbd..98c570dbe97 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
@@ -3,7 +3,7 @@
 #include "testC.h"
 #include "ace/Log_Msg.h"
 
-Client_Request_Interceptor::Client_Request_Interceptor (void)
+Client_Request_Interceptor::Client_Request_Interceptor ()
   : request_count_ (0),
     receive_exception_count_ (0)
 {
@@ -22,13 +22,13 @@ Client_Request_Interceptor::request_count () const
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
index cb3426d1ee7..1f0022bb517 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
@@ -28,7 +28,7 @@ class Client_Request_Interceptor
 {
 public:
   /// Constructor.
-  Client_Request_Interceptor (void);
+  Client_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Client Request Interceptor
@@ -40,9 +40,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
index 64c03e24b9f..230593e47fb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
@@ -20,13 +20,13 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The number assigned to this object.
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
index d8033778330..d525a2c6d2b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
@@ -16,13 +16,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
index c9090eae741..c2e3149538d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
@@ -41,9 +41,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
index 04dd1446685..59f89e64428 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
@@ -21,13 +21,13 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The number assigned to this object.
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index 7c427559c30..b09c3d471ea 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
index b72e0b2835b..e2771dc35d1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index c1ed4d78e36..02379f9d593 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
index 23dfac6b088..4d610d156c7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 948d7cbffa9..d3bc9c6d76f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -10,7 +10,7 @@ const char *reply_msg = "The Echo_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
   : myname_ ("Echo_Client_Interceptor")
 {
 }
@@ -20,13 +20,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -163,7 +163,7 @@ Echo_Client_Request_Interceptor::receive_exception (
               exception_id.in ()));
 }
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -173,13 +173,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 84d7fffcbd4..48808b448be 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -24,15 +24,15 @@ class Echo_Client_Request_Interceptor
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
   // ctor.
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr);
@@ -59,15 +59,15 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 24d6b91041f..bf3e91814a7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -22,21 +22,21 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
index 6029ec925fd..5a33574f133 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
@@ -30,11 +30,11 @@ public:
                          CORBA::Long one,
                          CORBA::Long two);
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index 22691fc3001..ccbc53f7bfe 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -12,7 +12,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
index 45ea7e8eeb8..9def7b204d8 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
@@ -23,7 +23,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
index 5445f920662..30a760155d1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "interceptors.h"
 #include "ace/OS_NS_string.h"
 
-Collocated_ORBInitializer::Collocated_ORBInitializer (void)
+Collocated_ORBInitializer::Collocated_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 7d7fd7ebafe..6f89c98c60b 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -24,7 +24,7 @@ class Collocated_ORBInitializer :
 {
 public:
   /// Constructor
-  Collocated_ORBInitializer (void);
+  Collocated_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index 9217cbc8aae..352a9d43559 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -15,7 +15,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
index 022376a0ccd..2700b4b77c3 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
@@ -26,7 +26,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index 32f5ba5dd10..b2fafc6a4f3 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -14,18 +14,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -243,24 +243,24 @@ Echo_Client_Request_Interceptor::receive_exception (
     }
 }
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) ~Echo_Server_Request_Interceptor\n"));
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index 009b2779714..c82ef51c8ee 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -59,16 +59,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index 651aa681fc6..f255f6fad0f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long)
 }
 
 void
-Visual_i::nothing (void)
+Visual_i::nothing ()
 {
 //  ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   //  this->_remove_ref ();
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n"));
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
index f6cd81bb42a..4593c3e7f18 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
@@ -24,13 +24,13 @@ public:
 
   void normal (CORBA::Long arg);
 
-  void nothing (void);
+  void nothing ();
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pseudo-reference (for shutdown).
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index 90cc634d689..472d2c4b846 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -21,7 +21,7 @@ Client_Request_Interceptor::name ()
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index df858f6df1f..100a1c7de26 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -62,9 +62,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index d014deb7204..8ee1d22830c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -7,7 +7,7 @@
 
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
   : server_interceptor_ ()
 {
 }
@@ -38,7 +38,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index de10ccbcdaf..31dab8edb87 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -43,7 +43,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -51,7 +51,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 961fea9f416..4bb03f0dea1 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -4,14 +4,14 @@
 #include "tao/ORB_Constants.h"
 #include "ace/Log_Msg.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
 {
   this->obj_[0] = CORBA::Object::_nil ();
   this->obj_[1] = CORBA::Object::_nil ();
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
@@ -32,13 +32,13 @@ Server_Request_Interceptor::forward_references (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   CORBA::release (this->obj_[0]);
   CORBA::release (this->obj_[1]);
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index 9d7bb209a90..0afdbc2cc13 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -58,7 +58,7 @@ class Server_Request_Interceptor
 {
 public:
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
@@ -74,9 +74,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -96,7 +96,7 @@ public:
 
 protected:
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
   /// The number of requests intercepted by this interceptor.
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
index 036615df073..4d1bf88b83e 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
@@ -31,13 +31,13 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The number assigned to this object.
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index cf8278aade8..1050f2e24dd 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -18,7 +18,7 @@ FOO_ClientRequestInterceptor::name ()
 }
 
 void
-FOO_ClientRequestInterceptor::destroy (void)
+FOO_ClientRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index b1a2370b447..63c5da7f136 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -57,9 +57,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index 3edbd032331..1c8ba647fe6 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -9,13 +9,13 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec)
 }
 
 char *
-FOO_IORInterceptor::name (void)
+FOO_IORInterceptor::name ()
 {
   return CORBA::string_dup ("FOO_IORInterceptor");
 }
 
 void
-FOO_IORInterceptor::destroy (void)
+FOO_IORInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 2ec40862839..3c112084dbb 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -56,10 +56,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index b5d29c3c716..9c39d8a1caf 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -7,7 +7,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\"test_i\" is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
index 2f80d63adc2..d134932f461 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
@@ -31,7 +31,7 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
index d8b124a8f65..9d4b972d2db 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
@@ -7,7 +7,7 @@ Server_Request_Interceptor::Server_Request_Interceptor (bool & destroy_called)
   this->destroy_called_ = false;  // Sanity check.
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
   // ORB::destroy() should have been called, which in turn should have
   // called the Interceptor::destroy() method in all registered
@@ -16,13 +16,13 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   this->destroy_called_ = true;
 }
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
index 3b9097ced24..0d5145d6f5e 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
@@ -57,9 +57,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -79,7 +79,7 @@ public:
 
 protected:
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
   /// Flag that states whether this interceptor's @c destroy() method
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
index b49ee6ca120..2b3a90c9569 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
@@ -5,18 +5,18 @@ test_i::test_i (CORBA::ORB_ptr orb)
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 void
-test_i::hello (void)
+test_i::hello ()
 {
   ACE_DEBUG ((LM_DEBUG, "Hello!\n"));
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Shutting down ORB.\n"));
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
index cc9433132db..0a9f179428e 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
@@ -30,13 +30,13 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Say hello.
-  virtual void hello (void);
+  virtual void hello ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
index bdb22b875ce..5b9b0d95de9 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
@@ -18,7 +18,7 @@ ClientRequestInterceptor::name ()
 }
 
 void
-ClientRequestInterceptor::destroy (void)
+ClientRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
index 0bca4b49de4..efac9183c17 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
@@ -57,9 +57,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
index 04cb706bf19..2e4b67a75d0 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
@@ -16,7 +16,7 @@ ClientRequestInterceptor2::name ()
 }
 
 void
-ClientRequestInterceptor2::destroy (void)
+ClientRequestInterceptor2::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
index bb69b5c1e82..0ec007e0330 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
@@ -53,9 +53,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index 17676f5844f..bc573411f0a 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -13,13 +13,13 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index d9990d5b102..314cdc19524 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -56,9 +56,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index d8deb2c5e89..6562d415e01 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -10,12 +10,12 @@ test_i::test_i (PortableInterceptor::Current_ptr current,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 void
-test_i::invoke_me (void)
+test_i::invoke_me ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test method invoked.\n"));
@@ -121,14 +121,14 @@ test_i::invoke_me (void)
 }
 
 void
-test_i::invoke_you (void)
+test_i::invoke_you ()
 {
   // Nothing to be tested here.  This method is here just so that we
   // have a different method
 }
 
 void
-test_i::invoke_we (void)
+test_i::invoke_we ()
 {
   // Insert some data into the TSC PICurrent object.
   const char str[] = "We drink milk!";
@@ -160,7 +160,7 @@ test_i::invoke_we (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Server is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
index 9e370707c0e..19c056bcc77 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
@@ -35,21 +35,21 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Main servant test method.
-  virtual void invoke_me (void);
+  virtual void invoke_me ();
 
   /// No-op method used so that a client request interceptor will be
   /// invoked when invoking this method from the above invoke_me()
   /// method.  Say that 10 times fast. :-)
-  virtual void invoke_you (void);
+  virtual void invoke_you ();
 
   /// Test just a set slot
-  virtual void invoke_we (void);
+  virtual void invoke_we ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Reference to the PICurrent object.
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index f33cdc51bb2..11d2a656315 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -1,24 +1,24 @@
 #include "IORInterceptor.h"
 #include "testC.h"
 
-IORInterceptor::IORInterceptor (void)
+IORInterceptor::IORInterceptor ()
   : success_ (false)
 {
 }
 
-IORInterceptor::~IORInterceptor (void)
+IORInterceptor::~IORInterceptor ()
 {
   ACE_ASSERT (this->success_);
 }
 
 char *
-IORInterceptor::name (void)
+IORInterceptor::name ()
 {
   return CORBA::string_dup ("");
 }
 
 void
-IORInterceptor::destroy (void)
+IORInterceptor::destroy ()
 {
   ACE_ASSERT (this->success_);
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index 8e804293690..7fdcf1fe48b 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -44,7 +44,7 @@ class IORInterceptor
 {
 public:
   /// Constructor
-  IORInterceptor (void);
+  IORInterceptor ();
 
   /**
    * @name Methods Required by the IOR Interceptor Interface
@@ -55,10 +55,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -71,7 +71,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  ~IORInterceptor (void);
+  ~IORInterceptor ();
 
 private:
   /// IORInterceptor successfully called and executed.
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
index bd8f1ee2fd1..76dc3704ee8 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
@@ -8,24 +8,24 @@ Policy::Policy (CORBA::ULong val)
 {
 }
 
-Policy::~Policy (void)
+Policy::~Policy ()
 {
 }
 
 CORBA::ULong
-Policy::value (void)
+Policy::value ()
 {
   return this->value_;
 }
 
 CORBA::PolicyType
-Policy::policy_type (void)
+Policy::policy_type ()
 {
   return Test::POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-Policy::copy (void)
+Policy::copy ()
 {
   CORBA::Policy_ptr p;
   ACE_NEW_THROW_EX (p,
@@ -36,6 +36,6 @@ Policy::copy (void)
 }
 
 void
-Policy::destroy (void)
+Policy::destroy ()
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
index 94ac029b363..5fc98b06d6b 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
@@ -33,13 +33,13 @@ public:
   Policy (CORBA::ULong val);
 
   /// Test method defined in test IDL.
-  virtual CORBA::ULong value (void);
+  virtual CORBA::ULong value ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   /// Destructor.
@@ -47,7 +47,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  ~Policy (void);
+  ~Policy ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
index 3136185327b..024ccda2a71 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
index adfccc8b685..6cf5b7383db 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index c1ed4d78e36..02379f9d593 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
index ce62b3f44da..e37c9eeb814 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   /// The status of the svc loop
   int status () const;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index c5c6b00ecc7..e6908f39945 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -12,7 +12,7 @@ const char *reply_msg = "The Echo_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
   : myname_ ("Echo_Client_Interceptor")
 {
 }
@@ -22,13 +22,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -169,7 +169,7 @@ Echo_Client_Request_Interceptor::receive_exception (
               exception_id.in ()));
 }
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -179,13 +179,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index db6e103987b..861dea81496 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -23,15 +23,15 @@ class Echo_Client_Request_Interceptor
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
   // ctor.
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr);
@@ -58,15 +58,15 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index f46bcf08ccb..5d544f50620 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -22,21 +22,21 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
index 6029ec925fd..5a33574f133 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
@@ -30,11 +30,11 @@ public:
                          CORBA::Long one,
                          CORBA::Long two);
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
index ba642d0678b..da7362004ab 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
index ca32199d1a5..b22248e78a8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
index 9b0426ef035..748a2d9369b 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
index 9915f4e1969..e3a9adfb055 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   /// The status of the svc loop
   int status () const;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index 911540c26a0..6fe6f526325 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -9,7 +9,7 @@ const char *request_msg = "The Echo_Client_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Client_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
   : myname_ ("Echo_Client_Interceptor")
 {
 }
@@ -19,13 +19,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index 25f0157d033..d47ed43f261 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -22,15 +22,15 @@ class Echo_Client_Request_Interceptor
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
   // ctor.
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index 4abd69de234..e0fe9d6e6dc 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -9,7 +9,7 @@ const char *request_msg = "The Echo_Server_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Server_Request_Interceptor reply message";
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -19,13 +19,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 88c30fa2ce7..60c57d76787 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -23,15 +23,15 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index c16b0f9373c..a5d7cfe5503 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -21,21 +21,21 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
index 6029ec925fd..5a33574f133 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
@@ -30,11 +30,11 @@ public:
                          CORBA::Long one,
                          CORBA::Long two);
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index 8d7ff33ea6b..7f06dcd7863 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -14,13 +14,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
index c9090eae741..c2e3149538d 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
@@ -41,9 +41,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index a59e89f3924..8102a86f94b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 #include "Server_Request_Interceptor.h"
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
index 116752a998e..d00d8969405 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
@@ -31,7 +31,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index a30c6d173d6..cfd431d23c5 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -4,23 +4,23 @@
 #include "ace/Log_Msg.h"
 #include "CrashPoint.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 5907543ac8b..dfe78ead1d4 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -27,7 +27,7 @@ class Server_Request_Interceptor
 {
 public:
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -39,9 +39,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -61,7 +61,7 @@ public:
 
 protected:
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
   /// The number of requests intercepted by this interceptor.
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
index 64c03e24b9f..230593e47fb 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
@@ -20,13 +20,13 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The number assigned to this object.
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
index f2c9fe409a2..340afbd7ba1 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -4,7 +4,7 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
index cb446a73d5f..186a826090b 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
@@ -27,7 +27,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
index 6a8d2fbfb2e..a0f82547975 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 #include "test_i.h"
 
-test_i::test_i (void)
+test_i::test_i ()
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h
index c0f1bb4811f..54f35968e3f 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h
@@ -24,10 +24,10 @@ class test_i : public virtual POA_TestModule::test
 {
 public:
   /// Constructor.
-  test_i (void);
+  test_i ();
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
 private:
 };
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index aeb29430a4a..d26df8265d4 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -15,7 +15,7 @@ Request_Interceptor::name ()
 }
 
 void
-Request_Interceptor::destroy (void)
+Request_Interceptor::destroy ()
 {
   CORBA::ULong s_count =
     this->starting_interception_point_count_.value ();
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
index 662b8e79d85..18448765d73 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
@@ -55,9 +55,9 @@ public:
    */
   //@{
   /// Return the name of this Requestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 9f87a70c3f5..35a71eaa5ff 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -46,7 +46,7 @@ test_i::server_test (Test::TestScenario scenario,
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
index 91260b771db..98f877dd83b 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
@@ -37,7 +37,7 @@ public:
                             CORBA::ULongSeq_out myseq);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index d65ed78aa37..cc83c5b7e3b 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index dd22dcc19d3..2d12efbd1f0 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index 9554057647d..e3d1af0b6df 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -26,7 +26,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index c9817031d44..5aab1315fc5 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -15,18 +15,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
index e7b490fa096..d3fb25ea8be 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index ae196bc661c..f8f4f5bd5d9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
index 2755fd363b3..1659c5f6071 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
@@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 268a43a0843..782c68db4b9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long arg)
 }
 
 void
-Visual_i::nothing (void)
+Visual_i::nothing ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
index 3937af13fdd..3f139b0fa66 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
@@ -25,13 +25,13 @@ public:
 
   void normal (CORBA::Long arg);
 
-  void nothing (void);
+  void nothing ();
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pseudo-reference (for shutdown).
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index ae3c8de8034..09d3f4f91ef 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -48,7 +48,7 @@ Client::Client (CORBA::ORB_ptr orb,
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   delete this->slider_;
   delete this->push_button_;
@@ -133,7 +133,7 @@ Client::create_widgets (/**/)
 }
 
 void
-Client::show (void)
+Client::show ()
 {
   this->mainwindow_.show ();
 }
@@ -145,7 +145,7 @@ Client::remote_call (int val)
 }
 
 void
-Client::shutdown_call (void)
+Client::shutdown_call ()
 {
   this->server_->shutdown ();
 }
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index c610cb064c2..06237659dc6 100644
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -27,12 +27,12 @@ public:
           QApplication &app);
 
   ///Dtor..
-  ~Client (void);
+  ~Client ();
 
   /// Adds the callbacks to the GUI underneath.....
-  void create_widgets (void);
+  void create_widgets ();
 
-  void show (void);
+  void show ();
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
 
@@ -43,7 +43,7 @@ public:
  public slots:
    /// Two slot handlers for the two widgets that we have
    void remote_call (int val);
-   void shutdown_call (void);
+   void shutdown_call ();
 
 private:
   /// A push button
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index c0074bd073f..f321fe0e5fa 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -7,7 +7,7 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 }
 
 void
-LCD_Display_imp::shutdown (void)
+LCD_Display_imp::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "The ORB has been shutdown, Close the windows to exit\n"));
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 055d2438111..562ba8595c5 100644
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -33,7 +33,7 @@ public:
 
   // ctor
 
-  void shutdown (void);
+  void shutdown ();
 
   void send_val (CORBA::Long val);
 
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
index cbddcd432f3..9580e893db9 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -19,7 +19,7 @@
 const size_t max_block_length = 256;
 
 static TAO_Queued_Message *
-create_new_message (void)
+create_new_message ()
 {
   // First create a message block
   size_t block_size =
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index f5bd2732d29..c821f25d5a0 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -97,7 +97,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -110,7 +110,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index 9681db29429..681bbad7e11 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -15,7 +15,7 @@ public:
                     CORBA::Short priority);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -104,7 +104,7 @@ Test_i::test_method (CORBA::Boolean client_propagated,
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
index a0745a4e2d8..8b3e04d3774 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
index 679816520a7..5c3004eea7f 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
@@ -41,7 +41,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -54,7 +54,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   int result = 0;
   try
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
index dac74fd104e..b714dfa3e49 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
@@ -9,18 +9,18 @@ Client_Request_Interceptor (const char *id)
 {
 }
 
-Client_Request_Interceptor::~Client_Request_Interceptor (void)
+Client_Request_Interceptor::~Client_Request_Interceptor ()
 {
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
index 34cebae1f23..ddede0c5438 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
@@ -29,10 +29,10 @@ public:
   virtual ~Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
index a98367c6f83..ad4588a3b80 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
@@ -103,7 +103,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -116,7 +116,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
index 10bad3ad070..f7cea023958 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
@@ -75,7 +75,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -88,7 +88,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
index ca3a5bb3ae0..3d347af46b3 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
@@ -153,7 +153,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -166,7 +166,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
index 4f22163fed7..59002204b8a 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
@@ -50,13 +50,13 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h
index 3dafef71563..49d55231c1b 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h
@@ -23,10 +23,10 @@ public:
                       CORBA::Long_out thread_count);
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index a0745a4e2d8..8b3e04d3774 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 4241267540d..b91f6002b60 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -41,7 +41,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -54,7 +54,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index dac74fd104e..b714dfa3e49 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -9,18 +9,18 @@ Client_Request_Interceptor (const char *id)
 {
 }
 
-Client_Request_Interceptor::~Client_Request_Interceptor (void)
+Client_Request_Interceptor::~Client_Request_Interceptor ()
 {
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index 34cebae1f23..ddede0c5438 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -29,10 +29,10 @@ public:
   virtual ~Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index dade2a7d8d1..d257aa53b1b 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -19,7 +19,7 @@ public:
   void test_method (CORBA::Short priority);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -63,7 +63,7 @@ Test_i::test_method (CORBA::Short priority)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -105,7 +105,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -118,7 +118,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 3e12434cb55..81f873b5ded 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -14,10 +14,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -38,7 +38,7 @@ Test_i::test_method ( /**/)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Shutting down\n"));
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index 5c82afa47e1..98494b81b1d 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -31,29 +31,29 @@ public:
           PortableServer::POA_ptr poa,
           Tests &tests);
 
-  void start (void);
+  void start ();
 
-  void method (void);
+  void method ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
-  int client_propagated (void);
+  int client_propagated ();
 
   void client_propagated (int);
 
-  int server_declared (void);
+  int server_declared ();
 
   void server_declared (int);
 
-  RTCORBA::Priority server_priority (void);
+  RTCORBA::Priority server_priority ();
 
   void server_priority (RTCORBA::Priority);
 
-  int in_lane (void);
+  int in_lane ();
 
   void in_lane (int);
 
-  int serviced_by_rt_tp (void);
+  int serviced_by_rt_tp ();
 
   void serviced_by_rt_tp (int);
 
@@ -66,7 +66,7 @@ public:
 
   void invocation_lane (CORBA::ULong lane);
 
-  RTCORBA::Priority invocation_priority (void);
+  RTCORBA::Priority invocation_priority ();
 
   void invocation_priority (RTCORBA::Priority);
 
@@ -108,7 +108,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 int
-test_i::client_propagated (void)
+test_i::client_propagated ()
 {
   return this->client_propagated_;
 }
@@ -120,7 +120,7 @@ test_i::client_propagated (int client_propagated)
 }
 
 int
-test_i::server_declared (void)
+test_i::server_declared ()
 {
   return this->server_declared_;
 }
@@ -132,7 +132,7 @@ test_i::server_declared (int server_declared)
 }
 
 RTCORBA::Priority
-test_i::server_priority (void)
+test_i::server_priority ()
 {
   return this->server_priority_;
 }
@@ -144,7 +144,7 @@ test_i::server_priority (RTCORBA::Priority server_priority)
 }
 
 int
-test_i::in_lane (void)
+test_i::in_lane ()
 {
   return this->in_lane_;
 }
@@ -156,7 +156,7 @@ test_i::in_lane (int in_lane)
 }
 
 int
-test_i::serviced_by_rt_tp (void)
+test_i::serviced_by_rt_tp ()
 {
   return this->serviced_by_rt_tp_;
 }
@@ -188,7 +188,7 @@ test_i::invocation_lane (CORBA::ULong lane)
 }
 
 RTCORBA::Priority
-test_i::invocation_priority (void)
+test_i::invocation_priority ()
 {
   return this->invocation_priority_;
 }
@@ -200,7 +200,7 @@ test_i::invocation_priority (RTCORBA::Priority invocation_priority)
 }
 
 void
-test_i::start (void)
+test_i::start ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n"));
@@ -279,13 +279,13 @@ test_i::thread_info (const char *method_name)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   this->thread_info ("test_i::method");
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -372,17 +372,17 @@ class Server
 public:
   Server (CORBA::ORB_ptr orb);
 
-  void create_servant_in_root_poa (void);
+  void create_servant_in_root_poa ();
   void create_poa_and_servant_with_tp_policy (const char *poa_name,
                                               int set_priority_model,
                                               RTCORBA::PriorityModel priority_model);
   void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                          RTCORBA::PriorityModel priority_model);
-  void test (void);
-  void start_testing (void);
+  void test ();
+  void start_testing ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
   CORBA::ORB_var orb_;
@@ -440,7 +440,7 @@ Server::Server (CORBA::ORB_ptr orb)
 }
 
 void
-Server::create_servant_in_root_poa (void)
+Server::create_servant_in_root_poa ()
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -707,7 +707,7 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
 }
 
 void
-Server::start_testing (void)
+Server::start_testing ()
 {
   Tests::ITERATOR iterator (this->tests_);
   while (!iterator.done ())
@@ -726,7 +726,7 @@ Server::start_testing (void)
 }
 
 void
-Server::test (void)
+Server::test ()
 {
   this->start_testing ();
 
@@ -739,7 +739,7 @@ Server::test (void)
 }
 
 void
-Server::shutdown (void)
+Server::shutdown ()
 {
   this->orb_->shutdown (true);
 
@@ -752,7 +752,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -765,7 +765,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
index ff80804b53d..356061f3cba 100644
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
@@ -78,7 +78,7 @@ static const char *dscp_char[]=
 };
 */
 
-Custom_Network_Priority_Mapping::Custom_Network_Priority_Mapping (void)
+Custom_Network_Priority_Mapping::Custom_Network_Priority_Mapping ()
   : corba_priority_ (RTCORBA::minPriority)
 {
 }
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
index 93d67b423c1..2bb2e9071f6 100644
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
+++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
@@ -33,7 +33,7 @@
 class Custom_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
 {
 public:
-  Custom_Network_Priority_Mapping (void);
+  Custom_Network_Priority_Mapping ();
 
   CORBA::Boolean to_network (RTCORBA::Priority corba_priority,
                              RTCORBA::NetworkPriority &network_priority);
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 1658d903351..3e7aaf5ec1d 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -13,10 +13,10 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -29,14 +29,14 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test_i::test_method\n"));
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index 8139491449d..f57bdda98c6 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -54,7 +54,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -67,7 +67,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 47fb7f623b8..eec7da5d71f 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -153,7 +153,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -166,7 +166,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 4f22163fed7..59002204b8a 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -50,13 +50,13 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
index 17dc7cbdea7..ab2fa2e9de7 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
@@ -22,10 +22,10 @@ public:
                       CORBA::Long_out thread_count);
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index 9dfa5127741..86ba3654e6e 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -15,10 +15,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -39,7 +39,7 @@ Test_i::test_method (/* */)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 163e344ee67..9d82bd361fc 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -75,9 +75,9 @@ public:
                  RTCORBA::Current_ptr current,
                  CORBA::Short priority);
 
-  int svc (void);
+  int svc ();
 
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   test_var test_;
@@ -97,7 +97,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Worker_Thread::validate_connection (void)
+Worker_Thread::validate_connection ()
 {
   // Try to validate the connection several times, ignoring transient
   // exceptions.  If the connection can still not be setup, return
@@ -131,7 +131,7 @@ Worker_Thread::validate_connection (void)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
@@ -157,7 +157,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -170,7 +170,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 5bb397b130c..65afe698d1f 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -13,13 +13,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -34,14 +34,14 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -50,7 +50,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -140,7 +140,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -153,7 +153,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index 778f3d3fda0..f152599b8ad 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -146,7 +146,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -159,7 +159,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
@@ -354,7 +354,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb,
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 05a61616ea5..821180b0877 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -16,10 +16,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -39,7 +39,7 @@ Test_i::test_method ( /* */)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -93,7 +93,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -106,7 +106,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index c9d95704910..96e72cfbca7 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -13,13 +13,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -34,14 +34,14 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -50,7 +50,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index 345973de395..5819b2d4553 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -57,7 +57,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -70,7 +70,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 16e648b1800..a4c66f8dcd4 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -14,15 +14,15 @@ public:
           CORBA::Short server_priority,
           CORBA::Short client_priority);
 
-  CORBA::Short method (void);
+  CORBA::Short method ();
 
-  void prioritized_method (void);
+  void prioritized_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -43,7 +43,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Short
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
@@ -52,7 +52,7 @@ test_i::method (void)
 }
 
 void
-test_i::prioritized_method (void)
+test_i::prioritized_method ()
 {
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTCurrent");
@@ -73,7 +73,7 @@ test_i::prioritized_method (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -82,7 +82,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -161,8 +161,8 @@ public:
           PortableServer::POA_ptr root_poa,
           PortableServer::POAManager_ptr poa_manager);
 
-  void test_root_poa (void);
-  void test_child_poa (void);
+  void test_root_poa ();
+  void test_child_poa ();
 
   typedef void (server::*test_function) (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
@@ -210,29 +210,29 @@ public:
                                        CORBA::Short client_priority,
                                        const char *test_name);
 
-  void test_default_pool_no_bands_client_propagated_poa (void);
+  void test_default_pool_no_bands_client_propagated_poa ();
 
-  void test_no_lanes_no_bands_client_propagated_poa (void);
+  void test_no_lanes_no_bands_client_propagated_poa ();
 
-  void test_lanes_no_bands_client_propagated_poa (void);
+  void test_lanes_no_bands_client_propagated_poa ();
 
-  void test_default_pool_bands_client_propagated_poa (void);
+  void test_default_pool_bands_client_propagated_poa ();
 
-  void test_no_lanes_bands_client_propagated_poa (void);
+  void test_no_lanes_bands_client_propagated_poa ();
 
-  void test_lanes_bands_client_propagated_poa (void);
+  void test_lanes_bands_client_propagated_poa ();
 
-  void test_default_pool_no_bands_server_declared_poa (void);
+  void test_default_pool_no_bands_server_declared_poa ();
 
-  void test_no_lanes_no_bands_server_declared_poa (void);
+  void test_no_lanes_no_bands_server_declared_poa ();
 
-  void test_lanes_no_bands_server_declared_poa (void);
+  void test_lanes_no_bands_server_declared_poa ();
 
-  void test_default_pool_bands_server_declared_poa (void);
+  void test_default_pool_bands_server_declared_poa ();
 
-  void test_no_lanes_bands_server_declared_poa (void);
+  void test_no_lanes_bands_server_declared_poa ();
 
-  void test_lanes_bands_server_declared_poa (void);
+  void test_lanes_bands_server_declared_poa ();
 
 private:
   CORBA::ORB_var orb_;
@@ -253,7 +253,7 @@ server::server (CORBA::ORB_ptr orb,
 }
 
 void
-server::test_root_poa (void)
+server::test_root_poa ()
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -279,7 +279,7 @@ server::test_root_poa (void)
 }
 
 void
-server::test_child_poa (void)
+server::test_child_poa ()
 {
   CORBA::PolicyList policies;
   policies.length (1);
@@ -480,7 +480,7 @@ server::test_bands_client_propagated_poa (CORBA::PolicyList &policies,
 }
 
 void
-server::test_default_pool_no_bands_client_propagated_poa (void)
+server::test_default_pool_no_bands_client_propagated_poa ()
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
@@ -489,7 +489,7 @@ server::test_default_pool_no_bands_client_propagated_poa (void)
 }
 
 void
-server::test_no_lanes_no_bands_client_propagated_poa (void)
+server::test_no_lanes_no_bands_client_propagated_poa ()
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
@@ -498,7 +498,7 @@ server::test_no_lanes_no_bands_client_propagated_poa (void)
 }
 
 void
-server::test_lanes_no_bands_client_propagated_poa (void)
+server::test_lanes_no_bands_client_propagated_poa ()
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority,
@@ -507,7 +507,7 @@ server::test_lanes_no_bands_client_propagated_poa (void)
 }
 
 void
-server::test_default_pool_bands_client_propagated_poa (void)
+server::test_default_pool_bands_client_propagated_poa ()
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
@@ -516,7 +516,7 @@ server::test_default_pool_bands_client_propagated_poa (void)
 }
 
 void
-server::test_no_lanes_bands_client_propagated_poa (void)
+server::test_no_lanes_bands_client_propagated_poa ()
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
@@ -525,7 +525,7 @@ server::test_no_lanes_bands_client_propagated_poa (void)
 }
 
 void
-server::test_lanes_bands_client_propagated_poa (void)
+server::test_lanes_bands_client_propagated_poa ()
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority + 1,
@@ -588,7 +588,7 @@ server::test_bands_server_declared_poa (CORBA::PolicyList &policies,
 }
 
 void
-server::test_default_pool_no_bands_server_declared_poa (void)
+server::test_default_pool_no_bands_server_declared_poa ()
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority + 1,
@@ -597,7 +597,7 @@ server::test_default_pool_no_bands_server_declared_poa (void)
 }
 
 void
-server::test_no_lanes_no_bands_server_declared_poa (void)
+server::test_no_lanes_no_bands_server_declared_poa ()
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority - 1,
@@ -606,7 +606,7 @@ server::test_no_lanes_no_bands_server_declared_poa (void)
 }
 
 void
-server::test_lanes_no_bands_server_declared_poa (void)
+server::test_lanes_no_bands_server_declared_poa ()
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority + 1,
@@ -615,7 +615,7 @@ server::test_lanes_no_bands_server_declared_poa (void)
 }
 
 void
-server::test_default_pool_bands_server_declared_poa (void)
+server::test_default_pool_bands_server_declared_poa ()
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority - 1,
@@ -624,7 +624,7 @@ server::test_default_pool_bands_server_declared_poa (void)
 }
 
 void
-server::test_no_lanes_bands_server_declared_poa (void)
+server::test_no_lanes_bands_server_declared_poa ()
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority + 1,
@@ -633,7 +633,7 @@ server::test_no_lanes_bands_server_declared_poa (void)
 }
 
 void
-server::test_lanes_bands_server_declared_poa (void)
+server::test_lanes_bands_server_declared_poa ()
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority - 1,
@@ -647,7 +647,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -660,7 +660,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index 88bff55664a..621a8106df6 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -62,7 +62,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -75,7 +75,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index 1f0ed9048e6..437bc8c8094 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -154,7 +154,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -167,7 +167,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index f33d08539bb..5635e9d438d 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -88,7 +88,7 @@ test_i::method (CORBA::ULong work,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -100,7 +100,7 @@ test_i::initialize (CORBA::ULong total_iterations)
 }
 
 int
-test_i::estimate_iterations (void)
+test_i::estimate_iterations ()
 {
   // Estimate for 2 seconds.
   ACE_Time_Value work_time (2);
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
index 5c8ad620c53..3ab143950c2 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
@@ -27,13 +27,13 @@ public:
                const char *iteration);
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   /// Work (burn CPU).
   void work (CORBA::ULong work);
 
   /// Estimates work iterations performed per second.
-  int estimate_iterations (void);
+  int estimate_iterations ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 7d33d8e2a48..63d5ec79ab1 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -14,10 +14,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -38,7 +38,7 @@ Test_i::test_method (/* */)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index 3d0a3128e24..00f1bab03a1 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -98,7 +98,7 @@ public:
           RTCORBA::RTORB_ptr rt_orb,
           CORBA::PolicyManager_ptr policy_manager);
 
-  void vanilla_invocations (void);
+  void vanilla_invocations ();
 
   void priority_invocations (int debug);
 
@@ -106,9 +106,9 @@ public:
 
   void set_priority_bands (int debug);
 
-  void set_private_connection_policies (void);
+  void set_private_connection_policies ();
 
-  void reset_policies (void);
+  void reset_policies ();
 
 
 private:
@@ -128,9 +128,9 @@ public:
                  RTCORBA::Current_ptr current,
                  CORBA::Short priority);
 
-  int svc (void);
+  int svc ();
 
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   Client client_;
@@ -153,7 +153,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Worker_Thread::validate_connection (void)
+Worker_Thread::validate_connection ()
 {
   // Try to validate the connection several times, ignoring transient
   // exceptions.  If the connection can still not be setup, return
@@ -187,7 +187,7 @@ Worker_Thread::validate_connection (void)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
@@ -218,7 +218,7 @@ Client::Client (test_ptr test,
 }
 
 void
-Client::vanilla_invocations (void)
+Client::vanilla_invocations ()
 {
   for (int i = 0; i < iterations; i++)
     {
@@ -339,7 +339,7 @@ Client::set_priority_bands (int debug)
 }
 
 void
-Client::set_private_connection_policies (void)
+Client::set_private_connection_policies ()
 {
   CORBA::PolicyList policies;
   policies.length (1);
@@ -352,7 +352,7 @@ Client::set_private_connection_policies (void)
 }
 
 void
-Client::reset_policies (void)
+Client::reset_policies ()
 {
   CORBA::PolicyList empty_policies;
 
@@ -366,7 +366,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -379,7 +379,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 33c297afc84..a54df58297e 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -28,13 +28,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -49,7 +49,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -73,7 +73,7 @@ test_i::method (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -83,7 +83,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -290,7 +290,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -303,7 +303,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index 4419abc930c..e84e8a3b901 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -18,7 +18,7 @@ public:
   void test_method (CORBA::Short priority);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -62,7 +62,7 @@ Test_i::test_method (CORBA::Short priority)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -195,7 +195,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -208,7 +208,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index dbfe11fae93..d3be7dda05a 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -17,7 +17,7 @@ public:
   // ctor
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -31,7 +31,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received request to shut down the ORB\n"));
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index fe8a0c032dd..26ebd2508b1 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -53,7 +53,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -66,7 +66,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 2c3b05e739e..702ea91a7f7 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -150,7 +150,7 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -163,7 +163,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index f05b9b314f5..d448c539159 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -44,13 +44,13 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index fa025e013dc..e57f4a6cfb9 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -22,10 +22,10 @@ public:
                       CORBA::Long iteration);
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
index 154474fea0b..979c3376d25 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
@@ -84,7 +84,7 @@ Thread_Task::activate_task (int thr_count)
 }
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   try
     {
@@ -168,7 +168,7 @@ Thread_Task::svc (void)
   return 0;
 }
 
-Thread_Task::~Thread_Task (void)
+Thread_Task::~Thread_Task ()
 {
   delete shutdown_lock_;
   delete lock_;
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h
index eca0f6da253..2051a7bafdf 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.h
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.h
@@ -13,7 +13,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH>
 
   int activate_task (int thr_count);
 
-  ~Thread_Task (void);
+  ~Thread_Task ();
 
  protected:
   /// task svc
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index 8280f3f4862..97ef880d374 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -17,7 +17,7 @@ class Test_Thread_Action:
 public RTScheduling::ThreadAction
 {
  public:
-  Test_Thread_Action (void);
+  Test_Thread_Action ();
 
   virtual void _cxx_do (CORBA::VoidData data);
 };
@@ -25,7 +25,7 @@ public RTScheduling::ThreadAction
 #endif /*Thread_Action_H*/
 
 
-Test_Thread_Action::Test_Thread_Action (void)
+Test_Thread_Action::Test_Thread_Action ()
 {
 }
 
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index fe6cfa85767..c25fcaec69d 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -11,12 +11,12 @@ TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb)
   current_ = RTScheduling::Current::_narrow (current_obj.in ());
 }
 
-TAO_Scheduler::~TAO_Scheduler (void)
+TAO_Scheduler::~TAO_Scheduler ()
 {
 }
 
 CORBA::PolicyList*
-TAO_Scheduler::scheduling_policies (void)
+TAO_Scheduler::scheduling_policies ()
 {
   return 0;
 }
@@ -27,13 +27,13 @@ TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-TAO_Scheduler::poa_policies (void)
+TAO_Scheduler::poa_policies ()
 {
   return 0;
 }
 
 char *
-TAO_Scheduler::scheduling_discipline_name (void)
+TAO_Scheduler::scheduling_discipline_name ()
 {
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h
index 5ab7fd1358a..ab11173f9a0 100644
--- a/TAO/tests/RTScheduling/Scheduler.h
+++ b/TAO/tests/RTScheduling/Scheduler.h
@@ -11,15 +11,15 @@ public RTScheduling::Scheduler,
  public:
   TAO_Scheduler (CORBA::ORB_ptr orb);
 
-  ~TAO_Scheduler (void);
+  ~TAO_Scheduler ();
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index a5017e013b7..0f42bfcc6f7 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -39,7 +39,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual void shutdown (void)
+  virtual void shutdown ()
   {
     orb_->shutdown ();
   }
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index 52ed109973a..66cdc33242b 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -6,7 +6,7 @@
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_index;
 
 RTScheduling::Current::IdType*
-Thread_Task::guids (void)
+Thread_Task::guids ()
 {
   return this->guid_;
 }
@@ -46,7 +46,7 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
 #endif /* THREAD_CANCELLED */
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
index 55c479befcb..642c23d55eb 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
@@ -11,7 +11,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH>
  public:
   int activate_task (CORBA::ORB_ptr orb);
 
-  RTScheduling::Current::IdType* guids (void);
+  RTScheduling::Current::IdType* guids ();
 
  protected:
   /// task svc
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index 22e9d2969df..0427cbd91c5 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -7,13 +7,13 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Oneway_Receiver::raise_no_permission (void)
+Oneway_Receiver::raise_no_permission ()
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
-Oneway_Receiver::destroy (void)
+Oneway_Receiver::destroy ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -24,7 +24,7 @@ Oneway_Receiver::destroy (void)
 }
 
 Test::Shutdown_Helper_ptr
-Oneway_Receiver::get_shutdown_helper (void)
+Oneway_Receiver::get_shutdown_helper ()
 {
   Shutdown_Helper *shutdown_helper;
   ACE_NEW_THROW_EX (shutdown_helper,
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index f7653e237c2..84671b4eea9 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -14,11 +14,11 @@ public:
   Oneway_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void raise_no_permission (void);
+  virtual void raise_no_permission ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void);
+  virtual Test::Shutdown_Helper_ptr get_shutdown_helper ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index ca529160340..ae0b79e779b 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -6,7 +6,7 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
 }
 
 void
-Shutdown_Helper::shutdown (void)
+Shutdown_Helper::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 994bf94396b..607cf8b0e24 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -14,7 +14,7 @@ public:
   Shutdown_Helper (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
index 70ac48de6eb..4d4c3276cdb 100644
--- a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
@@ -23,7 +23,7 @@ TAO::Objref_Traits<fwd_mock_reference>::release (
 }
 
 fwd_mock_reference_ptr
-TAO::Objref_Traits<fwd_mock_reference>::nil (void)
+TAO::Objref_Traits<fwd_mock_reference>::nil ()
 {
   return 0;
 }
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
index 008f15cda78..95e4c273736 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
@@ -70,7 +70,7 @@ TAO::Objref_Traits<mock_reference>::release (
 }
 
 mock_reference_ptr
-TAO::Objref_Traits<mock_reference>::nil (void)
+TAO::Objref_Traits<mock_reference>::nil ()
 {
   return mock_reference::_nil ();
 }
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
index 6f98d20f46f..b04e16125cf 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
@@ -6,7 +6,7 @@ One_Impl::One_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-One_Impl::get_string (void)
+One_Impl::get_string ()
 {
   return CORBA::string_dup ("One_Impl there!");
 }
@@ -17,7 +17,7 @@ Two_Impl::Two_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-Two_Impl::get_string (void)
+Two_Impl::get_string ()
 {
   return CORBA::string_dup ("One_Impl there!");
 }
@@ -29,7 +29,7 @@ Three_Impl::Three_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-Three_Impl::get_string (void)
+Three_Impl::get_string ()
 {
   return CORBA::string_dup ("Three_Impl there!");
 }
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index a33ac60baf4..11e14547108 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h
@@ -13,7 +13,7 @@ public:
   One_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
@@ -29,7 +29,7 @@ public:
   Two_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
@@ -45,7 +45,7 @@ public:
   Three_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 65a3bf86b53..2fcf8fd65e5 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -19,7 +19,7 @@ public:
   {
   }
 
-  int svc (void);
+  int svc ();
 
 private:
   PortableServer::POA_var p_;
@@ -29,7 +29,7 @@ private:
 };
 
 int
-MT_Task::svc (void)
+MT_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp
index 32bcd87338f..6343eee9ac3 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.cpp
+++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp
@@ -12,7 +12,7 @@ test_i::send_stuff (const char* string)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shudown...\n"));
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h
index ab8730f8b3f..0d88882e59e 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.h
+++ b/TAO/tests/Server_Connection_Purging/Test_i.h
@@ -14,7 +14,7 @@ public:
   // = The skeleton methods
   virtual void send_stuff (const char* string);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp
index 3ad4f33e1f8..4b2c6a46b3d 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.cpp
+++ b/TAO/tests/Server_Leaks/Ping_Service.cpp
@@ -6,12 +6,12 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
 }
 
 void
-Ping_Service::ping (void)
+Ping_Service::ping ()
 {
 }
 
 void
-Ping_Service::shutdown (void)
+Ping_Service::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index 1488a615128..ae6b6806e2c 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -14,9 +14,9 @@ public:
   Ping_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Server_Port_Zero/Hello.cpp
+++ b/TAO/tests/Server_Port_Zero/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 44acb005512..c066d4b7c03 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -39,7 +39,7 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shudown... "));
diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h
index e6869668f37..100978728df 100644
--- a/TAO/tests/Single_Read/test_i.h
+++ b/TAO/tests/Single_Read/test_i.h
@@ -28,7 +28,7 @@ public:
   void method (CORBA::ULong request_number,
                const test::data &);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
index dff1368f8de..fbde599f444 100644
--- a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
@@ -7,13 +7,13 @@ interface_3_i::interface_3_i (CORBA::ORB_ptr orb)
 
 // INTERFACE 1
 char *
-interface_3_i::operation_1 (void)
+interface_3_i::operation_1 ()
 {
   return CORBA::string_dup ("Invoked operation one");
 }
 
 ::CORBA::Long
-interface_3_i::attribute_1 (void)
+interface_3_i::attribute_1 ()
 {
   return 10;
 }
@@ -27,13 +27,13 @@ interface_3_i::attribute_1 (::CORBA::Long attribute_1)
 // INTERFACE 2
 
 char *
-interface_3_i::operation_2 (void)
+interface_3_i::operation_2 ()
 {
   return CORBA::string_dup ("Invoked operation two");
 }
 
 char *
-interface_3_i::attribute_2 (void)
+interface_3_i::attribute_2 ()
 {
   return CORBA::string_dup ("Returning attribute_2");
 }
@@ -41,19 +41,19 @@ interface_3_i::attribute_2 (void)
 //INTERFACE 3
 
 char *
-interface_3_i::operation_3 (void)
+interface_3_i::operation_3 ()
 {
   return CORBA::string_dup ("Invoked operation three");
 }
 
 void
-interface_3_i::shutdown (void)
+interface_3_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
 
 ::CORBA::Short
-interface_3_i::attribute_3 (void)
+interface_3_i::attribute_3 ()
 {
   return 10;
 }
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.h b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
index c532071b5c6..b536d54146f 100644
--- a/TAO/tests/Skeleton_Inheritance/interface_3_i.h
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
@@ -12,18 +12,18 @@ public:
   /// Constructor
   interface_3_i (CORBA::ORB_ptr orb);
 
-  virtual char * operation_1 (void);
-  virtual char * operation_2 (void);
-  virtual char * operation_3 (void);
+  virtual char * operation_1 ();
+  virtual char * operation_2 ();
+  virtual char * operation_3 ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual ::CORBA::Long attribute_1 (void);
+  virtual ::CORBA::Long attribute_1 ();
   virtual void attribute_1 (::CORBA::Long attribute_1);
 
-  virtual char * attribute_2 (void);
+  virtual char * attribute_2 ();
 
-  virtual ::CORBA::Short attribute_3 (void);
+  virtual ::CORBA::Short attribute_3 ();
   virtual void attribute_3 (::CORBA::Short attribute_3);
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index b8974757c1e..8a1ccf20498 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -1,5 +1,5 @@
 #include "Smart_Proxy_Impl.h"
-Smart_Test_Factory::Smart_Test_Factory (void)
+Smart_Test_Factory::Smart_Test_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Smart_Test_Factory\n"));
@@ -24,7 +24,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 }
 
 CORBA::Short
-Smart_Test_Proxy::box_prices (void)
+Smart_Test_Proxy::box_prices ()
 {
   if (this->price_ == 0)
     {
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index 3bd7df13a74..cffbbb30f72 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -2,7 +2,7 @@
 class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 {
 public:
-  Smart_Test_Factory (void);
+  Smart_Test_Factory ();
 
   virtual Test_ptr create_proxy (Test_ptr proxy);
   // This method will create the smart_proxy.
@@ -13,7 +13,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short box_prices(void);
+  virtual CORBA::Short box_prices();
   // "Smartify" the method call!
 
  private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index 4b9bab49faf..04f63a733b8 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -21,13 +21,13 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short box_prices  (void);
+  CORBA::Short box_prices  ();
 
   CORBA::Long tickets  (CORBA::Short number);
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
@@ -39,7 +39,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i::box_prices (void)
+Test_i::box_prices ()
 {
   return 125;
 }
@@ -51,7 +51,7 @@ Test_i::tickets (CORBA::Short number)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index 9b5a1e94d74..93e35c36308 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -14,7 +14,7 @@
 #include "Coll_Tester.h"
 #include "Smart_Proxy_Impl.h"
 
-Collocation_Test::Collocation_Test (void)
+Collocation_Test::Collocation_Test ()
 {
 }
 
@@ -76,7 +76,7 @@ Collocation_Test::parse_args (int, ACE_TCHAR *[])
 }
 
 int
-Collocation_Test::test_narrow (void)
+Collocation_Test::test_narrow ()
 {
   // Ensure that the smart proxy is the one which is used by registering
   // the user-defined factory. Its necessary to create one on the heap so
@@ -114,7 +114,7 @@ Collocation_Test::test_narrow (void)
 }
 
 int
-Collocation_Test::run (void)
+Collocation_Test::run ()
 {
   this->poa_manager_->activate ();
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index f7b8a7f346e..b1309a4f502 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -24,7 +24,7 @@
 class Collocation_Test
 {
 public:
-  Collocation_Test (void);
+  Collocation_Test ();
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializing the Collocation_Test object.
@@ -32,11 +32,11 @@ public:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (void);
+  int test_narrow ();
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (void);
+  int run ();
   // Run the test.
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
index 6dcf936df1f..349d03c1061 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
@@ -9,7 +9,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (void)
+Top_i::shape ()
 {
   return CORBA::string_dup ("a point.");
 }
@@ -25,13 +25,13 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (void)
+Left_i::shape ()
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
-Left_i::color (void)
+Left_i::color ()
 {
   return CORBA::string_dup ("black");
 }
@@ -45,20 +45,20 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (void)
+Right_i::shape ()
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
-Right_i::color (void)
+Right_i::color ()
 {
   return CORBA::string_dup ("red");
   //
 }
 
 CORBA::Long
-Right_i::width (void)
+Right_i::width ()
 {
   return 0;
 }
@@ -72,25 +72,25 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (void)
+Buttom_i::shape ()
 {
   return CORBA::string_dup ("a diamond");
 }
 
 char *
-Buttom_i::color (void)
+Buttom_i::color ()
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
-Buttom_i::width (void)
+Buttom_i::width ()
 {
   return 100;
 }
 
 char *
-Buttom_i::name (void)
+Buttom_i::name ()
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
index 354ae97d32b..147b9e862b6 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
@@ -11,62 +11,62 @@
 class Diamond_Export Top_i : public POA_Diamond::Top
 {
 public:
-  Top_i (void);
-  ~Top_i (void);
+  Top_i ();
+  ~Top_i ();
   // Ctor and dtor.
 
-  virtual char* shape (void);
+  virtual char* shape ();
   // Return the shape of this object (interface.)
 };
 
 class Diamond_Export Left_i : public POA_Diamond::Left
 {
 public:
-  Left_i (void);
-  ~Left_i (void);
+  Left_i ();
+  ~Left_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 };
 
 class Diamond_Export Right_i : public POA_Diamond::Right
 {
 public:
-  Right_i (void);
-  ~Right_i (void);
+  Right_i ();
+  ~Right_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 };
 
 class Diamond_Export Buttom_i : public POA_Diamond::Buttom
 {
 public:
-  Buttom_i (void);
-  ~Buttom_i (void);
+  Buttom_i ();
+  ~Buttom_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index 47ae1744758..bb628f8abab 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -3,7 +3,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void)
+Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG, "Smart_Diamond_Top_Factory\n"));
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index 1dd3fc82864..043a501e6a4 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -8,7 +8,7 @@
 class MY_Stub_Export Smart_Diamond_Top_Factory : public virtual Diamond::TAO_Diamond_Top_Default_Proxy_Factory
 {
 public:
-  Smart_Diamond_Top_Factory (void);
+  Smart_Diamond_Top_Factory ();
 
   virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy);
 
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
index fc0bbd9672a..8379e0391a6 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -1,7 +1,7 @@
 #define ACE_BUILD_SVC_DLL
 #include "Smart_Test_Factory.h"
 
-Smart_Test_Factory::Smart_Test_Factory (void)
+Smart_Test_Factory::Smart_Test_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Smart_Test_Factory\n"));
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
index 04df6b50990..974505ca8e0 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
@@ -8,7 +8,7 @@ class ACE_Svc_Export Smart_Test_Factory
 
 {
 public:
-  Smart_Test_Factory (void);
+  Smart_Test_Factory ();
 
   // This method will create the smart_proxy.
   virtual Test_ptr create_proxy (Test_ptr proxy);
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index 82be6239c97..bdf03d05fa3 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -25,7 +25,7 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
@@ -48,7 +48,7 @@ Test_i :: method (CORBA::Short boo)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 2ea587ee534..567999aac8e 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -25,7 +25,7 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
@@ -48,7 +48,7 @@ Test_i :: method (CORBA::Short boo)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index b8a035f4eab..e21bc567688 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -2,7 +2,7 @@
 
 ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior");
 
-Smart_Test_Factory::Smart_Test_Factory (void)
+Smart_Test_Factory::Smart_Test_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Smart_Test_Factory\n"));
@@ -62,7 +62,7 @@ Smart_Test_Proxy::method (CORBA::Short boo)
 }
 
 const ACE_CString&
-Smart_Test_Proxy::fake_ior (void)
+Smart_Test_Proxy::fake_ior ()
 {
   return fake_ior_;
 }
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index f749b8d668c..9f44e9d5dc3 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -4,7 +4,7 @@
 class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 {
 public:
-  Smart_Test_Factory (void);
+  Smart_Test_Factory ();
 
   virtual Test_ptr create_proxy (Test_ptr proxy);
   // This method will create the smart_proxy.
@@ -23,7 +23,7 @@ public:
   virtual CORBA::Short method (CORBA::Short boo);
   // "Smartify" the method call!
 
-  static const ACE_CString& fake_ior (void);
+  static const ACE_CString& fake_ior ();
 
   // Don't need to add any extra functionality into <shutdown>, hence
   // we don't define it.
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index 084d7474ab5..2969f2471b8 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -10,7 +10,7 @@ public:
   void hello (CORBA::Long howmany);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -29,7 +29,7 @@ Test_i::hello (CORBA::Long howmany)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 1f358d45de9..61dff5a477d 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -25,7 +25,7 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
@@ -48,7 +48,7 @@ Test_i :: method (CORBA::Short boo)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp
index 21f5d613490..4954166719c 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Sender_ptr sender,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -43,7 +43,7 @@ Client_Task::svc (void)
 
 
 void
-Client_Task::validate_connections (void)
+Client_Task::validate_connections ()
 {
   for (int i = 0 ; i != 100; i++)
     {
diff --git a/TAO/tests/Stack_Recursion/Client_Task.h b/TAO/tests/Stack_Recursion/Client_Task.h
index 4e3cc6b3dfe..bd87305f41e 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.h
+++ b/TAO/tests/Stack_Recursion/Client_Task.h
@@ -22,11 +22,11 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Simple pings to prune up the connections
-  void validate_connections (void);
+  void validate_connections ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index bcc4987e608..7616b16a34e 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -9,7 +9,7 @@ Sender::Sender (CORBA::ORB_ptr orb)
 }
 
 void
-Sender::dump_results (void)
+Sender::dump_results ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   ACE_DEBUG ((LM_DEBUG,
@@ -44,7 +44,7 @@ Sender::get_data (CORBA::ULong size,
 }
 
 CORBA::Long
-Sender::get_event_count (void)
+Sender::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
@@ -55,13 +55,13 @@ Sender::get_event_count (void)
 
 
 void
-Sender::ping (void)
+Sender::ping ()
 {
   return;
 }
 
 void
-Sender::shutdown (void)
+Sender::shutdown ()
 {
   if (this->is_done_ == false)
     {
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index c403ab93083..3cbadc6ec63 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -17,7 +17,7 @@ public:
   Sender (CORBA::ORB_ptr orb);
 
   /// Print out the results
-  void dump_results (void);
+  void dump_results ();
 
   /// Get the status of the flag..
   bool is_done () const;
@@ -26,11 +26,11 @@ public:
   virtual CORBA::Boolean get_data (CORBA::ULong size,
                                    Test::Payload_out payload);
 
-  virtual CORBA::Long get_event_count (void);
+  virtual CORBA::Long get_event_count ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp
index 5a3cf60f539..939beccbc61 100644
--- a/TAO/tests/Stack_Recursion/Server_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Server_Task.cpp
@@ -12,7 +12,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Stack_Recursion/Server_Task.h b/TAO/tests/Stack_Recursion/Server_Task.h
index 0bada3e7344..a4612707d64 100644
--- a/TAO/tests/Stack_Recursion/Server_Task.h
+++ b/TAO/tests/Stack_Recursion/Server_Task.h
@@ -22,7 +22,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp
index 6e6012b4613..46a3a25a599 100644
--- a/TAO/tests/Strategies/simple_test_i.cpp
+++ b/TAO/tests/Strategies/simple_test_i.cpp
@@ -6,7 +6,7 @@
 #endif /* __ACE_INLINE__ */
 
 CORBA::Boolean
-Simple_Server_i::print_status (void)
+Simple_Server_i::print_status ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -15,7 +15,7 @@ Simple_Server_i::print_status (void)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h
index fa074ddbe2b..86c1acf10e2 100644
--- a/TAO/tests/Strategies/simple_test_i.h
+++ b/TAO/tests/Strategies/simple_test_i.h
@@ -27,9 +27,9 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   // = The Simple_Server methods.
-  CORBA::Boolean print_status (void);
+  CORBA::Boolean print_status ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
index 803f6e98555..2241cdf9a62 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
@@ -25,7 +25,7 @@ Custom_Time_Policy_Strategy::~Custom_Time_Policy_Strategy ()
 {
 }
 
-ACE_Timer_Queue * Custom_Time_Policy_Strategy::create_timer_queue (void)
+ACE_Timer_Queue * Custom_Time_Policy_Strategy::create_timer_queue ()
 {
   ACE_Timer_Queue * tmq = 0;
 
@@ -44,7 +44,7 @@ Custom_Time_Policy_Strategy::destroy_timer_queue (ACE_Timer_Queue *tmq)
   delete tmq;
 }
 
-ACE_Dynamic_Time_Policy_Base * Custom_Time_Policy_Strategy::get_time_policy (void)
+ACE_Dynamic_Time_Policy_Base * Custom_Time_Policy_Strategy::get_time_policy ()
 {
   return &custom_time_policy_;
 }
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h
index 470147e86e7..5230f79d341 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h
@@ -33,11 +33,11 @@ class TPTEST_Export Custom_Time_Policy_Strategy
 public:
   virtual ~Custom_Time_Policy_Strategy ();
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
-  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void);
+  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy ();
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TPTEST, Custom_Time_Policy_Strategy)
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index 969d9534bc5..fbc9e7f8c4a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -30,7 +30,7 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::flush (void)
+test_i::flush ()
 {
   ACE_DEBUG ((LM_DEBUG, "server: got flush request\n"));
 }
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h
index 0d30b7009e1..581f2244a49 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.h
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h
@@ -31,7 +31,7 @@ public:
                const test::data &,
                CORBA::ULong work);
 
-  void flush (void);
+  void flush ();
 
   void shutdown (CORBA::Long start_time);
 
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index d615af9689d..a240a7d9e6c 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -33,7 +33,7 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index 32129102136..a175271fcd8 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
                     CORBA::Long msecs);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index d800764960b..191b2ac6a64 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -12,18 +12,18 @@ Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
 {
 }
 
-Current_Test_Impl::~Current_Test_Impl (void)
+Current_Test_Impl::~Current_Test_Impl ()
 {
 }
 
 ::CORBA::Long
-Current_Test_Impl::self_test (void)
+Current_Test_Impl::self_test ()
 {
   return 0;
 }
 
 void
-Current_Test_Impl::test_transport_current (void)
+Current_Test_Impl::test_transport_current ()
 {
   if (TAO_debug_level > 2)
     {
@@ -66,7 +66,7 @@ Current_Test_Impl::test_transport_current (void)
 }
 
 void
-Current_Test_Impl::invoked_by_client (void)
+Current_Test_Impl::invoked_by_client ()
 {
   try
     {
@@ -85,7 +85,7 @@ Current_Test_Impl::invoked_by_client (void)
 }
 
 void
-Current_Test_Impl::invoked_by_client_i (void)
+Current_Test_Impl::invoked_by_client_i ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -120,7 +120,7 @@ Current_Test_Impl::invoked_by_client_i (void)
 }
 
 void
-Current_Test_Impl::invoked_during_upcall (void)
+Current_Test_Impl::invoked_during_upcall ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -131,7 +131,7 @@ Current_Test_Impl::invoked_during_upcall (void)
 }
 
 void
-Current_Test_Impl::shutdown (void)
+Current_Test_Impl::shutdown ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp
index 5b42814602a..c17b7d4b697 100644
--- a/TAO/tests/TransportCurrent/Framework/client.cpp
+++ b/TAO/tests/TransportCurrent/Framework/client.cpp
@@ -99,7 +99,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server,
 /// interceptor
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index 99eac9cedc2..bff3fe20ae0 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -73,7 +73,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 /// interceptor
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index 5fe338c57c1..4f8461eb7e5 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -13,18 +13,18 @@ Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
 {
 }
 
-Current_Test_Impl::~Current_Test_Impl (void)
+Current_Test_Impl::~Current_Test_Impl ()
 {
 }
 
 ::CORBA::Long
-Current_Test_Impl::self_test (void)
+Current_Test_Impl::self_test ()
 {
   return 0;
 }
 
 void
-Current_Test_Impl::test_transport_current (void)
+Current_Test_Impl::test_transport_current ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -59,7 +59,7 @@ Current_Test_Impl::test_transport_current (void)
 
 
 void
-Current_Test_Impl::invoked_by_client (void)
+Current_Test_Impl::invoked_by_client ()
 {
   if (TAO_debug_level >= 1) {
     ACE_DEBUG ((LM_DEBUG,
@@ -95,7 +95,7 @@ Current_Test_Impl::invoked_by_client (void)
 }
 
 void
-Current_Test_Impl::invoked_during_upcall (void)
+Current_Test_Impl::invoked_during_upcall ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -105,7 +105,7 @@ Current_Test_Impl::invoked_during_upcall (void)
 }
 
 void
-Current_Test_Impl::shutdown (void)
+Current_Test_Impl::shutdown ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index 875a435d594..34628832a2e 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -15,12 +15,12 @@ namespace Test {
   {
   }
 
-  IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor (void)
+  IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor ()
   {
   }
 
   char *
-  IIOP_Server_Request_Interceptor::name (void)
+  IIOP_Server_Request_Interceptor::name ()
   {
     return CORBA::string_dup ("II SRI");
   }
@@ -131,7 +131,7 @@ namespace Test {
   /// Checks if all the endpoints, encountered on the way in have been
   /// cleaned on the way out of the interception point
   bool
-  IIOP_Server_Request_Interceptor::self_test (void)
+  IIOP_Server_Request_Interceptor::self_test ()
   {
     CORBA::String_var name (this->name ());
     bool has_remaining_endpoints = false;
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index 01942ade9e3..5c95455e007 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -51,7 +51,7 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
     /// incomming interception point
     virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
index c9abdc769c5..141d2517b7a 100644
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/client.cpp
@@ -99,7 +99,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server,
 /// interceptor
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index 56d431e9226..1a5ea9153a6 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -71,7 +71,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 /// Test referencing the TC data *inside* the context of a client-side
 /// interceptor
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index 4a282cd8ab6..5d78736cbf0 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -14,7 +14,7 @@ namespace Test
     /* no-op */
   }
 
-  Client_ORBInitializer::~Client_ORBInitializer (void)
+  Client_ORBInitializer::~Client_ORBInitializer ()
   {
     /* no-op */
   }
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
index a2f99cfd8bc..e89f12deda2 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
@@ -31,7 +31,7 @@ namespace Test
   {
   public:
     Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
-    virtual ~Client_ORBInitializer (void);
+    virtual ~Client_ORBInitializer ();
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index 890cf65a533..3ef844d0e41 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -17,13 +17,13 @@ namespace Test
   }
 
   CORBA::Long
-  Client_Request_Interceptor::interceptions (void)
+  Client_Request_Interceptor::interceptions ()
   {
     return this->request_count_;
   }
 
   char *
-  Client_Request_Interceptor::name (void)
+  Client_Request_Interceptor::name ()
   {
     return CORBA::string_dup ("Client_Request_Interceptor");
   }
@@ -53,7 +53,7 @@ namespace Test
   }
 
   void
-  Client_Request_Interceptor::destroy (void)
+  Client_Request_Interceptor::destroy ()
   {
   }
 
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
index 30e64315bf9..49bbe7f5619 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
@@ -64,9 +64,9 @@ namespace Test
      */
     //@{
     /// Return the name of this ClientRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
@@ -80,7 +80,7 @@ namespace Test
     //@}
 
     // Number of interceptions
-    CORBA::Long interceptions (void);
+    CORBA::Long interceptions ();
 
   private:
     // Implementation method, every inteception point will have to
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
index 8339d211416..0d585a7ea9a 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
@@ -31,21 +31,21 @@ public:
   Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls = 1);
 
   /// Destructor.
-  ~Current_Test_Impl (void);
+  ~Current_Test_Impl ();
 
   /// Main servant test method.
-  virtual void invoked_by_client (void);
+  virtual void invoked_by_client ();
 
   /// No-op method used so that a client request interceptor will be
   /// invoked when invoking this method from the above invoke_me()
   /// method.  Say that 10 times fast. :-)
-  virtual void invoked_during_upcall (void);
+  virtual void invoked_during_upcall ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // A self-test for coherency
-  virtual ::CORBA::Long self_test (void);
+  virtual ::CORBA::Long self_test ();
 
 public:
   /// Reports if unexpected errors have been encountered for the
@@ -53,10 +53,10 @@ public:
   bool is_successful () const;
 
 private:
-  void test_transport_current (void);
+  void test_transport_current ();
 
   /// Main servant test method.
-  void invoked_by_client_i (void);
+  void invoked_by_client_i ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index 8fb8af99ebf..974781ef717 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -14,7 +14,7 @@ namespace Test
     /* no-op */
   }
 
-  Server_ORBInitializer::~Server_ORBInitializer (void)
+  Server_ORBInitializer::~Server_ORBInitializer ()
   {
     /* no-op */
   }
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
index f3d554cf14a..2dc95808f3f 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
@@ -30,7 +30,7 @@ namespace Test
   {
   public:
     Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
-    virtual ~Server_ORBInitializer (void);
+    virtual ~Server_ORBInitializer ();
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 73980f0befb..2e79dc33976 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -13,7 +13,7 @@ namespace Test
   {
   }
 
-  Server_Request_Interceptor::~Server_Request_Interceptor (void)
+  Server_Request_Interceptor::~Server_Request_Interceptor ()
   {
   }
 
@@ -57,20 +57,20 @@ namespace Test
 
   /// queries the status of the test
   bool
-  Server_Request_Interceptor::self_test (void)
+  Server_Request_Interceptor::self_test ()
   {
     return true;
   }
 
 
   char *
-  Server_Request_Interceptor::name (void)
+  Server_Request_Interceptor::name ()
   {
     return CORBA::string_dup ("SRI   ");
   }
 
   void
-  Server_Request_Interceptor::destroy (void)
+  Server_Request_Interceptor::destroy ()
   {
   }
 
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index 06e0c363d52..ba8378de000 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -50,12 +50,12 @@ namespace Test
     Server_Request_Interceptor (const char*orb_id, TEST test);
 
     /// Destructor.
-    virtual ~Server_Request_Interceptor (void);
+    virtual ~Server_Request_Interceptor ();
 
     virtual void test_transport_current (const ACE_TCHAR* amethod);
 
     /// Coherency test
-    virtual bool self_test (void);
+    virtual bool self_test ();
 
     /**
      * @name Methods Required by the Server Request Interceptor
@@ -67,9 +67,9 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index 7909a5a3de1..9d4bb52a1f0 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -13,7 +13,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
 }
 
 void
-First_i::oneway_method (void)
+First_i::oneway_method ()
 {
   ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n"));
 
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 9b6f53cc0a1..56a2506f20d 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -18,7 +18,7 @@ public:
   First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done);
 
   /// Interface methods..
-  void oneway_method (void);
+  void oneway_method ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index a28794209cd..a01d2199aad 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -12,7 +12,7 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
 
 //factory method to create first object
 Two_Objects_Test::First_ptr
-Object_Factory_i::create_first (void)
+Object_Factory_i::create_first ()
 {
   First_i *first_impl;
 
@@ -41,7 +41,7 @@ Object_Factory_i::create_first (void)
 
 //factory method to create second object
 Two_Objects_Test::Second_ptr
-Object_Factory_i::create_second (void)
+Object_Factory_i::create_second ()
 {
   Second_i *second_impl;
 
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index 701a4bfb1df..e851eae2fcd 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -17,9 +17,9 @@ public:
   Object_Factory_i (CORBA::ORB_ptr orb,
                     CORBA::ULong len);
 
-  Two_Objects_Test::First_ptr create_first (void);
+  Two_Objects_Test::First_ptr create_first ();
 
-  Two_Objects_Test::Second_ptr create_second (void);
+  Two_Objects_Test::Second_ptr create_second ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index 286c37b03d2..a2eefb082ac 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -14,7 +14,7 @@ Second_i::Second_i (CORBA::ORB_ptr orb,
 }
 
 Two_Objects_Test::Octet_Seq *
-Second_i::twoway_method (void)
+Second_i::twoway_method ()
 {
   Two_Objects_Test::Octet_Seq  *preply_mesg = 0;
 
@@ -45,7 +45,7 @@ Second_i::twoway_method (void)
 }
 
 void
-Second_i::shutdown (void)
+Second_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 895dc85b823..6048b627f25 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -17,9 +17,9 @@ public:
              CORBA::ULong len, ACE_Auto_Event &two_way_done);
 
   Two_Objects_Test::Octet_Seq *
-    twoway_method (void);
+    twoway_method ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp
index 9387edcce9d..126f4e82561 100644
--- a/TAO/tests/Two_Objects/worker.cpp
+++ b/TAO/tests/Two_Objects/worker.cpp
@@ -7,7 +7,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index 71855f95da3..0bdedee34a8 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -7,7 +7,7 @@ const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 static int done = 0;
 
 void
-throw_exception (void)
+throw_exception ()
 {
   throw 1;
 }
@@ -18,14 +18,14 @@ class test_i :
 public:
   test_i (CORBA::ORB_ptr orb);
 
-  void normal_method (void);
+  void normal_method ();
 
-  void unknown_exception_in_method (void);
+  void unknown_exception_in_method ();
 
-  void unknown_exception_during_deactivation (void);
+  void unknown_exception_during_deactivation ();
 
-  void _add_ref (void);
-  void _remove_ref (void);
+  void _add_ref ();
+  void _remove_ref ();
 
   CORBA::ORB_var orb_;
 
@@ -39,14 +39,14 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::normal_method (void)
+test_i::normal_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::normal_method() called\n"));
 }
 
 void
-test_i::unknown_exception_in_method (void)
+test_i::unknown_exception_in_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::unknown_exception_in_method() called\n"));
@@ -58,7 +58,7 @@ test_i::unknown_exception_in_method (void)
 }
 
 void
-test_i::unknown_exception_during_deactivation (void)
+test_i::unknown_exception_during_deactivation ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::unknown_exception_during_deactivation() called\n"));
@@ -73,7 +73,7 @@ test_i::unknown_exception_during_deactivation (void)
 }
 
 void
-test_i::_add_ref (void)
+test_i::_add_ref ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::_add_ref() called; current refcount = %d\n",
@@ -81,7 +81,7 @@ test_i::_add_ref (void)
 }
 
 void
-test_i::_remove_ref (void)
+test_i::_remove_ref ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::_remove_ref() called; current refcount = %d\n",
@@ -105,9 +105,9 @@ class test_factory_i :
 public:
   test_factory_i (CORBA::ORB_ptr orb);
 
-  test_ptr create_test (void);
+  test_ptr create_test ();
 
-  void shutdown (void);
+  void shutdown ();
 
   CORBA::ORB_var orb_;
 };
@@ -119,7 +119,7 @@ test_factory_i::test_factory_i (CORBA::ORB_ptr orb)
 }
 
 test_ptr
-test_factory_i::create_test (void)
+test_factory_i::create_test ()
 {
   test_i *servant =
     new test_i (this->orb_.in ());
@@ -145,7 +145,7 @@ test_factory_i::create_test (void)
 }
 
 void
-test_factory_i::shutdown (void)
+test_factory_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "factory_i::shutdown() called\n"));
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index d46ed4ca6f1..f2a869ca3a3 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -24,7 +24,7 @@ public:
   Client (CORBA::ORB_ptr orb);
 
   ///Dtor..
-  ~Client (void);
+  ~Client ();
 
   /// The callbacks
   static void start_callback (Widget w,
@@ -35,8 +35,8 @@ public:
                               XtPointer call_data);
 
   /// The hooks...
-  void start_hook (void);
-  void stop_hook (void);
+  void start_hook ();
+  void stop_hook ();
 
   /// Adds the callbacks to the GUI underneath.....
   void add_callback (Control &);
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index b539334d7f8..f276b040571 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -25,12 +25,12 @@ Control::Control (Widget &parent)
                                           0);
 }
 
-Control::~Control (void)
+Control::~Control ()
 {
 }
 
 void
-Control::manage (void)
+Control::manage ()
 {
   XtManageChild (frame_);
   XtManageChild (rowcolumn_);
@@ -39,13 +39,13 @@ Control::manage (void)
 }
 
 Widget &
-Control::startwidget (void)
+Control::startwidget ()
 {
   return this->startwidget_;
 }
 
 Widget &
-Control::stopwidget (void)
+Control::stopwidget ()
 {
   return this->stopwidget_;
 }
diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h
index 2a80f83d474..959acddd14e 100644
--- a/TAO/tests/Xt_Stopwatch/Control.h
+++ b/TAO/tests/Xt_Stopwatch/Control.h
@@ -27,16 +27,16 @@ class Control
   Control (Widget &parent);
 
   /// Destructor
-  virtual ~Control (void);
+  virtual ~Control ();
 
   /// Manage the widget
-  virtual void manage (void);
+  virtual void manage ();
 
   /// Return the start widget
-  Widget& startwidget (void);
+  Widget& startwidget ();
 
   /// Return the stop widget..
-  Widget& stopwidget (void);
+  Widget& stopwidget ();
 
  private:
   /// A frame widget...
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
index fb6095fd925..b3826ed29f9 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -17,13 +17,13 @@ Stopwatch_display::Stopwatch_display (Widget &parent)
                                  0);
 }
 
-Stopwatch_display::~Stopwatch_display (void)
+Stopwatch_display::~Stopwatch_display ()
 {
   //No-op
 }
 
 void
-Stopwatch_display::manage (void)
+Stopwatch_display::manage ()
 {
   XtManageChild (this->frame_);
   XtManageChild (this->label_);
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
index fcba4acadd9..1c255ddfb33 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
@@ -23,10 +23,10 @@ public:
   Stopwatch_display (Widget &parent);
 
   /// Destructor
-  virtual ~Stopwatch_display (void);
+  virtual ~Stopwatch_display ();
 
   /// Manage the widget
-  virtual void manage (void);
+  virtual void manage ();
 
   /// Change the displayed time
   void set_time (CORBA::Float value);
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 7dd4d0ad804..b0fd70e1e59 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -52,7 +52,7 @@ Client::Client (CORBA::ORB_ptr orb)
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
 }
 
@@ -130,7 +130,7 @@ Client::stop_callback (Widget /*widget*/,
 }
 
 void
-Client::start_hook (void)
+Client::start_hook ()
 {
   try
     {
@@ -145,7 +145,7 @@ Client::start_hook (void)
 }
 
 void
-Client::stop_hook (void)
+Client::stop_hook ()
 {
   try
     {
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index 5f7a480883e..b348655e7d8 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -7,19 +7,19 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
 }
 
 void
-Stopwatch_imp::start (void)
+Stopwatch_imp::start ()
 {
   this->timer_->start ();
 }
 
 void
-Stopwatch_imp::stop (void)
+Stopwatch_imp::stop ()
 {
   this->timer_->stop ();
 }
 
 void
-Stopwatch_imp::shutdown (void)
+Stopwatch_imp::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 9e720422d35..7621b3e4ecb 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -29,11 +29,11 @@ public:
   Stopwatch_imp (CORBA::ORB_ptr, Timer_imp *);
 
   // = The Simple_Server methods.
-  void start (void);
+  void start ();
 
-  void stop (void);
+  void stop ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index 06050a3169a..af6f071c6b5 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -17,7 +17,7 @@ Timer_imp::~Timer_imp ()
 }
 
 void
-Timer_imp::start (void)
+Timer_imp::start ()
 {
   // Reset the elapsed time
   this->counter_ = 0;
@@ -37,7 +37,7 @@ Timer_imp::start (void)
 }
 
 void
-Timer_imp::stop (void)
+Timer_imp::stop ()
 {
     // Remove the current timeout function, if any
   if (this->id_)
@@ -47,7 +47,7 @@ Timer_imp::stop (void)
 }
 
 CORBA::Float
-Timer_imp::elapsed_time(void)
+Timer_imp::elapsed_time()
 {
     return ((CORBA::Float) counter_ * interval_ / 1000.0 );
 }
@@ -63,7 +63,7 @@ Timer_imp::tick_callback (XtPointer client_data,
 
 
 void
-Timer_imp::tick (void)
+Timer_imp::tick ()
 {
   // Increment a counter for each tick
   counter_++;
diff --git a/TAO/tests/Xt_Stopwatch/timer.h b/TAO/tests/Xt_Stopwatch/timer.h
index 3870a4c7599..a9fd30dc470 100644
--- a/TAO/tests/Xt_Stopwatch/timer.h
+++ b/TAO/tests/Xt_Stopwatch/timer.h
@@ -29,13 +29,13 @@ class Timer_imp
   virtual ~Timer_imp ();
 
   /// Resets, and starts the clock ticking
-  void start (void);
+  void start ();
 
   /// Stops the clock
-  void stop (void);
+  void stop ();
 
   /// Returns time since timer started
-  CORBA::Float  elapsed_time (void);
+  CORBA::Float  elapsed_time ();
 
  private:
   /// Static member function used for TimeOut callback.
@@ -43,7 +43,7 @@ class Timer_imp
                              XtIntervalId *);
 
   /// Called every interval_ milliseconds
-  void tick (void);
+  void tick ();
 
   /// Called at each clock tick...
   virtual void report_time (CORBA::Float);
diff --git a/TAO/tests/ZIOP/Hello.cpp b/TAO/tests/ZIOP/Hello.cpp
index 27e011bc7dd..40baa27e09f 100644
--- a/TAO/tests/ZIOP/Hello.cpp
+++ b/TAO/tests/ZIOP/Hello.cpp
@@ -44,7 +44,7 @@ Hello::big_request (const ::Test::Octet_Seq & octet_in)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ZIOP/Hello.h b/TAO/tests/ZIOP/Hello.h
index e92bfe83d9f..1c53b73a4ad 100644
--- a/TAO/tests/ZIOP/Hello.h
+++ b/TAO/tests/ZIOP/Hello.h
@@ -19,7 +19,7 @@ public:
   // = The skeleton methods
   virtual char * get_string (const char * mystring);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h
index 61445b5e13a..78ced488b2e 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h
@@ -32,7 +32,7 @@ namespace TAO
       public ::TAO::CompressorFactory
     {
       public:
-        Test_CompressorFactory (void);
+        Test_CompressorFactory ();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel compression_level);
diff --git a/TAO/utils/NamingViewer/NamingObject.cpp b/TAO/utils/NamingViewer/NamingObject.cpp
index 0823bfd7f6b..5de175f6684 100644
--- a/TAO/utils/NamingViewer/NamingObject.cpp
+++ b/TAO/utils/NamingViewer/NamingObject.cpp
@@ -23,21 +23,21 @@ CNamingObject::CNamingObject(CosNaming::Name &Name,
 {
 }
 
-CNamingObject::~CNamingObject (void)
+CNamingObject::~CNamingObject ()
 {
 }
 
-CosNaming::NamingContext_ptr CNamingObject::NamingContext (void)
+CosNaming::NamingContext_ptr CNamingObject::NamingContext ()
 {
   return CosNaming::NamingContext::_narrow (m_Object);
 }
 
-CORBA::Object_ptr CNamingObject::Object (void)
+CORBA::Object_ptr CNamingObject::Object ()
 {
   return m_Object;
 }
 
-CosNaming::Name& CNamingObject::Name (void)
+CosNaming::Name& CNamingObject::Name ()
 {
   return m_Name;
 }
diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h
index dec96a57aa2..f7fa92db98f 100644
--- a/TAO/utils/NamingViewer/NamingObject.h
+++ b/TAO/utils/NamingViewer/NamingObject.h
@@ -17,16 +17,16 @@ public:
   CNamingObject (CosNaming::Name& Name,
                  CORBA::Object_ptr pObject,
                  bool Context);
-  ~CNamingObject (void);
+  ~CNamingObject ();
 
-  CosNaming::NamingContext_ptr NamingContext (void);
+  CosNaming::NamingContext_ptr NamingContext ();
 
   // Returns a duplicated naming context ptr if this is a context or
   // nil if its not.
-  CORBA::Object_ptr Object (void);
+  CORBA::Object_ptr Object ();
 
   // returns a non duplicated object reference
-  CosNaming::Name& Name (void);
+  CosNaming::Name& Name ();
   // returns the name of the object
 
   bool IsContext (void) { return m_Context; }
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
index 415e10a3a24..9ffe80324ba 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
@@ -15,13 +15,13 @@ static char THIS_FILE[] = __FILE__;
 /////////////////////////////////////////////////////////////////////////////
 // CNamingTreeCtrl
 
-CNamingTreeCtrl::CNamingTreeCtrl (void)
+CNamingTreeCtrl::CNamingTreeCtrl ()
 {
   m_ContextPopup.LoadMenu (IDR_CONTEXT_POPUP);
   m_ObjectPopup.LoadMenu (IDR_OBJECT_POPUP);
 }
 
-CNamingTreeCtrl::~CNamingTreeCtrl (void)
+CNamingTreeCtrl::~CNamingTreeCtrl ()
 {
 }
 
diff --git a/TAO/utils/catior/Catior_i.h b/TAO/utils/catior/Catior_i.h
index 60d7e2610eb..89192117b8a 100644
--- a/TAO/utils/catior/Catior_i.h
+++ b/TAO/utils/catior/Catior_i.h
@@ -89,7 +89,7 @@ private:
 
   CORBA::Boolean cat_nskfs_profile (TAO_InputCDR& stream);
 
-  void indent (void);
+  void indent ();
 
   size_t trace_depth_;
   ACE_CString buffer_;
diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp
index 59cf1d2df43..c4a4f483561 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.cpp
+++ b/TAO/utils/logWalker/GIOP_Buffer.cpp
@@ -105,7 +105,7 @@ struct ReplyHeader_1_0 { // Renamed from ReplyHeader
 
 // 12 = req_id + flags + RESVD + addr disp.
 
-GIOP_Buffer::GIOP_Buffer(void)
+GIOP_Buffer::GIOP_Buffer()
   : cdr_ (0),
     preamble_(),
     log_offset_(0),
@@ -186,7 +186,7 @@ GIOP_Buffer::owner (Invocation *owner)
 }
 
 Invocation *
-GIOP_Buffer::owner (void)
+GIOP_Buffer::owner ()
 {
   return this->owner_;
 }
@@ -214,7 +214,7 @@ GIOP_Buffer::init_buf (const char *text, size_t offset)
   this->wr_pos_ = this->octets_;
 }
 
-GIOP_Buffer::~GIOP_Buffer(void)
+GIOP_Buffer::~GIOP_Buffer()
 {
   delete [] this->octets_;
 }
@@ -310,7 +310,7 @@ GIOP_Buffer::num_contexts () const
 }
 
 bool
-GIOP_Buffer::is_oneway (void)
+GIOP_Buffer::is_oneway ()
 {
   if (this->octets_ == 0)
     {
@@ -330,7 +330,7 @@ GIOP_Buffer::log_posn () const
 }
 
 Thread *
-GIOP_Buffer::thread (void)
+GIOP_Buffer::thread ()
 {
   return this->thr_;
 }
@@ -360,7 +360,7 @@ GIOP_Buffer::expected_size () const
 }
 
 size_t
-GIOP_Buffer::msg_size (void)
+GIOP_Buffer::msg_size ()
 {
   if (this->cur_size() < 12)
     return 0;
@@ -376,7 +376,7 @@ GIOP_Buffer::expected_req_id () const
 }
 
 size_t
-GIOP_Buffer::actual_req_id (void)
+GIOP_Buffer::actual_req_id ()
 {
   if (this->octets_ == 0)
     return 0;
@@ -394,7 +394,7 @@ GIOP_Buffer::cur_size () const
 }
 
 bool
-GIOP_Buffer::parse_svc_contexts (void)
+GIOP_Buffer::parse_svc_contexts ()
 {
   ACE_CDR::ULong temp;
   ACE_CDR::ULong num_svc_cont;
@@ -421,7 +421,7 @@ GIOP_Buffer::parse_svc_contexts (void)
 }
 
 bool
-GIOP_Buffer::parse_header (void)
+GIOP_Buffer::parse_header ()
 {
   if (this->octets_ == 0 || this->cur_size() < 12)
     {
@@ -532,7 +532,7 @@ GIOP_Buffer::target_oid (size_t &len)
 }
 
 const char *
-GIOP_Buffer::operation (void)
+GIOP_Buffer::operation ()
 {
   if (octets_ == 0)
     return 0;
@@ -544,7 +544,7 @@ GIOP_Buffer::operation (void)
 }
 
 ACE_InputCDR &
-GIOP_Buffer::payload (void)
+GIOP_Buffer::payload ()
 {
   if (octets_ != 0 && !this->header_parsed_)
     this->header_parsed_ = this->parse_header();
@@ -558,7 +558,7 @@ GIOP_Buffer::has_octets () const
 }
 
 bool
-GIOP_Buffer::validate (void)
+GIOP_Buffer::validate ()
 {
   return
     this->expected_req_id_ == this->actual_req_id() &&
@@ -583,7 +583,7 @@ GIOP_Buffer::matches (GIOP_Buffer *other) const
 }
 
 void
-GIOP_Buffer::reset (void)
+GIOP_Buffer::reset ()
 {
   this->octets_ = 0;
   this->wr_pos_ = 0;
diff --git a/TAO/utils/logWalker/GIOP_Buffer.h b/TAO/utils/logWalker/GIOP_Buffer.h
index 1b476d2defe..c3331b91771 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.h
+++ b/TAO/utils/logWalker/GIOP_Buffer.h
@@ -40,11 +40,11 @@ public:
                size_t offset,
                Thread *thread,
                Invocation *owner = 0);
-  GIOP_Buffer (void);
-  ~GIOP_Buffer (void);
+  GIOP_Buffer ();
+  ~GIOP_Buffer ();
 
   void owner (Invocation *);
-  Invocation *owner (void);
+  Invocation *owner ();
 
   void init_buf (const char *text, size_t offset);
   int add_octets(const char *text, size_t offset);
@@ -54,38 +54,38 @@ public:
   char minor_version () const;
   size_t reply_status () const;
   size_t num_contexts () const;
-  bool is_oneway (void);
+  bool is_oneway ();
   bool is_full () const;
   size_t log_posn () const;
-  Thread *thread (void);
+  Thread *thread ();
 
   const ACE_Time_Value & time () const;
   void time (const ACE_Time_Value &);
 
   const ACE_CString &preamble() const;
   size_t expected_req_id() const;
-  size_t actual_req_id(void);
+  size_t actual_req_id();
 
   size_t expected_size () const;
   size_t buf_size () const;
   size_t cur_size() const;
-  size_t msg_size (void);
+  size_t msg_size ();
 
   const char * target_oid (size_t &len);
-  const char * operation (void);
-  ACE_InputCDR &payload (void);
+  const char * operation ();
+  ACE_InputCDR &payload ();
 
   bool has_octets () const;
-  bool validate (void);
+  bool validate ();
   bool matches (GIOP_Buffer *other) const;
 
-  void reset (void);
+  void reset ();
   void transfer_from (GIOP_Buffer *other);
   void swap (GIOP_Buffer *other);
 
 private:
-  bool parse_svc_contexts (void);
-  bool parse_header (void);
+  bool parse_svc_contexts ();
+  bool parse_header ();
 
   ACE_InputCDR *cdr_;
   ACE_CString preamble_;
diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp
index 24a2c3427ae..c93aba3c71e 100644
--- a/TAO/utils/logWalker/HostProcess.cpp
+++ b/TAO/utils/logWalker/HostProcess.cpp
@@ -19,7 +19,7 @@ HostProcess::HostProcess (const ACE_CString &src, long pid)
 {
 }
 
-HostProcess::~HostProcess (void)
+HostProcess::~HostProcess ()
 {
   for (AddrList::ITERATOR i(this->listen_endpoints_);
        !i.done();
diff --git a/TAO/utils/logWalker/HostProcess.h b/TAO/utils/logWalker/HostProcess.h
index 2d00b7c8ea4..d3898ea3279 100644
--- a/TAO/utils/logWalker/HostProcess.h
+++ b/TAO/utils/logWalker/HostProcess.h
@@ -45,7 +45,7 @@ class HostProcess
 {
 public:
   HostProcess (const ACE_CString &src, long pid);
-  ~HostProcess (void);
+  ~HostProcess ();
 
   // set/get the name of the process. This is only provided by
   // an alias supplied to the logWalker command line or manifest file.
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index f62e1545889..7ab85a713a2 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -25,7 +25,7 @@ Invocation::Invocation (PeerProcess *peer, Thread *thr, size_t rid)
 {
 }
 
-Invocation::~Invocation (void)
+Invocation::~Invocation ()
 {
   delete this->req_octets_;
   delete this->repl_octets_;
@@ -80,7 +80,7 @@ Invocation::set_target (const char *oid, size_t oid_len)
 }
 
 bool
-Invocation::message_complete (void)
+Invocation::message_complete ()
 {
   if (this->is_oneway())
     {
@@ -187,13 +187,13 @@ Invocation::contains (size_t line)
 }
 
 size_t
-Invocation::req_line (void)
+Invocation::req_line ()
 {
   return this->req_octets_ == 0 ? 0 : this->req_octets_->log_posn();
 }
 
 size_t
-Invocation::repl_line (void)
+Invocation::repl_line ()
 {
   return this->repl_octets_ == 0 ? 0 : this->repl_octets_->log_posn();
 }
diff --git a/TAO/utils/logWalker/Invocation.h b/TAO/utils/logWalker/Invocation.h
index 787a68c0832..bfbe77234ed 100644
--- a/TAO/utils/logWalker/Invocation.h
+++ b/TAO/utils/logWalker/Invocation.h
@@ -45,7 +45,7 @@ public:
   // initialize a new instance, with the initial request text line and offeset
   Invocation (PeerProcess *peer, Thread *thr, size_t req_id = 0);
   bool init ( const char * text, size_t offset, Thread *thr);
-  ~Invocation (void);
+  ~Invocation ();
 
   // return true if the invocation was a oneway
   bool is_oneway() const;
@@ -54,7 +54,7 @@ public:
   // if it also has all its reply octets. The side-effect of this call
   // is to obtain the target reference from the request buffer and associate
   // it with the peer process.
-  bool message_complete (void);
+  bool message_complete ();
 
   size_t request_id () const;
 
@@ -74,8 +74,8 @@ public:
   GIOP_Buffer *give_octets (bool request);
 
   bool contains (size_t line);
-  size_t req_line (void);
-  size_t repl_line (void);
+  size_t req_line ();
+  size_t repl_line ();
 
   void add_notify_incident (const ACE_CString &text, size_t offset);
   Thread *waiter () const;
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index 3c75453f244..240dda83ee4 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -22,7 +22,7 @@ Log::Log (Session &session)
 {
 }
 
-Log::~Log (void)
+Log::~Log ()
 {
 }
 
@@ -213,7 +213,7 @@ Log::handle_msg_octets ()
 }
 
 void
-Log::parse_HEXDUMP_i (void)
+Log::parse_HEXDUMP_i ()
 {
   char *pos = ACE_OS::strstr (this->line_,"HEXDUMP");
   pos += 8;
@@ -232,7 +232,7 @@ Log::parse_HEXDUMP_i (void)
 }
 
 void
-Log::parse_dump_giop_msg_i (void)
+Log::parse_dump_giop_msg_i ()
 {
   int sending = ACE_OS::strstr (this->info_,"send") != 0 ? 0 : 1;
   int type =  ACE_OS::strstr (this->info_,"Request") != 0 ? 0 : 1;
@@ -342,7 +342,7 @@ Log::parse_dump_giop_msg_i (void)
 }
 
 void
-Log::parse_open_listener_i (void)
+Log::parse_open_listener_i ()
 {
   char *addr = ACE_OS::strchr(this->info_,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
@@ -352,7 +352,7 @@ Log::parse_open_listener_i (void)
 }
 
 void
-Log::parse_got_existing_i (void)
+Log::parse_got_existing_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -370,7 +370,7 @@ Log::parse_got_existing_i (void)
 }
 
 void
-Log::parse_muxed_tms_i (void)
+Log::parse_muxed_tms_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -395,7 +395,7 @@ Log::parse_muxed_tms_i (void)
 }
 
 void
-Log::parse_exclusive_tms_i (void)
+Log::parse_exclusive_tms_i ()
 {
   long handle = this->thr_->active_handle();
   PeerProcess *pp = this->hostproc_->find_peer(handle);
@@ -418,7 +418,7 @@ Log::parse_exclusive_tms_i (void)
 }
 
 void
-Log::parse_process_parsed_msgs_i (void)
+Log::parse_process_parsed_msgs_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_, '[');
   long handle = ACE_OS::strtol(hpos+1, 0, 10);
@@ -442,7 +442,7 @@ Log::parse_process_parsed_msgs_i (void)
 }
 
 void
-Log::parse_wait_for_event_i (void)
+Log::parse_wait_for_event_i ()
 {
 //   char *pos = ACE_OS::strchr (this->info_,'[');
 //   long rid = ACE_OS::strtol(pos+1, 0, 10);
@@ -460,14 +460,14 @@ Log::parse_wait_for_event_i (void)
 }
 
 void
-Log::parse_wait_on_read_i (void)
+Log::parse_wait_on_read_i ()
 {
   PeerProcess *pp = this->thr_->incoming();
   this->thr_->exit_wait (pp, this->offset_);
 }
 
 void
-Log::parse_make_idle_i (void)
+Log::parse_make_idle_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -484,7 +484,7 @@ Log::parse_make_idle_i (void)
 }
 
 void
-Log::parse_cleanup_queue_i (void)
+Log::parse_cleanup_queue_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -555,7 +555,7 @@ Log::parse_cleanup_queue_i (void)
 }
 
 void
-Log::parse_complete_connection_i (void)
+Log::parse_complete_connection_i ()
 {
   if (ACE_OS::strstr (this->info_, "failed") == 0)
     return;
@@ -586,7 +586,7 @@ Log::parse_complete_connection_i (void)
 }
 
 void
-Log::parse_close_connection_i (void)
+Log::parse_close_connection_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -713,7 +713,7 @@ Log::parse_handler_open_i (bool is_ssl)
 }
 
 void
-Log::parse_begin_connection_i (void)
+Log::parse_begin_connection_i ()
 {
   char *addr = ACE_OS::strchr(this->info_,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
@@ -731,7 +731,7 @@ Log::parse_begin_connection_i (void)
 }
 
 void
-Log::parse_connection_handler_ctor_i (void)
+Log::parse_connection_handler_ctor_i ()
 {
   // char *c = ACE_OS::strchr (this->info_, '[') + 1;
   // size_t handle = ACE_OS::strtol (c, 0, 10);
@@ -739,7 +739,7 @@ Log::parse_connection_handler_ctor_i (void)
 }
 
 void
-Log::parse_local_addr_i (void)
+Log::parse_local_addr_i ()
 {
   char *addr = ACE_OS::strchr(this->info_,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
@@ -769,7 +769,7 @@ Log::parse_local_addr_i (void)
 }
 
 void
-Log::parse_connection_not_complete_i (void)
+Log::parse_connection_not_complete_i ()
 {
   PeerProcess *pp = this->thr_->pop_new_connection ();
   if (pp != 0)
@@ -782,7 +782,7 @@ Log::parse_connection_not_complete_i (void)
 }
 
 void
-Log::parse_open_as_server_i (void)
+Log::parse_open_as_server_i ()
 {
   // ACE_DEBUG ((LM_DEBUG,"%d: open_as_server: adding peer process\n", offset_));
 
@@ -790,7 +790,7 @@ Log::parse_open_as_server_i (void)
 }
 
 void
-Log::parse_iiop_connection_handler_ctor_i (void)
+Log::parse_iiop_connection_handler_ctor_i ()
 {
   PeerProcess *pp = this->thr_->peek_new_connection();
   if (pp == 0)
@@ -807,7 +807,7 @@ Log::parse_iiop_connection_handler_ctor_i (void)
 }
 
 void
-Log::parse_wait_for_connection_i (void)
+Log::parse_wait_for_connection_i ()
 {
   //  ACE_ERROR ((LM_ERROR,"%d: wait_for_connection, line = %s\n", this->offset_, this->info_));
   if (ACE_OS::strstr (this->info_,"Connection not complete") == 0)
@@ -872,13 +872,13 @@ Log::parse_wait_for_connection_i (void)
 }
 
 void
-Log::parse_post_open_i (void)
+Log::parse_post_open_i ()
 {
   //  ACE_ERROR ((LM_ERROR,"%d: post_open, line = %s\n", this->offset_, this->line_));
 }
 
 void
-Log::parse_notify_poa_helper_i (void)
+Log::parse_notify_poa_helper_i ()
 {
   Invocation *inv = this->thr_->current_invocation ();
   if (inv == 0)
@@ -902,7 +902,7 @@ Log::parse_notify_poa_helper_i (void)
 }
 
 void
-Log::parse_notify_object_i (void)
+Log::parse_notify_object_i ()
 {
   Invocation *inv = this->thr_->current_invocation ();
   if (inv == 0)
@@ -976,7 +976,7 @@ Log::parse_notify_object_i (void)
 }
 
 void
-Log::get_timestamp (void)
+Log::get_timestamp ()
 {
   const char *time_tok = ACE_OS::strchr (this->line_,'@');
   size_t len = (size_t)(time_tok - this->line_);
@@ -1009,7 +1009,7 @@ Log::get_timestamp (void)
 }
 
 void
-Log::parse_line (void)
+Log::parse_line ()
 {
   if (this->dump_target_ != 0)
     {
diff --git a/TAO/utils/logWalker/Log.h b/TAO/utils/logWalker/Log.h
index 498bde21159..781ca90e485 100644
--- a/TAO/utils/logWalker/Log.h
+++ b/TAO/utils/logWalker/Log.h
@@ -37,42 +37,42 @@ class Log
 public:
   Log (Session &s);
 
-  virtual ~Log(void);
+  virtual ~Log();
 
   bool process_file (const ACE_TCHAR *filename, const char *alias = "");
 
 protected:
-  virtual void parse_line (void);
+  virtual void parse_line ();
 
-  void get_preamble (void);
-  void get_timestamp (void);
-  void handle_msg_octets (void);
-  bool match_target(void);
+  void get_preamble ();
+  void get_timestamp ();
+  void handle_msg_octets ();
+  bool match_target();
 
   void parse_handler_open_i (bool is_ssl);
-  void parse_connection_handler_ctor_i (void);
-  void parse_dump_giop_msg_i (void);
-  void parse_HEXDUMP_i (void);
-  void parse_open_listener_i (void);
-  void parse_got_existing_i (void);
-  void parse_muxed_tms_i (void);
-  void parse_exclusive_tms_i (void);
-  void parse_process_parsed_msgs_i (void);
-  void parse_wait_for_event_i (void);
-  void parse_wait_on_read_i (void);
-  void parse_make_idle_i (void);
-  void parse_cleanup_queue_i (void);
-  void parse_complete_connection_i (void);
-  void parse_close_connection_i (void);
-  void parse_begin_connection_i (void);
-  void parse_local_addr_i (void);
-  void parse_connection_not_complete_i (void);
-  void parse_open_as_server_i (void);
-  void parse_iiop_connection_handler_ctor_i (void);
-  void parse_wait_for_connection_i (void);
-  void parse_post_open_i (void);
-  void parse_notify_poa_helper_i (void);
-  void parse_notify_object_i (void);
+  void parse_connection_handler_ctor_i ();
+  void parse_dump_giop_msg_i ();
+  void parse_HEXDUMP_i ();
+  void parse_open_listener_i ();
+  void parse_got_existing_i ();
+  void parse_muxed_tms_i ();
+  void parse_exclusive_tms_i ();
+  void parse_process_parsed_msgs_i ();
+  void parse_wait_for_event_i ();
+  void parse_wait_on_read_i ();
+  void parse_make_idle_i ();
+  void parse_cleanup_queue_i ();
+  void parse_complete_connection_i ();
+  void parse_close_connection_i ();
+  void parse_begin_connection_i ();
+  void parse_local_addr_i ();
+  void parse_connection_not_complete_i ();
+  void parse_open_as_server_i ();
+  void parse_iiop_connection_handler_ctor_i ();
+  void parse_wait_for_connection_i ();
+  void parse_post_open_i ();
+  void parse_notify_poa_helper_i ();
+  void parse_notify_object_i ();
 
   ACE_CString origin_;
   ACE_CString alias_;
diff --git a/TAO/utils/logWalker/PeerObject.cpp b/TAO/utils/logWalker/PeerObject.cpp
index c78b5be710d..3e7d4d4986b 100644
--- a/TAO/utils/logWalker/PeerObject.cpp
+++ b/TAO/utils/logWalker/PeerObject.cpp
@@ -9,18 +9,18 @@ PeerObject::PeerObject (long id, const char *name, PeerProcess *)
 {
 }
 
-PeerObject::~PeerObject (void)
+PeerObject::~PeerObject ()
 {
 }
 
 ACE_CString &
-PeerObject::name (void)
+PeerObject::name ()
 {
   return this->name_;
 }
 
 long
-PeerObject::ident (void)
+PeerObject::ident ()
 {
   return this->ident_;
 }
@@ -31,7 +31,7 @@ PeerObject::add_invocation (Invocation *inv)
   this->invocations_.enqueue_tail (inv);
 }
 size_t
-PeerObject::num_invocations (void)
+PeerObject::num_invocations ()
 {
   return this->invocations_.size();
 }
diff --git a/TAO/utils/logWalker/PeerObject.h b/TAO/utils/logWalker/PeerObject.h
index 1567861d9f3..20e01859153 100644
--- a/TAO/utils/logWalker/PeerObject.h
+++ b/TAO/utils/logWalker/PeerObject.h
@@ -19,13 +19,13 @@ class PeerObject
 {
 public:
   PeerObject (long ident, const char *name, PeerProcess * );
-  virtual ~PeerObject (void);
+  virtual ~PeerObject ();
 
   void add_invocation (Invocation *inv);
   void dump_detail (ostream &strm);
-  size_t num_invocations (void);
-  long ident (void);
-  ACE_CString &name (void);
+  size_t num_invocations ();
+  long ident ();
+  ACE_CString &name ();
 
 private:
   long ident_;
diff --git a/TAO/utils/logWalker/PeerProcess.cpp b/TAO/utils/logWalker/PeerProcess.cpp
index bb312fa3fc1..2572fbba6dd 100644
--- a/TAO/utils/logWalker/PeerProcess.cpp
+++ b/TAO/utils/logWalker/PeerProcess.cpp
@@ -8,7 +8,7 @@
 #include "Thread.h"
 #include "Session.h"
 
-Endpoint::Endpoint (void)
+Endpoint::Endpoint ()
   : addr_ (),
     host_ (),
     port_ (),
@@ -132,7 +132,7 @@ PeerProcess::PeerProcess (size_t offset, const ACE_CString &time, bool is_server
   this->ident_ = PeerProcess::nextIdent(is_server);
 }
 
-PeerProcess::~PeerProcess (void)
+PeerProcess::~PeerProcess ()
 {
   delete [] ident_;
   while (this->invocations_.size())
@@ -199,7 +199,7 @@ PeerProcess::add_transport (Transport *t)
 }
 
 Transport *
-PeerProcess::last_transport (void)
+PeerProcess::last_transport ()
 {
   return this->last_transport_;
 }
@@ -330,7 +330,7 @@ PeerProcess::set_owner (HostProcess *hp)
 }
 
 HostProcess *
-PeerProcess::owner (void)
+PeerProcess::owner ()
 {
   return this->owner_;
 }
diff --git a/TAO/utils/logWalker/PeerProcess.h b/TAO/utils/logWalker/PeerProcess.h
index f4c062c885b..c37995dbe85 100644
--- a/TAO/utils/logWalker/PeerProcess.h
+++ b/TAO/utils/logWalker/PeerProcess.h
@@ -28,7 +28,7 @@ enum EndpointRole {
 class Endpoint
 {
 public:
-  Endpoint (void);
+  Endpoint ();
   Endpoint (const Endpoint &other);
   Endpoint (const char *addr, EndpointRole role = ER_UNKNOWN);
   void assign (const char *addr, EndpointRole role = ER_UNKNOWN);
@@ -70,13 +70,13 @@ public:
   static char *nextIdent(bool is_server);
   PeerProcess (size_t offset, const ACE_CString &time, bool is_server);
 
-  virtual ~PeerProcess (void);
+  virtual ~PeerProcess ();
 
   const char * id () const;
   void split_filename (char *buffer, size_t len) const;
 
   void set_owner (HostProcess *host);
-  HostProcess *owner (void);
+  HostProcess *owner ();
 
   void match_hosts (Session *session);
   void set_server_addr (const ACE_CString &addr);
@@ -87,7 +87,7 @@ public:
   size_t offset () const;
   void ssl (bool is_ssl);
   void add_transport (Transport *t);
-  Transport *last_transport (void);
+  Transport *last_transport ();
   Transport *find_transport (long handle);
 
   bool match_local (const char *addr) const;
diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp
index a23ed050981..62d0e24da56 100644
--- a/TAO/utils/logWalker/Session.cpp
+++ b/TAO/utils/logWalker/Session.cpp
@@ -13,7 +13,7 @@ AltAddresses
 Session::alt_addrs_;
 
 
-Session::Session (void)
+Session::Session ()
   : split_details_ (false)
 {
   ACE_CString n ("localhost");
@@ -21,7 +21,7 @@ Session::Session (void)
   this->alt_addrs_.bind (n,v);
 }
 
-Session::~Session (void)
+Session::~Session ()
 {
   for (Processes::iterator i = processes_.begin();
        i != processes_.end();
@@ -52,7 +52,7 @@ Session::set_tao_version (ACE_TCHAR *str)
 }
 
 long
-Session::tao_version (void)
+Session::tao_version ()
 {
   return tao_version_;
 }
@@ -167,13 +167,13 @@ Session::outfile (const char *o)
 }
 
 bool
-Session::has_dir (void)
+Session::has_dir ()
 {
   return this->base_dir_.length() > 0;
 }
 
 bool
-Session::has_outfile (void)
+Session::has_outfile ()
 {
   return this->outfile_.length() > 0;
 }
@@ -341,7 +341,7 @@ Session::dump ()
 // iterate over the collection of host processes to associate peer
 // processes via endpoints.
 void
-Session::reconcile (void)
+Session::reconcile ()
 {
   for (Processes::ITERATOR i (this->processes_); !i.done(); i.advance())
     {
diff --git a/TAO/utils/logWalker/Session.h b/TAO/utils/logWalker/Session.h
index 95f02dc6993..c34f2c286bb 100644
--- a/TAO/utils/logWalker/Session.h
+++ b/TAO/utils/logWalker/Session.h
@@ -24,15 +24,15 @@ class Session
 public:
   Session ();
 
-  ~Session (void);
+  ~Session ();
 
   void add_process (HostProcess *proc);
   HostProcess *find_process (long pid);
   HostProcess *find_host (const Endpoint &endpoint, bool server);
-  void reconcile (void);
+  void reconcile ();
 
   static bool set_tao_version (ACE_TCHAR *str);
-  static long tao_version (void);
+  static long tao_version ();
   static void alternate_address (const char *string);
   static bool is_equivalent (const ACE_CString &primary,
                              const ACE_CString &alternate);
@@ -41,8 +41,8 @@ public:
   void make_dir (const char * ,bool );
   void outfile (const char * );
 
-  bool has_dir (void);
-  bool has_outfile (void);
+  bool has_dir ();
+  bool has_outfile ();
 
   void dump ();
   ostream * stream_for (ostream *old,
diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp
index d6769bf078c..75708efce0e 100644
--- a/TAO/utils/logWalker/Thread.cpp
+++ b/TAO/utils/logWalker/Thread.cpp
@@ -44,7 +44,7 @@ Thread::push_new_connection (PeerProcess *pp)
 }
 
 PeerProcess *
-Thread::pop_new_connection (void)
+Thread::pop_new_connection ()
 {
   PeerProcess *pp = 0;
   this->new_connection_.pop (pp);
@@ -72,7 +72,7 @@ Thread::pending_local_addr () const
 }
 
 void
-Thread::handle_request (void)
+Thread::handle_request ()
 {
   this->server_encounters_++;
   if (this->pending_.size() > 1)
@@ -178,19 +178,19 @@ Thread::set_dup (Thread *other, bool set_other)
 }
 
 void
-Thread::clear_dup (void)
+Thread::clear_dup ()
 {
   this->target_dup_ = 0;
 }
 
 bool
-Thread::has_dup (void)
+Thread::has_dup ()
 {
   return this->target_dup_ != 0;
 }
 
 void
-Thread::swap_target (void)
+Thread::swap_target ()
 {
   if (target_dup_ != 0 && target_dup_->giop_target() != 0)
     {
@@ -208,7 +208,7 @@ Thread::swap_target (void)
 }
 
 GIOP_Buffer *
-Thread::giop_target (void)
+Thread::giop_target ()
 {
   return this->giop_target_;
 }
@@ -237,7 +237,7 @@ Thread::push_invocation (Invocation *inv)
 }
 
 void
-Thread::pop_invocation (void)
+Thread::pop_invocation ()
 {
   Invocation *inv;
   this->current_invocation_.pop (inv);
@@ -381,7 +381,7 @@ Thread::dump_incidents (ostream &strm, const ACE_Time_Value& relstart)
 }
 
 size_t
-Thread::count_nesting (void)
+Thread::count_nesting ()
 {
   std::stack<Invocation *> nested;
   for (ACE_DLList_Iterator <Invocation> i (this->invocations_);
diff --git a/TAO/utils/logWalker/Thread.h b/TAO/utils/logWalker/Thread.h
index 25b583e1883..1a4e196a4cd 100644
--- a/TAO/utils/logWalker/Thread.h
+++ b/TAO/utils/logWalker/Thread.h
@@ -31,14 +31,14 @@ public:
   void incoming_from (PeerProcess *);
   void add_invocation (Invocation *);
   void push_invocation (Invocation *);
-  void pop_invocation (void);
+  void pop_invocation ();
   Invocation *current_invocation () const;
 
   PeerProcess *incoming () const;
-  void handle_request (void);
+  void handle_request ();
   void enter_wait (PeerProcess *);
   void exit_wait (PeerProcess *, size_t linenum);
-  GIOP_Buffer *giop_target (void);
+  GIOP_Buffer *giop_target ();
   void set_giop_target (GIOP_Buffer *buffer);
   void dump_summary (ostream &strm);
   void dump_invocations (ostream &strm);
@@ -47,7 +47,7 @@ public:
   void get_summary (long &sent_reqs, long &recv_reqs, size_t &sent_size, size_t &recv_size);
 
   void push_new_connection (PeerProcess *pp);
-  PeerProcess *pop_new_connection (void);
+  PeerProcess *pop_new_connection ();
   PeerProcess *peek_new_connection () const;
 
   void pending_local_addr (const ACE_CString &addr);
@@ -55,11 +55,11 @@ public:
   void active_handle (long handle);
   long active_handle () const;
   void set_dup (Thread *other, bool set_other);
-  void clear_dup (void);
-  void swap_target (void);
-  bool has_dup (void);
+  void clear_dup ();
+  void swap_target ();
+  bool has_dup ();
 
-  size_t count_nesting (void);
+  size_t count_nesting ();
 
 private:
   long id_;
diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp
index 79f614b8dbc..7079d83c108 100644
--- a/TAO/utils/logWalker/logWalker.cpp
+++ b/TAO/utils/logWalker/logWalker.cpp
@@ -113,7 +113,7 @@ parse_manifest (Session &session, ACE_TCHAR *filename)
 }
 
 void
-print_help (void)
+print_help ()
 {
   ACE_DEBUG ((LM_DEBUG, "tao_logWalker recongizes the following arguments\n"));
   ACE_DEBUG ((LM_DEBUG, "-o <filename> - write all output to specified file\n"));
diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp
index eb2f3294a1d..bb973eb4a27 100644
--- a/TAO/utils/nsgroup/nsgroup.cpp
+++ b/TAO/utils/nsgroup/nsgroup.cpp
@@ -86,10 +86,10 @@ public:
   NSGROUP (int argc, ACE_TCHAR **argv);
 
   /// start the ORB.
-  int start_orb (void);
+  int start_orb ();
 
   /// parse command line, validate arguments and run the command
-  int run_cmd (void);
+  int run_cmd ();
 
   /// Display command line interface usage
   int show_usage( void );
@@ -102,7 +102,7 @@ public:
 
 private:
   /// parse command line arguments
-  NSGROUP_COMMAND parse_command_line (void);
+  NSGROUP_COMMAND parse_command_line ();
 
 private:
   NS_group_svc svc_;
@@ -135,7 +135,7 @@ private:
 }
 
 int
-NSGROUP::start_orb (void)
+NSGROUP::start_orb ()
 {
   const int RC_SUCCESS =  0;
   const int RC_ERROR   = -1;
@@ -210,7 +210,7 @@ NSGROUP::start_orb (void)
 }
 
 int
-NSGROUP::run_cmd(void)
+NSGROUP::run_cmd()
 {
   const int RC_ERROR   = -1;
   const int RC_BADARG  = -2;
@@ -278,7 +278,7 @@ NSGROUP::run_cmd(void)
 }
 
 NSGROUP::NSGROUP_COMMAND
-NSGROUP::parse_command_line (void)
+NSGROUP::parse_command_line ()
 {
   #if 0
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.h b/TAO/utils/wxNamingViewer/wxNamingTree.h
index 72d8ece9bde..1ba472b0ef0 100644
--- a/TAO/utils/wxNamingViewer/wxNamingTree.h
+++ b/TAO/utils/wxNamingViewer/wxNamingTree.h
@@ -34,7 +34,7 @@ private:
   enum {
     listQuantum = 40,
   };
-  void clearChildren (void);
+  void clearChildren ();
   void clearChildren (wxTreeItemId& item);
   WxNamingObject* getTreeObject() const;
   WxNamingObject* getTreeObject(wxTreeItemId& item) const;