remove unnecessary void in empty function declarations

82 files changed, 763 insertions, 763 deletions

diff --git a/src/address.cc b/src/address.cc
index 33d216e..378eff5 100644
--- a/src/address.cc
+++ b/src/address.cc
@@ -57,7 +57,7 @@ Address::Address(const string &wholeaddress)
   trim(name);
 }
 
-string Address::toParenList(void) const
+string Address::toParenList() const
 {
   string tmp = "(";
   tmp += name == "" ? "NIL" : toImapString(name);
diff --git a/src/argparser.cc b/src/argparser.cc
index 2d49c5f..621bc5c 100644
--- a/src/argparser.cc
+++ b/src/argparser.cc
@@ -203,7 +203,7 @@ bool CommandLineArgs::parse(int argc, char *argv[])
   return true;
 }
 
-string CommandLineArgs::errorString(void) const
+string CommandLineArgs::errorString() const
 {
   return errString;
 }
@@ -247,7 +247,7 @@ bool CommandLineArgs::hasArg(const string &arg) const
   return passedArgs.find(tmp) != passedArgs.end();
 }
 
-string CommandLineArgs::usageString(void) const
+string CommandLineArgs::usageString() const
 {
   string tmp = head;
   tmp += '\n';
@@ -286,7 +286,7 @@ string CommandLineArgs::usageString(void) const
   return tmp;
 }
 
-int CommandLineArgs::argc(void) const
+int CommandLineArgs::argc() const
 {
   return ac;
 }
diff --git a/src/bincimapd.cc b/src/bincimapd.cc
index 1ec89df..44e61bd 100644
--- a/src/bincimapd.cc
+++ b/src/bincimapd.cc
@@ -8,7 +8,7 @@
 #include "imapserver.h"
 
 namespace Binc {
-  void showGreeting(void) {}
+  void showGreeting() {}
 }
 
 int main(int argc, char *argv[])
diff --git a/src/broker.cc b/src/broker.cc
index 507c8c4..0a063f5 100644
--- a/src/broker.cc
+++ b/src/broker.cc
@@ -18,20 +18,20 @@
 using namespace Binc;
 using std::string;
 
-BrokerFactory::BrokerFactory(void)
+BrokerFactory::BrokerFactory()
 {
   brokers[Session::NONAUTHENTICATED] = new Broker();
   brokers[Session::AUTHENTICATED] = new Broker();
   brokers[Session::SELECTED] = new Broker();
 }
 
-BrokerFactory::~BrokerFactory(void)
+BrokerFactory::~BrokerFactory()
 {
   for (auto &[_, second] : brokers)
     delete second;
 }
 
-BrokerFactory &BrokerFactory::getInstance(void)
+BrokerFactory &BrokerFactory::getInstance()
 {
   static BrokerFactory brokerfactory;
   return brokerfactory;
@@ -77,9 +77,9 @@ Broker *BrokerFactory::getBroker(int state)
   return brokers[state];
 }
 
-Broker::Broker(void) {}
+Broker::Broker() {}
 
-Broker::~Broker(void) {}
+Broker::~Broker() {}
 
 void Broker::assign(const string &fname, Operator *o, bool deletable)
 {
diff --git a/src/compare.dirs b/src/compare.dirs
index 314b91a..563384f 100644
--- a/src/compare.dirs
+++ b/src/compare.dirs
@@ -173,7 +173,7 @@
  using namespace ::std;
  using namespace Binc;
 @@ -37,8 +36,8 @@
- int CapabilityOperator::getState(void) const
+ int CapabilityOperator::getState() const
  {
    return Session::NONAUTHENTICATED 
 -       | Session::AUTHENTICATED
@@ -281,7 +281,7 @@
 --- ./operator-logout.cc	2023-08-22 13:41:49.546630000 +0200
 +++ ../../bincimap-2.0.5/src//operator-logout.cc	2023-08-14 23:04:43.460303000 +0200
 @@ -41,8 +41,8 @@
- int LogoutOperator::getState(void) const
+ int LogoutOperator::getState() const
  {
    return Session::NONAUTHENTICATED
 -       | Session::AUTHENTICATED
@@ -327,7 +327,7 @@
  }
  
 -//----------------------------------------------------------------------
--int StarttlsOperator::goStartTLS (void) const
+-int StarttlsOperator::goStartTLS () const
 -{
 -  Session &session = Session::getInstance();
 -
diff --git a/src/convert.cc b/src/convert.cc
index 5e77f97..3af143a 100644
--- a/src/convert.cc
+++ b/src/convert.cc
@@ -12,9 +12,9 @@
 using namespace Binc;
 using std::string;
 
-BincStream::BincStream(void) {}
+BincStream::BincStream() {}
 
-BincStream::~BincStream(void)
+BincStream::~BincStream()
 {
   clear();
 }
@@ -27,7 +27,7 @@ string BincStream::popString(unsigned int size)
   return tmp;
 }
 
-char BincStream::popChar(void)
+char BincStream::popChar()
 {
   if (nstr.length() == 0) return '\0';
 
@@ -46,17 +46,17 @@ void BincStream::unpopStr(const string &s)
   nstr = s + nstr;
 }
 
-const string &BincStream::str(void) const
+const string &BincStream::str() const
 {
   return nstr;
 }
 
-void BincStream::clear(void)
+void BincStream::clear()
 {
   nstr = "";
 }
 
-unsigned int BincStream::getSize(void) const
+unsigned int BincStream::getSize() const
 {
   return (unsigned int)nstr.length();
 }
diff --git a/src/depot.cc b/src/depot.cc
index 629bda9..4039bfd 100644
--- a/src/depot.cc
+++ b/src/depot.cc
@@ -25,9 +25,9 @@ using namespace Binc;
 using std::endl;
 using std::string;
 
-DepotFactory::DepotFactory(void) {}
+DepotFactory::DepotFactory() {}
 
-DepotFactory::~DepotFactory(void)
+DepotFactory::~DepotFactory()
 {
   for (auto i : depots)
     delete i;
@@ -46,7 +46,7 @@ void DepotFactory::assign(Depot *depot)
   depots.push_back(depot);
 }
 
-DepotFactory &DepotFactory::getInstance(void)
+DepotFactory &DepotFactory::getInstance()
 {
   static DepotFactory depotfactory;
   return depotfactory;
@@ -62,7 +62,7 @@ Depot::Depot(const std::string &name)
   , delimiter('/')
 {}
 
-const string &Depot::getLastError(void) const
+const string &Depot::getLastError() const
 {
   return lastError;
 }
@@ -102,22 +102,22 @@ bool Depot::setSelected(Mailbox *m)
   return false;
 }
 
-const string &Depot::getName(void) const
+const string &Depot::getName() const
 {
   return name;
 }
 
-const string &Depot::getPersonalNamespace(void) const
+const string &Depot::getPersonalNamespace() const
 {
   return personalNamespace;
 }
 
-const string &Depot::getOthersNamespace(void) const
+const string &Depot::getOthersNamespace() const
 {
   return othersNamespace;
 }
 
-const string &Depot::getSharedNamespace(void) const
+const string &Depot::getSharedNamespace() const
 {
   return sharedNamespace;
 }
@@ -127,7 +127,7 @@ void Depot::setDelimiter(char c)
   delimiter = c;
 }
 
-char Depot::getDelimiter(void) const
+char Depot::getDelimiter() const
 {
   return delimiter;
 }
@@ -145,17 +145,17 @@ bool Depot::setDefaultType(const string &name)
   return false;
 }
 
-Mailbox *Depot::getSelected(void) const
+Mailbox *Depot::getSelected() const
 {
   return selectedmailbox;
 }
 
-void Depot::resetSelected(void)
+void Depot::resetSelected()
 {
   selectedmailbox = nullptr;
 }
 
-Mailbox *Depot::getDefault(void) const
+Mailbox *Depot::getDefault() const
 {
   return defaultmailbox;
 }
@@ -277,7 +277,7 @@ bool Depot::getStatus(const std::string &s_in, Status &dest) const
   return true;
 }
 
-std::vector<string> Depot::getSubscriptions(void) const
+std::vector<string> Depot::getSubscriptions() const
 {
   return subscribed;
 }
@@ -302,7 +302,7 @@ bool Depot::unsubscribeTo(const string mailbox)
   return false;
 }
 
-void Depot::loadSubscribes(void)
+void Depot::loadSubscribes()
 {
   // drop all existing subscribed folders.
   subscribed.clear();
@@ -342,7 +342,7 @@ void Depot::loadSubscribes(void)
   }
 }
 
-bool Depot::saveSubscribes(void) const
+bool Depot::saveSubscribes() const
 {
   // create a safe file name
   string ftemplate = ".subscribed-tmp-XXXXXX";
@@ -379,7 +379,7 @@ bool Depot::saveSubscribes(void) const
   return true;
 }
 
-Depot::iterator::iterator(void)
+Depot::iterator::iterator()
 {
   dirp = nullptr;
   ref = new int;
@@ -404,7 +404,7 @@ Depot::iterator::iterator(const iterator &copy)
   direntp = copy.direntp;
 }
 
-Depot::iterator::~iterator(void)
+Depot::iterator::~iterator()
 {
   deref();
 }
@@ -422,7 +422,7 @@ Depot::iterator &Depot::iterator::operator=(const iterator &copy)
   return *this;
 }
 
-void Depot::iterator::deref(void)
+void Depot::iterator::deref()
 {
   // decrease existing copy ref if there is one
   if (*ref != 0 && --(*ref) == 0) {
@@ -436,14 +436,14 @@ void Depot::iterator::deref(void)
   }
 }
 
-string Depot::iterator::operator*(void) const
+string Depot::iterator::operator*() const
 {
   if (direntp == nullptr) return "";
 
   return direntp->d_name;
 }
 
-void Depot::iterator::operator++(void)
+void Depot::iterator::operator++()
 {
   direntp = readdir(dirp);
 }
@@ -472,20 +472,20 @@ Depot::iterator Depot::begin(const string &path) const
   return i;
 }
 
-const Depot::iterator &Depot::end(void) const
+const Depot::iterator &Depot::end() const
 {
   return enditerator;
 }
 
-MaildirPPDepot::MaildirPPDepot(void) : Depot("Maildir++")
+MaildirPPDepot::MaildirPPDepot() : Depot("Maildir++")
 {
   privateNamespace = "INBOX";
   privateNamespace += getDelimiter();
 }
 
-MaildirPPDepot::~MaildirPPDepot(void) {}
+MaildirPPDepot::~MaildirPPDepot() {}
 
-const string &MaildirPPDepot::getPersonalNamespace(void) const
+const string &MaildirPPDepot::getPersonalNamespace() const
 {
   return privateNamespace;
 }
@@ -553,9 +553,9 @@ string MaildirPPDepot::filenameToMailbox(const string &m) const
   }
 }
 
-IMAPdirDepot::IMAPdirDepot(void) : Depot("IMAPdir") {}
+IMAPdirDepot::IMAPdirDepot() : Depot("IMAPdir") {}
 
-IMAPdirDepot::~IMAPdirDepot(void) {}
+IMAPdirDepot::~IMAPdirDepot() {}
 
 string IMAPdirDepot::mailboxToFilename(const string &m) const
 {
diff --git a/src/greeting.cc b/src/greeting.cc
index d96ab96..bd7ad51 100644
--- a/src/greeting.cc
+++ b/src/greeting.cc
@@ -17,10 +17,10 @@ using namespace Binc;
 static const unsigned int ISO8601SIZE = 32;
 
 namespace Binc {
-  void showGreeting(void);
+  void showGreeting();
 };
 
-void Binc::showGreeting(void)
+void Binc::showGreeting()
 {
   Session &session = Session::getInstance();
   time_t t = time(nullptr);
diff --git a/src/imapparser.cc b/src/imapparser.cc
index 6610c3e..e004feb 100644
--- a/src/imapparser.cc
+++ b/src/imapparser.cc
@@ -20,7 +20,7 @@
 using namespace Binc;
 using std::string;
 
-Request::Request(void)
+Request::Request()
   : uidmode(false)
   , extra(nullptr)
   , flags()
@@ -30,17 +30,17 @@ Request::Request(void)
   , fatt()
 {}
 
-Request::~Request(void)
+Request::~Request()
 {
   if (extra != nullptr) delete extra;
 }
 
-void Request::setUidMode(void)
+void Request::setUidMode()
 {
   uidmode = true;
 }
 
-bool Request::getUidMode(void) const
+bool Request::getUidMode() const
 {
   return uidmode;
 }
@@ -50,7 +50,7 @@ void Request::setTag(string &t_in)
   tag = t_in;
 }
 
-const string &Request::getTag(void) const
+const string &Request::getTag() const
 {
   return tag;
 }
@@ -60,7 +60,7 @@ void Request::setMode(const string &m_in)
   mode = m_in;
 }
 
-const string &Request::getMode(void) const
+const string &Request::getMode() const
 {
   return mode;
 }
@@ -70,7 +70,7 @@ void Request::setName(const string &s_in)
   name = s_in;
 }
 
-const string &Request::getName(void) const
+const string &Request::getName() const
 {
   return name;
 }
@@ -80,7 +80,7 @@ void Request::setAuthType(const string &s_in)
   authtype = s_in;
 }
 
-const string &Request::getAuthType(void) const
+const string &Request::getAuthType() const
 {
   return authtype;
 }
@@ -90,7 +90,7 @@ void Request::setLiteral(const string &s_in)
   literal = s_in;
 }
 
-const string &Request::getLiteral(void) const
+const string &Request::getLiteral() const
 {
   return literal;
 }
@@ -100,7 +100,7 @@ void Request::setDate(const string &s_in)
   date = s_in;
 }
 
-const string &Request::getDate(void) const
+const string &Request::getDate() const
 {
   return date;
 }
@@ -111,7 +111,7 @@ void Request::setCharSet(const string &s_in)
   uppercase(charset);
 }
 
-const string &Request::getCharSet(void) const
+const string &Request::getCharSet() const
 {
   return charset;
 }
@@ -121,7 +121,7 @@ void Request::setUserID(const string &s_in)
   userid = s_in;
 }
 
-const string &Request::getUserID(void) const
+const string &Request::getUserID() const
 {
   return userid;
 }
@@ -131,7 +131,7 @@ void Request::setPassword(const string &s_in)
   password = s_in;
 }
 
-const string &Request::getPassword(void) const
+const string &Request::getPassword() const
 {
   return password;
 }
@@ -141,7 +141,7 @@ void Request::setMailbox(const string &s_in)
   mailbox = s_in;
 }
 
-const string &Request::getMailbox(void) const
+const string &Request::getMailbox() const
 {
   return mailbox;
 }
@@ -151,7 +151,7 @@ void Request::setListMailbox(const string &s_in)
   listmailbox = s_in;
 }
 
-const string &Request::getListMailbox(void) const
+const string &Request::getListMailbox() const
 {
   return listmailbox;
 }
@@ -161,7 +161,7 @@ void Request::setContextInfo(const string &s_in)
   contextInfo = s_in;
 }
 
-const string &Request::getContextInfo(void) const
+const string &Request::getContextInfo() const
 {
   return contextInfo;
 }
@@ -171,27 +171,27 @@ void Request::setNewMailbox(const string &s_in)
   newmailbox = s_in;
 }
 
-const string &Request::getNewMailbox(void) const
+const string &Request::getNewMailbox() const
 {
   return newmailbox;
 }
 
-SequenceSet &Request::getSet(void)
+SequenceSet &Request::getSet()
 {
   return bset;
 }
 
-std::vector<string> &Request::getStatuses(void)
+std::vector<string> &Request::getStatuses()
 {
   return statuses;
 }
 
-std::vector<string> &Request::getFlags(void)
+std::vector<string> &Request::getFlags()
 {
   return flags;
 }
 
-SequenceSet::SequenceSet(void) : limited(true), nullSet(false) {}
+SequenceSet::SequenceSet() : limited(true), nullSet(false) {}
 
 SequenceSet::SequenceSet(const SequenceSet &copy)
   : limited(copy.limited)
@@ -208,21 +208,21 @@ SequenceSet &SequenceSet::operator=(const SequenceSet &copy)
   return *this;
 }
 
-SequenceSet::~SequenceSet(void) {}
+SequenceSet::~SequenceSet() {}
 
-SequenceSet &SequenceSet::null(void)
+SequenceSet &SequenceSet::null()
 {
   static SequenceSet nil;
   nil.nullSet = true;
   return nil;
 }
 
-bool SequenceSet::isNull(void) const
+bool SequenceSet::isNull() const
 {
   return nullSet;
 }
 
-SequenceSet &SequenceSet::all(void)
+SequenceSet &SequenceSet::all()
 {
   static bool initialized = false;
   static SequenceSet all;
@@ -280,7 +280,7 @@ BincImapParserFetchAtt::BincImapParserFetchAtt(const std::string &typeName) : ty
   hassection = false;
 }
 
-string BincImapParserFetchAtt::toString(void)
+string BincImapParserFetchAtt::toString()
 {
   string tmp;
   if (type == "BODY.PEEK")
@@ -317,13 +317,13 @@ string BincImapParserFetchAtt::toString(void)
   return tmp;
 }
 
-BincImapParserSearchKey::BincImapParserSearchKey(void)
+BincImapParserSearchKey::BincImapParserSearchKey()
 {
   type = 0;
   number = 0;
 }
 
-const SequenceSet &BincImapParserSearchKey::getSet(void) const
+const SequenceSet &BincImapParserSearchKey::getSet() const
 {
   return bset;
 }
diff --git a/src/imapserver.cc b/src/imapserver.cc
index 4003b93..7c913fb 100644
--- a/src/imapserver.cc
+++ b/src/imapserver.cc
@@ -20,7 +20,7 @@ using namespace Binc;
 using std::endl;
 
 namespace Binc {
-  void showGreeting(void);
+  void showGreeting();
 };
 
 IMAPServer::IMAPServer(int argc, char **argv)
@@ -31,16 +31,16 @@ IMAPServer::IMAPServer(int argc, char **argv)
   Session::getInstance().setState(Session::AUTHENTICATED);
 }
 
-IMAPServer::~IMAPServer(void) {}
+IMAPServer::~IMAPServer() {}
 
-int IMAPServer::initialize(void)
+int IMAPServer::initialize()
 {
   Session &session = Session::getInstance();
   if (!session.initialize(argc, argv)) return 111;
   return 0;
 }
 
-void IMAPServer::prepareForNextRequest(void)
+void IMAPServer::prepareForNextRequest()
 {
   serverStatus = OK;
 
@@ -52,7 +52,7 @@ void IMAPServer::prepareForNextRequest(void)
   Session::getInstance().clearResponseCode();
 }
 
-int IMAPServer::runStub(void)
+int IMAPServer::runStub()
 {
   bincDebug << "IMAPServer::runStub(), running stub" << endl;
   this->stubMode = true;
@@ -60,7 +60,7 @@ int IMAPServer::runStub(void)
   return run();
 }
 
-int IMAPServer::run(void)
+int IMAPServer::run()
 {
   Session &session = Session::getInstance();
   bincLog.setOutputLevelLimit(IODevice::InfoLevel);
diff --git a/src/include/address.h b/src/include/address.h
index 6d0a6cd..2cb4aef 100644
--- a/src/include/address.h
+++ b/src/include/address.h
@@ -17,7 +17,7 @@ namespace Binc {
     std::string local;
     std::string host;
 
-    std::string toParenList(void) const;
+    std::string toParenList() const;
 
     Address(const std::string &name, const std::string &addr);
     Address(const std::string &wholeaddr);
diff --git a/src/include/argparser.h b/src/include/argparser.h
index c3caf10..7aedf17 100644
--- a/src/include/argparser.h
+++ b/src/include/argparser.h
@@ -30,12 +30,12 @@ namespace Binc {
 
   class CommandLineArgs {
   public:
-    CommandLineArgs(void);
+    CommandLineArgs();
 
     bool parse(int argc, char *argv[]);
-    std::string errorString(void) const;
+    std::string errorString() const;
 
-    int argc(void) const;
+    int argc() const;
 
     const std::string operator[](const std::string &arg) const;
 
@@ -43,11 +43,11 @@ namespace Binc {
     void addRequired(const std::string &arg, const std::string &desc, bool boolean);
     bool hasArg(const std::string &arg) const;
 
-    std::string usageString(void) const;
+    std::string usageString() const;
 
     void setTail(const std::string &str);
 
-    const std::vector<std::string> &getUnqualifiedArgs(void) const;
+    const std::vector<std::string> &getUnqualifiedArgs() const;
 
   private:
     void registerArg(const std::string &arg,
diff --git a/src/include/broker.h b/src/include/broker.h
index eb28bd4..7cca0aa 100644
--- a/src/include/broker.h
+++ b/src/include/broker.h
@@ -23,7 +23,7 @@ namespace Binc {
   private:
     std::map<int, Broker *> brokers;
 
-    BrokerFactory(void);
+    BrokerFactory();
 
     mutable std::string lastError;
 
@@ -33,14 +33,14 @@ namespace Binc {
     void addCapability(const std::string &c);
     Operator *getOperator(int state, const std::string &name) const;
 
-    inline const std::string &getLastError(void) const;
+    inline const std::string &getLastError() const;
     inline void setLastError(const std::string &error) const;
 
-    static BrokerFactory &getInstance(void);
-    ~BrokerFactory(void);
+    static BrokerFactory &getInstance();
+    ~BrokerFactory();
   };
 
-  inline const std::string &BrokerFactory::getLastError(void) const
+  inline const std::string &BrokerFactory::getLastError() const
   {
     return lastError;
   }
@@ -62,7 +62,7 @@ namespace Binc {
 
     inline Broker(Broker &);
     inline Broker(const Broker &);
-    Broker(void);
+    Broker();
     ~Broker();
   };
 
diff --git a/src/include/convert.h b/src/include/convert.h
index cfd4747..0c7e703 100644
--- a/src/include/convert.h
+++ b/src/include/convert.h
@@ -260,18 +260,18 @@ namespace Binc {
 
     std::string popString(unsigned int size);
 
-    char popChar(void);
+    char popChar();
     void unpopChar(char c);
     void unpopStr(const std::string &s);
 
-    const std::string &str(void) const;
+    const std::string &str() const;
 
-    unsigned int getSize(void) const;
+    unsigned int getSize() const;
 
-    void clear(void);
+    void clear();
 
-    BincStream(void);
-    ~BincStream(void);
+    BincStream();
+    ~BincStream();
   };
 }
 
diff --git a/src/include/depot.h b/src/include/depot.h
index 3e65c8e..0d3cfae 100644
--- a/src/include/depot.h
+++ b/src/include/depot.h
@@ -23,33 +23,33 @@ namespace Binc {
   class DepotFactory {
   private:
     std::vector<Depot *> depots;
-    DepotFactory(void);
+    DepotFactory();
 
   public:
     void assign(Depot *);
     Depot *get(const std::string &name) const;
 
-    static DepotFactory &getInstance(void);
-    ~DepotFactory(void);
+    static DepotFactory &getInstance();
+    ~DepotFactory();
   };
 
   class Depot {
   public:
     class iterator {
     public:
-      iterator(void);
+      iterator();
       iterator(const iterator &copy);
       iterator(DIR *, struct dirent *);
-      ~iterator(void);
+      ~iterator();
 
       iterator &operator=(const iterator &copy);
 
-      std::string operator*(void) const;
-      void operator++(void);
+      std::string operator*() const;
+      void operator++();
       bool operator!=(iterator) const;
       bool operator==(iterator) const;
 
-      void deref(void);
+      void deref();
 
       friend class Depot;
 
@@ -78,31 +78,31 @@ namespace Binc {
   public:
     Depot();
     Depot(const std::string &name);
-    virtual ~Depot(void) = default;
+    virtual ~Depot() = default;
 
     virtual iterator begin(const std::string &) const;
-    virtual const iterator &end(void) const;
+    virtual const iterator &end() const;
 
     void setDelimiter(char);
-    char getDelimiter(void) const;
+    char getDelimiter() const;
 
     virtual void assign(Mailbox *);
 
     bool setDefaultType(const std::string &n);
-    Mailbox *getDefault(void) const;
+    Mailbox *getDefault() const;
     virtual Mailbox *get(const std::string &path) const;
 
     virtual bool setSelected(Mailbox *);
-    virtual Mailbox *getSelected(void) const;
-    void resetSelected(void);
+    virtual Mailbox *getSelected() const;
+    void resetSelected();
 
     bool getStatus(const std::string &s_in, Status &dest) const;
 
-    const std::string &getName(void) const;
+    const std::string &getName() const;
 
-    virtual const std::string &getPersonalNamespace(void) const;
-    virtual const std::string &getOthersNamespace(void) const;
-    virtual const std::string &getSharedNamespace(void) const;
+    virtual const std::string &getPersonalNamespace() const;
+    virtual const std::string &getOthersNamespace() const;
+    virtual const std::string &getSharedNamespace() const;
 
     virtual std::string mailboxToFilename(const std::string &m) const = 0;
     virtual std::string filenameToMailbox(const std::string &m) const = 0;
@@ -111,14 +111,14 @@ namespace Binc {
     virtual bool deleteMailbox(const std::string &m) const;
     virtual bool renameMailbox(const std::string &m, const std::string &n) const;
 
-    const std::string &getLastError(void) const;
+    const std::string &getLastError() const;
     void setLastError(const std::string &error) const;
 
-    virtual std::vector<std::string> getSubscriptions(void) const;
+    virtual std::vector<std::string> getSubscriptions() const;
     virtual void subscribeTo(const std::string mailbox);
     virtual bool unsubscribeTo(const std::string mailbox);
-    virtual void loadSubscribes(void);
-    virtual bool saveSubscribes(void) const;
+    virtual void loadSubscribes();
+    virtual bool saveSubscribes() const;
   };
 
   class MaildirPPDepot : public Depot {
@@ -126,7 +126,7 @@ namespace Binc {
     std::string mailboxToFilename(const std::string &m) const;
     std::string filenameToMailbox(const std::string &m) const;
 
-    const std::string &getPersonalNamespace(void) const;
+    const std::string &getPersonalNamespace() const;
 
     MaildirPPDepot();
     ~MaildirPPDepot();
diff --git a/src/include/imapparser.h b/src/include/imapparser.h
index 737d7c7..e0daeb2 100644
--- a/src/include/imapparser.h
+++ b/src/include/imapparser.h
@@ -19,23 +19,23 @@ namespace Binc {
     bool isInSet(unsigned int n) const;
     void addNumber(unsigned int a_in);
 
-    inline bool isLimited(void) const
+    inline bool isLimited() const
     {
       return limited;
     }
 
-    static SequenceSet &all(void);
+    static SequenceSet &all();
 
-    static SequenceSet &null(void);
+    static SequenceSet &null();
 
     SequenceSet &operator=(const SequenceSet &copy);
 
-    SequenceSet(void);
+    SequenceSet();
     SequenceSet(const SequenceSet &copy);
-    ~SequenceSet(void);
+    ~SequenceSet();
 
   protected:
-    bool isNull(void) const;
+    bool isNull() const;
 
   private:
     bool limited;
@@ -63,7 +63,7 @@ namespace Binc {
 
     BincImapParserFetchAtt(const std::string &typeName = "");
 
-    std::string toString(void);
+    std::string toString();
   };
 
   class BincImapParserSearchKey {
@@ -80,14 +80,14 @@ namespace Binc {
 
     std::vector<BincImapParserSearchKey> children;
 
-    const SequenceSet &getSet(void) const;
+    const SequenceSet &getSet() const;
 
-    BincImapParserSearchKey(void);
+    BincImapParserSearchKey();
   };
 
   class BincImapParserData {
   public:
-    virtual ~BincImapParserData(void) {}
+    virtual ~BincImapParserData() {}
   };
 
   class Request {
@@ -116,55 +116,55 @@ namespace Binc {
     BincImapParserSearchKey searchkey;
     std::vector<BincImapParserFetchAtt> fatt;
 
-    void setUidMode(void);
-    bool getUidMode(void) const;
+    void setUidMode();
+    bool getUidMode() const;
 
     void setTag(std::string &t_in);
-    const std::string &getTag(void) const;
+    const std::string &getTag() const;
 
     void setMode(const std::string &m_in);
-    const std::string &getMode(void) const;
+    const std::string &getMode() const;
 
     void setName(const std::string &s_in);
-    const std::string &getName(void) const;
+    const std::string &getName() const;
 
     void setLiteral(const std::string &s_in);
-    const std::string &getLiteral(void) const;
+    const std::string &getLiteral() const;
 
     void setDate(const std::string &s_in);
-    const std::string &getDate(void) const;
+    const std::string &getDate() const;
 
     void setCharSet(const std::string &s_in);
-    const std::string &getCharSet(void) const;
+    const std::string &getCharSet() const;
 
     void setUserID(const std::string &s_in);
-    const std::string &getUserID(void) const;
+    const std::string &getUserID() const;
 
     void setPassword(const std::string &s_in);
-    const std::string &getPassword(void) const;
+    const std::string &getPassword() const;
 
     void setMailbox(const std::string &s_in);
-    const std::string &getMailbox(void) const;
+    const std::string &getMailbox() const;
 
     void setAuthType(const std::string &s_in);
-    const std::string &getAuthType(void) const;
+    const std::string &getAuthType() const;
 
     void setNewMailbox(const std::string &s_in);
-    const std::string &getNewMailbox(void) const;
+    const std::string &getNewMailbox() const;
 
     void setListMailbox(const std::string &s_in);
-    const std::string &getListMailbox(void) const;
+    const std::string &getListMailbox() const;
 
     void setContextInfo(const std::string &s_in);
-    const std::string &getContextInfo(void) const;
+    const std::string &getContextInfo() const;
 
-    SequenceSet &getSet(void);
+    SequenceSet &getSet();
 
-    std::vector<std::string> &getFlags(void);
-    std::vector<std::string> &getStatuses(void);
+    std::vector<std::string> &getFlags();
+    std::vector<std::string> &getStatuses();
 
-    Request(void);
-    ~Request(void);
+    Request();
+    ~Request();
   };
 }
 
diff --git a/src/include/imapserver.h b/src/include/imapserver.h
index 2afaadd..76b2a83 100644
--- a/src/include/imapserver.h
+++ b/src/include/imapserver.h
@@ -10,11 +10,11 @@ namespace Binc {
   class IMAPServer {
   public:
     IMAPServer(int argc, char *argv[]);
-    ~IMAPServer(void);
+    ~IMAPServer();
 
-    int initialize(void);
-    int runStub(void);
-    int run(void);
+    int initialize();
+    int runStub();
+    int run();
 
     enum ServerStatus {
       OK,
@@ -26,7 +26,7 @@ namespace Binc {
     };
 
   private:
-    void prepareForNextRequest(void);
+    void prepareForNextRequest();
 
     int argc;
     char **argv;
diff --git a/src/include/iodevice.h b/src/include/iodevice.h
index 1612d3a..8b1314e 100644
--- a/src/include/iodevice.h
+++ b/src/include/iodevice.h
@@ -61,12 +61,12 @@ namespace Binc {
     /*!
       Destructs an IODevice; does nothing.
     */
-    virtual ~IODevice(void);
+    virtual ~IODevice();
 
     /*!
       Clears all data in the input and output buffers.
     */
-    void clear(void);
+    void clear();
 
     /*!
       Sets one or more flags.
@@ -129,7 +129,7 @@ namespace Binc {
 
       \sa setTimeout()
     */
-    unsigned int getTimeout(void) const;
+    unsigned int getTimeout() const;
 
     enum LogLevel { ErrorLevel, InfoLevel, WarningLevel, DebugLevel };
 
@@ -161,7 +161,7 @@ namespace Binc {
 
       \sa setOutputLevel()
     */
-    LogLevel getOutputLevel(void) const;
+    LogLevel getOutputLevel() const;
 
     /*!
       Sets the current output level limit. Write operations with a
@@ -177,26 +177,26 @@ namespace Binc {
 
       \sa setOutputLevelLimit()
     */
-    LogLevel getOutputLevelLimit(void) const;
+    LogLevel getOutputLevelLimit() const;
 
     /*!
       Returns the number of bytes that have been read from this device
       since it was created.
     */
-    unsigned int getReadCount(void) const;
+    unsigned int getReadCount() const;
 
     /*!
       Returns the number of bytes that have been written to this
       device since it was created.
     */
-    unsigned int getWriteCount(void) const;
+    unsigned int getWriteCount() const;
 
     /*!
       Calling this function enables the built-in protocol dumping feature in
       the device. All input and output to this device will be dumped to a file
       in /tmp.
     */
-    void enableProtocolDumping(void);
+    void enableProtocolDumping();
 
     /*!
       Writes data to the device. Depending on the value of the max
@@ -216,7 +216,7 @@ namespace Binc {
       Returns true if data can be read from the device; otherwise
       returns false.
     */
-    virtual bool canRead(void) const;
+    virtual bool canRead() const;
 
     /*!
       Reads data from the device, and stores this in a string. Returns
@@ -261,25 +261,25 @@ namespace Binc {
       Flushes the output buffer. Writes all data in the output buffer
       to the device.
     */
-    bool flush(void);
+    bool flush();
 
     /*!
       Returns the type of error that most recently occurred.
     */
-    Error getLastError(void) const;
+    Error getLastError() const;
 
     /*!
       Returns a human readable description of the error that most
       recently occurred. If no known error has occurred, this method
       returns "Unknown error".
     */
-    std::string getLastErrorString(void) const;
+    std::string getLastErrorString() const;
 
     /*!
       Returns the type of service provided by this device. Two valid
       return values are "client" and "log".
     */
-    virtual std::string service(void) const;
+    virtual std::string service() const;
 
   protected:
     /*!
@@ -292,14 +292,14 @@ namespace Binc {
       whether a timeout occurred or whether an error with the device
       prevents further writing.
     */
-    virtual bool waitForWrite(void) const;
+    virtual bool waitForWrite() const;
 
     /*!
       Waits until data can be read from the device.
 
       \sa waitForWrite()
     */
-    virtual bool waitForRead(void) const;
+    virtual bool waitForRead() const;
 
     /*!
       Types of results from a write.
@@ -312,7 +312,7 @@ namespace Binc {
       written, returns WriteDone.  If an error occurred, returns
       WriteError.
     */
-    virtual WriteResult write(void);
+    virtual WriteResult write();
 
     /*!
       Reads data from the device, and stores it in the input buffer.
@@ -324,7 +324,7 @@ namespace Binc {
 
       The number of bytes read from the device is undefined.
     */
-    virtual bool fillInputBuffer(void);
+    virtual bool fillInputBuffer();
 
     BincStream inputBuffer;
     BincStream outputBuffer;
diff --git a/src/include/iofactory.h b/src/include/iofactory.h
index 70bd8f4..52e911b 100644
--- a/src/include/iofactory.h
+++ b/src/include/iofactory.h
@@ -16,15 +16,15 @@
 namespace Binc {
   class IOFactory {
   public:
-    ~IOFactory(void);
+    ~IOFactory();
 
     static void addDevice(IODevice *dev);
-    static IOFactory &getInstance(void);
-    static IODevice &getClient(void);
-    static IODevice &getLogger(void);
+    static IOFactory &getInstance();
+    static IODevice &getClient();
+    static IODevice &getLogger();
 
   private:
-    IOFactory(void);
+    IOFactory();
 
     std::map<std::string, IODevice *> devices;
   };
diff --git a/src/include/mailbox.h b/src/include/mailbox.h
index 6d07282..c61dbf2 100644
--- a/src/include/mailbox.h
+++ b/src/include/mailbox.h
@@ -33,14 +33,14 @@ namespace Binc {
     class BaseIterator {
     public:
       BaseIterator(int sqn = 0);
-      virtual ~BaseIterator(void);
+      virtual ~BaseIterator();
 
-      virtual Message &operator*(void) = 0;
-      virtual void operator++(void) = 0;
+      virtual Message &operator*() = 0;
+      virtual void operator++() = 0;
       virtual bool operator!=(const BaseIterator &d) const = 0;
       virtual bool operator==(const BaseIterator &d) const = 0;
 
-      virtual void erase(void) = 0;
+      virtual void erase() = 0;
 
       unsigned int sqnr;
     };
@@ -49,14 +49,14 @@ namespace Binc {
     public:
       iterator(BaseIterator &i);
 
-      Message &operator*(void);
-      void operator++(void);
+      Message &operator*();
+      void operator++();
       bool operator==(const iterator &) const;
       bool operator!=(const iterator &) const;
 
       unsigned int getSqnr() const;
 
-      void erase(void);
+      void erase();
 
     protected:
       BaseIterator &realIterator;
@@ -68,7 +68,7 @@ namespace Binc {
 
     virtual iterator begin(const SequenceSet &bset,
                            unsigned int mod = INCLUDE_EXPUNGED | SQNR_MODE) const = 0;
-    virtual iterator end(void) const = 0;
+    virtual iterator end() const = 0;
 
     //-- Generic for one mailbox type
     virtual bool getStatus(const std::string &, Status &) const = 0;
@@ -79,24 +79,24 @@ namespace Binc {
 
     //-- Specific for one mailbox
     void setReadOnly(bool readOnly);
-    bool isReadOnly(void) const;
+    bool isReadOnly() const;
 
-    virtual const std::string getTypeName(void) const = 0;
-    const std::string getName(void) const;
+    virtual const std::string getTypeName() const = 0;
+    const std::string getName() const;
     void setName(const std::string &name);
 
-    virtual unsigned int getMaxUid(void) const = 0;
-    virtual unsigned int getMaxSqnr(void) const = 0;
-    virtual unsigned int getUidNext(void) const = 0;
-    virtual unsigned int getUidValidity(void) const = 0;
+    virtual unsigned int getMaxUid() const = 0;
+    virtual unsigned int getMaxSqnr() const = 0;
+    virtual unsigned int getUidNext() const = 0;
+    virtual unsigned int getUidValidity() const = 0;
 
     virtual bool getUpdates(bool scan,
                             unsigned int type,
                             PendingUpdates &updates,
                             bool forceScan) = 0;
 
-    virtual void updateFlags(void) = 0;
-    virtual void expungeMailbox(void) = 0;
+    virtual void updateFlags() = 0;
+    virtual void expungeMailbox() = 0;
     virtual bool selectMailbox(const std::string &name, const std::string &s_in) = 0;
     virtual bool createMailbox(const std::string &s,
                                mode_t mode,
@@ -104,19 +104,19 @@ namespace Binc {
                                gid_t group = 0,
                                bool root = false) = 0;
     virtual bool deleteMailbox(const std::string &s) = 0;
-    virtual void closeMailbox(void) = 0;
+    virtual void closeMailbox() = 0;
 
     virtual Message *createMessage(const std::string &mbox, time_t idate = 0) = 0;
     virtual bool commitNewMessages(const std::string &mbox) = 0;
-    virtual bool rollBackNewMessages(void) = 0;
+    virtual bool rollBackNewMessages() = 0;
     virtual bool fastCopy(Message &source, Mailbox &desttype, const std::string &destname) = 0;
 
-    const std::string &getLastError(void) const;
+    const std::string &getLastError() const;
     void setLastError(const std::string &error) const;
 
     //--
-    Mailbox(void);
-    virtual ~Mailbox(void);
+    Mailbox();
+    virtual ~Mailbox();
 
     Mailbox &operator=(const Mailbox &m) = delete;
 
diff --git a/src/include/maildir.h b/src/include/maildir.h
index 4a4c106..6ba1df3 100644
--- a/src/include/maildir.h
+++ b/src/include/maildir.h
@@ -41,10 +41,10 @@ namespace Binc {
   public:
     void insert(const std::string &unique, unsigned int uid, const std::string &fileName = "");
     void remove(const std::string &unique);
-    void clear(void);
-    void clearFileNames(void);
-    void clearUids(void);
-    unsigned int getSize(void) const;
+    void clear();
+    void clearFileNames();
+    void clearUids();
+    unsigned int getSize() const;
     MaildirIndexItem *find(const std::string &unique);
   };
 
@@ -54,28 +54,28 @@ namespace Binc {
 
     class iterator : public BaseIterator {
     public:
-      iterator(void);
+      iterator();
       iterator(Maildir *home,
                MessageMap::iterator i,
                const SequenceSet &bset,
                unsigned int mod = INCLUDE_EXPUNGED | SQNR_MODE);
       iterator(const iterator &copy);
-      ~iterator(void);
+      ~iterator();
 
-      Message &operator*(void);
-      void operator++(void);
+      Message &operator*();
+      void operator++();
       bool operator==(const BaseIterator &) const;
       bool operator!=(const BaseIterator &) const;
 
       iterator &operator=(const iterator &copy);
 
-      void erase(void);
+      void erase();
 
       friend class Maildir;
 
     protected:
-      void reposition(void);
-      MaildirMessage &curMessage(void);
+      void reposition();
+      MaildirMessage &curMessage();
 
     private:
       Maildir *mailbox;
@@ -89,33 +89,33 @@ namespace Binc {
       iterator(iterator &external);
     };
 
-    const std::string getTypeName(void) const;
+    const std::string getTypeName() const;
 
     Mailbox::iterator begin(const SequenceSet &bset,
                             unsigned int mod = INCLUDE_EXPUNGED | SQNR_MODE) const;
-    Mailbox::iterator end(void) const;
+    Mailbox::iterator end() const;
 
-    unsigned int getMaxUid(void) const;
-    unsigned int getMaxSqnr(void) const;
-    unsigned int getUidValidity(void) const;
-    unsigned int getUidNext(void) const;
+    unsigned int getMaxUid() const;
+    unsigned int getMaxSqnr() const;
+    unsigned int getUidValidity() const;
+    unsigned int getUidNext() const;
 
     bool getUpdates(bool doscan, unsigned int type, PendingUpdates &updates, bool forceScan);
 
-    const std::string &getPath(void) const;
+    const std::string &getPath() const;
     void setPath(const std::string &path_in);
 
     void bumpUidValidity(const std::string &) const;
 
     unsigned int getStatusID(const std::string &) const;
     bool getStatus(const std::string &, Status &) const;
-    void updateFlags(void);
+    void updateFlags();
 
     bool isMailbox(const std::string &) const;
     bool isMarked(const std::string &) const;
     bool selectMailbox(const std::string &name, const std::string &s_in);
-    void closeMailbox(void);
-    void expungeMailbox(void);
+    void closeMailbox();
+    void expungeMailbox();
     bool createMailbox(const std::string &s,
                        mode_t mode,
                        uid_t owner = 0,
@@ -125,12 +125,12 @@ namespace Binc {
 
     Message *createMessage(const std::string &mbox, time_t idate = 0);
     bool commitNewMessages(const std::string &mbox);
-    bool rollBackNewMessages(void);
+    bool rollBackNewMessages();
 
     bool fastCopy(Message &source, Mailbox &desttype, const std::string &destname);
 
-    Maildir(void);
-    ~Maildir(void);
+    Maildir();
+    ~Maildir();
 
     friend class Maildir::iterator;
     friend class MaildirMessage;
@@ -138,9 +138,9 @@ namespace Binc {
   protected:
     enum ReadCacheResult { Ok, NoCache, Error };
 
-    ReadCacheResult readCache(void);
-    bool writeCache(void);
-    bool scanFileNames(void) const;
+    ReadCacheResult readCache();
+    bool writeCache();
+    bool scanFileNames() const;
 
     enum ScanResult { Success = 0, TemporaryError = 1, PermanentError = 2 };
 
diff --git a/src/include/maildirmessage.h b/src/include/maildirmessage.h
index 96dcf73..b1bb04a 100644
--- a/src/include/maildirmessage.h
+++ b/src/include/maildirmessage.h
@@ -48,7 +48,7 @@ namespace Binc {
     /*!
       Returns the UID of a message.
     */
-    unsigned int getUID(void) const;
+    unsigned int getUID() const;
 
     /*!
       Sets the size of the message. This size must be consistent with
@@ -79,19 +79,19 @@ namespace Binc {
     /*!
       Resets all flags on a message.
     */
-    void resetStdFlags(void);
+    void resetStdFlags();
 
     /*!
       Returns the flags that are set on a message.
     */
-    unsigned char getStdFlags(void) const;
+    unsigned char getStdFlags() const;
 
     /*
      */
     void setCustomFlag(const std::string &flag);
     void removeCustomFlag(const std::string &flag);
-    void resetCustomFlags(void);
-    std::vector<std::string> getCustomFlags(void) const;
+    void resetCustomFlags();
+    std::vector<std::string> getCustomFlags() const;
 
     /*!
       Sets the internal flags.
@@ -110,20 +110,20 @@ namespace Binc {
     /*!
       Returns the internal flags.
     */
-    unsigned char getInternalFlags(void) const;
+    unsigned char getInternalFlags() const;
 
     /*!
       Sets a state in a message that indicates that no flags have been
       changed. Used together with hasFlagsChanged() to check if the
       flags in this message have been changed.
     */
-    void setFlagsUnchanged(void);
+    void setFlagsUnchanged();
 
     /*!
       Returns true if flags have been added or reset since the last
       call to setFlagsUnchanged(), otherwise returns false.
     */
-    bool hasFlagsChanged(void) const;
+    bool hasFlagsChanged() const;
 
     /*!
       Sets the internal date of a message. This is usually the date in
@@ -138,7 +138,7 @@ namespace Binc {
       Returns the internal date of the message in seconds since the
       epoch.
     */
-    time_t getInternalDate(void) const;
+    time_t getInternalDate() const;
 
     /*!
       Reads a chunk of up to 4096 bytes from a message.  Call close()
@@ -163,24 +163,24 @@ namespace Binc {
     /*!
       Resets a message and frees all allocated resources.
     */
-    void close(void);
+    void close();
 
     /*!
       Marks the message as expunged. Equivalent to calling
       setStdFlag() with F_EXPUNGED.
     */
-    void setExpunged(void);
+    void setExpunged();
 
     /*!
       Removes the F_EXPUNGED flag from the message.
     */
-    void setUnExpunged(void);
+    void setUnExpunged();
 
     /*!
       Returns true if the message is marked as expunged, otherwise
       returns false.
     */
-    bool isExpunged(void) const;
+    bool isExpunged() const;
 
     /*!
       Returns the first occurrance of a MIME header in a message,
@@ -197,7 +197,7 @@ namespace Binc {
 
     bool printBodyStructure(bool extended = true) const;
 
-    bool printEnvelope(void) const;
+    bool printEnvelope() const;
 
     bool printHeader(const std::string &section,
                      std::vector<std::string> headers,
@@ -229,11 +229,11 @@ namespace Binc {
                             bool onlyText = false) const;
 
     void setUnique(const std::string &s_in);
-    const std::string &getUnique(void) const;
+    const std::string &getUnique() const;
 
     //--
     MaildirMessage(Maildir &home);
-    ~MaildirMessage(void);
+    ~MaildirMessage();
 
     friend class Maildir;
 
@@ -253,17 +253,17 @@ namespace Binc {
     };
 
   protected:
-    bool parseFull(void) const;
-    bool parseHeaders(void) const;
+    bool parseFull() const;
+    bool parseHeaders() const;
 
-    std::string getFixedFilename(void) const;
-    std::string getFileName(void) const;
+    std::string getFixedFilename() const;
+    std::string getFileName() const;
 
     void setFile(int fd);
-    int getFile(void) const;
+    int getFile() const;
 
     void setSafeName(const std::string &name);
-    const std::string &getSafeName(void) const;
+    const std::string &getSafeName() const;
 
   private:
     mutable int fd;
@@ -287,12 +287,12 @@ namespace Binc {
 
     enum ParseStatus { NotParsed, HeaderParsed, AllParsed };
 
-    static MaildirMessageCache &getInstance(void);
+    static MaildirMessageCache &getInstance();
 
     void removeStatus(const MaildirMessage *);
     void addStatus(const MaildirMessage *, ParseStatus pstat);
     ParseStatus getStatus(const MaildirMessage *) const;
-    void clear(void);
+    void clear();
 
   private:
     MaildirMessageCache();
diff --git a/src/include/message.h b/src/include/message.h
index 130902e..e9c31f6 100644
--- a/src/include/message.h
+++ b/src/include/message.h
@@ -47,34 +47,34 @@ namespace Binc {
     };
 
     virtual void setUID(unsigned int) = 0;
-    virtual unsigned int getUID(void) const = 0;
+    virtual unsigned int getUID() const = 0;
 
     virtual void setSize(unsigned int) = 0;
     virtual unsigned int getSize(bool render = false) const = 0;
 
     virtual void setStdFlag(unsigned char) = 0;
-    virtual void resetStdFlags(void) = 0;
-    virtual unsigned char getStdFlags(void) const = 0;
+    virtual void resetStdFlags() = 0;
+    virtual unsigned char getStdFlags() const = 0;
 
     virtual void setCustomFlag(const std::string &flag) = 0;
     virtual void removeCustomFlag(const std::string &flag) = 0;
-    virtual void resetCustomFlags(void) = 0;
-    virtual std::vector<std::string> getCustomFlags(void) const = 0;
+    virtual void resetCustomFlags() = 0;
+    virtual std::vector<std::string> getCustomFlags() const = 0;
 
-    virtual void setFlagsUnchanged(void) = 0;
-    virtual bool hasFlagsChanged(void) const = 0;
+    virtual void setFlagsUnchanged() = 0;
+    virtual bool hasFlagsChanged() const = 0;
 
     virtual void setInternalDate(time_t) = 0;
-    virtual time_t getInternalDate(void) const = 0;
+    virtual time_t getInternalDate() const = 0;
 
-    // virtual void rewind(void) = 0;
+    // virtual void rewind() = 0;
     virtual int readChunk(std::string &) = 0;
     virtual bool appendChunk(const std::string &) = 0;
-    virtual void close(void) = 0;
+    virtual void close() = 0;
 
-    virtual void setExpunged(void) = 0;
-    virtual void setUnExpunged(void) = 0;
-    virtual bool isExpunged(void) const = 0;
+    virtual void setExpunged() = 0;
+    virtual void setUnExpunged() = 0;
+    virtual bool isExpunged() const = 0;
 
     virtual const std::string &getHeader(const std::string &header) = 0;
 
@@ -85,7 +85,7 @@ namespace Binc {
 
     virtual bool printBodyStructure(bool extended = true) const = 0;
 
-    virtual bool printEnvelope(void) const = 0;
+    virtual bool printEnvelope() const = 0;
 
     virtual bool printHeader(const std::string &section,
                              std::vector<std::string> headers,
@@ -117,26 +117,26 @@ namespace Binc {
                                     unsigned int length = UINTMAX,
                                     bool onlyText = false) const = 0;
 
-    Message(void);
-    virtual ~Message(void);
+    Message();
+    virtual ~Message();
 
     void setLastError(const std::string &) const;
-    const std::string &getLastError(void) const;
+    const std::string &getLastError() const;
 
   private:
     static std::string lastError;
   };
 
-  inline Message::Message(void) {}
+  inline Message::Message() {}
 
-  inline Message::~Message(void) {}
+  inline Message::~Message() {}
 
   inline void Message::setLastError(const std::string &error) const
   {
     lastError = error;
   }
 
-  inline const std::string &Message::getLastError(void) const
+  inline const std::string &Message::getLastError() const
   {
     return lastError;
   }
diff --git a/src/include/mime-inputsource.h b/src/include/mime-inputsource.h
index 011c4c3..f383e88 100644
--- a/src/include/mime-inputsource.h
+++ b/src/include/mime-inputsource.h
@@ -17,17 +17,17 @@ namespace Binc {
   class MimeInputSource {
   public:
     inline MimeInputSource(int fd, unsigned int start = 0);
-    virtual inline ~MimeInputSource(void);
+    virtual inline ~MimeInputSource();
 
-    virtual inline bool fillInputBuffer(void);
-    virtual inline void reset(void);
+    virtual inline bool fillInputBuffer();
+    virtual inline void reset();
 
     inline void seek(unsigned int offset);
     inline bool getChar(char *c);
-    inline void ungetChar(void);
-    inline int getFileDescriptor(void) const;
+    inline void ungetChar();
+    inline int getFileDescriptor() const;
 
-    inline unsigned int getOffset(void) const;
+    inline unsigned int getOffset() const;
 
   private:
     int fd;
@@ -52,9 +52,9 @@ namespace Binc {
     seek(start);
   }
 
-  inline MimeInputSource::~MimeInputSource(void) {}
+  inline MimeInputSource::~MimeInputSource() {}
 
-  inline bool MimeInputSource::fillInputBuffer(void)
+  inline bool MimeInputSource::fillInputBuffer()
   {
     char raw[4096];
     ssize_t nbytes = read(fd, raw, sizeof(raw));
@@ -87,7 +87,7 @@ namespace Binc {
     return true;
   }
 
-  inline void MimeInputSource::reset(void)
+  inline void MimeInputSource::reset()
   {
     offset = head = tail = 0;
     lastChar = '\0';
@@ -122,12 +122,12 @@ namespace Binc {
     --offset;
   }
 
-  inline int MimeInputSource::getFileDescriptor(void) const
+  inline int MimeInputSource::getFileDescriptor() const
   {
     return fd;
   }
 
-  inline unsigned int MimeInputSource::getOffset(void) const
+  inline unsigned int MimeInputSource::getOffset() const
   {
     return offset;
   }
diff --git a/src/include/mime.h b/src/include/mime.h
index ecf02a9..14d65e6 100644
--- a/src/include/mime.h
+++ b/src/include/mime.h
@@ -21,17 +21,17 @@ namespace Binc {
     mutable std::string value;
 
   public:
-    inline const std::string &getKey(void) const
+    inline const std::string &getKey() const
     {
       return key;
     }
 
-    inline const std::string &getValue(void) const
+    inline const std::string &getValue() const
     {
       return value;
     }
 
-    HeaderItem(void);
+    HeaderItem();
     HeaderItem(const std::string &key, const std::string &value);
   };
 
@@ -43,10 +43,10 @@ namespace Binc {
     bool getFirstHeader(const std::string &key, HeaderItem &dest) const;
     bool getAllHeaders(const std::string &key, std::vector<HeaderItem> &dest) const;
     void add(const std::string &name, const std::string &content);
-    void clear(void) const;
+    void clear() const;
 
-    Header(void);
-    ~Header(void);
+    Header();
+    ~Header();
   };
 
   class IODevice;
@@ -76,42 +76,42 @@ namespace Binc {
 
     mutable std::vector<MimePart> members;
 
-    inline const std::string &getSubType(void) const
+    inline const std::string &getSubType() const
     {
       return subtype;
     }
 
-    inline bool isMultipart(void) const
+    inline bool isMultipart() const
     {
       return multipart;
     }
 
-    inline bool isMessageRFC822(void) const
+    inline bool isMessageRFC822() const
     {
       return messagerfc822;
     }
 
-    inline unsigned int getSize(void) const
+    inline unsigned int getSize() const
     {
       return bodylength;
     }
 
-    inline unsigned int getNofLines(void) const
+    inline unsigned int getNofLines() const
     {
       return nlines;
     }
 
-    inline unsigned int getNofBodyLines(void) const
+    inline unsigned int getNofBodyLines() const
     {
       return nbodylines;
     }
 
-    inline unsigned int getBodyLength(void) const
+    inline unsigned int getBodyLength() const
     {
       return bodylength;
     }
 
-    inline unsigned int getBodyStartOffset(void) const
+    inline unsigned int getBodyStartOffset() const
     {
       return bodystartoffsetcrlf;
     }
@@ -131,7 +131,7 @@ namespace Binc {
                   Binc::IODevice &output,
                   unsigned int startoffset,
                   unsigned int length) const;
-    virtual void clear(void) const;
+    virtual void clear() const;
 
     const MimePart *getPart(const std::string &findpart,
                             std::string genpart,
@@ -139,8 +139,8 @@ namespace Binc {
     virtual int parseOnlyHeader(const std::string &toboundary) const;
     virtual int parseFull(const std::string &toboundary, int &boundarysize) const;
 
-    MimePart(void);
-    virtual ~MimePart(void);
+    MimePart();
+    virtual ~MimePart();
   };
 
   class MimeDocument : public MimePart {
@@ -151,20 +151,20 @@ namespace Binc {
   public:
     void parseOnlyHeader(int fd) const;
     void parseFull(int fd) const;
-    void clear(void) const;
+    void clear() const;
 
-    inline bool isHeaderParsed(void)
+    inline bool isHeaderParsed()
     {
       return headerIsParsed;
     }
 
-    inline bool isAllParsed(void)
+    inline bool isAllParsed()
     {
       return allIsParsed;
     }
 
-    MimeDocument(void);
-    ~MimeDocument(void);
+    MimeDocument();
+    ~MimeDocument();
   };
 
 };
diff --git a/src/include/multilogdevice.h b/src/include/multilogdevice.h
index 3ae4655..ee2a3c2 100644
--- a/src/include/multilogdevice.h
+++ b/src/include/multilogdevice.h
@@ -16,14 +16,14 @@ namespace Binc {
     MultilogDevice(int flags);
     ~MultilogDevice();
 
-    std::string service(void) const;
+    std::string service() const;
 
   protected:
-    bool waitForWrite(void) const;
-    bool waitForRead(void) const;
+    bool waitForWrite() const;
+    bool waitForRead() const;
 
-    WriteResult write(void);
-    bool fillInputBuffer(void);
+    WriteResult write();
+    bool fillInputBuffer();
   };
 }
 
diff --git a/src/include/operators.h b/src/include/operators.h
index f6bb987..9cfd10a 100644
--- a/src/include/operators.h
+++ b/src/include/operators.h
@@ -25,21 +25,21 @@ namespace Binc {
 
     virtual ProcessResult process(Depot &, Request &) = 0;
     virtual ParseResult parse(Request &) const = 0;
-    virtual int getState(void) const = 0;
-    virtual const std::string getName(void) const = 0;
+    virtual int getState() const = 0;
+    virtual const std::string getName() const = 0;
 
-    virtual ~Operator(void){};
+    virtual ~Operator(){};
   };
 
   class AppendOperator : public Operator {
   public:
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    AppendOperator(void);
-    ~AppendOperator(void);
+    AppendOperator();
+    ~AppendOperator();
   };
 
   class AuthenticateOperator : public Operator {
@@ -47,15 +47,15 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
     ProcessResult Login(std::string &username, std::string &password);
     ProcessResult Plain(std::string &username, std::string &password);
     ProcessResult Cram(std::string &username, std::string &password, std::string &challenge);
 
-    AuthenticateOperator(void);
-    ~AuthenticateOperator(void);
+    AuthenticateOperator();
+    ~AuthenticateOperator();
   };
 
   class CapabilityOperator : public Operator {
@@ -65,13 +65,13 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
     void addCapability(const std::string &cap);
 
-    CapabilityOperator(void);
-    ~CapabilityOperator(void);
+    CapabilityOperator();
+    ~CapabilityOperator();
   };
 
   class CheckOperator : public Operator {
@@ -79,11 +79,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    CheckOperator(void);
-    ~CheckOperator(void);
+    CheckOperator();
+    ~CheckOperator();
   };
 
   class CreateOperator : public Operator {
@@ -91,11 +91,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    CreateOperator(void);
-    ~CreateOperator(void);
+    CreateOperator();
+    ~CreateOperator();
   };
 
   class CloseOperator : public Operator {
@@ -103,11 +103,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    CloseOperator(void);
-    ~CloseOperator(void);
+    CloseOperator();
+    ~CloseOperator();
   };
 
   class CopyOperator : public Operator {
@@ -115,11 +115,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    CopyOperator(void);
-    ~CopyOperator(void);
+    CopyOperator();
+    ~CopyOperator();
   };
 
   class DeleteOperator : public Operator {
@@ -127,11 +127,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    DeleteOperator(void);
-    ~DeleteOperator(void);
+    DeleteOperator();
+    ~DeleteOperator();
   };
 
   class ExpungeOperator : public Operator {
@@ -139,11 +139,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    ExpungeOperator(void);
-    ~ExpungeOperator(void);
+    ExpungeOperator();
+    ~ExpungeOperator();
   };
 
   class FetchOperator : public Operator {
@@ -158,11 +158,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    FetchOperator(void);
-    ~FetchOperator(void);
+    FetchOperator();
+    ~FetchOperator();
   };
 
   class IdOperator : public Operator {
@@ -170,11 +170,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    IdOperator(void);
-    ~IdOperator(void);
+    IdOperator();
+    ~IdOperator();
   };
 
   class IdleOperator : public Operator {
@@ -189,11 +189,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    IdleOperator(void);
-    ~IdleOperator(void);
+    IdleOperator();
+    ~IdleOperator();
   };
 
   class ListOperator : public Operator {
@@ -212,11 +212,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    ListOperator(void);
-    ~ListOperator(void);
+    ListOperator();
+    ~ListOperator();
   };
 
   class LoginOperator : public Operator {
@@ -224,11 +224,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    LoginOperator(void);
-    ~LoginOperator(void);
+    LoginOperator();
+    ~LoginOperator();
   };
 
   class LogoutOperator : public Operator {
@@ -236,11 +236,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    LogoutOperator(void);
-    ~LogoutOperator(void);
+    LogoutOperator();
+    ~LogoutOperator();
   };
 
   class LsubOperator : public Operator {
@@ -248,11 +248,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    LsubOperator(void);
-    ~LsubOperator(void);
+    LsubOperator();
+    ~LsubOperator();
   };
 
   class NamespaceOperator : public Operator {
@@ -260,11 +260,11 @@ namespace Binc {
     virtual ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    NamespaceOperator(void);
-    ~NamespaceOperator(void);
+    NamespaceOperator();
+    ~NamespaceOperator();
   };
 
   class NoopOperator : public Operator {
@@ -272,19 +272,19 @@ namespace Binc {
     virtual ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    NoopOperator(void);
-    ~NoopOperator(void);
+    NoopOperator();
+    ~NoopOperator();
   };
 
   class NoopPendingOperator : public NoopOperator {
   public:
     ProcessResult process(Depot &, Request &);
 
-    NoopPendingOperator(void);
-    ~NoopPendingOperator(void);
+    NoopPendingOperator();
+    ~NoopPendingOperator();
   };
 
   class RenameOperator : public Operator {
@@ -292,11 +292,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    RenameOperator(void);
-    ~RenameOperator(void);
+    RenameOperator();
+    ~RenameOperator();
   };
 
   class SearchOperator : public Operator {
@@ -361,7 +361,7 @@ namespace Binc {
                               const std::string &delim = "-");
       static bool convertDateHeader(const std::string &d_in, time_t &t);
 
-      void order(void);
+      void order();
 
       bool match(Mailbox *,
                  Message *,
@@ -369,8 +369,8 @@ namespace Binc {
                  unsigned int lastmessage,
                  unsigned int lastuid) const;
 
-      int getType(void) const;
-      int getWeight(void) const;
+      int getType() const;
+      int getWeight() const;
       void setWeight(int i);
 
       void init(const BincImapParserSearchKey &a);
@@ -380,7 +380,7 @@ namespace Binc {
         return a.getWeight() < b.getWeight();
       }
 
-      SearchNode(void);
+      SearchNode();
       SearchNode(const BincImapParserSearchKey &a);
     };
 
@@ -388,11 +388,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    SearchOperator(void);
-    ~SearchOperator(void);
+    SearchOperator();
+    ~SearchOperator();
   };
 
   class SelectOperator : public Operator {
@@ -400,18 +400,18 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    SelectOperator(void);
-    ~SelectOperator(void);
+    SelectOperator();
+    ~SelectOperator();
   };
 
   class ExamineOperator : public SelectOperator {
   public:
-    const std::string getName(void) const;
-    ExamineOperator(void);
-    ~ExamineOperator(void);
+    const std::string getName() const;
+    ExamineOperator();
+    ~ExamineOperator();
   };
 
   class StarttlsOperator : public Operator {
@@ -419,12 +419,12 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
-    int goStartTLS(void) const;
+    const std::string getName() const;
+    int getState() const;
+    int goStartTLS() const;
 
-    StarttlsOperator(void);
-    ~StarttlsOperator(void);
+    StarttlsOperator();
+    ~StarttlsOperator();
   };
 
   class StatusOperator : public Operator {
@@ -434,11 +434,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    StatusOperator(void);
-    ~StatusOperator(void);
+    StatusOperator();
+    ~StatusOperator();
   };
 
   class StoreOperator : public Operator {
@@ -446,11 +446,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    StoreOperator(void);
-    ~StoreOperator(void);
+    StoreOperator();
+    ~StoreOperator();
   };
 
   class SubscribeOperator : public Operator {
@@ -458,11 +458,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    SubscribeOperator(void);
-    ~SubscribeOperator(void);
+    SubscribeOperator();
+    ~SubscribeOperator();
   };
 
   class UnsubscribeOperator : public Operator {
@@ -470,11 +470,11 @@ namespace Binc {
     ProcessResult process(Depot &, Request &);
     virtual ParseResult parse(Request &) const;
 
-    const std::string getName(void) const;
-    int getState(void) const;
+    const std::string getName() const;
+    int getState() const;
 
-    UnsubscribeOperator(void);
-    ~UnsubscribeOperator(void);
+    UnsubscribeOperator();
+    ~UnsubscribeOperator();
   };
 }
 
diff --git a/src/include/pendingupdates.h b/src/include/pendingupdates.h
index eddf8f9..fcfd548 100644
--- a/src/include/pendingupdates.h
+++ b/src/include/pendingupdates.h
@@ -24,17 +24,17 @@ namespace Binc {
       std::vector<unsigned int>::iterator internal;
 
     public:
-      unsigned int operator*(void) const;
-      void operator++(void);
+      unsigned int operator*() const;
+      void operator++();
       bool operator!=(expunged_const_iterator) const;
       bool operator==(expunged_const_iterator) const;
 
-      expunged_const_iterator(void);
+      expunged_const_iterator();
       expunged_const_iterator(std::vector<unsigned int>::iterator i);
     };
 
-    expunged_const_iterator beginExpunged(void);
-    expunged_const_iterator endExpunged(void);
+    expunged_const_iterator beginExpunged();
+    expunged_const_iterator endExpunged();
 
     class flagupdates_const_iterator {
     private:
@@ -43,22 +43,22 @@ namespace Binc {
       std::map<unsigned int, std::vector<std::string>> *sqnrtocflags;
 
     public:
-      unsigned int first(void) const;
-      unsigned int second(void) const;
-      std::vector<std::string> getCustomFlags(void) const;
-      unsigned int getUID(void) const;
+      unsigned int first() const;
+      unsigned int second() const;
+      std::vector<std::string> getCustomFlags() const;
+      unsigned int getUID() const;
 
-      void operator++(void);
+      void operator++();
       bool operator!=(flagupdates_const_iterator) const;
 
-      flagupdates_const_iterator(void);
+      flagupdates_const_iterator();
       flagupdates_const_iterator(std::map<unsigned int, unsigned int>::iterator i,
                                  std::map<unsigned int, std::vector<std::string>> *,
                                  std::map<unsigned int, unsigned int> *);
     };
 
-    flagupdates_const_iterator beginFlagUpdates(void);
-    flagupdates_const_iterator endFlagUpdates(void);
+    flagupdates_const_iterator beginFlagUpdates();
+    flagupdates_const_iterator endFlagUpdates();
 
     void addExpunged(unsigned int uid);
     void addFlagUpdates(unsigned int sqnr,
@@ -67,13 +67,13 @@ namespace Binc {
                         const std::vector<std::string> &cflags);
     void setExists(unsigned int n);
     void setRecent(unsigned int n);
-    unsigned int getExists(void) const;
-    unsigned int getRecent(void) const;
-    bool newExists(void) const;
-    bool newRecent(void) const;
+    unsigned int getExists() const;
+    unsigned int getRecent() const;
+    bool newExists() const;
+    bool newRecent() const;
 
-    PendingUpdates(void);
-    ~PendingUpdates(void);
+    PendingUpdates();
+    ~PendingUpdates();
 
   private:
     std::vector<unsigned int> expunges;
diff --git a/src/include/recursivedescent.h b/src/include/recursivedescent.h
index 26ad794..ea8dc67 100644
--- a/src/include/recursivedescent.h
+++ b/src/include/recursivedescent.h
@@ -19,13 +19,13 @@ namespace Binc {
   extern std::stack<int> inputBuffer;
   extern int charnr;
 
-  int readChar(void);
+  int readChar();
   void unReadChar(int c_in);
   void unReadChar(const std::string &s_in);
 
   Operator::ParseResult expectTag(std::string &s_in);
   Operator::ParseResult expectTagChar(int &c_in);
-  Operator::ParseResult expectSPACE(void);
+  Operator::ParseResult expectSPACE();
 
   Operator::ParseResult expectFlag(std::vector<std::string> &v_in);
 
@@ -56,9 +56,9 @@ namespace Binc {
   Operator::ParseResult expectSequenceNum(unsigned int &i_in);
   Operator::ParseResult expectNZNumber(unsigned int &i_in);
 
-  Operator::ParseResult expectCRLF(void);
-  Operator::ParseResult expectCR(void);
-  Operator::ParseResult expectLF(void);
+  Operator::ParseResult expectCRLF();
+  Operator::ParseResult expectCR();
+  Operator::ParseResult expectLF();
 
   Operator::ParseResult expectThisString(const std::string &s_in);
 }
diff --git a/src/include/session.h b/src/include/session.h
index b02abaa..6d9ffc1 100644
--- a/src/include/session.h
+++ b/src/include/session.h
@@ -43,42 +43,42 @@ namespace Binc {
 
     CommandLineArgs args;
 
-    int timeout(void) const;
+    int timeout() const;
 
     bool hasEnv(const std::string &key) const;
     std::string getEnv(const std::string &key);
     void setEnv(const std::string &key, const std::string &value);
 
-    int getState(void) const;
+    int getState() const;
     void setState(int n);
     bool parseCommandLine(int argc, char *argv[]);
-    void assignCommandLineArgs(void);
-    int getWriteBytes(void) const;
-    int getReadBytes(void) const;
+    void assignCommandLineArgs();
+    int getWriteBytes() const;
+    int getReadBytes() const;
     void addWriteBytes(int);
     void addReadBytes(int);
-    int getBodies(void) const;
-    int getStatements(void) const;
-    void addBody(void);
-    void addStatement(void);
+    int getBodies() const;
+    int getStatements() const;
+    void addBody();
+    void addStatement();
     void setLogFacility(int facility);
-    int getLogFacility(void) const;
-
-    const std::string &getLastError(void) const;
-    const std::string &getResponseCode(void) const;
-    const std::string &getIP(void) const;
-    const std::string &getUserID(void) const;
-    pid_t getPid(void);
-    const std::string &getHostname(void);
+    int getLogFacility() const;
+
+    const std::string &getLastError() const;
+    const std::string &getResponseCode() const;
+    const std::string &getIP() const;
+    const std::string &getUserID() const;
+    pid_t getPid();
+    const std::string &getHostname();
     void setLastError(const std::string &error) const;
     void setResponseCode(const std::string &error) const;
-    void clearResponseCode(void) const;
+    void clearResponseCode() const;
     void setIP(const std::string &ip);
     void setUserID(const std::string &s);
 
-    inline Depot *getDepot(void) const;
+    inline Depot *getDepot() const;
 
-    static Session &getInstance(void);
+    static Session &getInstance();
 
     bool initialize(int argc, char *argv[]);
 
@@ -104,10 +104,10 @@ namespace Binc {
     pid_t pid;
     std::string hostname;
 
-    Session(void);
+    Session();
   };
 
-  inline Depot *Session::getDepot(void) const
+  inline Depot *Session::getDepot() const
   {
     return depot;
   }
diff --git a/src/include/status.h b/src/include/status.h
index ae944c0..550986d 100644
--- a/src/include/status.h
+++ b/src/include/status.h
@@ -50,38 +50,38 @@ namespace Binc {
       uidnext = i;
     }
 
-    inline int getMessages(void) const
+    inline int getMessages() const
     {
       return messages;
     }
 
-    inline int getRecent(void) const
+    inline int getRecent() const
     {
       return recent;
     }
 
-    inline int getStatusID(void) const
+    inline int getStatusID() const
     {
       return statusid;
     }
 
-    inline int getUnseen(void) const
+    inline int getUnseen() const
     {
       return unseen;
     }
 
-    inline int getUidValidity(void) const
+    inline int getUidValidity() const
     {
       return uidvalidity;
     }
 
-    inline int getUidNext(void) const
+    inline int getUidNext() const
     {
       return uidnext;
     }
 
-    Status(void);
-    ~Status(void);
+    Status();
+    ~Status();
   };
 }
 
diff --git a/src/include/stdiodevice.h b/src/include/stdiodevice.h
index 9dac4fd..313a6cd 100644
--- a/src/include/stdiodevice.h
+++ b/src/include/stdiodevice.h
@@ -16,16 +16,16 @@ namespace Binc {
     StdIODevice(int flags);
     ~StdIODevice();
 
-    std::string service(void) const;
+    std::string service() const;
 
-    bool canRead(void) const;
+    bool canRead() const;
 
   protected:
-    bool waitForWrite(void) const;
-    bool waitForRead(void) const;
+    bool waitForWrite() const;
+    bool waitForRead() const;
 
-    WriteResult write(void);
-    bool fillInputBuffer(void);
+    WriteResult write();
+    bool fillInputBuffer();
   };
 }
 
diff --git a/src/include/syslogdevice.h b/src/include/syslogdevice.h
index 78389d7..f0d32ed 100644
--- a/src/include/syslogdevice.h
+++ b/src/include/syslogdevice.h
@@ -23,14 +23,14 @@ namespace Binc {
 
     void setPriority(int p);
 
-    std::string service(void) const;
+    std::string service() const;
 
   protected:
-    bool waitForWrite(void) const;
-    bool waitForRead(void) const;
+    bool waitForWrite() const;
+    bool waitForRead() const;
 
-    WriteResult write(void);
-    bool fillInputBuffer(void);
+    WriteResult write();
+    bool fillInputBuffer();
 
   private:
     static std::string ident;
diff --git a/src/include/tools.h b/src/include/tools.h
index 70f5cf4..f70486f 100644
--- a/src/include/tools.h
+++ b/src/include/tools.h
@@ -11,13 +11,13 @@ namespace Binc {
 
   class Tools {
   private:
-    Tools(void);
+    Tools();
 
   public:
     void setenv(const std::string &key, const std::string &value) const;
     std::string getenv(const std::string &key) const;
 
-    static Tools &getInstance(void);
+    static Tools &getInstance();
   };
 
 }
diff --git a/src/iodevice.cc b/src/iodevice.cc
index 894e3e2..e68167f 100644
--- a/src/iodevice.cc
+++ b/src/iodevice.cc
@@ -31,7 +31,7 @@ IODevice::IODevice(int f)
   , dumpfd(0)
 {}
 
-IODevice::~IODevice(void) {}
+IODevice::~IODevice() {}
 
 IODevice &IODevice::operator<<(ostream &(*source)(ostream &))
 {
@@ -54,7 +54,7 @@ IODevice &IODevice::operator<<(ostream &(*source)(ostream &))
   return *this;
 }
 
-bool IODevice::canRead(void) const
+bool IODevice::canRead() const
 {
   return false;
 }
@@ -116,7 +116,7 @@ void IODevice::setTimeout(unsigned int t)
     flags &= ~HasTimeout;
 }
 
-unsigned int IODevice::getTimeout(void) const
+unsigned int IODevice::getTimeout() const
 {
   return timeout;
 }
@@ -126,7 +126,7 @@ void IODevice::setOutputLevel(LogLevel level)
   outputLevel = level;
 }
 
-IODevice::LogLevel IODevice::getOutputLevel(void) const
+IODevice::LogLevel IODevice::getOutputLevel() const
 {
   return outputLevel;
 }
@@ -136,7 +136,7 @@ void IODevice::setOutputLevelLimit(LogLevel level)
   outputLevelLimit = level;
 }
 
-IODevice::LogLevel IODevice::getOutputLevelLimit(void) const
+IODevice::LogLevel IODevice::getOutputLevelLimit() const
 {
   return outputLevelLimit;
 }
@@ -194,52 +194,52 @@ bool IODevice::skipTo(char c)
   return true;
 }
 
-std::string IODevice::service(void) const
+std::string IODevice::service() const
 {
   return "nul";
 }
 
-bool IODevice::waitForWrite(void) const
+bool IODevice::waitForWrite() const
 {
   return false;
 }
 
-bool IODevice::waitForRead(void) const
+bool IODevice::waitForRead() const
 {
   return false;
 }
 
-IODevice::WriteResult IODevice::write(void)
+IODevice::WriteResult IODevice::write()
 {
   return WriteError;
 }
 
-bool IODevice::fillInputBuffer(void)
+bool IODevice::fillInputBuffer()
 {
   return false;
 }
 
-IODevice::Error IODevice::getLastError(void) const
+IODevice::Error IODevice::getLastError() const
 {
   return error;
 }
 
-std::string IODevice::getLastErrorString(void) const
+std::string IODevice::getLastErrorString() const
 {
   return errorString;
 }
 
-unsigned int IODevice::getReadCount(void) const
+unsigned int IODevice::getReadCount() const
 {
   return readCount;
 }
 
-unsigned int IODevice::getWriteCount(void) const
+unsigned int IODevice::getWriteCount() const
 {
   return writeCount;
 }
 
-void IODevice::enableProtocolDumping(void)
+void IODevice::enableProtocolDumping()
 {
   BincStream ss;
   ss << "/tmp/bincimap-dump-" << static_cast<int>(time(nullptr)) << "-"
diff --git a/src/iofactory.cc b/src/iofactory.cc
index dfb0870..2fe4816 100644
--- a/src/iofactory.cc
+++ b/src/iofactory.cc
@@ -11,11 +11,11 @@
 
 using namespace Binc;
 
-IOFactory::IOFactory(void) {}
+IOFactory::IOFactory() {}
 
-IOFactory::~IOFactory(void) {}
+IOFactory::~IOFactory() {}
 
-IOFactory &IOFactory::getInstance(void)
+IOFactory &IOFactory::getInstance()
 {
   static IOFactory ioFactory;
   return ioFactory;
@@ -32,7 +32,7 @@ void IOFactory::addDevice(IODevice *dev)
   IOFactory::getInstance().devices[dev->service()] = dev;
 }
 
-IODevice &IOFactory::getClient(void)
+IODevice &IOFactory::getClient()
 {
   static IODevice nulDevice;
 
@@ -44,7 +44,7 @@ IODevice &IOFactory::getClient(void)
   return nulDevice;
 }
 
-IODevice &IOFactory::getLogger(void)
+IODevice &IOFactory::getLogger()
 {
   static IODevice nulDevice;
 
diff --git a/src/mailbox.cc b/src/mailbox.cc
index 23ed2a5..f519dfb 100644
--- a/src/mailbox.cc
+++ b/src/mailbox.cc
@@ -18,13 +18,13 @@ Mailbox::BaseIterator::BaseIterator(int sqn)
   sqnr = sqn;
 }
 
-Mailbox::BaseIterator::~BaseIterator(void) {}
+Mailbox::BaseIterator::~BaseIterator() {}
 
-Mailbox::Mailbox(void) : readOnly(false) {}
+Mailbox::Mailbox() : readOnly(false) {}
 
-Mailbox::~Mailbox(void) {}
+Mailbox::~Mailbox() {}
 
-bool Mailbox::isReadOnly(void) const
+bool Mailbox::isReadOnly() const
 {
   return readOnly;
 }
@@ -36,12 +36,12 @@ void Mailbox::setReadOnly(bool readOnly)
 
 Mailbox::iterator::iterator(BaseIterator &i) : realIterator(i) {}
 
-Message &Mailbox::iterator::operator*(void)
+Message &Mailbox::iterator::operator*()
 {
   return *realIterator;
 }
 
-void Mailbox::iterator::operator++(void)
+void Mailbox::iterator::operator++()
 {
   ++realIterator;
 }
@@ -56,12 +56,12 @@ bool Mailbox::iterator::operator!=(const iterator &i) const
   return realIterator != i.realIterator;
 }
 
-void Mailbox::iterator::erase(void)
+void Mailbox::iterator::erase()
 {
   realIterator.erase();
 }
 
-unsigned int Mailbox::iterator::getSqnr(void) const
+unsigned int Mailbox::iterator::getSqnr() const
 {
   return realIterator.sqnr;
 }
@@ -71,12 +71,12 @@ void Mailbox::setName(const std::string &name)
   this->name = name;
 }
 
-const std::string Mailbox::getName(void) const
+const std::string Mailbox::getName() const
 {
   return name;
 }
 
-const std::string &Mailbox::getLastError(void) const
+const std::string &Mailbox::getLastError() const
 {
   return lastError;
 }
diff --git a/src/maildir-close.cc b/src/maildir-close.cc
index 81e526f..c5ae3f1 100644
--- a/src/maildir-close.cc
+++ b/src/maildir-close.cc
@@ -12,7 +12,7 @@
 
 using namespace Binc;
 
-void Binc::Maildir::closeMailbox(void)
+void Binc::Maildir::closeMailbox()
 {
   if (!selected) return;
 
diff --git a/src/maildir-expunge.cc b/src/maildir-expunge.cc
index a63f354..5dd8d93 100644
--- a/src/maildir-expunge.cc
+++ b/src/maildir-expunge.cc
@@ -16,7 +16,7 @@
 
 using namespace Binc;
 
-void Maildir::expungeMailbox(void)
+void Maildir::expungeMailbox()
 {
   if (readOnly) return;
 
diff --git a/src/maildir-readcache.cc b/src/maildir-readcache.cc
index de51988..de9c0e1 100644
--- a/src/maildir-readcache.cc
+++ b/src/maildir-readcache.cc
@@ -15,7 +15,7 @@ using namespace Binc;
 using std::string;
 using std::vector;
 
-Maildir::ReadCacheResult Maildir::readCache(void)
+Maildir::ReadCacheResult Maildir::readCache()
 {
   index.clearUids();
 
diff --git a/src/maildir-scanfilesnames.cc b/src/maildir-scanfilesnames.cc
index ff5c2d4..0fe5f0d 100644
--- a/src/maildir-scanfilesnames.cc
+++ b/src/maildir-scanfilesnames.cc
@@ -19,7 +19,7 @@
 
 using std::string;
 
-bool Binc::Maildir::scanFileNames(void) const
+bool Binc::Maildir::scanFileNames() const
 {
   string curpath = path + "/cur/";
   DIR *pdir = opendir(curpath.c_str());
diff --git a/src/maildir-updateflags.cc b/src/maildir-updateflags.cc
index 40c91e2..4d28a6b 100644
--- a/src/maildir-updateflags.cc
+++ b/src/maildir-updateflags.cc
@@ -16,7 +16,7 @@
 
 using std::string;
 
-void Binc::Maildir::updateFlags(void)
+void Binc::Maildir::updateFlags()
 {
   // don't update a read-only mailbox.
   if (readOnly) return;
diff --git a/src/maildir-writecache.cc b/src/maildir-writecache.cc
index 63d7541..7e7eeba 100644
--- a/src/maildir-writecache.cc
+++ b/src/maildir-writecache.cc
@@ -12,7 +12,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-bool Binc::Maildir::writeCache(void)
+bool Binc::Maildir::writeCache()
 {
   if (readOnly) return true;
 
diff --git a/src/maildir.cc b/src/maildir.cc
index 4452010..81a7d7c 100644
--- a/src/maildir.cc
+++ b/src/maildir.cc
@@ -39,7 +39,7 @@ using std::string;
 // Used to generate the unique names for Maildir delivery
 static int numDeliveries = 0;
 
-Maildir::iterator::iterator(void) {}
+Maildir::iterator::iterator() {}
 
 Maildir::iterator::iterator(Maildir *home,
                             MessageMap::iterator it,
@@ -77,19 +77,19 @@ Maildir::iterator &Maildir::iterator::operator=(const iterator &copy)
   return *this;
 }
 
-Maildir::iterator::~iterator(void) {}
+Maildir::iterator::~iterator() {}
 
-MaildirMessage &Maildir::iterator::curMessage(void)
+MaildirMessage &Maildir::iterator::curMessage()
 {
   return i->second;
 }
 
-Message &Maildir::iterator::operator*(void)
+Message &Maildir::iterator::operator*()
 {
   return curMessage();
 }
 
-void Maildir::iterator::operator++(void)
+void Maildir::iterator::operator++()
 {
   ++i;
   ++sqnr;
@@ -107,7 +107,7 @@ bool Maildir::iterator::operator!=(const BaseIterator &a) const
   return !((*this) == a);
 }
 
-void Maildir::iterator::reposition(void)
+void Maildir::iterator::reposition()
 {
   for (;;) {
     if (i == mailbox->messages.end()) break;
@@ -144,7 +144,7 @@ Mailbox::iterator Maildir::begin(const SequenceSet &bset, unsigned int mod) cons
   return Mailbox::iterator(beginIterator);
 }
 
-Mailbox::iterator Maildir::end(void) const
+Mailbox::iterator Maildir::end() const
 {
   endIterator = iterator(const_cast<Maildir *>(this),
                          messages.end(),
@@ -153,7 +153,7 @@ Mailbox::iterator Maildir::end(void) const
   return Mailbox::iterator(endIterator);
 }
 
-void Maildir::iterator::erase(void)
+void Maildir::iterator::erase()
 {
   MessageMap::iterator iter = i;
   ++iter;
@@ -166,7 +166,7 @@ void Maildir::iterator::erase(void)
   reposition();
 }
 
-Maildir::Maildir(void) : Mailbox()
+Maildir::Maildir() : Mailbox()
 {
   firstscan = true;
   cacheRead = false;
@@ -177,7 +177,7 @@ Maildir::Maildir(void) : Mailbox()
   oldexists = 0;
 }
 
-Maildir::~Maildir(void) {}
+Maildir::~Maildir() {}
 
 void Maildir::setPath(const string &path_in)
 {
@@ -251,7 +251,7 @@ bool Maildir::isMailbox(const std::string &s_in) const
           && (stat((s_in + "/tmp").c_str(), &mystat) == 0 && S_ISDIR(mystat.st_mode)));
 }
 
-const std::string Maildir::getTypeName(void) const
+const std::string Maildir::getTypeName() const
 {
   return "Maildir";
 }
@@ -423,7 +423,7 @@ bool Maildir::getStatus(const string &path, Status &s) const
   return true;
 }
 
-unsigned int Maildir::getMaxUid(void) const
+unsigned int Maildir::getMaxUid() const
 {
   MessageMap::const_iterator i = messages.end();
   if (i == messages.begin()) return 0;
@@ -442,7 +442,7 @@ unsigned int Maildir::getMaxUid(void) const
   return 0;
 }
 
-unsigned int Maildir::getMaxSqnr(void) const
+unsigned int Maildir::getMaxSqnr() const
 {
   int sqnr = messages.size();
   MessageMap::const_iterator i = messages.end();
@@ -463,12 +463,12 @@ unsigned int Maildir::getMaxSqnr(void) const
   return 0;
 }
 
-unsigned int Maildir::getUidValidity(void) const
+unsigned int Maildir::getUidValidity() const
 {
   return uidvalidity;
 }
 
-unsigned int Maildir::getUidNext(void) const
+unsigned int Maildir::getUidNext() const
 {
   return uidnext;
 }
@@ -615,7 +615,7 @@ bool Maildir::commitNewMessages(const string &mbox)
   return true;
 }
 
-bool Maildir::rollBackNewMessages(void)
+bool Maildir::rollBackNewMessages()
 {
   // Fixme: Messages that are in committedMessages should be skipped here.
   for (const auto &i : newMessages)
@@ -701,7 +701,7 @@ void Maildir::add(MaildirMessage &m)
   index.insert(m.getUnique(), m.getUID());
 }
 
-unsigned int MaildirIndex::getSize(void) const
+unsigned int MaildirIndex::getSize() const
 {
   return idx.size();
 }
@@ -734,18 +734,18 @@ MaildirIndexItem *MaildirIndex::find(const string &unique)
   return nullptr;
 }
 
-void MaildirIndex::clear(void)
+void MaildirIndex::clear()
 {
   idx.clear();
 }
 
-void MaildirIndex::clearUids(void)
+void MaildirIndex::clearUids()
 {
   for (auto &it : idx)
     it.second.uid = 0;
 }
 
-void MaildirIndex::clearFileNames(void)
+void MaildirIndex::clearFileNames()
 {
   for (auto &it : idx)
     it.second.fileName = "";
diff --git a/src/maildirmessage.cc b/src/maildirmessage.cc
index a2ebb57..0ebbad7 100644
--- a/src/maildirmessage.cc
+++ b/src/maildirmessage.cc
@@ -430,7 +430,7 @@ MaildirMessage::MaildirMessage(const MaildirMessage &copy)
   }
 }
 
-MaildirMessage::~MaildirMessage(void)
+MaildirMessage::~MaildirMessage()
 {
   delete customFlags;
 }
@@ -440,7 +440,7 @@ bool MaildirMessage::operator<(const MaildirMessage &a) const
   return uid < a.uid;
 }
 
-void MaildirMessage::close(void)
+void MaildirMessage::close()
 {
   if (fd != -1) {
     if ((internalFlags & WasWrittenTo) && fsync(fd) != 0 && errno != EINVAL && errno != EROFS)
@@ -477,37 +477,37 @@ void MaildirMessage::close(void)
   }
 }
 
-void MaildirMessage::setExpunged(void)
+void MaildirMessage::setExpunged()
 {
   internalFlags |= Expunged;
 }
 
-void MaildirMessage::setUnExpunged(void)
+void MaildirMessage::setUnExpunged()
 {
   internalFlags &= ~Expunged;
 }
 
-void MaildirMessage::setFlagsUnchanged(void)
+void MaildirMessage::setFlagsUnchanged()
 {
   internalFlags &= ~FlagsChanged;
 }
 
-bool MaildirMessage::hasFlagsChanged(void) const
+bool MaildirMessage::hasFlagsChanged() const
 {
   return (internalFlags & FlagsChanged) != 0;
 }
 
-unsigned char MaildirMessage::getStdFlags(void) const
+unsigned char MaildirMessage::getStdFlags() const
 {
   return stdflags;
 }
 
-bool MaildirMessage::isExpunged(void) const
+bool MaildirMessage::isExpunged() const
 {
   return (internalFlags & Expunged) != 0;
 }
 
-unsigned int MaildirMessage::getUID(void) const
+unsigned int MaildirMessage::getUID() const
 {
   return uid;
 }
@@ -522,12 +522,12 @@ unsigned int MaildirMessage::getSize(bool render) const
   return size;
 }
 
-const string &MaildirMessage::getUnique(void) const
+const string &MaildirMessage::getUnique() const
 {
   return unique;
 }
 
-time_t MaildirMessage::getInternalDate(void) const
+time_t MaildirMessage::getInternalDate() const
 {
   return internaldate;
 }
@@ -543,7 +543,7 @@ void MaildirMessage::setStdFlag(unsigned char f_in)
   stdflags |= f_in;
 }
 
-void MaildirMessage::resetStdFlags(void)
+void MaildirMessage::resetStdFlags()
 {
   internalFlags |= FlagsChanged;
   stdflags = F_NONE;
@@ -564,7 +564,7 @@ void MaildirMessage::setUnique(const string &s_in)
   unique = s_in;
 }
 
-int MaildirMessage::getFile(void) const
+int MaildirMessage::getFile() const
 {
   if (fd != -1) return fd;
 
@@ -615,12 +615,12 @@ void MaildirMessage::setSafeName(const string &name)
   safeName = name;
 }
 
-const string &MaildirMessage::getSafeName(void) const
+const string &MaildirMessage::getSafeName() const
 {
   return safeName;
 }
 
-string MaildirMessage::getFileName(void) const
+string MaildirMessage::getFileName() const
 {
   MaildirIndexItem *item = home.index.find(getUnique());
   if (!item) {
@@ -681,7 +681,7 @@ bool MaildirMessage::appendChunk(const string &chunk)
   return false;
 }
 
-bool MaildirMessage::parseFull(void) const
+bool MaildirMessage::parseFull() const
 {
   MaildirMessageCache &cache = MaildirMessageCache::getInstance();
   MaildirMessageCache::ParseStatus ps = cache.getStatus(this);
@@ -699,7 +699,7 @@ bool MaildirMessage::parseFull(void) const
   return true;
 }
 
-bool MaildirMessage::parseHeaders(void) const
+bool MaildirMessage::parseHeaders() const
 {
   MaildirMessageCache &cache = MaildirMessageCache::getInstance();
   MaildirMessageCache::ParseStatus ps = cache.getStatus(this);
@@ -726,7 +726,7 @@ bool MaildirMessage::printBodyStructure(bool extended) const
   return true;
 }
 
-bool MaildirMessage::printEnvelope(void) const
+bool MaildirMessage::printEnvelope() const
 {
   if (!parseFull()) return false;
 
@@ -933,14 +933,14 @@ const std::string &MaildirMessage::getHeader(const std::string &header)
   return hitem.getValue();
 }
 
-MaildirMessageCache::MaildirMessageCache(void) {}
+MaildirMessageCache::MaildirMessageCache() {}
 
-MaildirMessageCache::~MaildirMessageCache(void)
+MaildirMessageCache::~MaildirMessageCache()
 {
   clear();
 }
 
-MaildirMessageCache &MaildirMessageCache::getInstance(void)
+MaildirMessageCache &MaildirMessageCache::getInstance()
 {
   static MaildirMessageCache cache;
   return cache;
@@ -969,7 +969,7 @@ MaildirMessageCache::ParseStatus MaildirMessageCache::getStatus(const MaildirMes
   return statuses[m];
 }
 
-void MaildirMessageCache::clear(void)
+void MaildirMessageCache::clear()
 {
   for (std::deque<const MaildirMessage *>::iterator i = parsed.begin(); i != parsed.end(); ++i)
     parsed.clear();
@@ -996,7 +996,7 @@ void MaildirMessage::setInternalFlag(unsigned char f)
   internalFlags |= f;
 }
 
-unsigned char MaildirMessage::getInternalFlags(void) const
+unsigned char MaildirMessage::getInternalFlags() const
 {
   return internalFlags;
 }
@@ -1034,7 +1034,7 @@ void MaildirMessage::removeCustomFlag(const string &flag)
   }
 }
 
-void MaildirMessage::resetCustomFlags(void)
+void MaildirMessage::resetCustomFlags()
 {
   internalFlags |= FlagsChanged | CustomFlagsChanged;
 
@@ -1042,7 +1042,7 @@ void MaildirMessage::resetCustomFlags(void)
   customFlags = nullptr;
 }
 
-vector<string> MaildirMessage::getCustomFlags(void) const
+vector<string> MaildirMessage::getCustomFlags() const
 {
   if (!customFlags) return vector<string>();
 
diff --git a/src/mime.cc b/src/mime.cc
index 6a4817e..accaee6 100644
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -22,15 +22,15 @@
 
 using std::string;
 
-Binc::MimeDocument::MimeDocument(void) : MimePart()
+Binc::MimeDocument::MimeDocument() : MimePart()
 {
   allIsParsed = false;
   headerIsParsed = false;
 }
 
-Binc::MimeDocument::~MimeDocument(void) {}
+Binc::MimeDocument::~MimeDocument() {}
 
-void Binc::MimeDocument::clear(void) const
+void Binc::MimeDocument::clear() const
 {
   members.clear();
   h.clear();
@@ -38,13 +38,13 @@ void Binc::MimeDocument::clear(void) const
   allIsParsed = false;
 }
 
-void Binc::MimePart::clear(void) const
+void Binc::MimePart::clear() const
 {
   members.clear();
   h.clear();
 }
 
-Binc::MimePart::MimePart(void)
+Binc::MimePart::MimePart()
 {
   size = 0;
   messagerfc822 = false;
@@ -54,9 +54,9 @@ Binc::MimePart::MimePart(void)
   nbodylines = 0;
 }
 
-Binc::MimePart::~MimePart(void) {}
+Binc::MimePart::~MimePart() {}
 
-Binc::HeaderItem::HeaderItem(void) {}
+Binc::HeaderItem::HeaderItem() {}
 
 Binc::HeaderItem::HeaderItem(const string &key, const string &value)
 {
@@ -64,9 +64,9 @@ Binc::HeaderItem::HeaderItem(const string &key, const string &value)
   this->value = value;
 }
 
-Binc::Header::Header(void) {}
+Binc::Header::Header() {}
 
-Binc::Header::~Header(void) {}
+Binc::Header::~Header() {}
 
 bool Binc::Header::getFirstHeader(const string &key, HeaderItem &dest) const
 {
@@ -99,7 +99,7 @@ bool Binc::Header::getAllHeaders(const string &key, std::vector<HeaderItem> &des
   return (dest.size() != 0);
 }
 
-void Binc::Header::clear(void) const
+void Binc::Header::clear() const
 {
   content.clear();
 }
diff --git a/src/multilogdevice.cc b/src/multilogdevice.cc
index ea567ff..7531797 100644
--- a/src/multilogdevice.cc
+++ b/src/multilogdevice.cc
@@ -20,14 +20,14 @@ using namespace Binc;
 
 MultilogDevice::MultilogDevice(int f) : IODevice(f) {}
 
-MultilogDevice::~MultilogDevice(void) {}
+MultilogDevice::~MultilogDevice() {}
 
-std::string MultilogDevice::service(void) const
+std::string MultilogDevice::service() const
 {
   return "log";
 }
 
-bool MultilogDevice::waitForWrite(void) const
+bool MultilogDevice::waitForWrite() const
 {
   fd_set writeMask;
   FD_ZERO(&writeMask);
@@ -46,12 +46,12 @@ bool MultilogDevice::waitForWrite(void) const
   return result > 0;
 }
 
-bool MultilogDevice::waitForRead(void) const
+bool MultilogDevice::waitForRead() const
 {
   return false;
 }
 
-IODevice::WriteResult MultilogDevice::write(void)
+IODevice::WriteResult MultilogDevice::write()
 {
   for (;;) {
     ssize_t wrote = ::write(fileno(stderr),
@@ -75,7 +75,7 @@ IODevice::WriteResult MultilogDevice::write(void)
   }
 }
 
-bool MultilogDevice::fillInputBuffer(void)
+bool MultilogDevice::fillInputBuffer()
 {
   return false;
 }
diff --git a/src/operator-append.cc b/src/operator-append.cc
index 27cbfba..9463723 100644
--- a/src/operator-append.cc
+++ b/src/operator-append.cc
@@ -22,16 +22,16 @@
 using namespace Binc;
 using std::string;
 
-AppendOperator::AppendOperator(void) {}
+AppendOperator::AppendOperator() {}
 
-AppendOperator::~AppendOperator(void) {}
+AppendOperator::~AppendOperator() {}
 
-const string AppendOperator::getName(void) const
+const string AppendOperator::getName() const
 {
   return "APPEND";
 }
 
-int AppendOperator::getState(void) const
+int AppendOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-authenticate.cc b/src/operator-authenticate.cc
index 9add74c..045b008 100644
--- a/src/operator-authenticate.cc
+++ b/src/operator-authenticate.cc
@@ -23,16 +23,16 @@ using namespace Binc;
 using std::endl;
 using std::string;
 
-AuthenticateOperator::AuthenticateOperator(void) {}
+AuthenticateOperator::AuthenticateOperator() {}
 
-AuthenticateOperator::~AuthenticateOperator(void) {}
+AuthenticateOperator::~AuthenticateOperator() {}
 
-const string AuthenticateOperator::getName(void) const
+const string AuthenticateOperator::getName() const
 {
   return "AUTHENTICATE";
 }
 
-int AuthenticateOperator::getState(void) const
+int AuthenticateOperator::getState() const
 {
   return Session::NONAUTHENTICATED;
 }
diff --git a/src/operator-capability.cc b/src/operator-capability.cc
index 6be3e79..eff7e5a 100644
--- a/src/operator-capability.cc
+++ b/src/operator-capability.cc
@@ -18,16 +18,16 @@
 using namespace Binc;
 using std::string;
 
-CapabilityOperator::CapabilityOperator(void) {}
+CapabilityOperator::CapabilityOperator() {}
 
-CapabilityOperator::~CapabilityOperator(void) {}
+CapabilityOperator::~CapabilityOperator() {}
 
-const string CapabilityOperator::getName(void) const
+const string CapabilityOperator::getName() const
 {
   return "CAPABILITY";
 }
 
-int CapabilityOperator::getState(void) const
+int CapabilityOperator::getState() const
 {
   return Session::NONAUTHENTICATED | Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-check.cc b/src/operator-check.cc
index 110ce9c..260487e 100644
--- a/src/operator-check.cc
+++ b/src/operator-check.cc
@@ -16,16 +16,16 @@
 
 using namespace Binc;
 
-CheckOperator::CheckOperator(void) {}
+CheckOperator::CheckOperator() {}
 
-CheckOperator::~CheckOperator(void) {}
+CheckOperator::~CheckOperator() {}
 
-const std::string CheckOperator::getName(void) const
+const std::string CheckOperator::getName() const
 {
   return "CHECK";
 }
 
-int CheckOperator::getState(void) const
+int CheckOperator::getState() const
 {
   return Session::SELECTED;
 }
diff --git a/src/operator-close.cc b/src/operator-close.cc
index 2727e25..322dea1 100644
--- a/src/operator-close.cc
+++ b/src/operator-close.cc
@@ -15,16 +15,16 @@
 
 using namespace Binc;
 
-CloseOperator::CloseOperator(void) {}
+CloseOperator::CloseOperator() {}
 
-CloseOperator::~CloseOperator(void) {}
+CloseOperator::~CloseOperator() {}
 
-const std::string CloseOperator::getName(void) const
+const std::string CloseOperator::getName() const
 {
   return "CLOSE";
 }
 
-int CloseOperator::getState(void) const
+int CloseOperator::getState() const
 {
   return Session::SELECTED;
 }
diff --git a/src/operator-copy.cc b/src/operator-copy.cc
index 6f91349..06204b2 100644
--- a/src/operator-copy.cc
+++ b/src/operator-copy.cc
@@ -19,16 +19,16 @@
 using namespace Binc;
 using std::string;
 
-CopyOperator::CopyOperator(void) {}
+CopyOperator::CopyOperator() {}
 
-CopyOperator::~CopyOperator(void) {}
+CopyOperator::~CopyOperator() {}
 
-const string CopyOperator::getName(void) const
+const string CopyOperator::getName() const
 {
   return "COPY";
 }
 
-int CopyOperator::getState(void) const
+int CopyOperator::getState() const
 {
   return Session::SELECTED;
 }
diff --git a/src/operator-create.cc b/src/operator-create.cc
index 22fd37e..4269c7a 100644
--- a/src/operator-create.cc
+++ b/src/operator-create.cc
@@ -17,16 +17,16 @@
 
 using namespace Binc;
 
-CreateOperator::CreateOperator(void) {}
+CreateOperator::CreateOperator() {}
 
-CreateOperator::~CreateOperator(void) {}
+CreateOperator::~CreateOperator() {}
 
-const std::string CreateOperator::getName(void) const
+const std::string CreateOperator::getName() const
 {
   return "CREATE";
 }
 
-int CreateOperator::getState(void) const
+int CreateOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-delete.cc b/src/operator-delete.cc
index 00d7ecb..fb7ff4d 100644
--- a/src/operator-delete.cc
+++ b/src/operator-delete.cc
@@ -17,16 +17,16 @@
 
 using namespace Binc;
 
-DeleteOperator::DeleteOperator(void) {}
+DeleteOperator::DeleteOperator() {}
 
-DeleteOperator::~DeleteOperator(void) {}
+DeleteOperator::~DeleteOperator() {}
 
-const std::string DeleteOperator::getName(void) const
+const std::string DeleteOperator::getName() const
 {
   return "DELETE";
 }
 
-int DeleteOperator::getState(void) const
+int DeleteOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-examine.cc b/src/operator-examine.cc
index ceb1ec6..1d472c6 100644
--- a/src/operator-examine.cc
+++ b/src/operator-examine.cc
@@ -9,11 +9,11 @@
 
 using namespace Binc;
 
-const std::string ExamineOperator::getName(void) const
+const std::string ExamineOperator::getName() const
 {
   return "EXAMINE";
 }
 
-ExamineOperator::ExamineOperator(void) {}
+ExamineOperator::ExamineOperator() {}
 
-ExamineOperator::~ExamineOperator(void) {}
+ExamineOperator::~ExamineOperator() {}
diff --git a/src/operator-expunge.cc b/src/operator-expunge.cc
index 2416417..c987543 100644
--- a/src/operator-expunge.cc
+++ b/src/operator-expunge.cc
@@ -17,16 +17,16 @@
 
 using namespace Binc;
 
-ExpungeOperator::ExpungeOperator(void) {}
+ExpungeOperator::ExpungeOperator() {}
 
-ExpungeOperator::~ExpungeOperator(void) {}
+ExpungeOperator::~ExpungeOperator() {}
 
-const std::string ExpungeOperator::getName(void) const
+const std::string ExpungeOperator::getName() const
 {
   return "EXPUNGE";
 }
 
-int ExpungeOperator::getState(void) const
+int ExpungeOperator::getState() const
 {
   return Session::SELECTED;
 }
diff --git a/src/operator-fetch.cc b/src/operator-fetch.cc
index d0e2e6a..be6cbba 100644
--- a/src/operator-fetch.cc
+++ b/src/operator-fetch.cc
@@ -53,16 +53,16 @@ namespace {
 
 }
 
-FetchOperator::FetchOperator(void) {}
+FetchOperator::FetchOperator() {}
 
-FetchOperator::~FetchOperator(void) {}
+FetchOperator::~FetchOperator() {}
 
-const string FetchOperator::getName(void) const
+const string FetchOperator::getName() const
 {
   return "FETCH";
 }
 
-int FetchOperator::getState(void) const
+int FetchOperator::getState() const
 {
   return Session::SELECTED;
 }
diff --git a/src/operator-id.cc b/src/operator-id.cc
index 3a6fd49..db5b79b 100644
--- a/src/operator-id.cc
+++ b/src/operator-id.cc
@@ -18,16 +18,16 @@
 
 using namespace Binc;
 
-IdOperator::IdOperator(void) {}
+IdOperator::IdOperator() {}
 
-IdOperator::~IdOperator(void) {}
+IdOperator::~IdOperator() {}
 
-const std::string IdOperator::getName(void) const
+const std::string IdOperator::getName() const
 {
   return "ID";
 }
 
-int IdOperator::getState(void) const
+int IdOperator::getState() const
 {
   return Session::NONAUTHENTICATED | Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-idle.cc b/src/operator-idle.cc
index a278139..7c5ce40 100644
--- a/src/operator-idle.cc
+++ b/src/operator-idle.cc
@@ -48,16 +48,16 @@ static const int POLLTIMEOUT = 30 * 60;
 static const int POLLTIMEOUT = 30;
 #endif
 
-IdleOperator::IdleOperator(void) {}
+IdleOperator::IdleOperator() {}
 
-IdleOperator::~IdleOperator(void) {}
+IdleOperator::~IdleOperator() {}
 
-const std::string IdleOperator::getName(void) const
+const std::string IdleOperator::getName() const
 {
   return "IDLE";
 }
 
-int IdleOperator::getState(void) const
+int IdleOperator::getState() const
 {
   return Session::SELECTED;
 }
@@ -91,7 +91,7 @@ Operator::ProcessResult IdleOperator::process(Depot &depot, Request &command)
   // when not using FNOTIFY, we need to check the session timeout.
   time_t startTime = time(nullptr);
 #ifdef HAVE_FNOTIFY
-  (void)startTime;  // removes a compile warning
+  ()startTime;  // removes a compile warning
 #endif
 
   bincClient << "+ idling" << endl;
diff --git a/src/operator-list.cc b/src/operator-list.cc
index 7e65a11..25934fa 100644
--- a/src/operator-list.cc
+++ b/src/operator-list.cc
@@ -27,19 +27,19 @@ namespace {
   const time_t LIST_CACHE_TIMEOUT = 10;
 }
 
-ListOperator::ListOperator(void)
+ListOperator::ListOperator()
 {
   cacheTimeout = 0;
 }
 
-ListOperator::~ListOperator(void) {}
+ListOperator::~ListOperator() {}
 
-const string ListOperator::getName(void) const
+const string ListOperator::getName() const
 {
   return "LIST";
 }
 
-int ListOperator::getState(void) const
+int ListOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-login.cc b/src/operator-login.cc
index bc9efcb..db091aa 100644
--- a/src/operator-login.cc
+++ b/src/operator-login.cc
@@ -25,16 +25,16 @@
 
 using namespace Binc;
 
-LoginOperator::LoginOperator(void) {}
+LoginOperator::LoginOperator() {}
 
-LoginOperator::~LoginOperator(void) {}
+LoginOperator::~LoginOperator() {}
 
-const std::string LoginOperator::getName(void) const
+const std::string LoginOperator::getName() const
 {
   return "LOGIN";
 }
 
-int LoginOperator::getState(void) const
+int LoginOperator::getState() const
 {
   return Session::NONAUTHENTICATED;
 }
diff --git a/src/operator-logout.cc b/src/operator-logout.cc
index 67458f3..af40b72 100644
--- a/src/operator-logout.cc
+++ b/src/operator-logout.cc
@@ -19,16 +19,16 @@
 
 using namespace Binc;
 
-LogoutOperator::LogoutOperator(void) {}
+LogoutOperator::LogoutOperator() {}
 
-LogoutOperator::~LogoutOperator(void) {}
+LogoutOperator::~LogoutOperator() {}
 
-const std::string LogoutOperator::getName(void) const
+const std::string LogoutOperator::getName() const
 {
   return "LOGOUT";
 }
 
-int LogoutOperator::getState(void) const
+int LogoutOperator::getState() const
 {
   return Session::NONAUTHENTICATED | Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-lsub.cc b/src/operator-lsub.cc
index 7648586..375ffcc 100644
--- a/src/operator-lsub.cc
+++ b/src/operator-lsub.cc
@@ -31,16 +31,16 @@ using namespace Binc;
 using std::multimap;
 using std::string;
 
-LsubOperator::LsubOperator(void) {}
+LsubOperator::LsubOperator() {}
 
-LsubOperator::~LsubOperator(void) {}
+LsubOperator::~LsubOperator() {}
 
-const string LsubOperator::getName(void) const
+const string LsubOperator::getName() const
 {
   return "LSUB";
 }
 
-int LsubOperator::getState(void) const
+int LsubOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-namespace.cc b/src/operator-namespace.cc
index 96a3ee8..a331420 100644
--- a/src/operator-namespace.cc
+++ b/src/operator-namespace.cc
@@ -17,16 +17,16 @@
 
 using namespace Binc;
 
-NamespaceOperator::NamespaceOperator(void) {}
+NamespaceOperator::NamespaceOperator() {}
 
-NamespaceOperator::~NamespaceOperator(void) {}
+NamespaceOperator::~NamespaceOperator() {}
 
-const std::string NamespaceOperator::getName(void) const
+const std::string NamespaceOperator::getName() const
 {
   return "NAMESPACE";
 }
 
-int NamespaceOperator::getState(void) const
+int NamespaceOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-noop-pending.cc b/src/operator-noop-pending.cc
index b13fdc1..9104275 100644
--- a/src/operator-noop-pending.cc
+++ b/src/operator-noop-pending.cc
@@ -17,9 +17,9 @@
 
 using namespace Binc;
 
-NoopPendingOperator::NoopPendingOperator(void) : NoopOperator() {}
+NoopPendingOperator::NoopPendingOperator() : NoopOperator() {}
 
-NoopPendingOperator::~NoopPendingOperator(void) {}
+NoopPendingOperator::~NoopPendingOperator() {}
 
 Operator::ProcessResult NoopPendingOperator::process(Depot &depot, Request &command)
 {
diff --git a/src/operator-noop.cc b/src/operator-noop.cc
index bc73a10..77d2d9d 100644
--- a/src/operator-noop.cc
+++ b/src/operator-noop.cc
@@ -15,16 +15,16 @@
 
 using namespace Binc;
 
-NoopOperator::NoopOperator(void) {}
+NoopOperator::NoopOperator() {}
 
-NoopOperator::~NoopOperator(void) {}
+NoopOperator::~NoopOperator() {}
 
-const std::string NoopOperator::getName(void) const
+const std::string NoopOperator::getName() const
 {
   return "NOOP";
 }
 
-int NoopOperator::getState(void) const
+int NoopOperator::getState() const
 {
   return Session::NONAUTHENTICATED | Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-rename.cc b/src/operator-rename.cc
index 1d3a69a..c6c01f6 100644
--- a/src/operator-rename.cc
+++ b/src/operator-rename.cc
@@ -20,16 +20,16 @@
 using namespace Binc;
 using std::string;
 
-RenameOperator::RenameOperator(void) {}
+RenameOperator::RenameOperator() {}
 
-RenameOperator::~RenameOperator(void) {}
+RenameOperator::~RenameOperator() {}
 
-const string RenameOperator::getName(void) const
+const string RenameOperator::getName() const
 {
   return "RENAME";
 }
 
-int RenameOperator::getState(void) const
+int RenameOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-search.cc b/src/operator-search.cc
index 30b6ea2..c013e70 100644
--- a/src/operator-search.cc
+++ b/src/operator-search.cc
@@ -85,14 +85,14 @@ bool SearchOperator::SearchNode::convertDateHeader(const string &d_in, time_t &t
   return result;
 }
 
-SearchOperator::SearchNode::SearchNode(void) {}
+SearchOperator::SearchNode::SearchNode() {}
 
 SearchOperator::SearchNode::SearchNode(const BincImapParserSearchKey &a)
 {
   init(a);
 }
 
-int SearchOperator::SearchNode::getType(void) const
+int SearchOperator::SearchNode::getType() const
 {
   return type;
 }
@@ -459,7 +459,7 @@ void SearchOperator::SearchNode::init(const BincImapParserSearchKey &a)
   }
 }
 
-int SearchOperator::SearchNode::getWeight(void) const
+int SearchOperator::SearchNode::getWeight() const
 {
   return weight;
 }
@@ -469,23 +469,23 @@ void SearchOperator::SearchNode::setWeight(int i)
   weight = i;
 }
 
-void SearchOperator::SearchNode::order(void)
+void SearchOperator::SearchNode::order()
 {
   for (auto &i : children)
     i.order();
   stable_sort(children.begin(), children.end(), compareNodes);
 }
 
-SearchOperator::SearchOperator(void) {}
+SearchOperator::SearchOperator() {}
 
-SearchOperator::~SearchOperator(void) {}
+SearchOperator::~SearchOperator() {}
 
-const string SearchOperator::getName(void) const
+const string SearchOperator::getName() const
 {
   return "SEARCH";
 }
 
-int SearchOperator::getState(void) const
+int SearchOperator::getState() const
 {
   return Session::SELECTED;
 }
diff --git a/src/operator-select.cc b/src/operator-select.cc
index d0a48bf..de16e5e 100644
--- a/src/operator-select.cc
+++ b/src/operator-select.cc
@@ -21,16 +21,16 @@ using namespace Binc;
 using std::endl;
 using std::string;
 
-SelectOperator::SelectOperator(void) {}
+SelectOperator::SelectOperator() {}
 
-SelectOperator::~SelectOperator(void) {}
+SelectOperator::~SelectOperator() {}
 
-const string SelectOperator::getName(void) const
+const string SelectOperator::getName() const
 {
   return "SELECT";
 }
 
-int SelectOperator::getState(void) const
+int SelectOperator::getState() const
 {
   return Session::NONAUTHENTICATED | Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-starttls.cc b/src/operator-starttls.cc
index c127e1a..4f68285 100644
--- a/src/operator-starttls.cc
+++ b/src/operator-starttls.cc
@@ -20,21 +20,21 @@
 
 using namespace Binc;
 
-StarttlsOperator::StarttlsOperator(void) {}
+StarttlsOperator::StarttlsOperator() {}
 
-StarttlsOperator::~StarttlsOperator(void) {}
+StarttlsOperator::~StarttlsOperator() {}
 
-const std::string StarttlsOperator::getName(void) const
+const std::string StarttlsOperator::getName() const
 {
   return "STARTTLS";
 }
 
-int StarttlsOperator::getState(void) const
+int StarttlsOperator::getState() const
 {
   return Session::NONAUTHENTICATED | Session::AUTHENTICATED | Session::SELECTED;
 }
 
-int StarttlsOperator::goStartTLS(void) const
+int StarttlsOperator::goStartTLS() const
 {
   Session &session = Session::getInstance();
 
diff --git a/src/operator-status.cc b/src/operator-status.cc
index 2422747..0cc5341 100644
--- a/src/operator-status.cc
+++ b/src/operator-status.cc
@@ -24,16 +24,16 @@
 
 using namespace Binc;
 
-StatusOperator::StatusOperator(void) {}
+StatusOperator::StatusOperator() {}
 
-StatusOperator::~StatusOperator(void) {}
+StatusOperator::~StatusOperator() {}
 
-const std::string StatusOperator::getName(void) const
+const std::string StatusOperator::getName() const
 {
   return "STATUS";
 }
 
-int StatusOperator::getState(void) const
+int StatusOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-store.cc b/src/operator-store.cc
index 160002a..4c5b9d4 100644
--- a/src/operator-store.cc
+++ b/src/operator-store.cc
@@ -20,16 +20,16 @@ using namespace Binc;
 using std::string;
 using std::vector;
 
-StoreOperator::StoreOperator(void) {}
+StoreOperator::StoreOperator() {}
 
-StoreOperator::~StoreOperator(void) {}
+StoreOperator::~StoreOperator() {}
 
-const string StoreOperator::getName(void) const
+const string StoreOperator::getName() const
 {
   return "STORE";
 }
 
-int StoreOperator::getState(void) const
+int StoreOperator::getState() const
 {
   return Session::SELECTED;
 }
diff --git a/src/operator-subscribe.cc b/src/operator-subscribe.cc
index 2a7ca51..b05590b 100644
--- a/src/operator-subscribe.cc
+++ b/src/operator-subscribe.cc
@@ -19,16 +19,16 @@
 using namespace Binc;
 using std::string;
 
-SubscribeOperator::SubscribeOperator(void) {}
+SubscribeOperator::SubscribeOperator() {}
 
-SubscribeOperator::~SubscribeOperator(void) {}
+SubscribeOperator::~SubscribeOperator() {}
 
-const string SubscribeOperator::getName(void) const
+const string SubscribeOperator::getName() const
 {
   return "SUBSCRIBE";
 }
 
-int SubscribeOperator::getState(void) const
+int SubscribeOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/operator-unsubscribe.cc b/src/operator-unsubscribe.cc
index b4a197e..34b12a0 100644
--- a/src/operator-unsubscribe.cc
+++ b/src/operator-unsubscribe.cc
@@ -20,16 +20,16 @@
 using namespace Binc;
 using std::string;
 
-UnsubscribeOperator::UnsubscribeOperator(void) {}
+UnsubscribeOperator::UnsubscribeOperator() {}
 
-UnsubscribeOperator::~UnsubscribeOperator(void) {}
+UnsubscribeOperator::~UnsubscribeOperator() {}
 
-const string UnsubscribeOperator::getName(void) const
+const string UnsubscribeOperator::getName() const
 {
   return "UNSUBSCRIBE";
 }
 
-int UnsubscribeOperator::getState(void) const
+int UnsubscribeOperator::getState() const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
diff --git a/src/pendingupdates.cc b/src/pendingupdates.cc
index 402a75b..23a6aeb 100644
--- a/src/pendingupdates.cc
+++ b/src/pendingupdates.cc
@@ -20,7 +20,7 @@
 using namespace std;
 using namespace Binc;
 
-PendingUpdates::PendingUpdates(void) : expunges(), flagupdates()
+PendingUpdates::PendingUpdates() : expunges(), flagupdates()
 {
   recent = 0;
   exists = 0;
@@ -29,7 +29,7 @@ PendingUpdates::PendingUpdates(void) : expunges(), flagupdates()
   newexists = false;
 }
 
-PendingUpdates::~PendingUpdates(void) {}
+PendingUpdates::~PendingUpdates() {}
 
 void PendingUpdates::addExpunged(unsigned int uid)
 {
@@ -58,39 +58,39 @@ void PendingUpdates::setRecent(unsigned int n)
   newrecent = true;
 }
 
-unsigned int PendingUpdates::getExists(void) const
+unsigned int PendingUpdates::getExists() const
 {
   return exists;
 }
 
-unsigned int PendingUpdates::getRecent(void) const
+unsigned int PendingUpdates::getRecent() const
 {
   return recent;
 }
 
-bool PendingUpdates::newExists(void) const
+bool PendingUpdates::newExists() const
 {
   return newexists;
 }
 
-bool PendingUpdates::newRecent(void) const
+bool PendingUpdates::newRecent() const
 {
   return newrecent;
 }
 
-PendingUpdates::expunged_const_iterator::expunged_const_iterator(void) {}
+PendingUpdates::expunged_const_iterator::expunged_const_iterator() {}
 
 PendingUpdates::expunged_const_iterator::expunged_const_iterator(
     vector<unsigned int>::iterator i)
   : internal(i)
 {}
 
-unsigned int PendingUpdates::expunged_const_iterator::operator*(void) const
+unsigned int PendingUpdates::expunged_const_iterator::operator*() const
 {
   return *internal;
 }
 
-void PendingUpdates::expunged_const_iterator::operator++(void)
+void PendingUpdates::expunged_const_iterator::operator++()
 {
   ++internal;
 }
@@ -105,17 +105,17 @@ bool PendingUpdates::expunged_const_iterator::operator!=(expunged_const_iterator
   return internal != i.internal;
 }
 
-PendingUpdates::expunged_const_iterator PendingUpdates::beginExpunged(void)
+PendingUpdates::expunged_const_iterator PendingUpdates::beginExpunged()
 {
   return expunged_const_iterator(expunges.begin());
 }
 
-PendingUpdates::expunged_const_iterator PendingUpdates::endExpunged(void)
+PendingUpdates::expunged_const_iterator PendingUpdates::endExpunged()
 {
   return expunged_const_iterator(expunges.end());
 }
 
-PendingUpdates::flagupdates_const_iterator::flagupdates_const_iterator(void) {}
+PendingUpdates::flagupdates_const_iterator::flagupdates_const_iterator() {}
 
 PendingUpdates::flagupdates_const_iterator::flagupdates_const_iterator(
     map<unsigned int, unsigned int>::iterator i,
@@ -127,7 +127,7 @@ PendingUpdates::flagupdates_const_iterator::flagupdates_const_iterator(
   sqnrtouid = sqnrmap;
 }
 
-void PendingUpdates::flagupdates_const_iterator::operator++(void)
+void PendingUpdates::flagupdates_const_iterator::operator++()
 {
   ++internal;
 }
@@ -137,32 +137,32 @@ bool PendingUpdates::flagupdates_const_iterator::operator!=(flagupdates_const_it
   return internal != i.internal;
 }
 
-PendingUpdates::flagupdates_const_iterator PendingUpdates::beginFlagUpdates(void)
+PendingUpdates::flagupdates_const_iterator PendingUpdates::beginFlagUpdates()
 {
   return flagupdates_const_iterator(flagupdates.begin(), &sqnrtocflags, &sqnrtouid);
 }
 
-PendingUpdates::flagupdates_const_iterator PendingUpdates::endFlagUpdates(void)
+PendingUpdates::flagupdates_const_iterator PendingUpdates::endFlagUpdates()
 {
   return flagupdates_const_iterator(flagupdates.end(), &sqnrtocflags, &sqnrtouid);
 }
 
-unsigned int PendingUpdates::flagupdates_const_iterator::first(void) const
+unsigned int PendingUpdates::flagupdates_const_iterator::first() const
 {
   return internal->first;
 }
 
-unsigned int PendingUpdates::flagupdates_const_iterator::second(void) const
+unsigned int PendingUpdates::flagupdates_const_iterator::second() const
 {
   return internal->second;
 }
 
-vector<string> PendingUpdates::flagupdates_const_iterator::getCustomFlags(void) const
+vector<string> PendingUpdates::flagupdates_const_iterator::getCustomFlags() const
 {
   return (*sqnrtocflags)[internal->first];
 }
 
-unsigned int PendingUpdates::flagupdates_const_iterator::getUID(void) const
+unsigned int PendingUpdates::flagupdates_const_iterator::getUID() const
 {
   return (*sqnrtouid)[internal->first];
 }
diff --git a/src/recursivedescent.cc b/src/recursivedescent.cc
index de7aa39..68cd0e0 100644
--- a/src/recursivedescent.cc
+++ b/src/recursivedescent.cc
@@ -515,7 +515,7 @@ Operator::ParseResult Binc::expectDate(string &s_in)
   return Operator::ACCEPT;
 }
 
-Operator::ParseResult Binc::expectCRLF(void)
+Operator::ParseResult Binc::expectCRLF()
 {
   Operator::ParseResult res;
   if ((res = expectCR()) == Operator::ACCEPT && (res = expectLF()) == Operator::ACCEPT)
@@ -524,7 +524,7 @@ Operator::ParseResult Binc::expectCRLF(void)
     return res;
 }
 
-Operator::ParseResult Binc::expectCR(void)
+Operator::ParseResult Binc::expectCR()
 {
   Session &session = Session::getInstance();
 
@@ -544,7 +544,7 @@ Operator::ParseResult Binc::expectCR(void)
   }
 }
 
-Operator::ParseResult Binc::expectLF(void)
+Operator::ParseResult Binc::expectLF()
 {
   Session &session = Session::getInstance();
 
@@ -712,7 +712,7 @@ Operator::ParseResult Binc::expectTag(string &s_in)
   return Operator::ACCEPT;
 }
 
-Operator::ParseResult Binc::expectSPACE(void)
+Operator::ParseResult Binc::expectSPACE()
 {
   Session &session = Session::getInstance();
 
diff --git a/src/session.cc b/src/session.cc
index 41192cb..aa09abe 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -21,7 +21,7 @@ using std::string;
 
 extern char **environ;
 
-Session::Session(void)
+Session::Session()
 {
   readbytes = 0;
   writebytes = 0;
@@ -31,13 +31,13 @@ Session::Session(void)
   logfacility = LOG_DAEMON;
 }
 
-Session &Session::getInstance(void)
+Session &Session::getInstance()
 {
   static Session session;
   return session;
 }
 
-int Session::getState(void) const
+int Session::getState() const
 {
   return state;
 }
@@ -47,7 +47,7 @@ void Session::setState(int n)
   state = n;
 }
 
-const string &Session::getUserID(void) const
+const string &Session::getUserID() const
 {
   return userid;
 }
@@ -57,7 +57,7 @@ void Session::setUserID(const string &s)
   userid = s;
 }
 
-const string &Session::getIP(void) const
+const string &Session::getIP() const
 {
   return ip;
 }
@@ -72,17 +72,17 @@ void Session::setLogFacility(int facility)
   logfacility = facility;
 }
 
-int Session::getLogFacility(void) const
+int Session::getLogFacility() const
 {
   return logfacility;
 }
 
-void Session::addBody(void)
+void Session::addBody()
 {
   ++bodies;
 }
 
-void Session::addStatement(void)
+void Session::addStatement()
 {
   ++statements;
 }
@@ -97,22 +97,22 @@ void Session::addWriteBytes(int i)
   writebytes += i;
 }
 
-int Session::getBodies(void) const
+int Session::getBodies() const
 {
   return bodies;
 }
 
-int Session::getStatements(void) const
+int Session::getStatements() const
 {
   return statements;
 }
 
-int Session::getWriteBytes(void) const
+int Session::getWriteBytes() const
 {
   return writebytes;
 }
 
-int Session::getReadBytes(void) const
+int Session::getReadBytes() const
 {
   return readbytes;
 }
@@ -140,7 +140,7 @@ bool Session::parseCommandLine(int argc, char *argv[])
   return true;
 }
 
-void Session::assignCommandLineArgs(void)
+void Session::assignCommandLineArgs()
 {
   if (args.hasArg("allow-plain")) setEnv("ALLOW_NONSSL_PLAINTEXT_LOGINS", "yes");
 
@@ -153,7 +153,7 @@ void Session::assignCommandLineArgs(void)
   if (args.hasArg("delimiter")) setEnv("DELIMITER", args["delimiter"]);
 }
 
-const string &Session::getLastError(void) const
+const string &Session::getLastError() const
 {
   return lastError;
 }
@@ -163,7 +163,7 @@ void Session::setLastError(const string &error) const
   lastError = error;
 }
 
-const string &Session::getResponseCode(void) const
+const string &Session::getResponseCode() const
 {
   return responseCode;
 }
@@ -173,12 +173,12 @@ void Session::setResponseCode(const string &code) const
   responseCode = "[" + code + "] ";
 }
 
-void Session::clearResponseCode(void) const
+void Session::clearResponseCode() const
 {
   responseCode = "";
 }
 
-pid_t Session::getPid(void)
+pid_t Session::getPid()
 {
   if (pid == 0) pid = getpid();
 
diff --git a/src/status.cc b/src/status.cc
index 341c04f..657367b 100644
--- a/src/status.cc
+++ b/src/status.cc
@@ -9,6 +9,6 @@
 
 using namespace Binc;
 
-Status::Status(void) {}
+Status::Status() {}
 
-Status::~Status(void) {}
+Status::~Status() {}
diff --git a/src/stdiodevice.cc b/src/stdiodevice.cc
index 411bdc5..919e92c 100644
--- a/src/stdiodevice.cc
+++ b/src/stdiodevice.cc
@@ -21,20 +21,20 @@ using namespace Binc;
 
 StdIODevice::StdIODevice(int f) : IODevice(f) {}
 
-StdIODevice::~StdIODevice(void) {}
+StdIODevice::~StdIODevice() {}
 
-std::string StdIODevice::service(void) const
+std::string StdIODevice::service() const
 {
   return "client";
 }
 
-bool StdIODevice::canRead(void) const
+bool StdIODevice::canRead() const
 {
   size_t bytes;
   return ioctl(fileno(stdin), FIONREAD, (char *)&bytes) > 0;
 }
 
-bool StdIODevice::waitForWrite(void) const
+bool StdIODevice::waitForWrite() const
 {
   fd_set writeMask;
   FD_ZERO(&writeMask);
@@ -53,7 +53,7 @@ bool StdIODevice::waitForWrite(void) const
   return result > 0;
 }
 
-bool StdIODevice::waitForRead(void) const
+bool StdIODevice::waitForRead() const
 {
   fd_set readMask;
   FD_ZERO(&readMask);
@@ -68,7 +68,7 @@ bool StdIODevice::waitForRead(void) const
   return result > 0;
 }
 
-IODevice::WriteResult StdIODevice::write(void)
+IODevice::WriteResult StdIODevice::write()
 {
   for (;;) {
     ssize_t wrote = ::write(fileno(stdout),
@@ -89,7 +89,7 @@ IODevice::WriteResult StdIODevice::write(void)
   }
 }
 
-bool StdIODevice::fillInputBuffer(void)
+bool StdIODevice::fillInputBuffer()
 {
   if (!waitForRead()) return false;
 
diff --git a/src/syslogdevice.cc b/src/syslogdevice.cc
index 49162a4..f5ec42f 100644
--- a/src/syslogdevice.cc
+++ b/src/syslogdevice.cc
@@ -26,27 +26,27 @@ SyslogDevice::SyslogDevice(int f, const char *i, int o, int fa)
   openlog(ident.c_str(), option, facility);
 }
 
-SyslogDevice::~SyslogDevice(void)
+SyslogDevice::~SyslogDevice()
 {
   closelog();
 }
 
-string SyslogDevice::service(void) const
+string SyslogDevice::service() const
 {
   return "log";
 }
 
-bool SyslogDevice::waitForWrite(void) const
+bool SyslogDevice::waitForWrite() const
 {
   return true;
 }
 
-bool SyslogDevice::waitForRead(void) const
+bool SyslogDevice::waitForRead() const
 {
   return false;
 }
 
-IODevice::WriteResult SyslogDevice::write(void)
+IODevice::WriteResult SyslogDevice::write()
 {
   string out;
   string::const_iterator i = outputBuffer.str().begin();
@@ -67,7 +67,7 @@ IODevice::WriteResult SyslogDevice::write(void)
   return WriteDone;
 }
 
-bool SyslogDevice::fillInputBuffer(void)
+bool SyslogDevice::fillInputBuffer()
 {
   return false;
 }
diff --git a/src/tools.cc b/src/tools.cc
index 1b6e28a..abc0e5f 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -14,9 +14,9 @@
 using namespace Binc;
 using std::string;
 
-Tools::Tools(void) {}
+Tools::Tools() {}
 
-Tools &Tools::getInstance(void)
+Tools &Tools::getInstance()
 {
   static Tools tools;
   return tools;